Commit graph

88584 commits

Author SHA1 Message Date
Oleg Petšjonkin
ec3ef81fd9 Revert "Small fix: Use const value on IsHashreeDisabled"
This reverts commit f5d8773169.

Reason for revert: Identified as culprit for broken tests: b/317470107

Change-Id: If599c688bb4bbe800270881451fa5ac1f6898aff
2023-12-22 10:17:25 +00:00
Seungjae Yoo
3494e7e2ee Merge "Small fix: Use const value on IsHashreeDisabled" into main am: 1ff517ce9a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2889806

Change-Id: I8f5287b6fb3e951aed4d3d02a160bd014f4b7e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 06:29:04 +00:00
Seungjae Yoo
1ff517ce9a Merge "Small fix: Use const value on IsHashreeDisabled" into main 2023-12-22 05:53:43 +00:00
Seungjae Yoo
f5d8773169 Small fix: Use const value on IsHashreeDisabled
Bug: N/A
Test: Presubmit
Change-Id: I2167ac6d022c2c8c96febf2fc82eb3bba6fb6541
2023-12-22 10:11:55 +09:00
Steven Moreland
734ece8f8b Merge changes from topic "deprecate-llndk-vendor" into main am: 30e45c6e92
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2886673

Change-Id: I5e1842502b86744a258b79fbbc476ef67c644190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 22:55:16 +00:00
Steven Moreland
30e45c6e92 Merge changes from topic "deprecate-llndk-vendor" into main
* changes:
  try llndk-deprecate
  Deprecate android_is_in_vendor_process
2023-12-21 22:26:12 +00:00
Steven Moreland
54db200b21 try llndk-deprecate
No implementation required - seems to be ignored rather
than a failure

FIXME: should use vendor version, and be squashed into parent CL?

Bug: 300366609
Test: build
Change-Id: I19fd3871085f435c6ec55ac5e15e4769d7f3e450
2023-12-21 02:09:14 +00:00
Kiyoung Kim
ebbf9753e9 Deprecate android_is_in_vendor_process
android_is_in_vnedor_process previously checked if current process is in
system(-ish) section by trying to open vndk namespace. However, this
would not work once VNDK is deprecated. As there is no clear way to
replace this, and there is few usage on this API, it would be better
deprecated, and be implemented from each module if required.

Bug: 300366609
Test: AOSP CF build and boot succeeded
Change-Id: I70c70efb36199e12d4877ea4ecb39dbf94653551
2023-12-21 02:06:56 +00:00
Seungjae Yoo
a6a3005785 Merge "Support dm-verity with verification based on root digest" into main am: 91389231b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2877814

Change-Id: I775279288568c3962b6c14abf23b317c92406f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 01:21:30 +00:00
Seungjae Yoo
91389231b0 Merge "Support dm-verity with verification based on root digest" into main 2023-12-21 01:01:35 +00:00
Treehugger Robot
4a78bcebda Merge "Support batching ops across Add*Blocks() call" into main am: 26cb9dbfef
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2874375

Change-Id: I158c3527f9fd3b1c7fe72d6ddde9acd0b5880048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 23:27:57 +00:00
Treehugger Robot
af7a667271 Merge "Fix EmitSequenceData bug" into main am: c4b9840456
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2877302

Change-Id: I17a055fd3fbbdbc64c8a4b0f063fc843451bf3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 23:27:47 +00:00
Treehugger Robot
26cb9dbfef Merge "Support batching ops across Add*Blocks() call" into main 2023-12-20 22:49:38 +00:00
Treehugger Robot
c4b9840456 Merge "Fix EmitSequenceData bug" into main 2023-12-20 22:49:38 +00:00
Seungjae Yoo
66dc7b7b99 Support dm-verity with verification based on root digest
Currently the only ways to enable dm-verity were relying on its built-in
vbmeta image or containing its public key on standalone vbmeta image.
Merging this change will support enabling dm-verity based on hashtree
descriptor root digest for standalone vbmeta image.

Bug: 285855436
Test: Presubmit
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid --vendor /vendor/etc/avf/microdroid/microdroid_vendor.img
Change-Id: I51eb64cae2ca8b4e97f1c6419b35d45e6f51cacb
2023-12-20 10:41:44 +09:00
Kelvin Zhang
a008c9c1a4 Support batching ops across Add*Blocks() call
Performance of V3 COW writer is now on-par with V2 in both incremental
OTA and full OTA.

Test: th
Bug: 313962438
Change-Id: If56e0fe42367f947c513fc4c93119c3825763cb9
2023-12-19 16:32:02 -08:00
Treehugger Robot
5f3fc9c9a2 Merge "Add op count check before attempting to write operations" into main am: e0b444802b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2879168

Change-Id: Ief1ee28f8feb497c59f284e50386fb066ae309eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 20:46:15 +00:00
Treehugger Robot
e0b444802b Merge "Add op count check before attempting to write operations" into main 2023-12-19 20:18:41 +00:00
Akilesh Kailash
6ab4abd544 Merge "libsnapshot: Detach the daemon explicitly before stopping the service" into main am: 3a7774d650
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2881268

Change-Id: Idf47e02944a34cf39b1988d14b6ddd9c9f7f4be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 18:49:26 +00:00
Akilesh Kailash
3a7774d650 Merge "libsnapshot: Detach the daemon explicitly before stopping the service" into main 2023-12-19 17:50:06 +00:00
Chun-Wei Wang
c5780c5d40 Merge "Disable DSU in recovery mode" into main am: db6cb42d5f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2877498

Change-Id: I06cd3b323d18aabcd748803753a90638d891ee7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 04:26:26 +00:00
Chun-Wei Wang
db6cb42d5f Merge "Disable DSU in recovery mode" into main 2023-12-19 03:57:26 +00:00
Akilesh Kailash
1752c5f249 libsnapshot: Detach the daemon explicitly before stopping the service
If the daemon is alive, detach it before explicitly terminating service.

Bug: 316876960
Test: treehugger presubmit tests
Change-Id: I94d9d1a0dab09a6b016f422c7497098abc86add8
Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-12-18 17:22:06 -08:00
Peter Collingbourne
e890ccc180 Merge "Mount /tmp as tmpfs." into main am: 97807b79e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2876655

Change-Id: Ide83b63ecfad031c049e551fa003c97c33bb6f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-18 22:08:13 +00:00
Peter Collingbourne
97807b79e6 Merge "Mount /tmp as tmpfs." into main 2023-12-18 21:39:38 +00:00
Treehugger Robot
bdfce0b9b9 Merge "trusty: storageproxyd: fix logging of freed path pointer" into main am: f426858bbb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2880126

Change-Id: I22c40f5880c5ba52e3b68c600755fdef7544882a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-18 12:45:40 +00:00
Treehugger Robot
f426858bbb Merge "trusty: storageproxyd: fix logging of freed path pointer" into main 2023-12-18 12:16:43 +00:00
Mike McTernan
5647c0b738 trusty: storageproxyd: fix logging of freed path pointer
Bug: 316859216
Test: build.py
Change-Id: I09557d43cda13e21175ba6fceeb806ec1f9115e1
2023-12-18 11:03:36 +00:00
Chun-Wei Wang
222ffc5919 Disable DSU in recovery mode
DSU (modifying mounting paths) will cause OTA update
to fail in recovery mode

Bug: 315887685
Test: 1. enter DSU mode
      2. adb reboot recovery
      3. select "Apply update from ADB"
      4. adb sideload some-ota-update.zip
Change-Id: I6aec86893b7f8aa9e34f158269ebe2fd9dd98b33
2023-12-18 07:03:07 +08:00
Kelvin Zhang
c85038b866 Fix EmitSequenceData bug
If sequence data is written and the number of ops reaches the maximum,
op data will corrupt the block data because location of block data is
stale after writing sequence data. Fix by resetting location of block
data after EmitSequenceData()

Test: th
Bug: 313962438
Change-Id: Ib53b81772ba341cdf5c240baaee7c10725a365c3
2023-12-15 20:12:20 -08:00
Peter Collingbourne
cee7fcd001 Mount /tmp as tmpfs.
/tmp is a volatile temporary storage location for the shell user.
As with /data/local/tmp, it is owned by shell:shell and is chmod 771.

Bug: 311263616
Change-Id: Ice0229d937989b097971d9db434d5589ac2da99a
2023-12-15 16:46:46 -08:00
T.J. Mercier
44cd6d44d4 Merge changes from topic "cgroup.events2" into main am: 7341ffba7c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2875240

Change-Id: I6cb934698548101824400437d968a44fd4d783a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15 06:43:41 +00:00
T.J. Mercier
24e2480b2d Reapply "libprocessgroup: Poll on cgroup.events" am: 4928b6ef57
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2876955

Change-Id: Iafe95713ee45dcf5e71918c268729b232c8e8c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15 06:43:37 +00:00
T.J. Mercier
7341ffba7c Merge changes from topic "cgroup.events2" into main
* changes:
  libprocessgroup: Use cgroup.kill
  Reapply "libprocessgroup: Poll on cgroup.events"
2023-12-15 06:10:46 +00:00
Treehugger Robot
9e8b3ce8e0 Merge "remount: Detect when flashall has happened in the bootloader." into main am: 6f03bd72ad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2871216

Change-Id: I15ec2349eaa010ec18c46ca1cbb108f0dd173a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15 02:11:55 +00:00
Treehugger Robot
6f03bd72ad Merge "remount: Detect when flashall has happened in the bootloader." into main 2023-12-15 01:43:49 +00:00
Kelvin Zhang
73ac5f184e Add op count check before attempting to write operations
Test: th
Bug: 313962438
Change-Id: I0e288a42984d737d327236693a6b69c03a7ecc6e
2023-12-14 16:42:45 -08:00
David Anderson
adb91b0e59 remount: Detect when flashall has happened in the bootloader.
This adds a new metadata header flag to the super partition. This flag
is set when "adb remount" is used, and is implicitly cleared when
flashing.

If there is a scratch partition present on /data, we require that the
flag be set in order to proceed using overlays. If not set, scratch is
not mapped in first-stage init, and scratch images are removed later
during startup.

Bug: 297923468
Test: adb remount -R, touch file in out/, sync, flashall
Change-Id: I9cc411a1632101b5fc043193b38db8ffb9c20e7f
2023-12-14 16:00:27 -08:00
T.J. Mercier
a103630b5c libprocessgroup: Use cgroup.kill
By using cgroup.kill we don't need to read cgroup.procs at all for
SIGKILLs, which is more efficient and should help reduce CPU contention
and cgroup lock contention. Fallback to cgroup.procs if we encounter an
error trying to use cgroup.kill, but if cgroup.kill fails it's likely
that cgroup.procs will too.

Bug: 239829790
Test: atest StagedRollbackTest:com.android.tests.rollback.host.StagedRollbackTest#testNativeWatchdogTriggersRebootlessApexRollback
Change-Id: I9da67efd00af49b7b4b502fb742c1095d5c7b9e9
2023-12-14 21:52:13 +00:00
T.J. Mercier
4928b6ef57 Reapply "libprocessgroup: Poll on cgroup.events"
This reverts commit a72332f953.

This change was originally reverted due to a bug in the child commit
which caused process group kills not to occur when using cgroup.kill.
Now that has been fixed, bring back this change with the fixed child.

Bug: 301871933
Change-Id: Ia6c74d9b67a8c88aec4812ac4655646934e0d189
2023-12-14 21:49:14 +00:00
Treehugger Robot
30bf6a1d6b Merge changes If3a01ab8,Ib24d7c63 into main am: e2c6171f65
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2865205

Change-Id: If82e5b660585da6182dd07de6f055de196355d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 19:53:15 +00:00
Treehugger Robot
e2c6171f65 Merge changes If3a01ab8,Ib24d7c63 into main
* changes:
  Support batch writes for V3 cow format
  Optimize PrepareSnapshotPartitionsForUpdate runtime
2023-12-14 19:19:31 +00:00
Elliott Hughes
189d5b6459 Hang up narayan's janitor overalls.
Test: N/A
Change-Id: I1f0288e77fa9724a6621a08f12f996c19e2e3e9f
2023-12-14 17:47:24 +00:00
Treehugger Robot
823e0bf15f Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" into main am: b0c6a5dfd7 am: 3b3c06e73b am: 14a682f6ae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2869606

Change-Id: Id79dc8a7d7b97999573f9645fb77aa1e99d2a567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 01:52:13 +00:00
Treehugger Robot
14a682f6ae Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" into main am: b0c6a5dfd7 am: 3b3c06e73b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2869606

Change-Id: I8e45f9682687a064ee58d32a3eedb7883590933c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 01:20:13 +00:00
Florian Mayer
ab34acad5b Merge "Use correct stack depot size in __scudo_get_error" into main am: 26c0b9017b am: 30fe6fa7d7 am: 5e6f4e6f1c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2874634

Change-Id: Ieb050ec74729dc65228d36c6dc6689ea9d485b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 01:04:16 +00:00
Treehugger Robot
3b3c06e73b Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" into main am: b0c6a5dfd7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2869606

Change-Id: I78d36953d615e8e5dbf04f05f9a29b5218e9f3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 00:49:52 +00:00
Florian Mayer
5e6f4e6f1c Merge "Use correct stack depot size in __scudo_get_error" into main am: 26c0b9017b am: 30fe6fa7d7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2874634

Change-Id: Ica1caf67d7ec711d937bfc3093252d76df0479fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 00:29:56 +00:00
Treehugger Robot
b0c6a5dfd7 Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" into main 2023-12-14 00:24:57 +00:00
David Anderson
7ae131ab84 Merge "healthd: Add handling for "Calibration required" battery health." into main am: fb589aac77 am: 1d2e45dd56 am: fab3ca4f23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2868428

Change-Id: I42ce4bf281c4892a4427563504021eb5b398ceea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 00:13:17 +00:00