aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-12Snap for 7910331 from 946f3948b42e405bc0c21917498f668c41303f5b to ↵android-mainline-12.0.0_r92android-mainline-12.0.0_r78android-mainline-12.0.0_r50android12-mainline-neuralnetworks-releaseAndroid Build Coastguard Worker
mainline-neuralnetworks-release Change-Id: I3e7e2aa104fd88135a43c70400b51ebc96cf5563
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-releaseXin Li
am: 1f637922e6 -s ours am skip reason: Merged-In Ic7a83fb01a39113d408ed0c95d27f694d5a2649c with SHA-1 c75fbc7b8a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15546344 Change-Id: I5545d957715724c09a65a2e717eb151e7b61494f
2021-08-13Merge stage-aosp-sc-ts-dev before making it an upstreamXin Li
Bug: 169893837 Merged-In: Ic7a83fb01a39113d408ed0c95d27f694d5a2649c Change-Id: Ib15d857903753f890e6a75f2815a441359a81fc5
2021-08-12Merge ab/7633965The Android Open Source Project
Bug: 169893837 Merged-In: Ic7a83fb01a39113d408ed0c95d27f694d5a2649c Change-Id: I4494985e98790e8934f10c8ba6f6f2207b3050ab
2021-07-23Revert "Adding system property tracing" am: c75fbc7b8aBowgo Tsai
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15353073 Change-Id: Iaa942dfd6821f807b3d39215b073530348a98982
2021-07-23Revert "bionic_systrace: moving global static variables" am: 2ebdb61620Bowgo Tsai
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15353072 Change-Id: I9999b64c3af5b7c71c94424894a5ca2413726bed
2021-07-22Revert "Adding system property tracing"android12-hostruntime-devandroid12-devBowgo Tsai
Revert submission 1403568-sysprop_trace Reason for revert: makes property get/set non-reentrant Reverted Changes: I6f85f3f52:Add systrace tag for system property Id2b93acb2:Adding system property tracing Id78992d23:Add systrace tag for system property I1ba9fc7bd:Add systrace tag for system property Bug: 193050299 Test: build and boot a device Change-Id: Ic7a83fb01a39113d408ed0c95d27f694d5a2649c Merged-In: Ic7a83fb01a39113d408ed0c95d27f694d5a2649c (cherry picked from commit 61a5a8380d6417e9b85bb2f6a4a694ef4222031f)
2021-07-22Revert "bionic_systrace: moving global static variables"Bowgo Tsai
This reverts commit 1e1c7845aab0542306f61d8e8c880aca096ea336. Reason for revert: makes property get/set non-reentrant Bug: 193050299 Test: build and boot a device Change-Id: If59e3dc25684a3c2b1d3ff74f995311afe6c6e89 Merged-In: If59e3dc25684a3c2b1d3ff74f995311afe6c6e89 (cherry picked from commit 3ec21f527acbaefb5f7a114125bc7a93baa780c7)
2021-07-15Fix race when frees after main thread finishes. am: e9b672b3e0Christopher Ferris
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15291503 Change-Id: I8dc2c606518cb1d1186155448a902a6b4ef3e1b8
2021-07-15Fix race when frees after main thread finishes.Christopher Ferris
When the main thread is exiting, the code deleted the g_debug global pointer and destroys the disable pthread key. Unfortunately, if malloc debug was enabled in a way that requires a header for the pointer, any frees that occur after the main thread is torn down result in calls to the underlying allocator with bad pointers. To avoid this, don't delete the g_debug pointer and don't destroy the disable pthread key. Added a new system test that allocates a lot of pointers and frees them after letting the main thread finish. Also, fix one test that can fail sporadically due to a lack of unwinding information on arm32. Bug: 189541929 Test: Passes new system tests. Change-Id: I1cfe868987a8f0dc880a5b65de6709f44a5f1988 Merged-In: I1cfe868987a8f0dc880a5b65de6709f44a5f1988 (cherry picked from commit 33d73379aad3ed7dcbb9b10f945d3bc6264b79bd)
2021-07-13Merge "Make MTE tests pass with all values of MEMTAG_OPTIONS." into sc-dev ↵TreeHugger Robot
am: 1986e6b936 Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15273278 Change-Id: I42975b0e43538cd41f751cfc87e1c61fc836fcef
2021-07-13Merge "Make MTE tests pass with all values of MEMTAG_OPTIONS." into sc-devTreeHugger Robot
2021-07-13Make MTE tests pass with all values of MEMTAG_OPTIONS.Evgenii Stepanov
Do not assume that tests start with Sync MTE; check the initial setting and change test logic as appropriate. Bug: 192480262 Test: bionic-unit-tests with MEMTAG_OPTIONS=(off|sync|async) Merged-In: Id80301e6426af16f89bd80a7a7ab127b6fd60425 Change-Id: Id80301e6426af16f89bd80a7a7ab127b6fd60425 (cherry picked from commit 53df1f3772ad4843461e78540111b21e9061c051)
2021-07-08Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." into ↵Peter Collingbourne
sc-dev am: 4683b11390 Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15223414 Change-Id: Ie00b3bf1f9840963cb1b596a16b53dc4ff4301e9
2021-07-08Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." into ↵Peter Collingbourne
sc-dev
2021-07-07Allow the kernel to upgrade ASYNC mode processes to SYNC mode.Peter Collingbourne
On devices where the performance of ASYNC mode is similar to SYNC mode on certain CPUs, OEMs may choose to configure the kernel to prefer SYNC mode on those CPUs by writing the value "sync" to the sysfs node: /sys/devices/system/cpu/cpu<N>/mte_tcf_preferred The kernel will only respect the per-CPU preference if the user program allows this by specifying the preferred mode as a member of a set of allowed modes. Since only kernels with r.android.com/1754670 support specifying multiple modes, fall back to trying to specify a single mode if that doesn't work. Bug: 189966263 Change-Id: Ie7ada3b073178b7967f0819cbdadc2d8e3a2c648 Merged-In: Ie7ada3b073178b7967f0819cbdadc2d8e3a2c648
2021-06-24Add definition of M_MEMTAG_TUNING. am: a44aa2e138Evgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15097261 Change-Id: Ida33a3bafd2d73feec3b9690b02e49c4f5aa2aa3
2021-06-24Add definition of M_MEMTAG_TUNING.Evgenii Stepanov
Bug: 191769584 Test: N/A Merged-In: Ief77f95a04411528563787a9fc6d10738fc5688f Change-Id: Ief77f95a04411528563787a9fc6d10738fc5688f (cherry picked from commit d8d561c98457409c0003b37b9c1f84bb7d988e04)
2021-06-23Snap for 7483611 from 402b61b5b517ab6743e509cedc61ab399e8dd55c to ↵android-mainline-12.0.0_r33android-mainline-12.0.0_r3Android Build Coastguard Worker
mainline-neuralnetworks-release Change-Id: I28b39cac1d77d15a8ceb57e048d102bdc21dd406
2021-06-15Explicitly set generate_hashtree: false am: 29045b3d7bNikita Ioffe
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/14969091 Change-Id: I30a8f425cd45e68c3bd7094a2ef51049c5e32bd9
2021-06-15Explicitly set generate_hashtree: falseNikita Ioffe
Non-updatable APEXes are going to be only present on a dm-verity protected read-only partition. For such APEXes there is no need in embedding a hashtree. This is a no-op change in preparation of switching default value of generate_hashtree to true. Bug: 190621617 Test: m Change-Id: I426c1fce37ce63200810d69092660644e13291c2 Merged-In: I426c1fce37ce63200810d69092660644e13291c2 (cherry picked from commit 8f537e87621159b41a05c93c9a8caf09dd2261ad)
2021-06-09Merge "Disable return PAC in __pthread_start." into sc-dev am: eb5f5d8db6TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/14911776 Change-Id: Ie5dbdb4fd1d9efda1e2c70e91d089875ba1436dd
2021-06-09Merge "Use ro.build.type instead of ro.debuggable" into sc-dev am: 381ed8f9d2TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/14907816 Change-Id: I91ee38c8ad41d67dc94688b3125a8be7cec2021c
2021-06-09Merge "Disable return PAC in __pthread_start." into sc-devTreeHugger Robot
2021-06-08Disable return PAC in __pthread_start.Peter Collingbourne
This function doesn't return, but it does appear in stack traces. Avoid using return PAC in this function because we may end up resetting IA, which may confuse unwinders due to mismatching keys. Bug: 189808795 Change-Id: I953da9078acd1d43eb7a47fb11f75caa0099fa12 Merged-In: I953da9078acd1d43eb7a47fb11f75caa0099fa12
2021-06-08Merge "Use ro.build.type instead of ro.debuggable" into sc-devTreeHugger Robot
2021-06-08Use ro.build.type instead of ro.debuggableRyan Prichard
The LD_CONFIG_FILE test needs to match how Bionic was compiled, and Bionic only enables LD_CONFIG_FILE for debug builds (i.e. ro.build.type is "user"). ro.debuggable can be forced on without recompiling Bionic. Bug: http://b/140324381 Bug: http://b/189422994 Test: bionic unit tests Change-Id: I139059a7f94d15a5447dab292927606a6bcc48ef (cherry picked from commit 546723b2b804d8e12c2774c7338073184cf90075)
2021-06-04Fix dangling pointer in heapprofd API. am: b887dc0b5cFlorian Mayer
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/14830782 Change-Id: Ic5925108a9e8d30c8cee1ecdbf9563fade5c9e71
2021-06-04Fix dangling pointer in heapprofd API.Florian Mayer
We would dlopen heapprofd_client.so, which has a static initializer [1] that passes a pointer to of its functions to heapprofd_client_api.so. If we dlclose heapprofd_client.so, this pointer is dangling. [1]: https://cs.android.com/android/platform/superproject/+/master:external/perfetto/src/profiling/memory/malloc_interceptor_bionic_hooks.cc?q=symbol:g_heap_id This is a cherry-pick of 85c7838bd9cb40949c08d957499357547c7cd687. Bug: 189332777 Change-Id: Ia4a9d9dd7c89eceec86c6fac5f4b66de85d7604e
2021-05-13Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0 am: ↵David Srbecky
defbe6bfbd am: 7b89804d8a am: a3b1926d75 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416 Change-Id: Ifa8d385ca10e4465aad32c02dcde7bafb953a4a4
2021-05-13Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0 am: ↵David Srbecky
defbe6bfbd am: 7b89804d8a Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416 Change-Id: I83c0ee90b3763476f9497139cf838e70b3348dbc
2021-05-13Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0 am: defbe6bfbdDavid Srbecky
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416 Change-Id: Iab72065969294c1259351272ba8eab78a5591f6d
2021-05-13Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0David Srbecky
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416 Change-Id: If4599131c1ba63f1c9eb938483b78b2375baac7a
2021-05-13Merge "Update API of MapInfo from libunwindstack"David Srbecky
2021-05-13Update API of MapInfo from libunwindstackDavid Srbecky
Use accessors to for all the fields. Test: build Change-Id: I6ae458002e059ef2f9d73931cc68f2f698f85d7e
2021-05-13Merge "Clear the stack frame pointer in _start and __bionic_clone" am: ↵Christian Wailes
b1270fdd54 am: 98a50fa503 am: e7bc7bde23 am: 6b7cecc5ea Original change: https://android-review.googlesource.com/c/platform/bionic/+/1695053 Change-Id: I4a4aee2e318bc49da5daffff1f09146aad7e7635
2021-05-12Merge "Clear the stack frame pointer in _start and __bionic_clone" am: ↵Christian Wailes
b1270fdd54 am: 98a50fa503 am: e7bc7bde23 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1695053 Change-Id: Id9d2a02f0f96760f52e4dd18a5a08763680bdbf1
2021-05-12Merge "Clear the stack frame pointer in _start and __bionic_clone" am: ↵Christian Wailes
b1270fdd54 am: 98a50fa503 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1695053 Change-Id: I6e0abad919598aa6ac097306bc19d2bd17dfc89d
2021-05-12Merge "Clear the stack frame pointer in _start and __bionic_clone" am: ↵Christian Wailes
b1270fdd54 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1695053 Change-Id: Ib41092b668a8b5bdf177c56fa1ac46ebf8759799
2021-05-12Merge "Clear the stack frame pointer in _start and __bionic_clone"Christian Wailes
2021-05-11Merge "Add cc_defaults for hugepage alignment of shared libraries" am: ↵Collin Fijalkovich
13d267e77e am: fef6f7bcc5 am: 74e4a617aa am: 733895f673 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1691208 Change-Id: If07c0f105d22c328818c04e16987d02c67df7f4b
2021-05-11Merge "Add cc_defaults for hugepage alignment of shared libraries" am: ↵Collin Fijalkovich
13d267e77e am: fef6f7bcc5 am: 74e4a617aa Original change: https://android-review.googlesource.com/c/platform/bionic/+/1691208 Change-Id: I026d8a8c69ea9de5eb1b71a5f90b8cb2e16baf69
2021-05-11Merge "Add cc_defaults for hugepage alignment of shared libraries" am: ↵Collin Fijalkovich
13d267e77e am: fef6f7bcc5 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1691208 Change-Id: I30175a55a06a40170294665fbd0f0e094b445aea
2021-05-11Merge "Add cc_defaults for hugepage alignment of shared libraries" am: ↵Collin Fijalkovich
13d267e77e Original change: https://android-review.googlesource.com/c/platform/bionic/+/1691208 Change-Id: Iacab3396fab8fe7dddb996c93adbc1bed5c3f001
2021-05-11Merge "Add cc_defaults for hugepage alignment of shared libraries"Collin Fijalkovich
2021-05-10Merge "Bionic: Mark PMD aligned text segments huge page eligible" am: ↵Collin Fijalkovich
20ab1b7b47 am: be2927bf2f am: e20122b90e am: d6c5f93cae Original change: https://android-review.googlesource.com/c/platform/bionic/+/1652592 Change-Id: Id7b5d35f444a3900a509d1cbd8b0bb291f9c74b3
2021-05-10Merge "Bionic: Mark PMD aligned text segments huge page eligible" am: ↵Collin Fijalkovich
20ab1b7b47 am: be2927bf2f am: e20122b90e Original change: https://android-review.googlesource.com/c/platform/bionic/+/1652592 Change-Id: Icd962b28b78acfbc185ac71a30fe297ba53e5f41
2021-05-10Merge "Bionic: Mark PMD aligned text segments huge page eligible" am: ↵Collin Fijalkovich
20ab1b7b47 am: be2927bf2f Original change: https://android-review.googlesource.com/c/platform/bionic/+/1652592 Change-Id: I6b57627bdae52e073f533a2713f05e4d9249a6a9
2021-05-10Merge "Bionic: Mark PMD aligned text segments huge page eligible" am: 20ab1b7b47Collin Fijalkovich
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1652592 Change-Id: I9ea5cd0ba509d44081f92fbf59163113a87f5f38
2021-05-10Merge "Bionic: Mark PMD aligned text segments huge page eligible"Collin Fijalkovich