Commit graph

42784 commits

Author SHA1 Message Date
Carlos Galo
4a98366070 Adding missing mm tests in syscall.xml
Bug: 327496587
Test: local build and run
Change-Id: I914fe3b6665acadb3f2c87333f85f5ff0374f678
Signed-off-by: Carlos Galo <carlosgalo@google.com>
2024-03-11 13:55:46 -07:00
Treehugger Robot
5ab3daa560 Merge changes Iec225109,I988e9495 into main
* changes:
  Add mprotect syscall benchmark
  Rename mmap benchmarks to mm benchmark
2024-03-09 05:01:03 +00:00
Carlos Galo
f86d29cc49 Add mprotect syscall benchmark
Specific parameters were chosen based on the frequency of their use in
Android.

Bug: 327496587
Test: local build and run
Change-Id: Iec225109f62e1e9cde133863d3cee8103172a6c8
Signed-off-by: Carlos Galo <carlosgalo@google.com>
2024-03-08 22:02:11 +00:00
Treehugger Robot
fd9824d0b1 Merge changes from topic "revert-2966884-NAVMRGEYJW" into main
* changes:
  Revert "RELAND: bionic: loader: Extend LOAD segment VMAs"
  Revert "RELAND: bionic: loader: Extend GNU_RELRO protection"
2024-03-08 03:41:08 +00:00
Elliott Hughes
7b6de468dd Merge "Make our <ctype.h> benchmarks less useless." into main 2024-03-08 01:04:22 +00:00
Kalesh Singh
7a04fedc78 Revert "RELAND: bionic: loader: Extend LOAD segment VMAs"
Revert submission 2966884

Reason for revert: b/328266487

Reverted changes: /q/submissionid:2966884

Bug: 328266487
Change-Id: I45a2c5888eefab36c069f992de00ec8c87105288
2024-03-07 13:32:34 -08:00
Kalesh Singh
26de64896c Revert "RELAND: bionic: loader: Extend GNU_RELRO protection"
Revert submission 2966884

Reason for revert: b/328266487

Reverted changes: /q/submissionid:2966884

Bug: 328266487
Change-Id: I3e61443302bf7fd8f58c843c9d7dc3c747897959
2024-03-07 13:32:23 -08:00
Xin Li
0ed1d35333 Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:41:06 +00:00
Elliott Hughes
457dee1a33 Make our <ctype.h> benchmarks less useless.
Apparently we hadn't looked at the disassembly of these benchmarks since
implementing the various <ctype.h> functions inline, because they've all
been optimized away to literal loads of 0 or 1.

Obviously, this is not helpful when trying to judge further
optimizations.

Test: objdump and ran the benchmarks (on both arm64 and arm32)
Change-Id: Id66c4f7f4c92d9eee8937d31546158eda62ef3ba
2024-03-06 18:22:36 -08:00
Florian Mayer
0e1412e08e Make memtag_handle_longjmp precise
We would get the SP inside of memtag_handle_longjmp, which could prevent
us from detecting the case where a longjmp is going into a function that
had already returned. This changes makes the behaviour more predictable.

Change-Id: I75bf931c8f4129a2f38001156b7bbe0b54a726ee
2024-03-06 16:46:45 -08:00
Xin Li
14a7ebe3d2 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Ie84b92a2839ad09f5f73f1cce173df5a14e3e237
Change-Id: I855cd3db74a2b8ae33a09da35b7bcd067a435306
2024-03-06 09:29:44 -08:00
Carlos Galo
fb7dd9dd85 Rename mmap benchmarks to mm benchmark
This file no longer covers only mmap benchmarking, but also additional
memory related syscalls. Adjusting the name of this file to reflect the
broader utilization.

Bug: 327496587
Test: local build and run
Change-Id: I988e949589f9731fb1d85f489cd46ae64bf0a74c
Signed-off-by: Carlos Galo <carlosgalo@google.com>
2024-03-06 07:49:15 +00:00
Elliott Hughes
7c37e12827 Merge "Clarify the timespec argument to clock_nanosleep()." into main am: 70ecb746f3
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2987070

Change-Id: Ie84b92a2839ad09f5f73f1cce173df5a14e3e237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 15:44:19 +00:00
Elliott Hughes
c2ce647e2a Merge "Consistently use 'op' in argument names." into main am: 47f8ab80cc
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2987969

Change-Id: Id162bd1a19777501ea982996f3689a22142e18e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 15:44:07 +00:00
Elliott Hughes
786484d808 Merge "_Fork(): clarify what not running pthread_atfork() handlers means in practice." into main am: 69bc81615b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2987030

Change-Id: Ic3bcc3ec2addc60edf75d612eb4c5bd35f902040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 15:43:53 +00:00
Treehugger Robot
321ad5b869 Merge "Remove an unused include" into main am: 9d98e04aa9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2988089

Change-Id: Ibaeddef163e41c2fce7431fa5c7a6312c009d8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 15:43:38 +00:00
Elliott Hughes
70ecb746f3 Merge "Clarify the timespec argument to clock_nanosleep()." into main 2024-03-05 15:25:46 +00:00
Elliott Hughes
47f8ab80cc Merge "Consistently use 'op' in argument names." into main 2024-03-05 15:25:18 +00:00
Elliott Hughes
69bc81615b Merge "_Fork(): clarify what not running pthread_atfork() handlers means in practice." into main 2024-03-05 15:20:29 +00:00
Treehugger Robot
9d98e04aa9 Merge "Remove an unused include" into main 2024-03-05 15:07:03 +00:00
Ryan Prichard
cda3150674 Remove an unused include
Bug: none
Test: bionic-unit-tests
Change-Id: I738c24c82b5c4af5db275ba6566a5ba6f7d538ac
2024-03-04 17:29:41 -08:00
Ryan Prichard
0ba2cc0796 Merge "Revamp the elftls_dl.dtv_resize test" into main am: e6a4943dfa
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2983767

Change-Id: I78ddfe29db66d1ce781f70b72a318c84f75980d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 00:42:55 +00:00
Elliott Hughes
8dc9c1cad3 Clarify the timespec argument to clock_nanosleep().
Pointed out during review of a similar change to the man page.

Change-Id: I78f87bc4ff9fed773ca6f477e79f4a3fd507e056
2024-03-05 00:17:22 +00:00
Ryan Prichard
e6a4943dfa Merge "Revamp the elftls_dl.dtv_resize test" into main 2024-03-04 23:54:57 +00:00
Elliott Hughes
364fc76047 Consistently use 'op' in argument names.
This matches changes being made to regularize the man page terminology.

Change-Id: If949cf81a0a0a06f24a4a742e8bf45c53dbd0da1
2024-03-04 23:48:00 +00:00
Elliott Hughes
8257268d04 _Fork(): clarify what not running pthread_atfork() handlers means in practice.
Change-Id: I0546069bbef730ffc23b3cea90fe7280d905d885
2024-03-04 22:24:01 +00:00
Ryan Prichard
98731dc343 Revamp the elftls_dl.dtv_resize test
Split the test out into a separate executable to reduce the number of
ELF modules in the DTV, so that the test can more easily observe the
behavior of loading a module that requires doubling the DTV size. We
want to see the DTV expand from 5 entries (8 words w/header) to
13 entries (16 words w/header).

Make the test work with an initial number of ELF TLS modules between
2 and 4.

Bug: http://b/175635923
Test: bionic-unit-tests
Change-Id: I1e91b4462987a5c80e13838669c359053f5a62f6
2024-03-01 00:22:39 -08:00
Treehugger Robot
b4d8542a84 Merge "Correct the nullability annotation in posix_spawnattr_init()" into main am: 2c0e9a58ea
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2983453

Change-Id: Ib3fd19948abcb9f10e6ed4e4e2a9a16835c91c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-01 03:26:47 +00:00
Treehugger Robot
2c0e9a58ea Merge "Correct the nullability annotation in posix_spawnattr_init()" into main 2024-03-01 02:40:32 +00:00
Elliott Hughes
335380e79a Merge "Add _Fork()." into main am: a216b269ef
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2976351

Change-Id: I3292deb2184c7f88b39e2ee9d817775031bfbfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 23:29:07 +00:00
zijunzhao
148476d91c Correct the nullability annotation in posix_spawnattr_init()
The input __attr should be allowed to point to null.

Bugs: b/245972273
Test: adb shell
Change-Id: Id433d220e7c074ca68e2541371491975b33928ed
2024-02-29 22:55:00 +00:00
Elliott Hughes
a216b269ef Merge "Add _Fork()." into main 2024-02-29 22:25:45 +00:00
Elliott Hughes
2411fff9f2 Add _Fork().
POSIX issue 8 function, already in musl/glibc (but not iOS/macOS).

Bug: https://austingroupbugs.net/view.php?id=62
Test: treehugger
Change-Id: Id51611afdab92dff36a540b7d8737fc0e31f3d36
2024-02-29 20:50:58 +00:00
Treehugger Robot
91a073d442 Merge "Remove unnecessary includes" into main am: 9218876df0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2983496

Change-Id: I5d0ed4bbda78c7989cf44c2fd0d5feb58b3319d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 16:38:03 +00:00
Treehugger Robot
9218876df0 Merge "Remove unnecessary includes" into main 2024-02-29 15:57:14 +00:00
Florian Mayer
5f177e3746 Remove unnecessary includes
Test: debuggerd_test, CtsCrashDetailHostTestCases
Change-Id: Iceb0458d953f23aff13576a45c2f6a616c40c1a5
2024-02-28 17:28:54 -08:00
Steven Moreland
d29e333562 Merge "Add ..DEPRECATED_PAGE_SIZE macro" into main am: 2215ad406b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2978135

Change-Id: I436e26aa5e3587f5977854c4fdb720e0199a4b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 22:04:18 +00:00
Steven Moreland
2215ad406b Merge "Add ..DEPRECATED_PAGE_SIZE macro" into main 2024-02-28 21:34:56 +00:00
Steven Moreland
f6e9904fa9 Add ..DEPRECATED_PAGE_SIZE macro
When 'no page size' is turned on (especially if it is turned
on by default in some environments), we need a way to turn
it off, thus restoring the old behavior.

Bug: 312546062
Change-Id: I411cff621246b6ba40e70bb51234f3886ba9527a
Test: N/A
2024-02-28 21:34:42 +00:00
Kalesh Singh
c5b4880d0a Merge changes from topic "reland_bionic_vma_fixes" into main am: f9c297d344
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2966884

Change-Id: I5462276ccc3fb1c0b695c8bba2fb7544a84583bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 17:02:48 +00:00
Kalesh Singh
f9c297d344 Merge changes from topic "reland_bionic_vma_fixes" into main
* changes:
  RELAND: bionic: loader: Extend GNU_RELRO protection
  RELAND: bionic: loader: Extend LOAD segment VMAs
2024-02-28 16:20:08 +00:00
Treehugger Robot
56f01ac9a0 Merge "CtsBionicAppTestCases has moved to presubmit." into main am: a094f172b8
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2980612

Change-Id: I493170b4ebb03df182f60de2d926c4747224f012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 03:04:39 +00:00
Treehugger Robot
a094f172b8 Merge "CtsBionicAppTestCases has moved to presubmit." into main 2024-02-28 02:27:22 +00:00
Elliott Hughes
956ff6eeb4 Merge "Add CtsBionicAppTestCases to TEST_MAPPING." into main am: 15be223fcc
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2974191

Change-Id: I6cc4e6bfd0cbae44941dae48e401c38fce17203e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 23:06:13 +00:00
Elliott Hughes
575eb3438a CtsBionicAppTestCases has moved to presubmit.
Change-Id: I305bfe2724609c18abfd52c21fd8e3ae4edc1aea
2024-02-27 22:19:01 +00:00
Elliott Hughes
15be223fcc Merge "Add CtsBionicAppTestCases to TEST_MAPPING." into main 2024-02-27 22:09:34 +00:00
Treehugger Robot
0500d85da2 Merge "__bionic_get_shell_path(): explanatory comment." into main am: c3a6b446c4
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2978812

Change-Id: I4e4c1c7090e46bfc67bfe02f8ee3b63947675ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 19:51:17 +00:00
Treehugger Robot
c3a6b446c4 Merge "__bionic_get_shell_path(): explanatory comment." into main 2024-02-27 19:14:19 +00:00
Kalesh Singh
41b8863cd7 RELAND: bionic: loader: Extend GNU_RELRO protection
If the LOAD segment VMAs are extended to prevent creating additional
VMAs, the the protection extent of the GNU_RELRO segment must also
be updated to match. Otherwise, the partial mprotect will reintroduce
an additional VMA due to the split protections.

Update the GNU_RELRO protection range when the ELF was loaded by the
bionic loader. Be careful not to attempt any fix up for ELFs not loaded
by us (e.g. ELF loaded by the kernel) since these don't have the
extended VMA fix to begin with.

Consider a system with 4KB page size and the ELF files with 64K
alignment. e.g:

$ readelf -Wl /system/lib64/bootstrap/libc.so | grep 'Type\|LOAD'

Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
LOAD           0x000000 0x0000000000000000 0x0000000000000000 0x0441a8 0x0441a8 R   0x10000
LOAD           0x0441b0 0x00000000000541b0 0x00000000000541b0 0x091860 0x091860 R E 0x10000
LOAD           0x0d5a10 0x00000000000f5a10 0x00000000000f5a10 0x003d40 0x003d40 RW  0x10000
LOAD           0x0d9760 0x0000000000109760 0x0000000000109760 0x0005c0 0x459844 RW  0x10000

Before this patch:

$ cat /proc/1/maps | grep -A1 libc.so

7f468f069000-7f468f0bd000 r--p 00000000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f0bd000-7f468f15e000 r-xp 00044000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f15e000-7f468f163000 r--p 000d5000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f163000-7f468f172000 rw-p 000da000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f172000-7f468f173000 rw-p 000d9000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f173000-7f468f5c4000 rw-p 00000000 00:00 0                          [anon:.bss]

1 extra RW VMA at offset 0x000da000 (3 RW mappings in total)

After this patch:

$ cat /proc/1/maps | grep -A1 libc.so

7f5a50225000-7f5a50279000 r--p 00000000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f5a50279000-7f5a5031a000 r-xp 00044000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f5a5031a000-7f5a5032e000 r--p 000d5000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f5a5032e000-7f5a5032f000 rw-p 000d9000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f5a5032f000-7f5a50780000 rw-p 00000000 00:00 0                          [anon:.bss]

Removed RW VMA at offset 0x000da000 (2 RW mappings in total)

Bug: 316403210
Bug: 300367402
Bug: 307803052
Bug: 312550202
Test: atest -c linker-unit-tests
Test: atest -c bionic-unit-tests
Change-Id: I9cd04574190ef4c727308363a8cb1120c36e53e0
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-02-27 07:19:07 +00:00
Kalesh Singh
944164c5e2 RELAND: bionic: loader: Extend LOAD segment VMAs
When the page_size < p_align of the ELF load segment, the loader
will end up creating extra PROT_NONE gap VMA mappings between the
LOAD segments. This problem is exacerbated by Android's zygote
model, where the number of loaded .so's can lead to ~30MB increase
in vm_area_struct unreclaimable slab memory.

Extend the LOAD segment VMA's to cover the range between the
segment's end and the start of the next segment, being careful
to avoid touching regions of the extended mapping where the offset
would overrun the size of the file. This avoids the loader
creating an additional gap VMA for each LOAD segment.

Consider a system with 4KB page size and the ELF files with 64K
alignment. e.g:

$ readelf -Wl /system/lib64/bootstrap/libc.so | grep 'Type\|LOAD'

Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
LOAD           0x000000 0x0000000000000000 0x0000000000000000 0x0441a8 0x0441a8 R   0x10000
LOAD           0x0441b0 0x00000000000541b0 0x00000000000541b0 0x091860 0x091860 R E 0x10000
LOAD           0x0d5a10 0x00000000000f5a10 0x00000000000f5a10 0x003d40 0x003d40 RW  0x10000
LOAD           0x0d9760 0x0000000000109760 0x0000000000109760 0x0005c0 0x459844 RW  0x10000

Before this patch:

$ cat /proc/1/maps | grep -A1 libc.so

7fa1d4a90000-7fa1d4ad5000 r--p 00000000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7fa1d4ad5000-7fa1d4ae4000 ---p 00000000 00:00 0
7fa1d4ae4000-7fa1d4b76000 r-xp 00044000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7fa1d4b76000-7fa1d4b85000 ---p 00000000 00:00 0
7fa1d4b85000-7fa1d4b8a000 r--p 000d5000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7fa1d4b8a000-7fa1d4b99000 ---p 00000000 00:00 0
7fa1d4b99000-7fa1d4b9a000 rw-p 000d9000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7fa1d4b9a000-7fa1d4feb000 rw-p 00000000 00:00 0                          [anon:.bss]

3 additional PROT_NONE (---p) VMAs for gap mappings.

After this patch:

$ cat /proc/1/maps | grep -A1 libc.so

7f468f069000-7f468f0bd000 r--p 00000000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f0bd000-7f468f15e000 r-xp 00044000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f15e000-7f468f163000 r--p 000d5000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f163000-7f468f172000 rw-p 000da000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f172000-7f468f173000 rw-p 000d9000 fe:09 20635520                   /system/lib64/bootstrap/libc.so
7f468f173000-7f468f5c4000 rw-p 00000000 00:00 0                          [anon:.bss]

No additional gap VMAs. However notice there is an extra RW VMA at
offset 0x000da000. This is caused by the RO protection of the
GNU_RELRO segment, which causes the extended RW VMA to split.
The GNU_RELRO protection extension is handled in the subsequent
patch in this series.

Bug: 316403210
Bug: 300367402
Bug: 307803052
Bug: 312550202
Test: atest -c linker-unit-tests
Test: atest -c bionic-unit-tests
Change-Id: I7150ed22af0723cc0b2d326c046e4e4a8b56ad09
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-02-27 06:13:11 +00:00