Commit graph

84484 commits

Author SHA1 Message Date
Christopher Ferris
48d6e0452e Make libdebuggerd ramdisk available.
Test: Builds and debuggerd unit tests pass.
Change-Id: I2a5bd96e349f81ae0bec8dbffc49646c1f58bfea
2023-07-31 14:24:01 -07:00
Jooyung Han
201801ce8e Use /bootstrap-apex for bootstrap APEXes
This new directory is bind-mounted to /apex in the bootstrap mount
namespace so that apexd-bootstrap mounts bootstrap APEXes there via
/apex.

The directory is detached from /apex in the default mount namespace but
still visible in case bootstrap APEXes are needed.

However, there are (mostly, virtual) devices which don't need two mount
namespaces. Those devices don't need to make /bootstrap-apex directory
at all.

Bug: 290148078
Test: atest VendorApexHostTestCases
Test: atest MicrodroidTests
Change-Id: I541cec71d9970b14971d46e01e4808b23590dbed
2023-07-31 18:16:46 +09:00
Akilesh Kailash
e4841b7b2a Merge "libsnapshot: Verify the ordering of COW operations." into main am: 1db90d0aac am: 5eb2c1e898 am: 94a62bb477
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2668076

Change-Id: Ibfe168c4104d804f066fc4affc6224782896280e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-29 01:21:57 +00:00
Akilesh Kailash
94a62bb477 Merge "libsnapshot: Verify the ordering of COW operations." into main am: 1db90d0aac am: 5eb2c1e898
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2668076

Change-Id: Id4ac478e73957d6667619fea19ddec85a37bdf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-29 00:15:18 +00:00
Akilesh Kailash
5eb2c1e898 Merge "libsnapshot: Verify the ordering of COW operations." into main am: 1db90d0aac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2668076

Change-Id: I001c81b563dafbc1fb5b4dd6e16fbec76294ff92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 23:37:21 +00:00
Akilesh Kailash
1db90d0aac Merge "libsnapshot: Verify the ordering of COW operations." into main 2023-07-28 22:52:20 +00:00
Daniel Zheng
289582abd4 Merge "Adding include to functional" into main am: b0f9c07590 am: 29d1636f84 am: 59f6265d0c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679741

Change-Id: I23455b46c8cab07f9ecd0342f48f3c5ac9c4797e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 22:05:58 +00:00
Daniel Zheng
59f6265d0c Merge "Adding include to functional" into main am: b0f9c07590 am: 29d1636f84
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679741

Change-Id: I79c851090b16ac22bff4df2db3cb471b56c6040a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 21:21:13 +00:00
Daniel Zheng
29d1636f84 Merge "Adding include to functional" into main am: b0f9c07590
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679741

Change-Id: Ia2332c046edaa70bb79bd208cb16a6cdb9423e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 20:40:35 +00:00
Daniel Zheng
b0f9c07590 Merge "Adding include to functional" into main 2023-07-28 20:00:44 +00:00
Daniel Zheng
750fe6a37b Adding include to functional
adding include to functional since we use it in this file. Some users
are reporting build issues due to missing this include

Test: m fastboot
Change-Id: I9ba11bdaf7dcedf5f9ebfb6fa50013be50738f48
2023-07-28 11:00:16 -07:00
Akilesh Kailash
63ec4c6180 libsnapshot: Verify the ordering of COW operations.
Sequence op should contain all ordered ops followed
by Replace and Zero ops. There shouldn't be any non-ordered
ops embedded between ordered ops in the sequence ordering.

Bug: 290159346
Test: inspect_cow <cow_file>, OTA
Change-Id: Ia840340b0e4be07525f216838043bf0265f690c3
Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-07-28 10:11:06 -07:00
Jooyung Han
5ffd88f26f init: move MarkServicesUpdate later
MarkServicesUpdate() starts delayed services which are mostly for
APEXes. (e.g. start a service from APEX). But before
"DefaultNamespaceReady", services are started in "bootstrap" mount
namespace, which makes services from non-bootstrap APEXes fail to start.

This is a quick fix for the problem before coming up with better
solution in the future.

Bug: 293535323
Test: add 'start adbd' before 'perform_apex_config' in init.rc
      adbd starts successfully.
Change-Id: I846689f7c38cdca83c1f7faec0106b8174527e09
2023-07-28 17:28:27 +09:00
Treehugger Robot
484ee83b60 Merge "trusty: keymint: Statically link Rust deps" into main am: 545f3e0d35 am: b6d50d3984 am: cb33f3bbd8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679717

Change-Id: I73956885cffd11b63908b98736d03d6bd155569e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 03:49:59 +00:00
Treehugger Robot
651368b07d Merge changes I02e3046b,I5b33ca47 into main am: 50eaceedda am: f0e1d5105e am: 543846cb9a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675707

Change-Id: I833bcab7fee98974adc0ee8341c3a501338654c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 03:05:52 +00:00
Treehugger Robot
cb33f3bbd8 Merge "trusty: keymint: Statically link Rust deps" into main am: 545f3e0d35 am: b6d50d3984
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679717

Change-Id: I53f39d967ff7df026a9964ebb46c4e75bd7b4f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 01:35:46 +00:00
Treehugger Robot
543846cb9a Merge changes I02e3046b,I5b33ca47 into main am: 50eaceedda am: f0e1d5105e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675707

Change-Id: I0f8b5178a36b26832a91e312eef8e297bbb0d12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 01:14:47 +00:00
Treehugger Robot
b6d50d3984 Merge "trusty: keymint: Statically link Rust deps" into main am: 545f3e0d35
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679717

Change-Id: I5e6a937abb70d2ff734336885709d85d16510862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:44:17 +00:00
Treehugger Robot
f0e1d5105e Merge changes I02e3046b,I5b33ca47 into main am: 50eaceedda
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2675707

Change-Id: I80fe24293f3147a80195d270f216254bbf233f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:43:59 +00:00
Treehugger Robot
545f3e0d35 Merge "trusty: keymint: Statically link Rust deps" into main 2023-07-27 23:29:48 +00:00
Treehugger Robot
50eaceedda Merge changes I02e3046b,I5b33ca47 into main
* changes:
  libprocessgroup: optimize SetAttributeAction::ExecuteForProcess performance
  libprocessgroup: fix reset of file_v2_name
2023-07-27 22:59:34 +00:00
Matthew Maurer
cac69b6cb8 trusty: keymint: Statically link Rust deps
Vendor libraries can be linked dynamically now, but until more Rust
components are using it, static is more efficient.

Bug: 292062611
Test: TH
Change-Id: I3708f5fac1ace797b6233811adf3ec71218d5738
2023-07-27 22:36:28 +00:00
Suren Baghdasaryan
3483798fd9 libprocessgroup: optimize SetAttributeAction::ExecuteForProcess performance
Current implementation of SetAttributeAction::ExecuteForProcess reuses
SetAttributeAction::ExecuteForTask while not utilizing available uid/pid
information. This results in a call to GetPathForTask() which is an
expensive function due to it reading and parsing /proc/$pid/cgroups.
This can be avoided if we utilize available uid/pid info and the fact
that cgroup v2 attributes share the cgroup v2 hierarchy as process
groups, which use a known path template.

Bug: 292636609
Change-Id: I02e3046bd85d0dfebc68ab444f1796bb54cc69c7
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2023-07-27 21:55:48 +00:00
Suren Baghdasaryan
3507846872 libprocessgroup: fix reset of file_v2_name
ProfileAttribute::Reset does not reset file_v2_name, fix that. Also
provide ProfileAttribute::file_name() to consolidate the code.

Bug: 292636609
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I5b33ca47b4fa5cabf582c8804bd13f72f6e58411
2023-07-27 21:55:40 +00:00
Treehugger Robot
a0f2909c32 Merge "Add bug component to cutils" into main am: bb3976c149 am: ee8eb76e84 am: 0289ddb87b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679836

Change-Id: Icdb7e22285d12a24f7185090d42c94d35f37e122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:53:57 +00:00
Lee George Thomas
ea1ee8426f Merge "Create /data/misc/bootanim folder in init.rc." into main am: 9d398af95c am: 9837a1e03f am: 0839350cb3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676056

Change-Id: I24f5f99021c6d7e561c95febf18a158cd3367d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:52:11 +00:00
Treehugger Robot
0289ddb87b Merge "Add bug component to cutils" into main am: bb3976c149 am: ee8eb76e84
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679836

Change-Id: I82647ca3ca26d8ab3ce5fbbbe6b64b53d903702f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:03:16 +00:00
Lee George Thomas
0839350cb3 Merge "Create /data/misc/bootanim folder in init.rc." into main am: 9d398af95c am: 9837a1e03f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676056

Change-Id: I70e9dc2c3fb0b1c0528f1be421bf8d0c806915b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:00:55 +00:00
Treehugger Robot
ee8eb76e84 Merge "Add bug component to cutils" into main am: bb3976c149
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2679836

Change-Id: Id8cf8de7403004b41a3f6d2eb87c199b9fc77596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 18:34:19 +00:00
Lee George Thomas
9837a1e03f Merge "Create /data/misc/bootanim folder in init.rc." into main am: 9d398af95c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676056

Change-Id: I14d2a4fc510a3001e68472ccf5e9b84b2ed7d1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 18:32:28 +00:00
Treehugger Robot
bb3976c149 Merge "Add bug component to cutils" into main 2023-07-27 18:29:10 +00:00
Lee George Thomas
9d398af95c Merge "Create /data/misc/bootanim folder in init.rc." into main 2023-07-27 17:34:08 +00:00
Tomasz Wasilczyk
8fe4f073c2 Add bug component to cutils
Bug: 289414897
Test: N/A
Change-Id: Ic7122e52c3847beba3891b121b723d19bf2076de
2023-07-27 10:16:05 -07:00
Treehugger Robot
7a5895d0b2 Merge "libprocessgroup: UIDs in linux are unsigned" into main am: f8d02eeee1 am: 01d4fdfad3 am: 8cabf4bed4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2677642

Change-Id: Ie6a63b0fd704e754cac063dfba0006712d3a3495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:57:41 +00:00
Treehugger Robot
8cabf4bed4 Merge "libprocessgroup: UIDs in linux are unsigned" into main am: f8d02eeee1 am: 01d4fdfad3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2677642

Change-Id: Iea7a39817a8a18497c1dee17b1def58c6706b170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 03:15:24 +00:00
Treehugger Robot
01d4fdfad3 Merge "libprocessgroup: UIDs in linux are unsigned" into main am: f8d02eeee1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2677642

Change-Id: I9bcc66576d12fa017d424ff9a4b505980d9d5f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 02:28:58 +00:00
Treehugger Robot
f8d02eeee1 Merge "libprocessgroup: UIDs in linux are unsigned" into main 2023-07-27 01:27:48 +00:00
T.J. Mercier
aa6158b410 libprocessgroup: UIDs in linux are unsigned
We missed two incorrect specifiers in the previous commit with this same
title.

We use the %d format specificier for uid_t, which maps to
__kernel_uid32_t, which is unsigned. [1] This is undefined behavior
which can lead to paths with negative UIDs when erroneously large
values are passed for uid:

E libprocessgroup: No such cgroup attribute: /sys/fs/cgroup/uid_-89846/cgroup.freeze

Fix it with %u.

[1] https://cs.android.com/search?q=typedef.*__kernel_uid32_t&ss=android%2Fplatform%2Fsuperproject%2Fmain

Change-Id: Ica04b03526bd2e156f026a2797fe9912b259cd9f
2023-07-26 22:12:44 +00:00
Eric Biggers
503fa1ece2 Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"" into main am: 428622bb7f am: 82161b0c05 am: f68b038ec5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676760

Change-Id: I3e32bbb3e7520fc35dbc099e97ae503cc331a604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 20:39:18 +00:00
Eric Biggers
f68b038ec5 Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"" into main am: 428622bb7f am: 82161b0c05
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676760

Change-Id: Ib9f977750fa6a478f241600857888d661d844c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 19:54:15 +00:00
Treehugger Robot
6d9b10edd9 Merge "Add bug component to system/core" into main am: 17df69eb5f am: 4bad19f3a2 am: 079f2c78c2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2677635

Change-Id: I099a0e5daea7e8f2bdf9ff787e9723a2668837d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 19:08:51 +00:00
Eric Biggers
82161b0c05 Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"" into main am: 428622bb7f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2676760

Change-Id: I3fa7aefb95ecebb0e015e37559334c9748ed2d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 19:08:06 +00:00
Eric Biggers
428622bb7f Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"" into main 2023-07-26 18:06:51 +00:00
Treehugger Robot
079f2c78c2 Merge "Add bug component to system/core" into main am: 17df69eb5f am: 4bad19f3a2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2677635

Change-Id: I11555a21b9a481303b45e57294126100d045b6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:02:04 +00:00
Treehugger Robot
4bad19f3a2 Merge "Add bug component to system/core" into main am: 17df69eb5f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2677635

Change-Id: I8d6f551024e820c43258e41e185fba83539c5d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 16:13:41 +00:00
Treehugger Robot
17df69eb5f Merge "Add bug component to system/core" into main 2023-07-26 15:26:59 +00:00
Tomasz Wasilczyk
a895aac5e0 Add bug component to system/core
Bug: 289414897
Test: N/A
Change-Id: I9709b2483988f8d7a4204d5398cc559d167f14bf
2023-07-26 07:57:58 -07:00
Yunkai Lim
9292f74fc1 Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"
Revert submission 2662658-fsverity-init-cleanup

Reason for revert: Culprit for test breakage b/293232766

Reverted changes: /q/submissionid:2662658-fsverity-init-cleanup

Change-Id: I77086f955a53eec274166b7395a88b7dc0e1ad53
2023-07-26 06:21:43 +00:00
Eric Biggers
2c8543d825 Merge "init.rc: stop calling 'fsverity_init --load-verified-keys'" into main am: 5aade9ca04 am: e17aeed6b8 am: 534840eeab
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2662658

Change-Id: Ifda46a86f6c895967f35c8efef882479fc05d151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:22:30 +00:00
Eric Biggers
534840eeab Merge "init.rc: stop calling 'fsverity_init --load-verified-keys'" into main am: 5aade9ca04 am: e17aeed6b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2662658

Change-Id: Ibb90ec4b0d816514def6522eb761fb7ac0a9ecfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 00:35:03 +00:00