Commit graph

2146 commits

Author SHA1 Message Date
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
efff4f02ea Merge "Disable tidy DeprecatedOrUnsafeBufferHandling check" am: 4498ab9a0e am: 7e36d58e20 am: ab692d9390
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2377333

Change-Id: I2578a5d7e862343f07f1bcb69a6863bd81ac16e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 22:39:18 +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
c39a352f13 Update bpf helpers to support new ignore_on fields am: b41a3cfd4e am: a078efe524 am: 8bb6b64f07
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2374671

Change-Id: I94ca606abe1c3d1b20d890bdaccb85200b918102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 22:21:36 +00: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
40314c277f Actually skip programs based on ignore_on am: 0fb433a965 am: 8c4de761b3 am: 6e60cf1c21
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2377412

Change-Id: I4f078907a86f7c73e69046115ea51dcebbb9f85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 14:22:06 +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
TreeHugger Robot
1897730879 [automerger skipped] Merge "bpfloader - fix includes" into tm-mainline-prod am: 44e612f687 -s ours
am skip reason: Merged-In I3c46875a34b744c9ff0af2b52b63ecbc9db5c15e with SHA-1 23607cd0b3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/20827932

Change-Id: If8be20cca0818adf7b8a6b97c7fe53d387997bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-26 05:10:17 +00:00
TreeHugger Robot
aefec0f4d8 Merge changes from topic "cherrypicker-L29300000957901995:N82600001323516697"
* changes:
  [automerged blank] bpfloader - fix includes 2p: 23607cd0b3
  bpfloader - fix includes
2022-12-26 04:41:05 +00:00
TreeHugger Robot
44e612f687 Merge "bpfloader - fix includes" into tm-mainline-prod 2022-12-26 04:41:05 +00:00
Maciej Żenczykowski
670c15b9de [automerged blank] bpfloader - fix includes 2p: 23607cd0b3
Blank merge reason: Change-Id I3c46875a34b744c9ff0af2b52b63ecbc9db5c15e with SHA-1 300c51fd4f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/20827932


Change-Id: Ica69c7ebd86251e7240fe09305464a0324aac96e
Merged-In: I3c46875a34b744c9ff0af2b52b63ecbc9db5c15e
2022-12-26 01:02:51 +00:00
Maciej Żenczykowski
23607cd0b3 bpfloader - fix includes
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3c46875a34b744c9ff0af2b52b63ecbc9db5c15e
(cherry picked from commit 300c51fd4f)
Merged-In: I3c46875a34b744c9ff0af2b52b63ecbc9db5c15e
2022-12-26 01:02:43 +00:00
Maciej Żenczykowski
d8371de5a3 [automerged blank] include BpfSyscallWrappers.h 2p: 5db022fdc1
Blank merge reason: Change-Id Ia0d6941cd461089584e539e007b1e8b2873d095f with SHA-1 4e4dea008e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/20827930


Change-Id: I20ca4bcf00c303da82eb1623544c04778474bbd6
Merged-In: Ia0d6941cd461089584e539e007b1e8b2873d095f
2022-12-26 01:00:26 +00:00
Maciej Żenczykowski
5db022fdc1 include BpfSyscallWrappers.h
Change-Id: Ia0d6941cd461089584e539e007b1e8b2873d095f
(cherry picked from commit 4e4dea008e)
Merged-In: Ia0d6941cd461089584e539e007b1e8b2873d095f
2022-12-26 01:00:18 +00:00
Maciej Żenczykowski
6ccb046d91 Merge "Add option to skip map/prog based on build type" am: 4fba4f7a22 am: ce89521c3e am: 8ce05c5915
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2360645

Change-Id: Ia9ac59e1de7973b29f78d59acfac7efbfc68d669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 10:25:28 +00: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
7ddfc40482 bpfloader - fix includes am: 300c51fd4f am: 2b996bc783 am: 84b9e5f20b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2363880

Change-Id: I283e16c7276da85827c0cb29aa9cf8b76880e565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 00:03:56 +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
086de2b76f Merge "bpfloader - allow writeProcSysFile failure on misconfigured kernels" am: 4a7ca6f2b1 am: 3389616583 am: baab545499
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2345327

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

Change-Id: I47db1bfb688966c313cd57bd598aaa407da90278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 10:36:07 +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
f651b84665 bpfloader - add writeProcSysFile failure mode comment am: 052cda1973 am: 0fedb29a8b am: 85a0eeb35d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2337906

Change-Id: If3dd03f60eaeb4be14c99f6db988a89324537cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 09:22:40 +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
bb74af8e4c Merge "bpfloader: pass whole struct Location to loadProg()" am: b909fed62a am: 1432ac4cca am: 7c7cd9fba4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2325035

Change-Id: I1d63c08bf589f37bdc5742fe3bb7586cbdc8a992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 12:13:24 +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
d43a1b0d1a Merge "Add a test BPF program with a ring buffer." am: a9b54078f4 am: bba7ee57a8 am: b7364d3fd7
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2336160

Change-Id: I3fe883acb7b0c3ac31e57d7e11f5d9de92dadb89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 03:49:47 +00:00