Commit graph

72858 commits

Author SHA1 Message Date
David Anderson
5cd741583f Merge "libdm, libsnapshot: Add a virtual interface for DeviceMapper." 2021-09-23 22:25:46 +00:00
Elliott Hughes
c75d25d172 Merge "libdebuggerd: fix process uptime." am: c00bfdcc9a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1832953

Change-Id: I2898dd4105171edc5d73e75e355973135f036044
2021-09-23 15:25:41 +00:00
Elliott Hughes
c00bfdcc9a Merge "libdebuggerd: fix process uptime." 2021-09-23 15:16:10 +00:00
Yi-Yo Chiang
bb77c544e5 Reland: Add /system_ext/etc/selinux/ to the debug policy search path for GSI
This change only *adds* /system_ext/etc/selinux to the debug policy
search path, and does not change any preconditions to load the debug
policy. The device still needs to be bootloader-unlocked and has the
debug ramdisk flashed to be able to use the debug policy. The only thing
changed is that now the debug policy can be loaded from /system_ext or
/debug_ramdisk when system partition is compliance testing GSI.

The debug policy in the boot ramdisk may be outdated if the system
partition is flashed with a image built from a different revision.
This happens frequently when running the compliance testing VTS, where
the device is flashed with (A) GSI and (B) device vendor image & debug
boot image, and (A) and (B) are built from different git revisions.

To address this, we install a copy of the debug policy under
/system_ext, so that the version desync between (A) & (B) wouldn't be a
problem anymore because (A) no longer relies on the debug policy file
from (B).

Bug: 188067818
Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash
  gsi_arm64-user from master, device can boot and `adb root` works
Change-Id: Ibe17eb1ecb0e813309c9596d1f152b7455686b26
2021-09-23 14:26:27 +00:00
Santiago Seifert
f60946a242 Merge "Revert "Add /system_ext/etc/selinux/ to the debug policy search ..."" am: 2b324f5642
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1834618

Change-Id: I8b3e938430736bbe1a42c173d167d66c397f88de
2021-09-23 13:33:47 +00:00
Santiago Seifert
2b324f5642 Merge "Revert "Add /system_ext/etc/selinux/ to the debug policy search ..."" 2021-09-23 13:25:55 +00:00
Santiago Seifert
be09a1e643 Revert "Add /system_ext/etc/selinux/ to the debug policy search ..."
Revert "Add a copy of debug policy to GSI system image"

Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"

Revert "Add system_ext_userdebug_plat_sepolicy.cil for GSI"

Revert submission 1824717-gsi_debug_policy

Reason for revert: Breaks the build (see b/200933187).
Reverted Changes:
I37ef02628:Add a copy of debug policy to GSI system image
I9c3dad8bb:Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
I43adc6ada:Add system_ext_userdebug_plat_sepolicy.cil for GSI...
I4d6235c73:Add /system_ext/etc/selinux/ to the debug policy s...

Change-Id: I2eb3b00abb981c25514b75b2e7b4b7b203653390
2021-09-23 13:07:25 +00:00
Yi-Yo Chiang
1e27e4b5da Merge "Add /system_ext/etc/selinux/ to the debug policy search path for GSI" am: d7f8cf483b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1824634

Change-Id: I6107412518294026723339a5de215593c1e6a1e7
2021-09-23 10:15:17 +00:00
Yi-Yo Chiang
d7f8cf483b Merge "Add /system_ext/etc/selinux/ to the debug policy search path for GSI" 2021-09-23 10:07:10 +00:00
Marco Nelissen
dd538a6ec9 Merge "trusty_apploader: log to stderr" am: e0e160c54b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1833093

Change-Id: I6a479aebdae6d13aecf4ebabdc592d095ca7bdba
2021-09-22 17:03:48 +00:00
Marco Nelissen
e0e160c54b Merge "trusty_apploader: log to stderr" 2021-09-22 17:01:30 +00:00
Mohammad Samiul Islam
954ab6ec55 Merge "libbinder: split out PackageManagerNative aidl" into stage-aosp-master 2021-09-22 10:28:10 +00:00
Elliott Hughes
32d3cdda22 libdebuggerd: fix process uptime.
I was here because we have a case where timeout(1) kills logcat, but
debuggerd alleges that the process that was killed had started less than
a second ago. I'm not sure this is the problem there, but I did notice
that far too many tombstones were claiming improbably short process
uptimes. It turns out that the code was measuring the *thread* uptime,
not the *process* uptime.

Also simplify the code a bit by switching to sysinfo(2) rather than
reading a file.

Test: manual, plus the existing unit test
Change-Id: Ie2810b1d5777ad9182be92bfb3f60795dc978b24
2021-09-21 17:30:30 -07:00
Marco Nelissen
92cd8891ff trusty_apploader: log to stderr
Print an error message to stderr on connection failure, so that the
command doesn't exit silently in case of the common user error of
forgetting to run it as root.

Bug: None
Test: Run as regular user, see "permission denied" message.
Change-Id: Ia213dedccab27e6152b5eb969fbee06d82d3d4ff
2021-09-21 15:51:58 -07:00
Marco Nelissen
b87e035e6a Merge "re-tab and clang-format tipc_test" am: 51fd280b8e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1831680

Change-Id: Iba910dc3e2481b6c06a089fdf2a4f4368d4f2202
2021-09-21 14:56:59 +00:00
Marco Nelissen
51fd280b8e Merge "re-tab and clang-format tipc_test" 2021-09-21 14:42:52 +00:00
David Anderson
efec0abf4a libdm, libsnapshot: Add a virtual interface for DeviceMapper.
It is difficult to test libsnapshot failures because there is no way to
inject failure scenarios into the kernel's device-mapper. Exposing a
virtual interface will allow this kind of testing via dependency
injection.

Bug: 199785546
Test: builds, tests pass
Change-Id: I5add0c7e24f7fa2853114eaeda7c479eaa4e0552
2021-09-20 22:13:20 -07:00
Marco Nelissen
7637d25ae0 re-tab and clang-format tipc_test
tipc_test.c used a mix of tabs and spaces for indentation and other
things that clang-format doesn't like, so retab and format it.

Bug: None
Test: build
Change-Id: I9b3a64bae54697d43e7fb39fe7d6e1dabe0be380
2021-09-20 17:10:05 -07:00
Treehugger Robot
a3d7000475 Merge "bootstat: add more bootreasons" am: c91c8f88e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1813399

Change-Id: I7cb659bc1571000cf53bb6a74e8f54999baab759
2021-09-20 22:02:20 +00:00
Treehugger Robot
c91c8f88e6 Merge "bootstat: add more bootreasons" 2021-09-20 21:48:20 +00:00
Howie Chang
d5f24c5bb9 bootstat: add more bootreasons
add more bootreasons for new projects

Bug: 184012295
Test: trigger apc watchdog then "adb shell bootstat -p"
Change-Id: I7166969dde3675cdbe8433dbfba634a192f6be33
2021-09-19 19:11:06 +00:00
Yi-Yo Chiang
650b29d234 Add /system_ext/etc/selinux/ to the debug policy search path for GSI
This change only *adds* /system_ext/etc/selinux to the debug policy
search path, and does not change any preconditions to load the debug
policy. The device still needs to be bootloader-unlocked and has the
debug ramdisk flashed to be able to use the debug policy. The only thing
changed is that now the debug policy can be loaded from /system_ext or
/debug_ramdisk when system partition is compliance testing GSI.

The debug policy in the boot ramdisk may be outdated if the system
partition is flashed with a image built from a different revision.
This happens frequently when running the compliance testing VTS, where
the device is flashed with (A) GSI and (B) device vendor image & debug
boot image, and (A) and (B) are built from different git revisions.

To address this, we install a copy of the debug policy under
/system_ext, so that the version desync between (A) & (B) wouldn't be a
problem anymore because (A) no longer relies on the debug policy file
from (B).

Bug: 188067818
Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash
  gsi_arm64-user from master, device can boot and `adb root` works
Change-Id: I4d6235c73472e4d97619b2230292e6a0bc4b3e05
2021-09-18 20:21:25 +08:00
Christopher Ferris
acd0e3f8cc Merge "Add a test to verify the dex_pc is correct." am: 3275d3eeec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1827525

Change-Id: I68f82bcb614e874ab0b23e6595fb70511bbd847e
2021-09-16 16:46:44 +00:00
Christopher Ferris
3275d3eeec Merge "Add a test to verify the dex_pc is correct." 2021-09-16 16:32:14 +00:00
Samiul Islam
abacb514f9 libbinder: split out PackageManagerNative aidl
Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit
Ignore-AOSP-First: To avoid merge conflicts, uploading it internally
first. Will be cherry-picked to AOSP later.

Change-Id: Ieca32fc3c970f2b720d76071651e85459d082f02
Merged-In: Ieca32fc3c970f2b720d76071651e85459d082f02
2021-09-16 10:41:54 +00:00
Treehugger Robot
e1e29d75eb Merge "[storageproxyd] Dump binary buffers to log instead of stderr" am: 7ea42b96e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1826416

Change-Id: I961297b92b53a07dda4ab7e45c4a382a003b2f6e
2021-09-16 00:39:32 +00:00
Treehugger Robot
7ea42b96e6 Merge "[storageproxyd] Dump binary buffers to log instead of stderr" 2021-09-16 00:22:34 +00:00
Christopher Ferris
2038cc7633 Add a test to verify the dex_pc is correct.
The libunwindstack code will attempt to dlopen the libdexfile.so
when a dex pc is found. Unfortunately, this failed since that
library was not properly listed as a runtime library. To make
sure this doesn't happen again, add an end to end test that
will create a dex pc frame, and will verify the correct
dex function name is in that frame.

Bug: 199043576

Test: Unit test passes on arm/aarch64/x86/x86_64.
Test: Removed the runtime_libs of libdexfile from libunwindstack
Test: and verified the new test fails.
Change-Id: I3a11f9ee44e06e37a547d193b04f7fbb90ccfe0a
2021-09-15 22:14:28 +00:00
Stephen Crane
38003165b2 [storageproxyd] Dump binary buffers to log instead of stderr
Rewrites the buffer logging to print to the Android log instead of
stderr. The storageproxyd service is started by init and stderr is not
logged anywhere. Because we want to log sense data errors under normal
operation, we need to log to logcat instead of stderr.

Test: Define RPMB_DEBUG, build for qemu-trusty, run, inspect logcat
Bug: 195544379
Change-Id: Iecc0d4680420bb92c94be628789093888a2f1941
2021-09-15 14:17:38 -07:00
Treehugger Robot
6387a16f9a Merge "Add LOCAL_LICENSE_KINDS to system/core/fs_mgr" am: c305070746
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1827516

Change-Id: Ib3cade87344093a9e08ec86721756a442ba8dca6
2021-09-15 20:50:39 +00:00
Treehugger Robot
c305070746 Merge "Add LOCAL_LICENSE_KINDS to system/core/fs_mgr" 2021-09-15 20:31:38 +00:00
Bob Badour
fe9d02890c Add LOCAL_LICENSE_KINDS to system/core/fs_mgr
Added Android-Apache-2.0 to fs_mgr/libsnapshot/scripts/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: If966409962d564c1cfec901af2f2b78e891b7fca
2021-09-15 10:57:11 -07:00
Akilesh Kailash
0725099e89 Merge "libsnapshot: Error handling after QuerySnapshotStatus" am: 6f9672291c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1824992

Change-Id: I15cad82611d8ff880ae84c8d5d57a118b95dcc49
2021-09-15 16:44:49 +00:00
Akilesh Kailash
6f9672291c Merge "libsnapshot: Error handling after QuerySnapshotStatus" 2021-09-15 16:31:33 +00:00
Samiul Islam
26eeec7f04 libbinder: split out PackageManagerNative aidl
Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit

Change-Id: Ieca32fc3c970f2b720d76071651e85459d082f02
Merged-In: Ieca32fc3c970f2b720d76071651e85459d082f02
(cherry picked from commit 47a5f43202)
2021-09-15 11:14:07 +01:00
Colin Cross
2efb060e2b Merge "Fix compiling libprocessgroup against musl" am: c92ae83adc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1826815

Change-Id: Idae752020bef026600c89aa076a8e832484906eb
2021-09-14 23:44:23 +00:00
Colin Cross
5677973d14 Merge "libpropertyinfoparser: only use system_shared_libs for bionic variant" am: 376f2cfa82
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1826814

Change-Id: Ifcfd599fa6dfb9ebc28489fa988b2bd94672438b
2021-09-14 23:43:56 +00:00
Colin Cross
c92ae83adc Merge "Fix compiling libprocessgroup against musl" 2021-09-14 23:31:59 +00:00
Colin Cross
376f2cfa82 Merge "libpropertyinfoparser: only use system_shared_libs for bionic variant" 2021-09-14 23:31:50 +00:00
David Anderson
819e302a1e Merge "libsnapshot: Fix new partitions not transitioning in second-stage init." am: 4d18ab25f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1817816

Change-Id: Ie98dac109e849facedecca7e51f9a902b31a6f79
2021-09-14 19:54:14 +00:00
David Anderson
4d18ab25f6 Merge "libsnapshot: Fix new partitions not transitioning in second-stage init." 2021-09-14 19:35:06 +00:00
Colin Cross
80e34e3017 Fix compiling libprocessgroup against musl
Include sys/cdefs.h before using __BEGIN_DECLS.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: Iac009275f7198476dd83ac70dbbc626b70f88ed1
2021-09-14 12:35:01 -07:00
Akilesh Kailash
3ad55a9690 libsnapshot: Error handling after QuerySnapshotStatus
QuerySnapshotStatus will capture the error codes
from dm-snapshot if there are any snapshot related
failure. Handle the error codes and fail the
QuerySnapshotStatus call.

Validate snapshot status in MapSnapshot(). If
the mode is set to Persistent and snapshot status
is in Merging state, then forcefully set the
mode to Merge state.

Bug: 198265278
Test: Full/incremental OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I779184f1998b23edacd6e780acf2676442004340
2021-09-14 06:47:06 +00:00
David Anderson
7f994f4cfb libsnapshot: Fix new partitions not transitioning in second-stage init.
Bug: 196922070
Test: vts_libsnapshot_test
Change-Id: If8a7afde218fd719e4426dc1dda41f53a4e6544b
2021-09-13 19:42:58 -07:00
Tri Vo
3a0d176e8d [automerger skipped] Merge "Revert^2 "Activate KeyMint."" am: 11ffd99154 -s ours
am skip reason: Merged-In I85d9e57fe83627992ddaa705946893a4b9890001 with SHA-1 5dfd44ed5c is already in history

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

Change-Id: Ia9bb794786768d431e6d3bfc139da416e58d6f46
2021-09-13 23:42:00 +00:00
Tri Vo
11ffd99154 Merge "Revert^2 "Activate KeyMint."" 2021-09-13 23:31:49 +00:00
Akilesh Kailash
e24e5bf0a9 Merge "snapuserd: I/O request on sectors not mapping to any COW op" am: db3c0a4a51
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1824032

Change-Id: I96932acbe2d995908da4285484578f9b51fb97f1
2021-09-13 20:48:50 +00:00
Akilesh Kailash
db3c0a4a51 Merge "snapuserd: I/O request on sectors not mapping to any COW op" 2021-09-13 20:37:39 +00:00
Treehugger Robot
7dc38fe273 Merge "Looper: Use sequence numbers in epoll_event to track requests" am: 663c692a2d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1795650

Change-Id: Id4072ec03cbd6f0c5eb6a54d8c37d9dd453cf989
2021-09-13 12:11:00 +00:00
Treehugger Robot
663c692a2d Merge "Looper: Use sequence numbers in epoll_event to track requests" 2021-09-13 11:58:45 +00:00