Commit graph

31146 commits

Author SHA1 Message Date
Automerger Merge Worker
5f660e586c Merge "Try to resolve interface names before removing nameless interfaces." am: 9f8e1d52cb am: cea478eca2
Change-Id: Ie995f010d568f614dc056463dae9297d375eb1a1
2020-02-25 09:18:00 +00:00
Automerger Merge Worker
cea478eca2 Merge "Try to resolve interface names before removing nameless interfaces." am: 9f8e1d52cb
Change-Id: Id5751c2e9c8882b5cdc58d786195d0f518880a43
2020-02-25 09:10:32 +00:00
Bram Bonné
9f8e1d52cb Merge "Try to resolve interface names before removing nameless interfaces." 2020-02-25 08:59:49 +00:00
Bram Bonné
14e5c3c3b6 Try to resolve interface names before removing nameless interfaces.
For interfaces that didn't get their name set, try to resolve their name
using if_indextoname first, before removing them from the list.

This allows getifaddrs() to keep returning interfaces that only have an
IPv6 address set (as opposed to the previous behavior where only
interfaces with an IPv4 address would be returned).

Change-Id: I0e4e6611948b12794cd3e354538f2964fbf31078
Fix: 148886805
Bug: 141455849
Test: atest NetworkInterfaceTest
Test: atest bionic-unit-tests-static
Test: atest IpSecManagerTunnelTest
2020-02-24 10:56:57 +01:00
Automerger Merge Worker
c32a1077b8 Merge "Fix wrong link in getauxval(3) doc comment." am: 438ddfedfe am: ec5b567170
Change-Id: I780fb6dd3886342239b64ce7e83c9602798038d7
2020-02-22 15:49:50 +00:00
Automerger Merge Worker
ec5b567170 Merge "Fix wrong link in getauxval(3) doc comment." am: 438ddfedfe
Change-Id: I20b3ec454c21d355d164008e832d0a6892a848b8
2020-02-22 15:35:33 +00:00
Treehugger Robot
438ddfedfe Merge "Fix wrong link in getauxval(3) doc comment." 2020-02-22 15:27:05 +00:00
Automerger Merge Worker
101e064745 Merge "Add a std::map, std::unordered_map benchmark." am: e86e697159 am: 7f21a44dfc
Change-Id: I85b4b23ff2e67357c723b3236f859cbcd4b1238d
2020-02-22 15:10:17 +00:00
Automerger Merge Worker
7f21a44dfc Merge "Add a std::map, std::unordered_map benchmark." am: e86e697159
Change-Id: Ia9c6b36cf89c446daa2516ecd184b8daa8262419
2020-02-22 14:56:07 +00:00
Christopher Ferris
e86e697159 Merge "Add a std::map, std::unordered_map benchmark." 2020-02-22 14:43:57 +00:00
Christopher Ferris
d613f89bf0 Add a std::map, std::unordered_map benchmark.
This benchmark also includes the measuring of RSS.

Bug: 137795072

Test: Ran different iterations and verified the RSS_MB value is nearly
Test: identical no matter the number of iterations.
Change-Id: I465a0eae9dcff2e1fb739c35623a26291680951f
2020-02-22 14:43:41 +00:00
Elliott Hughes
5403bd647b Fix wrong link in getauxval(3) doc comment.
Test: treehugger
Change-Id: I8646251edaa07fa8682127428f4fdb1fa0cf80e5
2020-02-21 16:23:33 -08:00
Automerger Merge Worker
6a9d706a86 Merge "Rename APEX Namespace" am: fcbdba22ab am: 613d40c4f5
Change-Id: I5d1daec21ddc0579d8277e72c127f160d125208d
2020-02-21 01:22:19 +00:00
Automerger Merge Worker
938245ef14 Merge "Allow android_mallopt(M_SET_HEAP_TAGGING_LEVEL) to control scudo heap tagging." am: 935aae907c am: f052569012
Change-Id: I7616e1138cc5bb203a650a9e2845830775f1237a
2020-02-21 01:22:11 +00:00
Automerger Merge Worker
613d40c4f5 Merge "Rename APEX Namespace" am: fcbdba22ab
Change-Id: Ifdee2653abc4c6991bcb78024f930d37321cb860
2020-02-21 01:12:02 +00:00
Automerger Merge Worker
f052569012 Merge "Allow android_mallopt(M_SET_HEAP_TAGGING_LEVEL) to control scudo heap tagging." am: 935aae907c
Change-Id: I1429607de3bf0e60a282a48549432ee7d7050afb
2020-02-21 01:11:46 +00:00
Kiyoung Kim
fcbdba22ab Merge "Rename APEX Namespace" 2020-02-21 01:04:37 +00:00
Peter Collingbourne
935aae907c Merge "Allow android_mallopt(M_SET_HEAP_TAGGING_LEVEL) to control scudo heap tagging." 2020-02-21 00:59:32 +00:00
Automerger Merge Worker
81103233b4 Merge "Remove ld.config.txt from bionic APEX" am: 9ed719e167 am: f8f384c697
Change-Id: I672282d8737f30f3b6d28fe0aeef716dadd236d1
2020-02-21 00:21:49 +00:00
Automerger Merge Worker
f8f384c697 Merge "Remove ld.config.txt from bionic APEX" am: 9ed719e167
Change-Id: I0dc4f91f1ef102faca6dec8beb528836108e550d
2020-02-21 00:07:18 +00:00
Kiyoung Kim
9ed719e167 Merge "Remove ld.config.txt from bionic APEX" 2020-02-20 23:47:11 +00:00
Peter Collingbourne
45819dde10 Allow android_mallopt(M_SET_HEAP_TAGGING_LEVEL) to control scudo heap tagging.
The tag level may now be async, which is now the default. When the tag level
is set to none, memory tagging is disabled in the allocator using the new
API proposed in https://reviews.llvm.org/D70762 .

Bug: 135772972
Change-Id: I847f5822a70913c446ed9ffa13792177bbfc96af
2020-02-20 15:25:08 -08:00
Kiyoung Kim
bf40eac2eb Remove ld.config.txt from bionic APEX
Dynamic linker will use generated linker configuration in general. As
ld.config.txt file in the APEX module will not be used, we can remove
this to avoid confusion.

Bug: 149887007
Test: m -j passed
Test: Boot succeeded from cuttlefish and walleye
Change-Id: Iffd2113cf29055a7263eb3697547297639e9dc0c
2020-02-20 16:05:27 +09:00
Kiyoung Kim
8116b70fee Rename APEX Namespace
Current APEX Namespace is named with APEX name itself, which also uses
.(dot) so linker configuration can keep the syntax safe.

For example, if there are APEX modules named 'A' and 'A.link.A', then
'namespace.A.link.A.link.A = a.so' phrase can be ambiguous from the
linker. To allow any additional linker syntax in the future, we should
avoid dot separator from the namespace name.

Bug: 148826508
Test: m -j passed
Test: boot succeeded from cuttlefish and walleye
Change-Id: Ic3fe396aef6366fc6c7a0677bc7f92a57fd4e229
2020-02-20 01:27:35 +00:00
Automerger Merge Worker
06fecf208e Merge "benchmarks: add 16 and 32 bytes to common sizes" am: f2549c8369 am: 787d012eac
Change-Id: If9dfca2992cafe48efef53a19245efa23125b5d8
2020-02-19 22:29:06 +00:00
Automerger Merge Worker
fc61b72052 Merge "[GWP-ASan] Export GWP-ASan regions to libdebuggerd." am: 2121f60d97 am: 2e8373c34c
Change-Id: I4bc25216372efe89cadedc188499303ca0e08261
2020-02-19 22:27:16 +00:00
Automerger Merge Worker
787d012eac Merge "benchmarks: add 16 and 32 bytes to common sizes" am: f2549c8369
Change-Id: I44f09beeb4f44bb0b05ea4906d373f944dabc8a7
2020-02-19 22:26:15 +00:00
Christopher Ferris
f2549c8369 Merge "benchmarks: add 16 and 32 bytes to common sizes" 2020-02-19 22:25:05 +00:00
Automerger Merge Worker
2e8373c34c Merge "[GWP-ASan] Export GWP-ASan regions to libdebuggerd." am: 2121f60d97
Change-Id: I837fb7888c8d76c8314833ce5901736faacb62c2
2020-02-19 22:14:28 +00:00
Mitch Phillips
2121f60d97 Merge "[GWP-ASan] Export GWP-ASan regions to libdebuggerd." 2020-02-19 20:35:10 +00:00
Automerger Merge Worker
81a06a280a Merge "fortify: simplify strlen for LLVM's new optimization" am: db5c45b457 am: 1ccba9f0fe
Change-Id: Ie2140538f4145841a6338364d282175da1c6041e
2020-02-19 18:43:57 +00:00
Automerger Merge Worker
1ccba9f0fe Merge "fortify: simplify strlen for LLVM's new optimization" am: db5c45b457
Change-Id: I9a954bfdbccdd2e53dd0e88cfb7fe0d8fc80a226
2020-02-19 18:32:09 +00:00
George Burgess IV
db5c45b457 Merge "fortify: simplify strlen for LLVM's new optimization" 2020-02-19 18:12:31 +00:00
Mitch Phillips
4c9293f29a [GWP-ASan] Export GWP-ASan regions to libdebuggerd.
Exports GWP-ASan allocator information callbacks to libdebuggerd so that
tombstoned can get information from the GWP-ASan allocator in the case
of a crash.

Bug: 135634846
Test: atest bionic-unit-tests

Change-Id: Ie16426af55602fb2a76c4e69217773354c365843
2020-02-19 09:01:27 -08:00
Jake Weinstein
4b11192d8a benchmarks: add 16 and 32 bytes to common sizes
Per Wilco Dijkstra at ARM, 16 and 32 byte copies are much more common
than 8 or 64.

Change-Id: I3699d8bcd5f9dd8a8ccd8564a6cf58d2bd7089f5
Suggested-By: Wilco Dijkstra <wilco.dijkstra@arm.com>
2020-02-19 17:18:25 +01:00
Automerger Merge Worker
8d3cd44c94 Merge "[GWP-ASan] Remove log line from init." am: 679d8e19cf am: 87a632bd75
Change-Id: I9f7c2e09736042c5e80d18296416880ab367a3c3
2020-02-19 01:37:25 +00:00
Automerger Merge Worker
0b201e01e6 Merge "Remove unused declarations." am: 1c2efaaa11 am: d975d10334
Change-Id: I71619906c311583fc78d1c26d6f63ea4ddce3a91
2020-02-19 01:36:10 +00:00
Automerger Merge Worker
87a632bd75 Merge "[GWP-ASan] Remove log line from init." am: 679d8e19cf
Change-Id: Ifd86e6b0bf766b05832bb5d4d5670ecba2bc854e
2020-02-19 01:28:02 +00:00
Mitch Phillips
679d8e19cf Merge "[GWP-ASan] Remove log line from init." 2020-02-19 01:24:49 +00:00
Automerger Merge Worker
d975d10334 Merge "Remove unused declarations." am: 1c2efaaa11
Change-Id: I6f5723efcb0a5835e88b626cfce940dae5822b83
2020-02-19 01:20:40 +00:00
Mitch Phillips
4d62ffc5b1 [GWP-ASan] Remove log line from init.
The notification that GWP-ASan is enabled causes ART tests to break.
Remove the log for now.

Bug: 135634846
Bug: 149790891
Test: (Attempt to fix the ART tests).
Change-Id: I8a7751a838a64f160b3b7b9f07752bb64644b9db
2020-02-18 17:16:23 -08:00
Elliott Hughes
1c2efaaa11 Merge "Remove unused declarations." 2020-02-19 01:01:51 +00:00
Automerger Merge Worker
74efc2bc53 Merge "Allow nested usage of ScopedDisableMTE." am: 6ed60cc1ab am: 21cfe020c7
Change-Id: I7ba26bd7b1cb732b1ac31ba717bf676d6c1fdf20
2020-02-18 23:08:41 +00:00
Automerger Merge Worker
21cfe020c7 Merge "Allow nested usage of ScopedDisableMTE." am: 6ed60cc1ab
Change-Id: Ifc9c20b5beb5a700da3474e770bad8cce503e4fd
2020-02-18 22:55:22 +00:00
Peter Collingbourne
6ed60cc1ab Merge "Allow nested usage of ScopedDisableMTE." 2020-02-18 22:41:17 +00:00
Automerger Merge Worker
10d92bddd3 Merge "[GWP-ASan] Enable GWP-ASan w/ process sampling ~1%." am: f73778abae am: ff55587dfe
Change-Id: I343b56c73f71ddbac1dfded0c0d3aef8d2145d11
2020-02-18 22:18:34 +00:00
Automerger Merge Worker
ff55587dfe Merge "[GWP-ASan] Enable GWP-ASan w/ process sampling ~1%." am: f73778abae
Change-Id: I710f41574f96724589d9de7271b341e09342b9c2
2020-02-18 22:06:31 +00:00
Mitch Phillips
f73778abae Merge "[GWP-ASan] Enable GWP-ASan w/ process sampling ~1%." 2020-02-18 21:47:48 +00:00
Elliott Hughes
36359f47a2 Remove unused declarations.
Test: treehugger
Change-Id: Ia96dc01df0d26e2e3023bebab23de82ca8e389f7
2020-02-18 13:25:22 -08:00
Peter Collingbourne
c8cef93f24 Allow nested usage of ScopedDisableMTE.
An upcoming change to scudo will cause us to start calling
android_unsafe_frame_pointer_chase() from within the allocator. Since this
function uses ScopedDisableMTE, this would otherwise make it unsafe to use
the allocator from within ScopedDisableMTE. This seems like an unreasonable
restriction, so make ScopedDisableMTE save the PSTATE.TCO state in the
constructor and restore it in the destructor.

Bug: 135772972
Change-Id: I47e18d5fb2929efd5a58676488180cd85731007b
2020-02-18 13:13:57 -08:00