Commit graph

35734 commits

Author SHA1 Message Date
Ryan Prichard
ac2b3304df Merge changes Ie92399c9,Ic6f05388 am: 6f0c44eebc
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1956680

Change-Id: I76eb1679a27ae2cea6927a656114695b777903f7
2022-02-08 00:21:58 +00:00
Treehugger Robot
606ea33a2a Merge "[NFCI] Change Android's NT_TYPE to NT_ANDROID_TYPE." am: 128475fd8c
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1975227

Change-Id: Id29efc7ce3b99e0ec21edcccb942331cd20e2f2d
2022-02-08 00:20:40 +00:00
Ryan Prichard
6f0c44eebc Merge changes Ie92399c9,Ic6f05388
* changes:
  Change default block size alignment to be 4 for memory saving on 32-bit arch
  Keep allocation of `tail_` outside of LinkedList
2022-02-08 00:11:08 +00:00
Treehugger Robot
128475fd8c Merge "[NFCI] Change Android's NT_TYPE to NT_ANDROID_TYPE." 2022-02-08 00:04:46 +00:00
Mitch Phillips
93400371f7 [NFCI] Change Android's NT_TYPE to NT_ANDROID_TYPE.
Normally, platform-specific note types in the toolchain are prefixed
with the platform name. Because we're exposing the NT_TYPE_MEMTAG and
synthesizing the note in the toolchain in an upcoming patch
(https://reviews.llvm.org/D118948), it's been requested that we change
the name to include the platform prefix.

While NT_TYPE_IDENT and NT_TYPE_KUSER aren't known about or synthesized
by the toolchain, update those references as well for consistency.

Bug: N/A
Test: Build Android
Change-Id: I7742e4917ae275d59d7984991664ea48028053a1
2022-02-07 13:49:20 -08:00
Eric Miao
08cf949855 Change default block size alignment to be 4 for memory saving on 32-bit arch
For a 32-bit userspace, `struct LinkedListEntry` takes 8 bytes for
storing the two pointers, a default block allocator size alignment of
16-bytes would waste 50% of memory. By changing the alignment to size
of a pointer, it saves >1MB memory postboot on wembley device.

Bug: http://b/206889551
Test: bionic-unit-tests
Change-Id: Ie92399c9bb3971f631396ee09bbbfd7eb17dc1a7
2022-02-03 16:55:37 -08:00
Christopher Ferris
e17b538019 Merge "Fix possible nullptr dereference." am: 442544d7b4
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1970080

Change-Id: I117ea83fb1f8b80580a4199261a3e6c2565b5fd2
2022-02-04 00:38:53 +00:00
Christopher Ferris
442544d7b4 Merge "Fix possible nullptr dereference." 2022-02-04 00:22:00 +00:00
Pirama Arumuga Nainar
6ede8410e3 Merge "Annotate fortify functions with diagnose_as_builtin" am: 37b3d9d705
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1940574

Change-Id: I009bb77a29027326ad0da077ac97dec089b0c33c
2022-02-03 23:41:57 +00:00
Pirama Arumuga Nainar
37b3d9d705 Merge "Annotate fortify functions with diagnose_as_builtin" 2022-02-03 23:24:14 +00:00
Pirama Arumuga Nainar
db71defb66 Annotate fortify functions with diagnose_as_builtin
Bug: http://b/197147102
Bug: http://b/214080353

With https://reviews.llvm.org/D77491, clang got stricter when issuing
diagnostics regarding builtin functions.
https://reviews.llvm.org/D112024 adds a diagnose_as_builtin attribute
which lets it diagnose builtins even though their signature is slightly
different.  This patch adds diagnose_as_builtin attribute as needed.

Versioner is built with an older clang so it doesn't recognize this
attribute.  So this is added with a preprocessor check on clang
versions.  We can remove the version check once versioner gets updated
shortly after the compiler update.

Test: mmma bionic/tests with clang-r445002
Change-Id: I3d0d63ecdbea0cffe97eb5110e2d9f2a7595a38e
2022-02-03 11:53:52 -08:00
Christopher Ferris
d49ad1e39b Fix possible nullptr dereference.
Test: Unit tests pass.
Change-Id: I046c6e1665de4d941362e2f65605609e77731c97
2022-02-02 17:56:48 -08:00
Eric Miao
fbee3177af Keep allocation of tail_ outside of LinkedList
This change is to allocate `head_` and `tail_` outside of LinkedList
and only keep a readonly pointer there. By doing this, all updates
of the list touches memory other than the LinkedList itself, thus
preventing copy-on-write pages being allocated in child processes
when the list changes.

The other approach is to make the LinkedList a singly-linked list,
however, that approach would cause a full list traversal to add
one item to the list. And preliminary number shows there are ~60K
calls to `soinfo::add_secondary_namespace` during Android bootup
on a wembley device, where a singly-linked approach could be
hurting performance.

NOTE: the header is allocated and initialized upon first use instead
of being allocated in the constructor, the latter ends up in crash.
This is likely caused by static initialization order in the linker,
e.g. g_soinfo_list_allocator is a static object, and if this linked
list is embedded into some other static objects, there's no guarantee
the allocator will be available.

Bug: http://b/206889551
Test: bionic-unit-tests
Change-Id: Ic6f053881f85f9dc5d249bb7d7443d7a9a7f214f
2022-02-01 21:32:30 -08:00
Florian Mayer
a58dd462b1 Merge "Fix HWASan crashes in heapprofd initialization." am: 8266380c77
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1965516

Change-Id: Id5d5c1c934955a7e756c81bb67c30fbd8a299589
2022-02-01 20:51:15 +00:00
Florian Mayer
8266380c77 Merge "Fix HWASan crashes in heapprofd initialization." 2022-02-01 20:30:25 +00:00
Florian Mayer
6c1c3422a2 Fix HWASan crashes in heapprofd initialization.
Test: atest perfetto_integrationtests on HWASan build

Bug: 210588740
Change-Id: Iddaa4a7d0dedee541f97bbf0a13958de023bdf59
2022-02-01 17:10:32 +00:00
Treehugger Robot
64a42f33ed Merge "Silence -Wnon-power-of-two-alignment for a test" am: 650233457a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1964751

Change-Id: I465c037c5bae18733229b1b66ccdda98663d4e4d
2022-01-29 01:20:23 +00:00
Treehugger Robot
650233457a Merge "Silence -Wnon-power-of-two-alignment for a test" 2022-01-29 01:04:50 +00:00
Pirama Arumuga Nainar
44dd9facb2 Silence -Wnon-power-of-two-alignment for a test
Bug: http://b/214080353

The wrong alignment to aligned_alloc() is deliberate.  Silence the
warning around the test.

Test: build with clang-r445002
Change-Id: I73bad7775423c908c2bbe1c550e8ce5aeede129d
2022-01-28 13:27:07 -08:00
Daniele Di Proietto
deb0f9972a Merge "Fix recursive deadlock inside bionic_systrace" am: f7e721cdc9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1958831

Change-Id: I5404720d7dccfc9779fd6fd81f71af23b18fdec4
2022-01-26 23:34:02 +00:00
Daniele Di Proietto
f7e721cdc9 Merge "Fix recursive deadlock inside bionic_systrace" 2022-01-26 23:12:27 +00:00
Daniele Di Proietto
f5f04b19fe Fix recursive deadlock inside bionic_systrace
The first time should_trace() returns true, bionic_trace_begin() calls
open() on trace_marker.

The problem is that open() can call bionic_trace_begin(). We've observed
this happening, for example when:

* fdtrack is enabled. dlopen("libfdtrack.so") can be used to enable
  fdtrack on a process.
* ThreadA is busy unwinding inside fdtrack and is holding an fdtrack
  internal mutex.
* ThreadB calls bionic_trace_begin() for the first time since the
  property "debug.atrace.tags.enableflags" contains ATRACE_TAG_BIONIC.
* ThreadB calls open("/sys/kernel/tracing/trace_marker"). Since fdtrack
  is enabled, ThreadB tries to do unwinding as well.
* ThreadB, inside fdtrack's unwinding tries to grab the same mutex that
  ThreadA is holding.
* Mutex contention is reported using bionic_systrace, therefore
  bionic_trace_begin() is called again on ThreadB.
* ThreadB tries to grab g_lock in bionin_systrace.cpp, but that's
  already held by ThreadB itself, earlier on the stack. Therefore
  ThreadB is stuck.

I managed to reproduce the above scenario by manually pausing ThreadA
inside unwinding with a debugger and letting ThreadB hitting
bionic_trace_begin() for the first time.

We could avoid using g_lock while calling open() (either by releasing
g_lock and reacquiring it later, or by using atomics), but
bionic_trace_begin() would try to call open() again. In my tests, open()
does not call bionic_trace_begin() a third time, because fdtrack has
reentrancy protection, but there might be another code path inside open
that calls bionic_trace_begin again (it could be racy or only happen in
certain configurations).

This commit fixes the problem by implementing reentrancy protection in
bionic_systrace.

Sample callstack from ThreadA deadlocked before the fix:
```
  * frame #0: 0x0000007436db077c libc.so`syscall at syscall.S:41
    frame #1: 0x0000007436db0ba0 libc.so`bionic_trace_begin(char const*) [inlined] __futex(ftx=0x000000743737a548, op=<unavailable>, value=2, timeout=0x0000000000000000, bitset=-1) at bionic_futex.h:45:16
    frame #2: 0x0000007436db0b8c libc.so`bionic_trace_begin(char const*) [inlined] __futex_wait_ex(ftx=0x000000743737a548, value=2) at bionic_futex.h:66:10
    frame #3: 0x0000007436db0b78 libc.so`bionic_trace_begin(char const*) [inlined] Lock::lock(this=0x000000743737a548) at bionic_lock.h:67:7
    frame #4: 0x0000007436db0b74 libc.so`bionic_trace_begin(char const*) [inlined] should_trace() at bionic_systrace.cpp:38:10
    frame #5: 0x0000007436db0b74 libc.so`bionic_trace_begin(message="Contending for pthread mutex") at bionic_systrace.cpp:59:8
    frame #6: 0x0000007436e193e4 libc.so`NonPI::MutexLockWithTimeout(pthread_mutex_internal_t*, bool, timespec const*) [inlined] NonPI::NormalMutexLock(mutex=0x0000007296cae9f0, shared=0, use_realtime_clock=false, abs_timeout_or_null=0x0000000000000000) at pthread_mutex.cpp:592:17
    frame #7: 0x0000007436e193c8 libc.so`NonPI::MutexLockWithTimeout(mutex=0x0000007296cae9f0, use_realtime_clock=false, abs_timeout_or_null=0x0000000000000000) at pthread_mutex.cpp:719:16
    frame #8: 0x0000007436e1912c libc.so`::pthread_mutex_lock(mutex_interface=<unavailable>) at pthread_mutex.cpp:839:12 [artificial]
    frame #9: 0x00000071a4e5b290 libfdtrack.so`std::__1::mutex::lock() [inlined] std::__1::__libcpp_mutex_lock(__m=<unavailable>) at __threading_support:256:10
    frame #10: 0x00000071a4e5b28c libfdtrack.so`std::__1::mutex::lock(this=<unavailable>) at mutex.cpp:31:14
    frame #11: 0x00000071a4e32634 libfdtrack.so`unwindstack::Elf::Step(unsigned long, unwindstack::Regs*, unwindstack::Memory*, bool*, bool*) [inlined] std::__1::lock_guard<std::__1::mutex>::lock_guard(__m=0x0000007296cae9f0) at __mutex_base:104:27
    frame #12: 0x00000071a4e32618 libfdtrack.so`unwindstack::Elf::Step(this=0x0000007296cae9c0, rel_pc=66116, regs=0x0000007266ca0470, process_memory=0x0000007246caa130, finished=0x0000007ff910efb4, is_signal_frame=0x0000007ff910efb0) at Elf.cpp:206:31
    frame #13: 0x00000071a4e2b3b0 libfdtrack.so`unwindstack::LocalUnwinder::Unwind(this=0x00000071a4ea1528, frame_info=<unavailable>, max_frames=34) at LocalUnwinder.cpp:102:22
    frame #14: 0x00000071a4e2a3ec libfdtrack.so`fd_hook(event=<unavailable>) at fdtrack.cpp:119:18
    frame #15: 0x0000007436dbf684 libc.so`::__open_2(pathname=<unavailable>, flags=<unavailable>) at open.cpp:72:10
    frame #16: 0x0000007436db0a04 libc.so`bionic_trace_begin(char const*) [inlined] open(pathname=<unavailable>, flags=524289) at fcntl.h:63:12
    frame #17: 0x0000007436db09f0 libc.so`bionic_trace_begin(char const*) [inlined] get_trace_marker_fd() at bionic_systrace.cpp:49:25
    frame #18: 0x0000007436db09c0 libc.so`bionic_trace_begin(message="pthread_create") at bionic_systrace.cpp:63:25
```

Bug: 213642769
Change-Id: I10d331859045cb4a8609b007f5c6cf2577ff44df
2022-01-25 20:50:12 +00:00
Evgenii Stepanov
d474cf97f4 Merge "Fix MemtagNoteTest and make it runnable on non-MTE devices." am: 97ec0e312b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1957287

Change-Id: I0832697c3a4c7c8aa7803fb62a0d56f3f39e6d93
2022-01-25 18:42:34 +00:00
Evgenii Stepanov
97ec0e312b Merge "Fix MemtagNoteTest and make it runnable on non-MTE devices." 2022-01-25 18:27:16 +00:00
Yi Kong
92897479bb Merge "Move linker from sampling PGO to AFDO pipeline" am: fb946fd873
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1959003

Change-Id: Ic2e3cf27cad7295def30689939b8f5eb6ca70e21
2022-01-25 18:06:25 +00:00
Yi Kong
fb946fd873 Merge "Move linker from sampling PGO to AFDO pipeline" 2022-01-25 17:50:09 +00:00
Peter Collingbourne
659885327f Merge "Disable pointer authentication in app processes." am: ccae7efeed
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1955116

Change-Id: I8236ec524fc14f950e84c371346d820ddcb2b2df
2022-01-24 21:33:43 +00:00
Peter Collingbourne
ccae7efeed Merge "Disable pointer authentication in app processes." 2022-01-24 21:17:30 +00:00
Yi Kong
e20a1d9060 Move linker from sampling PGO to AFDO pipeline
Sampling PGO is being replaced by AFDO.

Test: presubmit
Change-Id: I23e4dace5f2c2d1f2499daba99a28b2a1bc0f22d
2022-01-25 03:19:58 +08:00
Evgenii Stepanov
e37ca53157 Fix MemtagNoteTest and make it runnable on non-MTE devices.
Update the path to the helper binary, and run the test on non-MTE
hardware with the expectation that the bug is not detected.

Test: bionic-unit-tests
Bug: none
Change-Id: I34eb4dc46d0bacd83824d307398f7891d4806686
2022-01-21 19:55:54 +00:00
Peter Collingbourne
bf52e88596 Disable pointer authentication in app processes.
Unfortunately we have discovered that some applications in the wild
are using PAC instructions incorrectly. To keep those applications
working on PAC enabled devices, disable PAC in application processes
for now.

Bug: 212660282
Change-Id: I3030c47be9d02a27505bd4775c1982a20755758c
2022-01-19 13:35:54 -08:00
Elliott Hughes
3eaf9ab52f Merge "libm: sync with upstream." am: b838fbda2a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1947706

Change-Id: I28981febb0e79bad47c921024ef25e0ade9c540f
2022-01-18 22:36:00 +00:00
Elliott Hughes
b838fbda2a Merge "libm: sync with upstream." 2022-01-18 22:21:25 +00:00
Treehugger Robot
815b9e5447 Merge "Update the status for S and T." am: 095509f80a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1950404

Change-Id: Ie2a176a93447dcedaad7d8be3051c8aed1685ae7
2022-01-16 05:02:55 +00:00
Treehugger Robot
095509f80a Merge "Update the status for S and T." 2022-01-16 04:49:18 +00:00
Elliott Hughes
57f17dea20 Update the status for S and T.
Test: treehugger
Change-Id: I21c4374d7e55dbbb2294cef5cc7bf50b7fe1b549
2022-01-14 16:26:25 -08:00
Elliott Hughes
8605016db3 Merge "Don't use LLVM when readelf(1) will do." am: e62be7eea5
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1949583

Change-Id: I2d9bf114e3ef58a47ed1423799e49a0bdd8e886d
2022-01-14 20:03:46 +00:00
Elliott Hughes
e62be7eea5 Merge "Don't use LLVM when readelf(1) will do." 2022-01-14 19:45:54 +00:00
Elliott Hughes
1ff7be0713 Don't use LLVM when readelf(1) will do.
This was probably the least worst choice at the time, but we have toybox
readelf now, which is a much lighter-weight dependency (that we already
have for some other tests).

This is also one less use of the *renderscript* LLVM, which we'll be
wanting to finally delete soon.

Test: treehugger
Change-Id: I0e05b8f139ec6e6a425b575368f3d514b8b1cc64
2022-01-13 15:46:13 -08:00
Treehugger Robot
443f506182 Merge "Don't use llvm-defaults to build some tests." am: 4a85b045fd
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1946968

Change-Id: Idafad4ac6cd9602aaa26f55954580e4f61297c2a
2022-01-13 04:10:24 +00:00
Treehugger Robot
4a85b045fd Merge "Don't use llvm-defaults to build some tests." 2022-01-13 03:55:16 +00:00
Elliott Hughes
99ef447d0f libm: sync with upstream.
There's potential here to maybe lose some/all of builtins.cpp, but I'll
look at that separately later.

Test: treehugger
Change-Id: I2c2bc1d0753affdd214daeb09fa1ac7cd73db347
2022-01-12 17:52:15 -08:00
Treehugger Robot
fa83c83273 Merge "Fix copy pasta in guard macro for weak symbols." am: 5396787062
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1940462

Change-Id: I5f82ecad3e171ea53c11ee41816c2196c06a49e5
2022-01-12 22:33:45 +00:00
Treehugger Robot
5396787062 Merge "Fix copy pasta in guard macro for weak symbols." 2022-01-12 22:19:11 +00:00
Elliott Hughes
db358e6ae1 Don't use llvm-defaults to build some tests.
It's not clear this was ever needed, it doesn't seem to make any
difference now, and these are the defaults for the obsolete renderscript
LLVM anyway, so... yeah.

This was noticed because it was causing some of our tests to be built as
C++11 rather than [the current default of] C++17.

Test: treehugger
Change-Id: I7d72b3fd58e9cf9a02048b0298eee845d19307f7
2022-01-12 09:15:46 -08:00
Christopher Ferris
9757d047e0 Merge "Update to v5.16 kernel headers." am: c79b02088b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1943890

Change-Id: I5d5d1bd58594728653e508ab4c3dedf476b3153b
2022-01-11 21:52:21 +00:00
Christopher Ferris
c79b02088b Merge "Update to v5.16 kernel headers." 2022-01-11 21:39:53 +00:00
Christopher Ferris
a479261feb Update to v5.16 kernel headers.
Kernel headers coming from:

Git: https://android.googlesource.com/kernel/common/
Branch: android-mainline
Tag: android-mainline-5.16

Test: Builds and bionic unit tests pass.
Change-Id: I2522c4f2a0efb9f8a193e1f2d65868e478217502
2022-01-10 13:51:15 -08:00
Treehugger Robot
7064948b1a Merge "Remove availability definitions for mbs APIs." am: f62c8f99cb
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1940461

Change-Id: I9424c079d5646071d1a3295b574f5aaf6f7e84e4
2022-01-10 21:25:28 +00:00
Treehugger Robot
f62c8f99cb Merge "Remove availability definitions for mbs APIs." 2022-01-10 21:04:37 +00:00