tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2273 commits 1 branch 0 tags 1.8 MiB
Commit graph

2273 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maciej Żenczykowski
97e633a6ea sort OWNERS_bpf and add trailing newline 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I173ae31ac371dd33f3715a7720509cfab00b3b58
 2024-03-10 14:35:44 -07:00
Maciej Żenczykowski
e0a5665570 Platform BpfLoader: remove spurious comment about versions 
(leftover)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I82b589ed3aa0218c22e0a312928f2a36487ce7bd
 2024-03-09 06:35:45 +00:00
Maciej Żenczykowski
9e8e2ebd4c Platform BpfLoader: remove IGNORE_ON_{ARCH} support 
We've never used it (even in mainline) and it's probably even
less useful in platform, as it can simply be handled at build
time by appropriate Android.bp stanzas...

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I788dae8d0378556e5e4580e1ca4f2f0cd6b393dc
 2024-03-09 06:33:12 +00:00
Maciej Żenczykowski
420e8a15c5 Platform BpfLoader: remove IGNORE_ON_{USER,USERDEBUG,ENG} support 
Unlike in mainline, this isn't actually particularly useful for
platform, as you can simply not include such programs
via Android.bp/mk stanzas at build time.

Even in mainline we've had only one user (and we've graduated
that use as well...)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com
Change-Id: I66a83e79a866c306de4c409e8b5822eac99454ec
 2024-03-09 06:30:08 +00:00
Maciej Żenczykowski
df94ef3949 BpfLoader: remove platform bpfloader version. 
it's now meaningless, as it only loads programs
that are part of platform and thus compiled at
the same time (there can thus be no version skew).

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5552f551bae432814b606c3618eb95833e2edb0d
 2024-03-08 19:37:09 +00:00
Maciej Żenczykowski
4bc57c23b8 Merge "BpfLoader: progs section must be present" into main 2024-03-08 18:53:42 +00:00
Treehugger Robot
96f60b6db3 Merge "BpfLoader: remove version check logic" into main 2024-03-08 10:58:10 +00:00
Maciej Żenczykowski
554d0a2c5e BpfLoader: progs section must be present 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8e51ab4738c6fe009a2abe0d14ad8c7da3981389
 2024-03-08 08:21:20 +00:00
Maciej Żenczykowski
a5646cb031 BpfLoader: remove version check logic 
Platform bpfloader version cannot skew vs platform shipped
bpf.o files, as they are built at the same time...

This is because the platform bpfloader no longer loads mainline
(and thus potentially newer) shipped bpf.o files.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I41a287cb726148269159cc7b08397a748eb70b75
 2024-03-08 08:09:34 +00:00
Maciej Żenczykowski
278a712e69 BpfLoader: remove dead code 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iae17d41884c17cd061dbf487a48b523028cd67a7
 2024-03-08 07:55:53 +00:00
Maciej Żenczykowski
6456428d38 bpfloader: remove duplicate code am: 301a12f54d 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2983911

Change-Id: I32941c7b03e107b3f06fb1274129a195b8affb0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-29 11:12:05 +00:00
Maciej Żenczykowski
301a12f54d bpfloader: remove duplicate code 
(setting the sysctls is already done by NetBpfLoad.cpp before this,
while creating the loader subdir will happen after aosp/2983013,
but that is currently unused functionality anyway)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie465e4be459d5b77924799c486b5fe03bef6f521
 2024-02-29 02:05:21 +00:00
Aditya Choudhary
ba3b6c9781 Migrate Test Targets to New Android Ownership Model am: 57c8f90936 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2946401

Change-Id: I3e98f4c28418587d49d596ca39abc4be5f744ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-13 04:57:26 +00:00
Aditya Choudhary
57c8f90936 Migrate Test Targets to New Android Ownership Model 
This CL is created as a best effort to migrate test targets to the new Android ownership model.
It is based on historical data from repository history and insights from git blame.
Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary
attribution in this CL, please create a new CL to fix that.

For detailed guidelines and further information on the migration please refer to the link below,
go/new-android-ownership-model

Bug: 304529413
Test: N/A
Change-Id: Ifb44dde6bd09eada179228a6cbaa67e0c4d1b863
 2024-02-02 14:02:31 +00:00
Yu-Ting Tseng
56858e9fee Add uprobestats path to BpfLoader. am: 9c56a5a699 am: b8fe151a9b am: f233c8b3ac 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2907041

Change-Id: Ia262d395ec95da65d78553187624c917f91ddccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-13 00:05:14 +00:00
Yu-Ting Tseng
f233c8b3ac Add uprobestats path to BpfLoader. am: 9c56a5a699 am: b8fe151a9b 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2907041

Change-Id: Ib9fcb8fa4fde4c9ad13d7dc6e5c184701733e4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-12 23:30:50 +00:00
Yu-Ting Tseng
b8fe151a9b Add uprobestats path to BpfLoader. am: 9c56a5a699 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2907041

Change-Id: I9609e9c47ed4325cdc940c74c687b735316ea2ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-12 23:01:19 +00:00
Yu-Ting Tseng
9c56a5a699 Add uprobestats path to BpfLoader. 
Test: m
Bug: 296108553
Change-Id: If033a459ade1ae9e9a1f2b7eb7eec23bf8418bdf
 2024-01-12 09:41:18 -08:00
Maciej Żenczykowski
ce109aa1f1 move bpfloader.rc into p/m/C am: ddea8ce1af am: c555d8fb01 am: 03911d686f 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2800818

Change-Id: Id8af2ab67be2a686146d175cdfcaccbcb272f13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 01:13:14 +00:00
Maciej Żenczykowski
ad161ab5a9 move bpfloader.rc into p/m/C am: ddea8ce1af am: 7037728ece am: 1c64ea1742 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2800818

Change-Id: Iecaecb7a0d3defcdad605a9ea0252999047b1ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 00:48:01 +00:00
Maciej Żenczykowski
03911d686f move bpfloader.rc into p/m/C am: ddea8ce1af am: c555d8fb01 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2800818

Change-Id: I39c81934470535dfe7ec4096e7a3eb02660497a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 00:43:53 +00:00
Maciej Żenczykowski
1c64ea1742 move bpfloader.rc into p/m/C am: ddea8ce1af am: 7037728ece 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2800818

Change-Id: Id22048708f061b115dee03fb6939aad09738d5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 00:42:34 +00:00
Maciej Żenczykowski
c555d8fb01 move bpfloader.rc into p/m/C am: ddea8ce1af 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2800818

Change-Id: I8e43e0d56adc1b7599301664432420be7161a1d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 00:22:38 +00:00
Maciej Żenczykowski
7037728ece move bpfloader.rc into p/m/C am: ddea8ce1af 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2800818

Change-Id: Icc29fa45c0004b3ce4ac1d9f2130493dea9fc7fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 00:20:44 +00:00
Maciej Żenczykowski
cc423cb8e6 [automerger skipped] bpfRingbufProg: use named values not raw true/false values. am: a8e1252c3f -s ours 
am skip reason: Merged-In Idd8055d823d98d8d0e2b3fe26246edc0c457e16b with SHA-1 4038b8f63e is already in history

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

Change-Id: I1b3a324914f51c19b6fb84b159e6fd0fd331852e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 20:33:53 +00:00
Maciej Żenczykowski
a8e1252c3f bpfRingbufProg: use named values not raw true/false values. 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:4038b8f63ecd1025cf823ace6c69e23f52f9c2d5)
Merged-In: Idd8055d823d98d8d0e2b3fe26246edc0c457e16b
Change-Id: Idd8055d823d98d8d0e2b3fe26246edc0c457e16b
 2023-10-24 18:22:15 +00:00
Maciej Żenczykowski
ddea8ce1af move bpfloader.rc into p/m/C 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic472e69758a1190cbfb8b04b89a3a477241a717a
 2023-10-24 02:15:24 -07:00
Maciej Żenczykowski
ed0480cf94 Merge "execute bpfloader via netbpfload" into main am: 6b21c10161 am: 30b5e41a34 am: 3ae3036e51 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2798732

Change-Id: I5948d9d8b270e896699d21268961eb873d376434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 17:11:07 +00:00
Maciej Żenczykowski
0eae932096 Merge "execute bpfloader via netbpfload" into main am: 6b21c10161 am: b1ec007a13 am: 30308790fc 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2798732

Change-Id: Ic03d14532938f15bc98fb4f0047a8f4b2600681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 16:50:18 +00:00
Maciej Żenczykowski
3ae3036e51 Merge "execute bpfloader via netbpfload" into main am: 6b21c10161 am: 30b5e41a34 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2798732

Change-Id: Idb0b122160533b4077a8d7da8a99da69095352f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 16:46:34 +00:00
Maciej Żenczykowski
30308790fc Merge "execute bpfloader via netbpfload" into main am: 6b21c10161 am: b1ec007a13 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2798732

Change-Id: Ibf006fc3987c015d08095803f59a05d792423e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 16:45:32 +00:00
Maciej Żenczykowski
30b5e41a34 Merge "execute bpfloader via netbpfload" into main am: 6b21c10161 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2798732

Change-Id: I060b14914b0ca43dce21fd1324783a84edce62eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 16:29:31 +00:00
Maciej Żenczykowski
b1ec007a13 Merge "execute bpfloader via netbpfload" into main am: 6b21c10161 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2798732

Change-Id: I5031605d6e6d6fb70b0897e4e2492f557f0fe8ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 16:27:57 +00:00
Maciej Żenczykowski
6b21c10161 Merge "execute bpfloader via netbpfload" into main 2023-10-21 16:06:44 +00:00
Maciej Żenczykowski
42da46ab87 Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 am: 36ec4b0dd9 am: 664a880c04 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: I8ae16a59b5370d627d52b65519a1fb15eb4535ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 03:22:24 +00:00
Maciej Żenczykowski
664a880c04 Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 am: 36ec4b0dd9 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: I5759b78eb53fe447c565c664d18054d7182c9a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 02:58:31 +00:00
Maciej Żenczykowski
820a6c618a Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 am: 026704ae9c am: a7de4e1f05 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: If23544950c00dcd446aef54293163801131b9b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 02:41:30 +00:00
Maciej Żenczykowski
36ec4b0dd9 Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: Ibec1c5e3dd12a82c457cca8fcef6103bb66662af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 02:41:05 +00:00
Maciej Żenczykowski
a7de4e1f05 Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 am: 026704ae9c 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: I2370a5f33c4d28d005826da8c0aeb73b787c3a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 02:36:20 +00:00
Maciej Żenczykowski
026704ae9c Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: I475331b69ff9900fda18d3496f3cbf485bea4fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-21 02:18:43 +00:00
Maciej Żenczykowski
04229c8453 Merge "reverse bpfloader vs netbpfload order" into main 2023-10-21 02:18:05 +00:00
Matthias Männich
292d85e9fd Update BPF OWNERS am: e5cdeb21d1 am: cf59dbec29 am: 8d8611b955 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2797701

Change-Id: I5cf54cabf23e8af2028c8bf4f561307540ff4804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 23:11:33 +00:00
Matthias Männich
f1e25c0800 Update BPF OWNERS am: e5cdeb21d1 am: 06752826fb am: 4b48e3ddbe 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2797701

Change-Id: I9dfef9602100f633184d462e235a8044e084bda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 23:10:56 +00:00
Matthias Männich
8d8611b955 Update BPF OWNERS am: e5cdeb21d1 am: cf59dbec29 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2797701

Change-Id: Id63022a44f7acb8fcf7809abc7c26496037ad023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:39:15 +00:00
Matthias Männich
4b48e3ddbe Update BPF OWNERS am: e5cdeb21d1 am: 06752826fb 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2797701

Change-Id: Ifcbbab5d98830d40d0248f4bb27c8dfafc84182c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:38:06 +00:00
Maciej Żenczykowski
483d5710e8 execute bpfloader via netbpfload 
This effectively reverts us most of the way back to U,
after this change we have:

$ git diff aosp/android14-release:bpfloader/bpfloader.rc HEAD:bpfloader/bpfloader.rc
@@ -17,7 +17,8 @@
 on load_bpf_programs
     exec_start bpfloader

-service bpfloader /system/bin/bpfloader
+service bpfloader /system/bin/netbpfload
+    # netbpfload will do network bpf loading, then execute /system/bin/bpfloader
     capabilities CHOWN SYS_ADMIN NET_ADMIN
     # The following group memberships are a workaround for lack of DAC_OVERRIDE
     # and allow us to open (among other things) files that we created and are
@@ -67,10 +68,10 @@ service bpfloader /system/bin/bpfloader
     # 2. comment out 'reboot_on_failure reboot,bpfloader-failed' below
     # 3. rebuild/reflash/reboot
     # 4. as the device is booting up capture bpfloader logs via:
-    #    adb logcat -s 'bpfloader:*' 'LibBpfLoader:*'
+    #    adb logcat -s 'bpfloader:*' 'LibBpfLoader:*' 'NetBpfLoad:*' 'NetBpfLoader:*'
     #
     # something like:
-    #   $ adb reboot; sleep 1; adb wait-for-device; adb root; sleep 1; adb wait-for-device; adb logcat -s 'bpfloader:*' 'LibBpfLoader:*'
+    #   $ adb reboot; sleep 1; adb wait-for-device; adb root; sleep 1; adb wait-for-device; adb logcat -s 'bpfloader:*' 'LibBpfLoader:*' 'NetBpfLoad:*' 'NetBpfLoader:*'
     # will take care of capturing logs as early as possible
     #
     # 5. look through the logs from the kernel's bpf verifier that bpfloader dumps out,

Change-Id: If3bc3da2b66fdb135850d094df68a9dc420be832
 2023-10-20 14:19:04 -07:00
Maciej Żenczykowski
ab8fd4c4f6 reverse bpfloader vs netbpfload order 
in preparation for:
  'service bpfloader' -> netbpfload -> exec -> bpfloader

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I68c16f4b33b6f09229d449c42d55c10269a361e2
 2023-10-20 14:12:35 -07:00
Matthias Männich
cf59dbec29 Update BPF OWNERS am: e5cdeb21d1 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2797701

Change-Id: I9ec9d2ffca148a5f84a04ec162d8805702fc3c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:02:33 +00:00
Matthias Männich
06752826fb Update BPF OWNERS am: e5cdeb21d1 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2797701

Change-Id: Iee1bc8e28cf32ea2ddc5f0d8ffaf2be963d64e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:00:32 +00:00
Matthias Männich
e5cdeb21d1 Update BPF OWNERS 
Change-Id: I7f8f1275f09993972dac5635e3edb88630930736
Signed-off-by: Matthias Männich <maennich@google.com>
 2023-10-20 08:57:37 +00:00