Commit graph

89420 commits

Author SHA1 Message Date
Dennis Shen
d0ed4346f9 Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main am: 086371cb49
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092324

Change-Id: I4843dea4b64b3d5b11d1d59bd2187673290e8588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 13:37:20 +00:00
Dennis Shen
086371cb49 Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main 2024-05-17 13:13:28 +00:00
Treehugger Robot
fee6d5fdad Merge "cleanup: PLOG(FATAL) crashes, does not need else branch" into main am: 4c3ebe4723
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092740

Change-Id: If86da6eaee87768027c3d266447f6b2d2ebec099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 01:57:04 +00:00
Treehugger Robot
4c3ebe4723 Merge "cleanup: PLOG(FATAL) crashes, does not need else branch" into main 2024-05-17 01:42:33 +00:00
Dennis Shen
208fccdae8 init.rc: set up init.rc for aconfigd to initialize mainline storage
aconfigd-mainline-init is the service target to initialize mainline
storage files. aconfigd is the service target to start aconfigd socket
for incoming messages.

Bug: b/312444587
Test: m and avd
Change-Id: Ic8052eaf933501da3371812c482ad816ec353b27
2024-05-17 00:56:29 +00:00
Treehugger Robot
6f29391e40 Merge "Add restorecon flags for force and data data" into main am: be6e1459ee
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080964

Change-Id: I0a579bcb434bf8b4c581d0d68599b9fc0e39f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 23:35:23 +00:00
Treehugger Robot
be6e1459ee Merge "Add restorecon flags for force and data data" into main 2024-05-16 23:15:55 +00:00
Florian Mayer
c4b24f70e6 cleanup: PLOG(FATAL) crashes, does not need else branch
Change-Id: I49a439d444dc9f566a05bab23d8cfd06ce56d4a6
2024-05-16 22:59:16 +00:00
Treehugger Robot
9d5473637d Merge "crasher: hide xom from help when unavailable" into main am: 57db6f453c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092580

Change-Id: I26090b94fcd705813b26a56e323a24ec0bcd8e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 22:56:48 +00:00
Treehugger Robot
57db6f453c Merge "crasher: hide xom from help when unavailable" into main 2024-05-16 22:36:33 +00:00
Luzanne Batoon
1ebf9cb663 Add restorecon flags for force and data data
Test: m
Bug: 210155681

Change-Id: I9d5b64c48d21e83fb8f03dac261efc530c5f8aa6
2024-05-16 21:35:54 +00:00
Josh Gao
3a9a989484 crasher: hide xom from help when unavailable
Test: m crasher
Change-Id: Iaf25dd650eb5cf6e8b0933f574b3d4a208b74da9
2024-05-16 13:53:02 -07:00
Sijie Chen
4826151723 Merge changes from topic "revert-3081452-revert-3062926-CJGHTRPCBP-GUVWVZQSHP" into main am: 4f88e4b79a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080066

Change-Id: Ic447425ad46bb3b560941cf035ec07108f3c9a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 16:18:50 +00:00
Sijie Chen
4f88e4b79a Merge changes from topic "revert-3081452-revert-3062926-CJGHTRPCBP-GUVWVZQSHP" into main
* changes:
  Reland "[Berberis][CrashReporting] Dump guest thread inf..."
  Reland "[Berberis][CrashReporting] Extend ThreadInfo to ..."
2024-05-16 16:04:47 +00:00
Ryan Prichard
449c8f1881 Merge "Define String8 and String16 operator<=>" into main am: c97381bf01
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3081027

Change-Id: I1d86ec2f7d2c68afa83c795d43934c11beba8ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 03:54:21 +00:00
Treehugger Robot
8a36ea617e Merge "libstatssocket_lazy: add isAvailable()" into main am: e0ca67f286
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3084108

Change-Id: I301790b27ccb3a745bfb6af69712d371ec0bfa2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 03:54:00 +00:00
Ryan Prichard
c97381bf01 Merge "Define String8 and String16 operator<=>" into main 2024-05-16 03:45:15 +00:00
Treehugger Robot
e0ca67f286 Merge "libstatssocket_lazy: add isAvailable()" into main 2024-05-16 03:40:46 +00:00
Jooyung Han
ec54595aff libstatssocket_lazy: add isAvailable()
Early processes might not have access to libstatssocket. They should be
able to check before using libstatssocket APIs. Adding isAvailable().

Bug: 281162849
Test: atest libstatssocket_lazy_test
Test: atest StagedRollbackTest
Change-Id: Ie2a851ef5bcf4fe081898153d688a843d8886788
2024-05-16 10:57:59 +09:00
Steven Moreland
b1f216255c Merge "16k kernel dev option changes ro.build.fingerprint" into main am: bf7e0df4d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3090045

Change-Id: Ia837f5efa1e89cd484db8940b88eabcca8780ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 00:58:44 +00:00
Steven Moreland
bf7e0df4d6 Merge "16k kernel dev option changes ro.build.fingerprint" into main 2024-05-16 00:44:41 +00:00
Ryan Prichard
f01048743a Define String8 and String16 operator<=>
Previously, in C++20 mode, using <=> on String8 or String16 would
compare the pointer values from the implicit conversion operators
returning const char* and const char16_t*. Instead, compare the string
content. This is especially a problem with STL containers that prefer
<=> when it is available.

See https://godbolt.org/z/cc1hW17h3 for a demo of the problem.

Bug: 339775405
Test: treehugger
Change-Id: I5ee6af96dee0c9968a1bab1ad96729e45bb1ac50
2024-05-15 17:34:57 -07:00
Steven Moreland
188d59a919 16k kernel dev option changes ro.build.fingerprint
When someone uses the 16kb dev option, they switch
out the kernel, but the same build is used. Make
sure this is visible in the fingerprint to help
split up any analytics or reports.

Bug: 332406754
Test: no change on normal device, on 16k dev option device:

:) adb shell getprop ro.product.build.16k_page.enabled
true
:) adb shell getconf PAGE_SIZE
16384
:) adb shell getprop ro.build.fingerprint
generic/aosp_cf_x86_64_phone_pgagnostic_16kb/vsoc_x86_64_pgagnostic:VanillaIceCream/MAIN.b7aab5e4/eng.smorel.20240514.203625:userdebug/test-keys
                                       ^^^^^^
             ----------------------------/

cheers

Change-Id: I9632237cef4a3b077761022eda8cf42784a41753
2024-05-15 20:18:51 +00:00
Florian Mayer
6654e8f2d0 Merge "Prevent mte_upgrade_test from hanging if MTE is disabled" into main am: 53748d08e5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3086860

Change-Id: I2f7c720783e1e620f735da62927ba41bbdd60c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 18:12:04 +00:00
Florian Mayer
53748d08e5 Merge "Prevent mte_upgrade_test from hanging if MTE is disabled" into main 2024-05-15 17:48:31 +00:00
Florian Mayer
389637e0c2 Merge "Fix mte_upgrade_test" into main am: 6726655b5c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3084785

Change-Id: Idc6b5fde2b5d0047e0d90750cfd2addd560dcc5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 17:24:29 +00:00
Florian Mayer
6726655b5c Merge "Fix mte_upgrade_test" into main 2024-05-15 16:49:25 +00:00
Keir Fraser
6317a2d17e Merge changes If17796f4,If44918c5,I559fb264 into main am: 901b3ec78e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3084166

Change-Id: Ic4afd9b1f75823d0816dd3d856d567e17b1e4ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 16:24:30 +00:00
Keir Fraser
901b3ec78e Merge changes If17796f4,If44918c5,I559fb264 into main
* changes:
  mkbootfs: Allow invocation with no directories specified
  mkbootfs: Fix usage message for dev node list files
  mkbootfs: Fix -f typo in usage message
2024-05-15 16:06:58 +00:00
Keir Fraser
c5cec3c71c mkbootfs: Allow invocation with no directories specified
1. A non-empty archive can still be generated, if a dev nodes
file is specified; and
2. cpio itself handles the case of an empty archive
(containing only the trailer entry), for example:
  echo -n | cpio -oc | cpio -it

Bug: 328362894
Change-Id: If17796f445e50842249554a1e82478bc375cf5eb
2024-05-15 16:05:55 +00:00
Florian Mayer
1277bd4dfd Prevent mte_upgrade_test from hanging if MTE is disabled
Turns out we didn't need the syscall because the kernel checks
for async MTE fault on exit.

Test: atest mte_upgrade_test with and without MTE
Change-Id: Iebdf181d67b4586926499c7549c72e73efc13c56
2024-05-15 16:04:43 +00:00
Treehugger Robot
ce0510d769 Merge "Create OWNERS for test_upgrade_mte" into main am: f6b59d19ae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3086565

Change-Id: Iccda7a6b60c9638d0b9ab965e05fb0153b57ea3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 13:16:47 +00:00
Treehugger Robot
f6b59d19ae Merge "Create OWNERS for test_upgrade_mte" into main 2024-05-15 13:00:04 +00:00
Florian Mayer
b3c145e0f7 Fix mte_upgrade_test
init ignored the rc file because of incorrect permissions
also replace deprecated "push" with "push-file"

Test: atest mte_upgrade_test
Bug: 335232356
Change-Id: I4c17311dbb1d001567f4cdda65036f16aec2b5c1
2024-05-14 17:38:51 -07:00
Sijie Chen
c8027933b3 Reland "[Berberis][CrashReporting] Dump guest thread inf..."
Guest thread information will print out follow host thread.

Revert submission 3081452-revert-3062926-CJGHTRPCBP

Reason for revert: Will make the change base on the original CLs for a reland.

Bug: b/321799516
Test: riscv64, checked tombstone file has wanted block.
https://paste.googleplex.com/6282302317658112
Added arm64 support and tested arm64 unwinding in internal repo.
https://paste.googleplex.com/6545612887818240

Change-Id: Ie54ad6f359d60283442adfcd9ee95f5a116e4b72
2024-05-14 21:28:39 +00:00
Sijie Chen
cb53fe136b Reland "[Berberis][CrashReporting] Extend ThreadInfo to ..."
Revert submission 3081452-revert-3062926-CJGHTRPCBP

Reason for revert: Will make the change base on the original CLs for a reland.

(Original CL commit message)
This CL is to get guest registers information.

Bug: b/321799516
Test: m
Testing for TLS Slot:
Manual testing by: 1. crash the jni tests to produce tombstones file 2.
get the signature field of guest state header 3. verified it is the same
value as NATIVE_BRIDGE_GUEST_STATE_SIGNATURE

Manual test the arm64 by: 1. flash build to pixel phone and verify
retrieving TLS_SLOT_THREAD_ID's tid field is the same as current thread
id.

Testing for register values:
Test and print out registers values for riscv64, looks make sense that
has null zero value slots.

Change-Id: Ieebf845bff517380ee07fac77f24b48efeb53521
2024-05-14 21:28:32 +00:00
Florian Mayer
0b36b59e45 Create OWNERS for test_upgrade_mte
Change-Id: I0dd6bccf9f6a1767f11fd3e687d819eceaab7b5e
2024-05-14 19:43:07 +00:00
Keir Fraser
b2016ecadc mkbootfs: Fix usage message for dev node list files
Bug: 328362894
Change-Id: If44918c52ff5bb0ca207fa4817ac14ae5af8c55f
2024-05-13 13:10:44 +00:00
Keir Fraser
7ae58649ae mkbootfs: Fix -f typo in usage message
Bug: 328362894
Change-Id: I559fb2640cb9fda7dbba172709ad1c3a7f3b6dd9
2024-05-13 13:10:44 +00:00
Dimitry Ivanov
ff4b02d27e Merge changes from topic "revert-3062926-CJGHTRPCBP" into main am: 9fbd7e1026
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3081452

Change-Id: I26db97698dbf1795e8b95360b5d57f45fcb68859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 16:30:39 +00:00
Dimitry Ivanov
9fbd7e1026 Merge changes from topic "revert-3062926-CJGHTRPCBP" into main
* changes:
  Revert "[Berberis][CrashReporting] Extend ThreadInfo to have gue..."
  Revert "[Berberis][CrashReporting] Dump guest thread info to tom..."
2024-05-10 16:14:06 +00:00
Dimitry Ivanov
cdf499f9cd Revert "[Berberis][CrashReporting] Extend ThreadInfo to have gue..."
Revert submission 3062926

Reason for revert: We want guest state to be present in all threads - revert to be able to fix the proto field type.

Reverted changes: /q/submissionid:3062926

Change-Id: I32b745cca95a619b78bdce0a7d948ac479d42f21
2024-05-10 10:02:07 +00:00
Dimitry Ivanov
899c1bdfa1 Revert "[Berberis][CrashReporting] Dump guest thread info to tom..."
Revert submission 3062926

Reason for revert: We want guest state to be present in all threads - revert to be able to fix the proto field type.

Reverted changes: /q/submissionid:3062926

Change-Id: I87b282a0d9caebe4eae2e7d8eca8ec8ebaa3eca6
2024-05-10 10:02:07 +00:00
Sijie Chen
faf7c1023b Merge changes from topic "berberis-crash-reporting-guest_regs" into main am: a6e1ac8efe
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3062926

Change-Id: I9842ddade6483e39483c0cd159b261963f2836a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-09 22:36:52 +00:00
Sijie Chen
a6e1ac8efe Merge changes from topic "berberis-crash-reporting-guest_regs" into main
* changes:
  [Berberis][CrashReporting] Dump guest thread info to tombstone file
  [Berberis][CrashReporting] Extend ThreadInfo to have guest registers
2024-05-09 22:16:44 +00:00
Sijie Chen
4c3a9dfd2f [Berberis][CrashReporting] Dump guest thread info to tombstone file
As title.

Bug: b/321799516
Test: riscv64, checked tombstone file has wanted block.
https://paste.googleplex.com/5958508322750464
Added arm64 support and tested arm64 unwinding in internal repo.
https://paste.googleplex.com/6545612887818240

Change-Id: I4e8a3414d0198de88a577ef4d5672a9ad0286fc5
2024-05-09 20:21:16 +00:00
Sijie Chen
3ff250f6d7 [Berberis][CrashReporting] Extend ThreadInfo to have guest registers
This CL is to get guest registers information.

Bug: b/321799516
Test: m
Testing for TLS Slot:
Manual testing by: 1. crash the jni tests to produce tombstones file 2.
get the signature field of guest state header 3. verified it is the same
value as NATIVE_BRIDGE_GUEST_STATE_SIGNATURE

Manual test the arm64 by: 1. flash build to pixel phone and verify
retrieving TLS_SLOT_THREAD_ID's tid field is the same as current thread
id.

Testing for register values:
Test and print out registers values for riscv64, looks make sense that
has null zero value slots.

Change-Id: Iff44ac5c2b202e44f3fb4e6909fbea141e54ae6b
2024-05-09 18:28:30 +00:00
Christopher Ferris
e13b66333a Merge "Clean up usage of 32 bit/64 bit checks." into main am: 0455ca3e09
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3077764

Change-Id: I72ffd161bd81b6c6e4818d3fe629a4107d667d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 20:51:36 +00:00
Christopher Ferris
0455ca3e09 Merge "Clean up usage of 32 bit/64 bit checks." into main 2024-05-08 20:06:18 +00:00
Treehugger Robot
a4fdd5a206 Merge "Updated 'cc' field of fuzz_config in Android.bp file" into main am: 68c89b7d7c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3062086

Change-Id: Id8daa06fbd6de13bf1a5e40ba8c78795fda1c7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 03:59:26 +00:00