Commit graph

71847 commits

Author SHA1 Message Date
Devin Moore
5e4a18ff53 Merge "Revert "Handle "hardware" bootconfig parameter as "androidboot.hardware""" into sc-dev am: 3cc7a0c5a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15067569

Change-Id: Idebabcf17beb57e471fcd2f6a764180c541e9467
2021-07-01 22:10:06 +00:00
Devin Moore
3cc7a0c5a6 Merge "Revert "Handle "hardware" bootconfig parameter as "androidboot.hardware""" into sc-dev 2021-07-01 21:55:10 +00:00
Inseob Kim
b928ae29e7 Revert "Remove RECOVERY_AS_BOOT check for init_first_stage" am: 9fa041c9a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15166552

Change-Id: I9e9ba4caadab4abb0c9d0a7134b935ff6a9ff63d
2021-07-01 03:32:53 +00:00
Inseob Kim
9fa041c9a4 Revert "Remove RECOVERY_AS_BOOT check for init_first_stage"
This reverts commit 94c2593ea0.

Reason for revert: build breakage

Change-Id: I270a56bb33d19a2747298c69f6ec1b24746d97bf
2021-07-01 02:33:53 +00:00
Inseob Kim
a6b78a6835 Remove RECOVERY_AS_BOOT check for init_first_stage am: 94c2593ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15125801

Change-Id: Ibdfb65f7c87ac0342cddfbe17d6550e60f929e36
2021-06-30 23:37:29 +00:00
Inseob Kim
94c2593ea0 Remove RECOVERY_AS_BOOT check for init_first_stage
This has kept adb_debug.prop from being installed.

Ignore-AOSP-First: fixes sc-release test breakage

Bug: 192432810
Test: build ramdisk-debug.img and see contents
Change-Id: I254579d2c6427213f40e9ae8e50d046e19390ba5
2021-06-30 11:35:21 +00:00
Mitch Phillips
9acc411405 [MTE] Add a HWASan-style tag dump to tombstones. am: 729e08f6ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15147124

Change-Id: Id77388ceca29d7da42b77d49ab050f9d1c915c79
2021-06-30 02:19:13 +00:00
Mitch Phillips
729e08f6ea [MTE] Add a HWASan-style tag dump to tombstones.
We already dump the tags in the regigster dump section by appending the
tag to the memory address. You only get 2 granules before each register
and 13 after.

The HWASan-style tag dump is extremely useful for debugging, as it gives
a pretty comprehensive overview of the memory subsystem. It also
provides enough context bytes (256) to give you a reasonable intuition
about a particular bug.

The tag dump shows up only if PTRACE_PEEKTAGS returns at least one value
in the 256 requested. If the start of end of the region is untagged,
it's omitted. The tag dump looks like this:

Change-Id: Icc33fb97542d9b1fa3ae9e58aba34d524c6ba7b5

---
Memory tags around the fault address (0x60000704414d340), one tag per 16 bytes:
      0x704414d000: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d100: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d200: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
    =>0x704414d300: 0  0  0  0 [2] 2  0  0  0  0  0  0  0  0  0  0
      0x704414d400: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d500: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d600: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d700: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d800: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414d900: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
      0x704414da00: 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0
---

Bug: 183992164
Test: atest debuggerd_test on MTE+QEMU and sunfish.

Change-Id: I8d5842e4803ca30b407e866c99eef56f2cb36600
Merged-In: I8d5842e4803ca30b407e866c99eef56f2cb36600
2021-06-29 16:17:58 -07:00
Devin Moore
68bb5c4195 Revert "Handle "hardware" bootconfig parameter as "androidboot.hardware""
This reverts commit 0a799bdfd6.
Now that the kernel bootconfig feature has been to updated to handle
mixed subkeys and values, androidboot.hardware parameter is supported.

Test: build and boot Cuttlefish with "androidboot.hardware=cutf_vm"
Bug: 191502832
Merged-In: I0e436a27730d20689bc6974562c3e88d744385db
Change-Id: I0e436a27730d20689bc6974562c3e88d744385db
2021-06-29 12:53:08 -07:00
Wei Wang
6575f73a1a Merge "init.rc: remove system cgroup migraion" into sc-dev am: 67fa21cbdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15097965

Change-Id: Ib46da24a1d9b921f7a630d7a14582c6b01f1eda4
2021-06-25 17:25:33 +00:00
Wei Wang
67fa21cbdc Merge "init.rc: remove system cgroup migraion" into sc-dev 2021-06-25 17:04:00 +00:00
Christopher Ferris
27a984030a Merge "Avoid using thread cache in unwinder." into sc-dev am: a705c040ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15098025

Change-Id: Ica2f9113aa74cd2800645a799497a8ec10a7a6d9
2021-06-25 00:26:33 +00:00
Christopher Ferris
a705c040ea Merge "Avoid using thread cache in unwinder." into sc-dev 2021-06-25 00:03:51 +00:00
Inseob Kim
9a2828a0e9 Merge "Completely migrate init first stage to Soong" into sc-dev am: 86454f80ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15071196

Change-Id: I6d08b84b7ad37bb76d575e2d35847beb628e3165
2021-06-24 23:43:59 +00:00
Inseob Kim
86454f80ef Merge "Completely migrate init first stage to Soong" into sc-dev 2021-06-24 23:21:04 +00:00
Wei Wang
b4e79853cd init.rc: remove system cgroup migraion
We never use CONFIG_RT_GROUP_SCHED in GKI kernel, but that could be set
on legacy devices. Remove system cgroup migration and also RT settings
as we should not have any task under those groups.

Bug: 191925901
Test: Build
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I492833975e28e9888e412711e80670ca0901010d
2021-06-24 14:46:45 -07:00
TreeHugger Robot
1080fb202c Merge "reboot_utils: Check bootconfig for reboot parameters" into sc-dev am: 70f5ffc6e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15068923

Change-Id: I6702351e493f784f2749cbf7a7a0dc48cba389bb
2021-06-24 21:31:58 +00:00
TreeHugger Robot
70f5ffc6e7 Merge "reboot_utils: Check bootconfig for reboot parameters" into sc-dev 2021-06-24 21:18:29 +00:00
yidong zhang
72d0f9b6e7 Avoid using thread cache in unwinder.
Using  thread cache will cause SIGSEGV for 32bit+kernel4.9 device.

Bug: 190579082
Bug: 189803009

Test: run cts -m CtsSeccompHostTestCases
Change-Id: I47b13d02674aadbacd8dac36d8382eed0885413c
Merged-In: I47b13d02674aadbacd8dac36d8382eed0885413c
Signed-off-by: yidong zhang <yidong.zhang@amlogic.com>
(cherry picked from commit cbf7c466e6)
2021-06-24 20:28:34 +00:00
David Anderson
59d6ed14b6 Perform a consistency check before deleting snapshots. am: 91b351ea7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15088010

Change-Id: I08e8e858dd3bdedc8ed35113ef8ac6d42d62ac46
2021-06-24 19:37:34 +00:00
David Anderson
91b351ea7b Perform a consistency check before deleting snapshots.
If for some reason the COW state is not fully synced to disk, but
dm-snapshot has flushed its pending merges, we do not want to delete
snapshots. Doing so could potentially leave blocks unmerged.

This situation is quite unexpected so we label it as a merge failure.
The device can recover by completely syncing the COW state, and then
rebooting, which will attempt to make forward progress on the merge.

Bug: 190582627
Test: vts_libsnapshot_test
      full OTA on bramble
      incremental OTA on bramble
Change-Id: Ib887f1d9e4397a712ed2f800cc1222cf9305a039
Merged-In: Ib887f1d9e4397a712ed2f800cc1222cf9305a039
2021-06-23 19:12:01 -07:00
Devin Moore
2d93a2a100 reboot_utils: Check bootconfig for reboot parameters
Androidboot parameters have moved from /proc/cmdline to /proc/bootconfig
so we need to check both places in reboot_utils.
"ro.boot.*" properties can not be used because this is initialized
before the properties are set.

Test: boot Cuttlefish with init_fatal_panic and
init_fatal_reboot_target in bootconfig and in cmdline
Bug: 191494101

Merged-In: I6c230496ec1c3632470d20ff4a31f28db96ea71b
Change-Id: I6c230496ec1c3632470d20ff4a31f28db96ea71b
2021-06-23 11:27:52 +00:00
Inseob Kim
7418252a4e Completely migrate init first stage to Soong
adb_debug.prop is migrated too. And ramdisk_available is added to all
dependencies.

Bug: 187196593
Test: boot
Change-Id: I59cd149e0021211b8fd59c44b93bbf18dc8637bf
Merged-In: I59cd149e0021211b8fd59c44b93bbf18dc8637bf
2021-06-23 04:26:12 +00:00
TreeHugger Robot
46e8c5cf9c Merge "Isolate app profile ref data" into sc-dev am: 028303d523
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15015690

Change-Id: I842c8b657ef3063557455a583fcde566855c37e2
2021-06-22 16:40:39 +00:00
TreeHugger Robot
028303d523 Merge "Isolate app profile ref data" into sc-dev 2021-06-22 16:22:45 +00:00
Shawn Willden
9d7361a0c9 Merge "Revert^2 "Activate KeyMint."" into sc-dev am: 2a3c9238fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15053362

Change-Id: I697a6d04dffd828ab2ee0603f45b6907d9df1aaf
2021-06-21 23:30:40 +00:00
Shawn Willden
2a3c9238fe Merge "Revert^2 "Activate KeyMint."" into sc-dev 2021-06-21 23:12:32 +00:00
TreeHugger Robot
ed7f9608be Merge "Revert "Activate KeyMint."" into sc-dev am: c01255b092
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15043826

Change-Id: I77512dcb9a43b57216df116ea94288e971632a87
2021-06-21 19:55:43 +00:00
Shawn Willden
5dfd44ed5c Revert^2 "Activate KeyMint."
81cdd3f3da

Bug: 177729159
Test: VtsAidlKeyMintTargetTest & CtsKeystoreTestCases
Change-Id: I85d9e57fe83627992ddaa705946893a4b9890001
2021-06-21 19:44:02 +00:00
TreeHugger Robot
c01255b092 Merge "Revert "Activate KeyMint."" into sc-dev 2021-06-21 17:49:42 +00:00
Ioannis Ilkos
81cdd3f3da Revert "Activate KeyMint."
Revert "Activate KeyMint"

Revert submission 14947110-activate_keymint

Reason for revert: Likely b/191652216
Reverted Changes:
I6c5210356:Activate KeyMint
I784d39383:Activate KeyMint.

Bug: b/191652216
Change-Id: I7028a6aedc6e5aca670991033a616b6e8a97515b
2021-06-21 15:45:04 +00:00
Shawn Willden
efa1a7c9ef Merge "Activate KeyMint." into sc-dev am: aa73d0467d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14724569

Change-Id: I6aa187fb4171a2c855b1bb67428c575ad113af16
2021-06-21 13:14:50 +00:00
Shawn Willden
aa73d0467d Merge "Activate KeyMint." into sc-dev 2021-06-21 12:51:59 +00:00
Treehugger Robot
7980327d6b Isolate app profile ref data
Due to aosp/1708274, ref data directory is now world accessible.
We need to fix ref data directory so that it does not leak app
visibility information.

Bug: 189787375
Test: AppDataIsolationTests
Merged-In: I716852478ce0734c7038934c88c36a567c06393f
Change-Id: I351fd9763c4bdb6d3c0c9a9047de9a4f9986bd03
2021-06-17 19:13:54 +01:00
Shawn Willden
a6bad8b263 Merge "Splitting out Trusty IPC into a library." into sc-dev am: 2efdeec6eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14985018

Change-Id: I1776728bfa8b277794fd87b0d51de82c0d9926c7
2021-06-15 23:34:58 +00:00
Shawn Willden
2efdeec6eb Merge "Splitting out Trusty IPC into a library." into sc-dev 2021-06-15 23:17:37 +00:00
Elliott Hughes
33d4199f1b Merge "Check for overflow in String16::append and String16::insert." into sc-dev am: eec890e173
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14940186

Change-Id: Ia2d3c8f77101be90a992275a66a266a32eae118b
2021-06-15 22:34:57 +00:00
Elliott Hughes
eec890e173 Merge "Check for overflow in String16::append and String16::insert." into sc-dev 2021-06-15 22:19:15 +00:00
Elliott Hughes
a1fa7f2b1c Merge "Check for overflow in String8::real_append." into sc-dev am: 20462789dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14941314

Change-Id: Iac20a235a33d04f3e3e7808e0f9d8cb612181205
2021-06-15 21:17:30 +00:00
Elliott Hughes
20462789dc Merge "Check for overflow in String8::real_append." into sc-dev 2021-06-15 20:49:48 +00:00
Wei Wang
068a97d6ff Merge "task_profiles.json: add taskprofile for SurfaceFlinger" into sc-dev am: 99234c4967
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14968302

Change-Id: I8a6ae4cb744a80a714e30dc24866c09917660b67
2021-06-15 19:46:22 +00:00
Max Bires
fc0ed9527d Splitting out Trusty IPC into a library.
This allows the relevant IPC code to be included in the provisioner tool
easily as it's shuffled over into a non-AOSP component due to
chip specific requirements in provisioning Device IDs.

Bug: 178796950
Test: Stuff builds
Change-Id: I57482e89035e8648544f87291ec14c6aece09bd0
2021-06-15 12:15:36 -07:00
Wei Wang
99234c4967 Merge "task_profiles.json: add taskprofile for SurfaceFlinger" into sc-dev 2021-06-15 19:15:19 +00:00
Shawn Willden
40fccd3fe5 Merge "Add TrustyKeyMintDevice" into sc-dev am: 8caf16a46e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14724568

Change-Id: Icef14bcaa6fca2fbd721d5c5acecb287ad7b0b8e
2021-06-15 13:30:21 +00:00
Shawn Willden
8caf16a46e Merge "Add TrustyKeyMintDevice" into sc-dev 2021-06-15 13:15:33 +00:00
Bowgo Tsai
6c9ce52d3c Merge "fastboot: support vbmeta_vendor.img" into sc-dev am: e89ec3c0dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/14876515

Change-Id: Ibc08bc0c575522e500de8443e938f71432d80647
2021-06-15 02:22:02 +00:00
Bowgo Tsai
e89ec3c0dc Merge "fastboot: support vbmeta_vendor.img" into sc-dev 2021-06-15 02:09:57 +00:00
Wei Wang
6d6b71e582 task_profiles.json: add taskprofile for SurfaceFlinger
In some platforms, setting a different cpuset (or remove it) and/or
uclamp setting is beneficial to both performance and power. Adding 2
separate profiles for vendor to override surfaceflinger scheduling
policies.

Bug: 170507315
Test: build and boot
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ib313fd67c6ccd701109c5683d8dbab9ecd1580d8
2021-06-14 14:47:00 -07:00
Shawn Willden
c3626d0b1d Activate KeyMint.
Ignore-AOSP-First: No merge path from AOSP
Bug: 177729159
Test: VtsAidlKeyMintTargetTest
Change-Id: I784d393835d15e1eac3dd369202a1e245048801f
2021-06-14 14:33:00 -06:00
Shawn Willden
5bd73cceb5 Add TrustyKeyMintDevice
Ignore-AOSP-First: No merge path from AOSP
Bug: 177729159
Test: Not testable until more CLs land
Change-Id: Iea4e70bb5b4ce051492f2e42d2e0d219d088388e
2021-06-14 14:33:00 -06:00