Commit graph

78118 commits

Author SHA1 Message Date
Treehugger Robot
4f3a242c7c Merge "trusty-binder: Add AIDL files for trusty-binder tests" am: 4304cbd8db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2163116

Change-Id: I0904e9608d60b6f566586d50bf2bffd92d9cc2c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 15:38:24 +00:00
Treehugger Robot
4304cbd8db Merge "trusty-binder: Add AIDL files for trusty-binder tests" 2022-07-26 15:19:56 +00:00
Akilesh Kailash
9334046277 Merge "Flush after every 2MB merge of replace ops." am: 8f7aaf9d97
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2164727

Change-Id: Iaace80dc278faaaca9183a76acda4157162eab9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 21:47:14 +00:00
Akilesh Kailash
8f7aaf9d97 Merge "Flush after every 2MB merge of replace ops." 2022-07-25 21:27:40 +00:00
Akilesh Kailash
58377417e9 Flush after every 2MB merge of replace ops.
This will be in sync with incremental OTA's where the sync
is done every 2MB. This improves performance on devices
with low memory.

Merge times for full OTA may increase by couple of seconds but
that is ok given it decreases the memory footprint.

Bug: 238052097
Test: OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ic2c8d2ffdbdb677e0c4d44e5de68ce8ccf86df34
2022-07-25 19:08:46 +00:00
Thiébaud Weksteen
973318bbe3 Merge "Remove unused execution paths when formatting" am: 6eb4d64eae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2162076

Change-Id: Icaf2cb7deb5d1e0a556daf08ad6d3e1fd047ac93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 00:20:23 +00:00
Thiébaud Weksteen
6eb4d64eae Merge "Remove unused execution paths when formatting" 2022-07-24 23:59:18 +00:00
Treehugger Robot
4725998d49 Merge "libfiemap: Add a test case for larger block size filesystems." am: e7bc3e3764
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2157716

Change-Id: Iecb01cca0438e0bd5cabde42c6af7ac98c30e5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-23 03:59:40 +00:00
Treehugger Robot
e7bc3e3764 Merge "libfiemap: Add a test case for larger block size filesystems." 2022-07-23 03:18:58 +00:00
David Anderson
d76c31ba40 libfiemap: Add a test case for larger block size filesystems.
This adds a test case for filesystems with larger than 4KiB alignment.
It creates a temporary FAT filesystem and attempts to create a backing
image. The actual size of the block device should be the requested size.

Test: fiemap_image_test
Bug: N/A
Change-Id: I8ef574b22dbf6d47f4855b7de681c927cf81f2b7
2022-07-22 17:44:12 -07:00
Deyao Ren
aebf88191b Merge "Add apex name to service" am: ec73481e58
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155014

Change-Id: I3c44c321568173fa11588c2d6c69a43ad48c63f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 23:09:19 +00:00
Jooyung Han
07316159c3 Merge "Respect namespace mnt" am: ba1fbaf50c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2163903

Change-Id: I67d5c5d93109b97b376fb97b01618893aba8af13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 23:08:56 +00:00
Deyao Ren
ec73481e58 Merge "Add apex name to service" 2022-07-22 23:03:45 +00:00
Jooyung Han
ba1fbaf50c Merge "Respect namespace mnt" 2022-07-22 22:41:14 +00:00
Jooyung Han
5eb441caca Respect namespace mnt
This fixes the regression of aosp/2153354.
SwitchToMountNamespaceIfNeeded() is supposed to switch between "default"
mount namespace and "bootstrap" mount namespace. But it shouldn't affect
services with its own mount namespace.

Bug: 239882455
Test: make a hal service start in a separate mount namespace
    using 'namespace mnt' in its definition.
    see the mount namespace of the service process
    $ cat /proc/$(pgrep -f myservice)/ns/mnt
Change-Id: I8c80eaec723241c405f48980b9e88640123c43ad
2022-07-23 01:41:18 +09:00
Deyao Ren
df40ed1be1 Add apex name to service
Passed apex file name to service. The file name will be parsed
to determine 1) whether the service is from an apex; 2) apex name

Bug: 236090201

Change-Id: I2c292c0c067f4bf44bb25b1f80e4f972b94f7258
2022-07-22 04:00:30 +00:00
Tri Vo
b7c0e159a3 Merge "storageproxyd: Remove setuid, setgid, and capset" am: 6a058f492c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2154998

Change-Id: Ib6e423f0a9a7af64b71877b056669e779c30eef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 00:15:04 +00:00
Tri Vo
6a058f492c Merge "storageproxyd: Remove setuid, setgid, and capset" 2022-07-21 23:59:45 +00:00
David Anekstein
c6768f7aad trusty-binder: Add AIDL files for trusty-binder tests
Bug: 224644083
Change-Id: I4818bfee421996dbf313c96d3ab53d9d0429f0c4
2022-07-21 15:34:43 -04:00
Thiébaud Weksteen
5d72d6ce20 Remove unused execution paths when formatting
fastboot uses the internal functions generate_ext4_image and
generate_f2fs_image when called via the `format` subcommand. An option
for populating the newly created fs with an initial directory exists,
but it is not exposed to the command line interface (initial_dir is
always ""). Remove the unused codepaths for this preloading.

Test: atest --host fastboot_test
Bug: 237960487
Change-Id: I7acfe6352cf26b5cbe0e5553b288c3798e96a893
2022-07-21 14:50:05 +10:00
Yi-yo Chiang
c57557ba96 Merge "fs_mgr_overlayfs: Try "/system" and "/" when setting "/system" shared type" am: 44f1f094b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2159442

Change-Id: Ie7490efdebb369dcac06c8447d1955141afda821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 04:12:50 +00:00
Yi-yo Chiang
44f1f094b3 Merge "fs_mgr_overlayfs: Try "/system" and "/" when setting "/system" shared type" 2022-07-21 03:52:52 +00:00
Yi-Yo Chiang
379be50f9c fs_mgr_overlayfs: Try "/system" and "/" when setting "/system" shared type
b/239574953 uncovers an obscure test device configuration that breaks
with aosp/2146960.

Without aosp/2146960, "/system" is not a mountpoint, because after
switch_root, the "/system" mount entry becomes "/", thus changing the
subtree propagation type of "/system" would fail.
With aosp/2146960, "/system" is bind-mounted to itself after
switch_root, ensuring "/system" being a mountpoint, thus changing the
subtree propagation type of "/system" is allowed.

Before we can re-land aosp/2146960, just try both "/system" and "/"
when changing the subtree shared propagation type of "/system", so
both scenarios are handled.

Test: Add submount under /system and adb remount
Change-Id: I4006a5c1b1987d5f6452efa069ec5c7d2ac7c8ec
2022-07-21 03:52:26 +00:00
David Anderson
bc11b2b3f2 Merge "remount: Ensure that scratch images are block-size aligned." am: c20b6b58fc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2159540

Change-Id: I60b46e05323e9a3aaaea069a1364067a2e515b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 03:27:46 +00:00
David Anderson
c20b6b58fc Merge "remount: Ensure that scratch images are block-size aligned." 2022-07-21 01:56:09 +00:00
David Anderson
2d8bc21823 remount: Ensure that scratch images are block-size aligned.
Bug: 218976943
Test: adb remount
Change-Id: I46a4592c4ba504865a633437d734ce26e5fba6a5
2022-07-20 16:20:03 +00:00
Yi-yo Chiang
a367bdbc4c Merge "Revert "first_stage_mount: Bind mount /system after switch root"" am: e321b113d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2159462

Change-Id: Ie9afb0754d73a7bdcf735c8dc6d1c0fec4a514db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 03:57:26 +00:00
Treehugger Robot
1c64425b32 Merge "vts_fs_test: checks AVB 1.0 isn't used" am: c89e97f627
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2154915

Change-Id: I0c8965cb14a15dfc67a993c228aa0b04d4a15ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 03:57:06 +00:00
Yi-yo Chiang
e321b113d6 Merge "Revert "first_stage_mount: Bind mount /system after switch root"" 2022-07-20 03:49:59 +00:00
Treehugger Robot
c89e97f627 Merge "vts_fs_test: checks AVB 1.0 isn't used" 2022-07-20 03:29:26 +00:00
David Anderson
f176246041 Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade" am: f4753d1cc5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2153356

Change-Id: Ic4a85f9f04acf3b12d914b2c671e40025985daea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 21:28:56 +00:00
David Anderson
f4753d1cc5 Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade" 2022-07-19 21:11:55 +00:00
Zhuoyao Zhang
54ec48fad7 Revert "first_stage_mount: Bind mount /system after switch root"
This reverts commit d7e6353a69.

Reason for revert: b/239574953 breaking emulator based test on g3

Change-Id: Ib7d17fe8383937c7764f6612cf89db4fb7e5a4d3
2022-07-19 18:09:42 +00:00
Jiyong Park
03e341e44a Merge "Replace #apex with #systemapi" am: f3e6cf0a76
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155074

Change-Id: I21cc70f34a76811580e51f1e416e6762642f53d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 15:53:27 +00:00
Jiyong Park
f3e6cf0a76 Merge "Replace #apex with #systemapi" 2022-07-19 15:35:13 +00:00
Bowgo Tsai
80cb505f64 vts_fs_test: checks AVB 1.0 isn't used
AVB 1.0 support in fs_mgr has been removed in commit
Ibfb46aa6c2f761dbb3a9b5f0b16336e510417620.

Adding a VTS test case to ensure the legacy 'verify' fs_mgr
flag isn't used anymore.

Also converting GetFstabPath() to a public API in the fstab.h,
so the test case can read then parse the fstab file.

Bug: 204948957
Test: atest vts_fs_test
Change-Id: Ib6ed7cb8b6ad719b19cd876acf10f4312ecb51b6
2022-07-19 16:27:59 +08:00
Jiyong Park
35ed22e7c0 Merge "Enhance documentation about SetMmapRndBitsAction" am: ccb1ce32cc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2156356

Change-Id: I86fbac8de9872ef6733cbd05bb140e1c92820d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 05:06:30 +00:00
Jiyong Park
a9f856b13b Merge "init: don't touch mmap_rnd_compat_bits on 64-bit only builds" am: 2d79c6c096
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2154914

Change-Id: I1e3ef837b69b85c5a554a9d0f41d319dd986ecb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 05:06:20 +00:00
Jiyong Park
ccb1ce32cc Merge "Enhance documentation about SetMmapRndBitsAction" 2022-07-19 04:41:32 +00:00
Jiyong Park
2d79c6c096 Merge "init: don't touch mmap_rnd_compat_bits on 64-bit only builds" 2022-07-19 04:40:39 +00:00
Jiyong Park
5b16ccb36e Enhance documentation about SetMmapRndBitsAction
Bug: N/A
Test: N/A
Change-Id: I0408158d181ef08831a55e1381477f5b128a5c52
2022-07-19 10:47:47 +09:00
Jooyung Han
6bfcefca0a Merge "Update linker configuration when loading apex" am: 11e757c9cc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155096

Change-Id: Ife9943c015595c8d1381716fede99ad0fce2fab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 23:59:47 +00:00
Jooyung Han
11e757c9cc Merge "Update linker configuration when loading apex" 2022-07-18 23:39:56 +00:00
Yi-yo Chiang
c3e43e63fe Merge "first_stage_mount: Bind mount /system after switch root" am: 53f1fab6ac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146960

Change-Id: I6f8029284650238dcca3727cb9be81d486a9d314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 10:08:01 +00:00
Yi-yo Chiang
53f1fab6ac Merge "first_stage_mount: Bind mount /system after switch root" 2022-07-18 09:47:56 +00:00
Jooyung Han
626be07153 Update linker configuration when loading apex
On ctl.apex_load <apex_name> control message, init invokes linkerconfig
to update linker configuration for the updated apex.

Bug: 232173613
Test: CtsInitTestCases
Test: VendorApexHostTestCases
Change-Id: I01d975849c3f4efe74205a7b04ebbd6864ba1121
2022-07-18 17:45:15 +09:00
Treehugger Robot
f8415fdc19 Merge "first_stage_mount: Fix log typo "check_at_most_once"" am: 4bc5277152
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146961

Change-Id: Id41980ebd8e4ec7353def81828f0138374858a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 06:18:51 +00:00
Treehugger Robot
4bc5277152 Merge "first_stage_mount: Fix log typo "check_at_most_once"" 2022-07-18 05:58:42 +00:00
Jiyong Park
11d7bc52df init: don't touch mmap_rnd_compat_bits on 64-bit only builds
mmap_rnd_compat_bits is for address space randomization of 32-bit
applications on 64-bit system. Configuring it is not only unnecessary
for 64-bit "only" builds, but also can cause a boot failure if the
kernel is built without CONFIG_COMPAT which is the case for Microdroid.

Use ro.product.abilist32 to determine whether 32-bit applications are
supported and if not, don't configure it, but mmap_rnd_bits.

Bug: 237950549
Test: run Microdroid with the kernel built with aosp/2153639

Change-Id: Ifca6fa02f14ad4c7d8f9b2ab8852494c12945c3a
2022-07-18 14:31:13 +09:00
Yi-Yo Chiang
a3832d496b first_stage_mount: Fix log typo "check_at_most_once"
Was "check_most_at_once", should be "check_at_most_once".
Also straighten the if-then-else logic from:
  if (cond) {
    // then
  } else {
    // error...
    return;
  }
to:
  if (!cond) {
    // error...
    return;
  }
  // fallthrough is "then"

Test: Presubmit
Change-Id: I85c1e94c47a727089374d5d05ecd40f4187b66a1
2022-07-18 04:38:02 +00:00