Commit graph

89367 commits

Author SHA1 Message Date
Nikita Ioffe
081689ff8e Move ForkExecveAndWaitForCompletion to util.h am: fe7b83faea
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2986254

Change-Id: Ied5c3373b9159538bdc11c1e8f390c65b71356c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 11:39:55 +00:00
Nikita Ioffe
3109a477f7 Mount /microdroid_resources as tmpfs am: 2384e8abfe
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3000936

Change-Id: Ied06eca140bea3d749067dc46b50aa98c842217f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 11:39:49 +00:00
Nikita Ioffe
13db31040f Merge changes from topic "derive-microdroid-vendor-dice-node" into main
* changes:
  Add a step to derive microdroid vendor dice node
  Move ForkExecveAndWaitForCompletion to util.h
  Mount /microdroid_resources as tmpfs
2024-03-14 11:20:06 +00:00
Treehugger Robot
9f75e7d4d7 Merge "Define macros for LLNDK versioning" into main am: 9bceea5a7f am: 590c553e12
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2996956

Change-Id: I055015b222274b780ab3156eea3aba703c71ae1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 06:33:49 +00:00
Treehugger Robot
590c553e12 Merge "Define macros for LLNDK versioning" into main am: 9bceea5a7f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2996956

Change-Id: Ia39ac2d67884b8fe8fa2be3caa47fc4e3be7b1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 06:19:12 +00:00
Treehugger Robot
9bceea5a7f Merge "Define macros for LLNDK versioning" into main 2024-03-14 05:58:32 +00:00
Daniel Zheng
9ce8219f52 libsnapshot: fix warnings
Fix unused header warning

Test: th
Change-Id: I5c9f22f3f74d6ca44e738e1dc8e9fe146749857f
2024-03-13 22:31:58 -07:00
Daniel Zheng
da960a1341 libsnapshot: remove temporary solution
Remove temporary estimation solution (using 4k to overestimate the cow).
With the updated estimation logic, we should be able to accurately
estimate the cow size with variable block sized compression

Bug: 322279333
Test: th
Change-Id: I199970048605a8d21d3791614ad88ca61662e1a3
2024-03-13 22:28:43 -07:00
Dennis Shen
07afcabf67 start aconfig storage daemon
Bug: b/312444587
Test: m and launch AVD
Change-Id: I92946fc4ec2100d995300c58ef6045ae5b40f13a
2024-03-13 19:16:29 +00:00
Bart Van Assche
55452053f1 Merge "Make foreground and background I/O priority different" into main am: f21e60282e am: c0d3d2a207
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2998919

Change-Id: I59a9dbe5b763d04c86c5945fd248389c17270b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-13 16:47:42 +00:00
Bart Van Assche
c0d3d2a207 Merge "Make foreground and background I/O priority different" into main am: f21e60282e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2998919

Change-Id: I1f96192d837a7fa53b8c4f749f3f47f837d4fc76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-13 16:34:37 +00:00
Bart Van Assche
f21e60282e Merge "Make foreground and background I/O priority different" into main 2024-03-13 16:15:20 +00:00
Nikita Ioffe
1e114e677b Add a step to derive microdroid vendor dice node
The derivation happens in the derive_microdroid_vendor_dice_node binary
which first_stage_init forks and execvs.

Since the derivation requires talking to the dice driver, its
initialisation is also moved to the first stage init.

The derivation happens before the microdroid vendor partition is
verified & mounted. This should be safe because the first_stage_init
will fail the boot if the verification of the microdroid vendor
partition fails.

Bug: 287593065
Test: run microdroid with and without vendor partition
Test: atest MicrodroidTests
Change-Id: I0d83772eb98a56c315617e66ec64bd03639cfde6
2024-03-13 15:24:44 +00:00
Nikita Ioffe
fe7b83faea Move ForkExecveAndWaitForCompletion to util.h
In the follow up patch this function will also be used in
first_stage_init.

Bug: 287593065
Test: m
Change-Id: Id805f8523596c26ed262d89aa652b27184b612c1
2024-03-13 14:44:46 +00:00
Nikita Ioffe
2384e8abfe Mount /microdroid_resources as tmpfs
This will be used to store the new dice chain generated during
first_stage_init phase in case Microdroid VM is launched with
microdroid vendor partition.

Bug: 287593065
Test: atest MicrodroidTests
Test: start Microdroid VM & check microdroid_resources exists
Change-Id: I40677376bfed14d813ad51c78db6109b2d76d1d1
2024-03-13 14:39:08 +00:00
Treehugger Robot
4aa5befb5c Merge changes I68f7d46b,I5d5278ab into main am: 0c2301240a am: 898ce952f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2995299

Change-Id: I6cddab3fe989bc5f0e7010b7cb5745c6f8fef08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-13 06:51:44 +00:00
Treehugger Robot
898ce952f9 Merge changes I68f7d46b,I5d5278ab into main am: 0c2301240a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2995299

Change-Id: Ie3e9c1f0c980e26feddf0cc65e20d80d9357bbb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-13 06:05:51 +00:00
Treehugger Robot
0c2301240a Merge changes I68f7d46b,I5d5278ab into main
* changes:
  toolbox/modprobe: Fix failure due to blocklist
  libmodprobe: Make IsBlocklisted() public
2024-03-13 05:27:59 +00:00
Bart Van Assche
7f3fe0aaf2 Make foreground and background I/O priority different
The default I/O priority is "best effort" so the combination of "none"
and "restrict-to-be" is not sufficient to make foreground and background
I/O priorities different. This CL makes sure that foreground and
background I/O priorities are different.

As one can see, this CL has the intended effect in Cuttlefish:
$ adb -s 0.0.0.0:6520 shell 'cd /dev/blkio && grep -aH . blkio.prio.class background/blkio.prio.class'
blkio.prio.class:promote-to-rt
background/blkio.prio.class:restrict-to-be

Bug: 186902601
Change-Id: I24d30d360280d8c398684b0b5e88635f658ff870
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-03-12 13:30:40 -07:00
Florian Mayer
d1f0254a01 Merge "Update test for more accurate memtag_handle_longjmp" into main am: c923ea5a6d am: 4595c8f531
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992657

Change-Id: I847e3a5ddfcdaf01f0cceb4442a0acd24a49b707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-12 19:24:01 +00:00
Veena Arvind
9e3187b196 Merge "Scan for quiescent in sub reason and details" into main am: fe7e089a7c am: bbe79fedf6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2994919

Change-Id: I16432fda8887ab8a2337c58f25f2fd895cd4ad08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-12 19:23:48 +00:00
Florian Mayer
4595c8f531 Merge "Update test for more accurate memtag_handle_longjmp" into main am: c923ea5a6d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992657

Change-Id: I9d6c4471fc9569c3ff50472d2b2b3c56f6f4ed10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-12 18:20:10 +00:00
Veena Arvind
bbe79fedf6 Merge "Scan for quiescent in sub reason and details" into main am: fe7e089a7c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2994919

Change-Id: I85f5d288bf5a5dfb2cfcdf50056631ed540ec0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-12 18:18:34 +00:00
Florian Mayer
c923ea5a6d Merge "Update test for more accurate memtag_handle_longjmp" into main 2024-03-12 18:12:46 +00:00
Veena Arvind
fe7e089a7c Merge "Scan for quiescent in sub reason and details" into main 2024-03-12 17:46:54 +00:00
Veena Arvind
b46e5e6d0b Scan for quiescent in sub reason and details
Bug: 326526460
Test: manual (b/320369923#comment19)
Change-Id: I702841bf1afa6a04318b8233eb6ddb89c46b7ad5
2024-03-11 22:23:09 +00:00
Jiakai Zhang
d45e011648 Merge changes from topic "snapshotctl_prop" into main am: a08ad4b1e5 am: 6951e8d74d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2994275

Change-Id: Ie046e1408b30e8eccd03b5680d21ac1422ed2869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-11 18:15:22 +00:00
Jiakai Zhang
6951e8d74d Merge changes from topic "snapshotctl_prop" into main am: a08ad4b1e5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2994275

Change-Id: I80585524ab145a907bce6ca5d7d9184c6413969b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-11 17:33:44 +00:00
Jiakai Zhang
a08ad4b1e5 Merge changes from topic "snapshotctl_prop" into main
* changes:
  Make snapshotctl also log to logd.
  Allow other processes to run snapshotctl through init.
2024-03-11 16:55:25 +00:00
Justin Yun
f8292344cd Define macros for LLNDK versioning
__INTRODUCED_IN_LLNDK(vendor_api_level) is for the LLNDK APIs
introduced in the vendor_api_level. It is ignored for non-vendor
modules.

API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) is used as a
statement for 'if' to guard the API callers. For example:

if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
  new_api_for_V_and_202404();
} else {
  fallback_function();
}

Bug: 302113279
Test: build trunk-staging and next configurations
Change-Id: I60d40655b1f8afdfa5c69b2ac4be2205f8057bea
2024-03-11 20:24:07 +09:00
Jiakai Zhang
6480d875b5 Make snapshotctl also log to logd.
Since http://r.android.com/2994274, snapshotctl can be run by init.
Therefore, we need it to log to logd for better debuggability.

Bug: 311377497
Test: adb shell setprop sys.snapshotctl.map requested
Test: adb shell setprop sys.snapshotctl.unmap requested
Change-Id: I287ecf77d45fb9e6c44bea36e14d2624029afea5
2024-03-08 18:56:13 +00:00
Jiakai Zhang
22ddb0aec5 Allow other processes to run snapshotctl through init.
Running snapshotctl involves talking to gsid, which requires the UID to
be 0. To allow other processes to run snapshotctl without running as the
root user, this change adds system properties "sys.snapshotctl.map" and
"sys.snapshotctl.unmap" that proxy snapshotctl calls.

Bug: 311377497
Test: adb shell setprop sys.snapshotctl.map requested
Test: adb shell setprop sys.snapshotctl.unmap requested
Change-Id: Ia29dde30021a94511b8e699c2c8f3816b851bf5c
2024-03-08 18:53:47 +00:00
Florian Mayer
1fef1b1359 Update test for more accurate memtag_handle_longjmp
Change-Id: Ie5482d343c37ee8cf57a8ce105a0c8a363e5761e
2024-03-07 17:12:57 -08:00
Will McVicker
b9dead1a75 toolbox/modprobe: Fix failure due to blocklist
When a module is blocklisted, LoadWithAliases() will return an error
indicating the module failed to load. When the blocklist is requested
(via the -b parameter), let's not return an error if a blocklisted
module fails to load.

Test: verified lsmod on pixel 6
Bug: 324018983
Change-Id: I68f7d46bf9fd99e4b4e51ef92ea71686907f1125
2024-03-07 15:01:59 -08:00
Will McVicker
2d3658a421 libmodprobe: Make IsBlocklisted() public
This allows tools like modprobe to check if a module is blocklisted.

Test: verified lsmod on pixel 6
Bug: 324018983
Change-Id: I5d5278ab056e58a4ee103db94b573928cbeb5c5f
2024-03-07 15:01:54 -08:00
Snehal Koukuntla
37b492316b Merge "[Metrics] Add helper data structures to parse metrics messages" into main am: b2bfb972e8 am: d640b02b72
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982434

Change-Id: Id88512dead8e79c562db028d2691da8ea9a50313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 11:48:30 +00:00
Snehal Koukuntla
d640b02b72 Merge "[Metrics] Add helper data structures to parse metrics messages" into main am: b2bfb972e8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982434

Change-Id: I07700fd673792cf127645981de39b2a299edd768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 11:04:09 +00:00
Xin Li
8a52c566ab [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: ba485e7f71 -s ours am: 4e783eb315 -s ours
am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7ff is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699

Change-Id: I6434f10a98b20ddc5228592f450390df21422f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:11:59 +00:00
Snehal Koukuntla
b2bfb972e8 Merge "[Metrics] Add helper data structures to parse metrics messages" into main 2024-03-07 09:11:31 +00:00
Xin Li
b33d73e643 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2f5e50cfd0 -s ours am: 6be3bcb5bb -s ours
am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7ff is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699

Change-Id: I92729e360d21adce61d9dd64d450353cb5fcd372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:10:31 +00:00
Xin Li
4e783eb315 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: ba485e7f71 -s ours
am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7ff is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699

Change-Id: I8a16fbf8c03e42c4da1468b203701c7dc9eda25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 08:34:56 +00:00
Xin Li
6be3bcb5bb [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2f5e50cfd0 -s ours
am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7ff is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699

Change-Id: Icb3def6d6621136bc6a49adb22ddf6908382b696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 08:33:31 +00:00
Michael Hoisie
6299508238 Merge "Remove the redundant libcutils_sockets_test" into main am: 1140355bde am: 42061e923a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2991012

Change-Id: Iff50b758f9c10daf81d9a2d27d6c08f319131080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 07:30:33 +00:00
Michael Hoisie
42061e923a Merge "Remove the redundant libcutils_sockets_test" into main am: 1140355bde
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2991012

Change-Id: I97e8e58001bf4855040e0cec8356e0fa172b301b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 06:50:58 +00:00
Xin Li
ba485e7f71 Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:10:51 +00:00
Michael Hoisie
1140355bde Merge "Remove the redundant libcutils_sockets_test" into main 2024-03-07 06:01:19 +00:00
Treehugger Robot
070433bb80 Merge "Skip initializing ro.vendor.api_level if already defined" into main am: 6c6b9e33d6 am: 097b46e454
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2981775

Change-Id: I4824bcb79e0a788803efab6fc6e75734e5fbfeec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 04:55:29 +00:00
Treehugger Robot
097b46e454 Merge "Skip initializing ro.vendor.api_level if already defined" into main am: 6c6b9e33d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2981775

Change-Id: I91f60d742914d046c71acfeaa9a9c1a0d6682971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 04:13:15 +00:00
Treehugger Robot
6c6b9e33d6 Merge "Skip initializing ro.vendor.api_level if already defined" into main 2024-03-07 03:42:14 +00:00
Xin Li
2f5e50cfd0 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I4955367085f3f7c829b8b4e7b06aafaaac9ad748
Change-Id: Idefdb54491ebf42c4d8a04ddcc71fa87f500b79e
2024-03-06 18:58:28 -08:00