Commit graph

79947 commits

Author SHA1 Message Date
Treehugger Robot
74167124db Merge "init: Disable test init#StartConsole" am: 1af6ecda38
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2313500

Change-Id: Ic779a45f479c629378f9a2a789983dffbec62a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 05:28:50 +00:00
Treehugger Robot
1af6ecda38 Merge "init: Disable test init#StartConsole" 2022-11-23 04:51:55 +00:00
Bart Van Assche
027b275b57 init: Disable test init#StartConsole
Bug: 260104465
Change-Id: I43a19b2451bad955d101d9ebdc3c98419d83597d
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-22 16:38:43 -08:00
Yi-yo Chiang
7ab7444545 Merge "remount: Treat disable verity error as fatal only if verity is enabled" am: fb9b7de413
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2311386

Change-Id: Ic34c50d3b6ba1ad9a85fd8b8dfa6133598836f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:41:15 +00:00
Yi-yo Chiang
fb9b7de413 Merge "remount: Treat disable verity error as fatal only if verity is enabled" 2022-11-22 19:04:49 +00:00
Yi-Yo Chiang
b4a86eeb2f remount: Treat disable verity error as fatal only if verity is enabled
If device doesn't enable AVB altogether, then it might not have a vbmeta
partition at all. In this case, we shall ignore disable-verity errors.
We still disable verity unconditionally to keep the logic simple, but we
ignore any disable-verity error if AVB is not enabled in the first
place.

Bug: 241688845
Test: adb-remount-test on emulator
Test: Test remount on yukawa
Change-Id: Ifc763b3f0ca6989550c139a8c3a2308c9c2a7c3e
2022-11-22 15:26:37 +08:00
Treehugger Robot
adcfac015b Merge "init: Fix a race condition in KillProcessGroup()" am: 3fca6e72cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2302562

Change-Id: I08e0a68155cfaf0abf45eff5eb2d9e54a70ece0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 23:28:32 +00:00
Treehugger Robot
3fca6e72cf Merge "init: Fix a race condition in KillProcessGroup()" 2022-11-21 23:08:31 +00:00
Bart Van Assche
01e6669c66 init: Fix a race condition in KillProcessGroup()
Multiple tests in CtsInitTestCases, e.g. RebootTest#StopServicesSIGKILL,
can trigger the following race condition:
* A service is started. This involves calling fork() and also to call
  RunService() in the child process. RunService() calls setpgid().
* Service::Stop() is called and calls KillProcessGroup().
  KillProcessGroup() calls kill(-pgid, SIGKILL) before the child process
  has called setpgid(). pgid is the process ID of the child process. The
  kill() call fails because setpgid() has not yet been called.

Fix this race condition by adding a setpgid() call in the parent process
and by waiting from the parent until the child has called setsid() if a
console is attached.

Bug: 213617178
Change-Id: Ieb9e6908df725447e3695ed66bb8bd30e4e38aa9
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-21 11:42:44 -08:00
Bart Van Assche
22ac02c57c Merge "init: Introduce RequiresConsole()" am: f2934de9c1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2303437

Change-Id: I02cc8a62019ead190348d1d796f1daa04215b6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:26:29 +00:00
Bart Van Assche
f4d6de8f90 Merge "init: Introduce symbolic names for certain constants" am: 27630f0d0f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2308681

Change-Id: Ia66f90b9ab1ead168fd805f4d827d629d032682e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:25:19 +00:00
Bart Van Assche
f2934de9c1 Merge "init: Introduce RequiresConsole()" 2022-11-21 18:08:35 +00:00
Bart Van Assche
27630f0d0f Merge "init: Introduce symbolic names for certain constants" 2022-11-21 18:07:56 +00:00
Bart Van Assche
f745c45d6d Merge "init: Reduce the number of system calls" am: 254ae6c82b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2308680

Change-Id: If1047bc42621171e113b1e45c8fd873f92942073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 03:52:45 +00:00
Bart Van Assche
e213d23447 Merge "Revert "init: Rename 'cgroups_activated' into 'fifo'"" am: 30bd9e9522
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2301276

Change-Id: I8f21d37499e8744c248e8d2f0583b711074bf8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 03:52:36 +00:00
Bart Van Assche
8b53ed2574 Merge "init: Document which class Service members are not modified" am: 3afd63273a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2302561

Change-Id: I098e328dfb259ec8e3e9f11f4333ca3c75925d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 03:52:26 +00:00
Bart Van Assche
eb7c4f3e10 Merge "init: Add a unit test for the "start console" action" am: 208f93042b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2301275

Change-Id: Ie68fcc7ffaab22ccbac5b6e06b65e2b1bc4efa82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 03:52:17 +00:00
Bart Van Assche
254ae6c82b Merge "init: Reduce the number of system calls" 2022-11-21 03:18:44 +00:00
Bart Van Assche
30bd9e9522 Merge "Revert "init: Rename 'cgroups_activated' into 'fifo'"" 2022-11-21 03:18:31 +00:00
Bart Van Assche
3afd63273a Merge "init: Document which class Service members are not modified" 2022-11-21 03:18:19 +00:00
Bart Van Assche
208f93042b Merge "init: Add a unit test for the "start console" action" 2022-11-21 03:18:06 +00:00
Tri Vo
1f9beb5718 Merge "trusty: IRPC supportedNumKeysInCsr support" am: e49eb79e07
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2307900

Change-Id: Ida65616fec1095844d73c4186c13c742ef9553df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 19:38:38 +00:00
Tri Vo
e49eb79e07 Merge "trusty: IRPC supportedNumKeysInCsr support" 2022-11-18 19:03:28 +00:00
Bart Van Assche
987391656f init: Introduce RequiresConsole()
Prepare for adding more code in the parent process that depends on
whether or not a console is required.

Bug: 213617178
Change-Id: I066ede32fcd4ce09d06be23158f3c1970064a697
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-18 09:49:43 -08:00
Bart Van Assche
c8f34254b8 init: Introduce symbolic names for certain constants
Make the code easier to read by introducing symbolic names for the
constants used by Service::Start() for communication between the parent
and child processes.

Bug: 213617178
Change-Id: I3e735e149682fa9df2ed57f75eb5a67d7c68bd92
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-18 09:49:01 -08:00
Bart Van Assche
d394f74365 init: Reduce the number of system calls
Change setpgid(0, getpid()) into setpgid(0, 0). This patch removes one
system call but does not change the behavior of the code. From the
setpgid() man page: "If pgid is zero, then the PGID of the process
specified by pid is made the same as its process ID."

Bug: 213617178
Change-Id: I7031d9eb3711f526751da495c07a8927f9386d97
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-18 09:45:33 -08:00
Bart Van Assche
41787239ec Revert "init: Rename 'cgroups_activated' into 'fifo'"
Revert commit 9c61dad67e in preparation of
introducing a second interprocess communication channel.

Bug: 213617178
Change-Id: I2959a3902a1b994cca2ac99855be1fc60d63bcbb
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-18 09:42:14 -08:00
Bart Van Assche
bfcf4374ed init: Document which class Service members are not modified
It is nontrivial to derive from the implementation of class Service
which members are not modified. Hence this CL that documents this by
declaring these members 'const'.

Change-Id: I27b907a1c7044376d5c5393a29050c66cbdab7bf
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-18 09:42:14 -08:00
Bart Van Assche
5d18891e60 init: Add a unit test for the "start console" action
Treehugger starts Cuttlefish with the console disabled. Add a test that
enables the console. The purpose of this test is to trigger the code paths
in Service::Start() that are unique to processes associated with a
console.

Bug: 213617178
Change-Id: I834632ce6ec5c237c9c2c3f5b1aa7bc98c3ef260
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-11-18 09:42:05 -08:00
Yi-yo Chiang
206363ed88 Merge "remount: Check device mapper to see if verity is already disabled" am: a6844e4c62
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2306226

Change-Id: I358822dd75b861b3f9473b3cffdce2ecd405d7eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 03:41:50 +00:00
Yi-yo Chiang
a6844e4c62 Merge "remount: Check device mapper to see if verity is already disabled" 2022-11-18 03:11:57 +00:00
Tri Vo
ed1f13f62b trusty: IRPC supportedNumKeysInCsr support
Bug: 254137722
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ic76c27b8c65274f76adca6b83614eac73964ea20
2022-11-17 17:15:21 -08:00
Yi-Yo Chiang
f48d5778a1 remount: Check device mapper to see if verity is already disabled
No matter verity is enabled or disabled, androidboot.veritymode is
always "enforcing" on emulator kernel cmdline.

This is a violation of the AVB contract:
https://cs.android.com/android/platform/superproject/+/master:external/avb/README.md#handling-dm-verity-errors

Before emulator can fix this, workaround this by checking the device
mapper table to see if verity is disabled or not.
If no "<partition>-verity" device is present, than assume verity is
already disabled.

Also log mountpoints that are successfully remounted.

Bug: 241688845
Bug: 259207493
Test: adb-remount-test
Test: Run adb remount on emulator
Change-Id: Id5767b05cbfb48adf2a8c372dfdad4d15b98e091
2022-11-18 00:35:45 +08:00
Treehugger Robot
455aba6afe Merge "Revert "init: Fix a race condition in KillProcessGroup()"" am: 4cdb6cf415
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2302566

Change-Id: I3e0fae688563a4ffc426749007fe34f1e658ae4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 02:51:42 +00:00
Treehugger Robot
4cdb6cf415 Merge "Revert "init: Fix a race condition in KillProcessGroup()"" 2022-11-15 02:07:02 +00:00
Bart Van Assche
f26e59ebba Revert "init: Fix a race condition in KillProcessGroup()"
This reverts commit 15e5ecdcd7.

Reason for revert: breaks console support.
Bug: 213617178
Bug: 258754901
Change-Id: Iffe213e2cd295461a427621f2b84933f1bebd39f
2022-11-15 00:55:45 +00:00
Treehugger Robot
b16e22376e Merge "riscv64 doesn't require a 32-bit crash dump policy." am: 0d681e1f96
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2302477

Change-Id: If9ffd2efba716d3b10fbe2033e76a0417b2aedaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:22:18 +00:00
Treehugger Robot
0d681e1f96 Merge "riscv64 doesn't require a 32-bit crash dump policy." 2022-11-14 21:37:42 +00:00
Elliott Hughes
2f883314b9 riscv64 doesn't require a 32-bit crash dump policy.
Test: `mm -j` in bionic
Change-Id: I6c2e91b540f544b1ca428692ebfb25697b0cb6e4
2022-11-14 20:06:16 +00:00
Yi-yo Chiang
66e3f01be9 Merge changes Iba86a814,If5d702ab am: 4b507bcdf3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2294138

Change-Id: Ice335ae1762578e0df34332868a158bbc9213c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 08:49:31 +00:00
Yi-yo Chiang
4b507bcdf3 Merge changes Iba86a814,If5d702ab
* changes:
  remount: Remove all remaining opaque exit code (RemountStatus enum)
  remount: Don't assert ro.boot.vbmeta.* properties
2022-11-14 08:16:45 +00:00
Yi-yo Chiang
48b09efd50 Merge "remount: Simplify disable verity logic" am: d1b270abb2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2284553

Change-Id: Iad5ee139641c1c8b8ecb862153e1058bdd46dd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 07:21:11 +00:00
Yi-yo Chiang
6305b0c1ab Merge "set-verity-state: Use ro.boot.veritymode to determine current verity state" am: d40fd73e62
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2284293

Change-Id: I9d004b9eb9cfdc3b91d88ac1f8aebe64e2c5303c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 07:21:02 +00:00
Jooyung Han
520b408009 Merge "Revert "add apex-ready event after post-fs-data"" am: d9d3a5cb2b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2294239

Change-Id: I7d11517140e04c10673d12eefe4941ef6971d463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 07:20:52 +00:00
Yi-yo Chiang
d1b270abb2 Merge "remount: Simplify disable verity logic" 2022-11-14 07:13:27 +00:00
Yi-yo Chiang
d40fd73e62 Merge "set-verity-state: Use ro.boot.veritymode to determine current verity state" 2022-11-14 07:00:48 +00:00
Jooyung Han
d9d3a5cb2b Merge "Revert "add apex-ready event after post-fs-data"" 2022-11-14 06:51:14 +00:00
Treehugger Robot
65b4b8f13c Merge "Remove a file we haven't built since 2013." am: c14cda00a8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2299260

Change-Id: Ia2da2c39d7f1aeec611db0a1a53bf60c8babe62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 23:50:38 +00:00
Treehugger Robot
c14cda00a8 Merge "Remove a file we haven't built since 2013." 2022-11-11 23:28:50 +00:00
Elliott Hughes
8a9495aba6 Remove a file we haven't built since 2013.
It was only added in 2012, so it's been dead for 10 times longer than it
was ever built for at this point... YAGNI.

Test: treehugger
Change-Id: I6f31a3d1354f4d3304da463322cd1d9eff9e0597
2022-11-11 21:56:34 +00:00