Commit graph

1832 commits

Author SHA1 Message Date
Maciej Żenczykowski
0bdec84b13 bpfloader: add more program types am: c3c4f484e2 am: fdfca05483
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2512795

Change-Id: I752741436705ead14aa6045d8005d99e0892d325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:09:58 +00:00
Maciej Żenczykowski
fdfca05483 bpfloader: add more program types am: c3c4f484e2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2512795

Change-Id: I617bc20689d5aef74090ee49fcaf088da90a5f50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:14:35 +00:00
Maciej Żenczykowski
c3c4f484e2 bpfloader: add more program types
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8c78008faeeedf455bc879bea2c2f1d9ed08a908
2023-03-29 03:28:56 +00:00
Patrick Rohr
a8e9cfa511 bpfloader: add support for connect4 / connect6 progs am: aa624f299b am: 3d15b5906e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2512140

Change-Id: I1f2d4627345c4f74ccf5afd809a10408cc562e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 01:45:03 +00:00
Patrick Rohr
3d15b5906e bpfloader: add support for connect4 / connect6 progs am: aa624f299b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2512140

Change-Id: Ibdb5cf1e1a99aeaab5ae07d445f8aa50535601a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 01:11:50 +00:00
Patrick Rohr
aa624f299b bpfloader: add support for connect4 / connect6 progs
These should be useful for producing onConnectEvent events from mainline
bpf code.

BPF_PROG_TYPE_CGROUP_SOCK_ADDR requires the attach type to be explicitly
specified at load time.

Test: builds
Bug: 270905383
Bug: 259000745
Change-Id: Ida57c6eb632b8bb406ee4cadf0a30e47d9c422ff
2023-03-28 23:02:52 +00:00
Maciej Żenczykowski
f718a01dd2 reduce bpfloader boot log spam am: 509b1b90b9 am: 84bd7711b7
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2473464

Change-Id: Ib0a8dfe11a1e9aae5ba90d13f344737189d4e188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:30:28 +00:00
Maciej Żenczykowski
84bd7711b7 reduce bpfloader boot log spam am: 509b1b90b9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2473464

Change-Id: Ia49f93e25c88e8b9b59d8528500c808751efcd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 01:54:40 +00:00
Maciej Żenczykowski
509b1b90b9 reduce bpfloader boot log spam
Bug: 261472074
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I57b97ac7978c85913c52443d7efe40813146a2ba
2023-03-07 01:11:48 +00:00
Treehugger Robot
9bbde57681 Merge "Add a warning to bpfloader version number." am: 8d8e166e46 am: 33fe2fd505
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2396892

Change-Id: I5fba497ddd468d3f2b49bf1bbbd2f932cefcea07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 21:36:42 +00:00
Treehugger Robot
33fe2fd505 Merge "Add a warning to bpfloader version number." am: 8d8e166e46
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2396892

Change-Id: I34b819b156c9b548221727ffbeaa0bb97f525e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 19:18:38 +00:00
Treehugger Robot
8d8e166e46 Merge "Add a warning to bpfloader version number." 2023-01-30 18:48:51 +00:00
Maciej Żenczykowski
b32f3e6ee9 Remove connoro@ from bpf OWNERS file. am: d616e8d47f am: 8111e3b855
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2400033

Change-Id: I245201117921b52391f3c931ae972d97cab47f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 23:28:04 +00:00
Maciej Żenczykowski
8111e3b855 Remove connoro@ from bpf OWNERS file. am: d616e8d47f
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2400033

Change-Id: I6e1396d7d242ab2b505eda93da6d3d03fc8411ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 22:19:28 +00:00
Maciej Żenczykowski
d616e8d47f Remove connoro@ from bpf OWNERS file.
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I79f07fa5644b82286065e55ec485bde60485d72a
2023-01-24 09:16:55 +00:00
Maciej Żenczykowski
0582566336 Add a warning to bpfloader version number.
Driven by GTS failure seen in b/265383327

Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic45c1f8c0ef38a379981bf29c44358ad39c3a90b
2023-01-20 13:02:42 +00:00
Chih-hung Hsieh
ab692d9390 Merge "Disable tidy DeprecatedOrUnsafeBufferHandling check" am: 4498ab9a0e am: 7e36d58e20
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2377333

Change-Id: Idc0cbfd26718f0abbd95dea52661bd01fede9f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 20:25:53 +00:00
Chih-hung Hsieh
7e36d58e20 Merge "Disable tidy DeprecatedOrUnsafeBufferHandling check" am: 4498ab9a0e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2377333

Change-Id: Ia0ec3f89e8a81c8c736e2d6323c813e91361f610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 20:06:00 +00:00
Chih-hung Hsieh
4498ab9a0e Merge "Disable tidy DeprecatedOrUnsafeBufferHandling check" 2023-01-13 18:59:45 +00:00
Chih-Hung Hsieh
ef3f44b639 Disable tidy DeprecatedOrUnsafeBufferHandling check
This check is disabled in global default,
see build/soong/cc/config/tidy.go.
This bpf_defaults is used to compile an external/bcc module.
Unless all such warnings can be fixed in the external/bcc source,
we should not enable this check locally.

Test: presubmit; make tidy-external-bcc_subset
Change-Id: I97f6dd944dfb21fed664175c5c7eec02c10ebe4c
2023-01-09 10:58:19 -08:00
Ryan Zuklie
8bb6b64f07 Update bpf helpers to support new ignore_on fields am: b41a3cfd4e am: a078efe524
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2374671

Change-Id: I344a2abf0e79abf954367768a3041ca46df74560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:45:32 +00:00
Ryan Zuklie
a078efe524 Update bpf helpers to support new ignore_on fields am: b41a3cfd4e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2374671

Change-Id: I82ebc5f46d5a43e1acc179daa87b84ff53cde26f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:13:40 +00:00
Ryan Zuklie
6e60cf1c21 Actually skip programs based on ignore_on am: 0fb433a965 am: 8c4de761b3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2377412

Change-Id: I9dc87b05abdce6425241a76c0dcec369c04ee568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 13:45:43 +00:00
Ryan Zuklie
8c4de761b3 Actually skip programs based on ignore_on am: 0fb433a965
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2377412

Change-Id: I9fa041fe8abdb7d184afbb29ad7c9cbbbb79b3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 13:14:12 +00:00
Ryan Zuklie
b41a3cfd4e Update bpf helpers to support new ignore_on fields
This change updates callers to include the new ignore_on and bpfloader
arguments as per the change in aosp/2374598.

Bug: 246985031
Test: tethering build & install, full platform build & install
Change-Id: I4cebc82ed596cfb55c30325b30cff160da9514cd
2023-01-05 17:57:24 -08:00
Ryan Zuklie
0fb433a965 Actually skip programs based on ignore_on
Bug: 246985031
Test: flash aosp/2374785, check loaded progs via adb shell ls
Change-Id: I0f4ba45958e4d5805b69cf9e91759d58de390b0e
2023-01-05 17:57:24 -08:00
Maciej Żenczykowski
8ce05c5915 Merge "Add option to skip map/prog based on build type" am: 4fba4f7a22 am: ce89521c3e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2360645

Change-Id: I905534b91feaf91be5f10ffa22fa5c70dcb9632d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 09:38:03 +00:00
Maciej Żenczykowski
ce89521c3e Merge "Add option to skip map/prog based on build type" am: 4fba4f7a22
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2360645

Change-Id: I676e22fed7b750aa6aff66099b4b92a355807942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 09:00:40 +00:00
Maciej Żenczykowski
4fba4f7a22 Merge "Add option to skip map/prog based on build type" 2022-12-20 08:38:45 +00:00
Maciej Żenczykowski
84b9e5f20b bpfloader - fix includes am: 300c51fd4f am: 2b996bc783
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2363880

Change-Id: I57f3546fff314ee738bb1148fa4d5adeb0c7e25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 23:15:34 +00:00
Maciej Żenczykowski
2b996bc783 bpfloader - fix includes am: 300c51fd4f
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2363880

Change-Id: Ieb30f32c9393ef431168b8c29cdb13bde18b0ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 22:40:48 +00:00
Ryan Zuklie
ce89f50035 Add option to skip map/prog based on build type
This feature allows skipping a program or map based on the type of the
build. This allows things like userdebug-only programs.

Bug: 246985031
Test: added test program and watched it skipped on userdebug
Change-Id: I981e3447b40751926cbfd1692e13772ec582d3d4
2022-12-19 14:39:31 -08:00
Maciej Żenczykowski
300c51fd4f bpfloader - fix includes
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3c46875a34b744c9ff0af2b52b63ecbc9db5c15e
2022-12-19 19:14:33 +00:00
Treehugger Robot
baab545499 Merge "bpfloader - allow writeProcSysFile failure on misconfigured kernels" am: 4a7ca6f2b1 am: 3389616583
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2345327

Change-Id: I8e57752d1adcb2cd9efe37741799ea37c01319fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 10:33:47 +00:00
Treehugger Robot
3389616583 Merge "bpfloader - allow writeProcSysFile failure on misconfigured kernels" am: 4a7ca6f2b1
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2345327

Change-Id: If7ed18b32f1d99de82ee782908dd2789cfc63d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 10:02:00 +00:00
Maciej Żenczykowski
63433e6867 Merge "include BpfSyscallWrappers.h" am: 98ac2b9ffd am: a1cf127e82
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2340842

Change-Id: I03750faa4b179893a9d6706a34a12620ea9687b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 09:56:40 +00:00
Treehugger Robot
4a7ca6f2b1 Merge "bpfloader - allow writeProcSysFile failure on misconfigured kernels" 2022-12-14 09:36:57 +00:00
Maciej Żenczykowski
a1cf127e82 Merge "include BpfSyscallWrappers.h" am: 98ac2b9ffd
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2340842

Change-Id: Ibf622ee6a04677f26f5bd352268726cf7dc523ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 09:25:16 +00:00
Maciej Żenczykowski
98ac2b9ffd Merge "include BpfSyscallWrappers.h" 2022-12-14 08:55:43 +00:00
Maciej Żenczykowski
85a0eeb35d bpfloader - add writeProcSysFile failure mode comment am: 052cda1973 am: 0fedb29a8b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2337906

Change-Id: If7aa2429ebcb0b3c3084c205a2fb7623cc7e27f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 08:42:21 +00:00
Maciej Żenczykowski
0fedb29a8b bpfloader - add writeProcSysFile failure mode comment am: 052cda1973
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2337906

Change-Id: I2fd620c6dc2d901b3bf4b3db6505506fb7cb6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 08:11:12 +00:00
Maciej Żenczykowski
8aa34a756c bpfloader - allow writeProcSysFile failure on misconfigured kernels
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I20c486ab89669c60cf1e1ebc3a5d66ef0efc1389
2022-12-14 07:43:27 +00:00
Maciej Żenczykowski
052cda1973 bpfloader - add writeProcSysFile failure mode comment
as discovered on some sunfish 4.14 kernels

Note that CONFIG_BPF_JIT=y is required for 4.14-r,
but sunfish was 4.14-q and thus missed VINTF enforcement of this
(it was enabled for b1c1[blueline/crosshatch]/bonito & floral[flame/coral]).

Bug: 262115216
Test: N/A, comment only
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If6ee9f7f9e449526602fd0e5cffd49f132e681a2
2022-12-12 00:22:27 +00:00
Maciej Żenczykowski
4e4dea008e include BpfSyscallWrappers.h
Change-Id: Ia0d6941cd461089584e539e007b1e8b2873d095f
2022-12-10 17:59:05 +00:00
Maciej Żenczykowski
7c7cd9fba4 Merge "bpfloader: pass whole struct Location to loadProg()" am: b909fed62a am: 1432ac4cca
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2325035

Change-Id: I86ff0bcb5c9469d50d89d306551052fcd501f916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 11:36:32 +00:00
Maciej Żenczykowski
1432ac4cca Merge "bpfloader: pass whole struct Location to loadProg()" am: b909fed62a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2325035

Change-Id: I94d604c44cc2c6315ceebba96c52ff9745281352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 11:06:03 +00:00
Maciej Żenczykowski
b909fed62a Merge "bpfloader: pass whole struct Location to loadProg()" 2022-12-10 10:24:43 +00:00
Treehugger Robot
b7364d3fd7 Merge "Add a test BPF program with a ring buffer." am: a9b54078f4 am: bba7ee57a8
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2336160

Change-Id: I1bd5781db628b8f278a3f84f7063ce4256110212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 03:13:18 +00:00
Treehugger Robot
bba7ee57a8 Merge "Add a test BPF program with a ring buffer." am: a9b54078f4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2336160

Change-Id: I0fa70f2db028620f6f33f948694deee88e5fa866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:42:04 +00:00
Treehugger Robot
a9b54078f4 Merge "Add a test BPF program with a ring buffer." 2022-12-10 02:27:06 +00:00