Commit graph

2176 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Maciej Żenczykowski
4ca1f95e79 bpfloader: start netbpfload after bpfloader am: c76a0dca67 am: 2fd19d3f6f am: 2e91202d7f am: 88c426e5d4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2780568

Change-Id: I5fe4d48660f47822a163b2c43b1a1cb81c35eb5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:55 +00:00
Maciej Żenczykowski
b57c8a22be bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894 am: e8c2a76dde am: ac228f0824 am: f7603192f1
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: I1daad52aac0abff9ae84a0db979d9faeac61b3b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:49 +00:00
Maciej Żenczykowski
e5a7691ed8 bpfloader: remove support for networking bpf programs am: a00b2ad3df am: b80978b195 am: 01e745199e am: 94ba7893af
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: Id8ec9d70d038d5577616f42e92132e463112dc5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:43 +00:00
Maciej Żenczykowski
bde473c787 bpfloader: stop loading networking bpf programs am: 0e3a078884 am: b081a5d9c4 am: 909229743b am: d9107452c2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: I7d434c39dcc1fb6f6bcdb4d61ce8e8383129264e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:37 +00:00
Maciej Żenczykowski
88c426e5d4 bpfloader: start netbpfload after bpfloader am: c76a0dca67 am: 2fd19d3f6f am: 2e91202d7f
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2780568

Change-Id: I316ce5e3d81c9682c2bdf7525506def2e9e0a9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:54 +00:00
Maciej Żenczykowski
f7603192f1 bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894 am: e8c2a76dde am: ac228f0824
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: I9025292beb28faf5120c49bca372d47b24e6afc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:52 +00:00
Maciej Żenczykowski
94ba7893af bpfloader: remove support for networking bpf programs am: a00b2ad3df am: b80978b195 am: 01e745199e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: Ide7e637786bc1ded08a8129e7b9a09fadfd57a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:49 +00:00
Maciej Żenczykowski
d9107452c2 bpfloader: stop loading networking bpf programs am: 0e3a078884 am: b081a5d9c4 am: 909229743b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: Ie2273a4f5ec6c6f5d270c092ef3b2ed4b2db2867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:47 +00:00
Maciej Żenczykowski
2e91202d7f bpfloader: start netbpfload after bpfloader am: c76a0dca67 am: 2fd19d3f6f
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2780568

Change-Id: Ie1f37f674a0f78927eea0d0852e5b6210d5103e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:24:04 +00:00
Maciej Żenczykowski
ac228f0824 bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894 am: e8c2a76dde
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: Idd70a323a2bce0acc4d49e2d006598df0adf7d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:24:01 +00:00
Maciej Żenczykowski
01e745199e bpfloader: remove support for networking bpf programs am: a00b2ad3df am: b80978b195
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: I6c30bcd5e32afe1e04719a9d358c72a8251aa598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:23:58 +00:00
Maciej Żenczykowski
909229743b bpfloader: stop loading networking bpf programs am: 0e3a078884 am: b081a5d9c4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: Ifdc19e96f98d8240407714258058f660a9455616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:23:56 +00:00
Maciej Żenczykowski
2fd19d3f6f bpfloader: start netbpfload after bpfloader am: c76a0dca67
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2780568

Change-Id: I1638b02e135995d08b9fcd158f2d9b5d9aeedc06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:41 +00:00
Maciej Żenczykowski
e8c2a76dde bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: I6f471e7baaa1a9146b7b4fd76a0039b84e64d7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:38 +00:00
Maciej Żenczykowski
b80978b195 bpfloader: remove support for networking bpf programs am: a00b2ad3df
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: I2d1a9c08d49c4e0242b3e5d472f45a9a5afcc84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:35 +00:00
Maciej Żenczykowski
b081a5d9c4 bpfloader: stop loading networking bpf programs am: 0e3a078884
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: I93867fcff4566a3be20cbe26b2e9d352cc3fc59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:29 +00:00
Maciej Żenczykowski
c76a0dca67 bpfloader: start netbpfload after bpfloader
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib052eddc1cc3585c108b7715af99bab63d012021
2023-10-10 00:53:29 -07:00
Elliott Hughes
010bb1fe40 Use libbase properties for a slight simplification. am: 3b0811b786 am: 0228644fa2 am: 4541c2eabf am: a0e307cc4a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: Ice9bf9a239ea7b2aa8e5a8f45ad2bec0a85d4256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 07:04:54 +00:00
Maciej Żenczykowski
e56c0a2366 bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c am: f320624f27 am: aebdb6c0c8
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: I5aa8e43026232f4bc3b3ccd7d54e85caac523352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 07:04:51 +00:00
Elliott Hughes
a0e307cc4a Use libbase properties for a slight simplification. am: 3b0811b786 am: 0228644fa2 am: 4541c2eabf
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: I9e4e97cf015e1c7ee071155fc1b07e70cf45d544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 06:29:54 +00:00
Maciej Żenczykowski
aebdb6c0c8 bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c am: f320624f27
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Id8438dfe8aed04dce982f04c91972d6f39818ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 06:29:50 +00:00
Elliott Hughes
4541c2eabf Use libbase properties for a slight simplification. am: 3b0811b786 am: 0228644fa2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: If5fdf5d48859808314a6b34c59e3f122687c0741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:38:17 +00:00
Maciej Żenczykowski
f320624f27 bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Ia1906eda8a785a1ae574b34db3f40926a095068f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:38:15 +00:00
Elliott Hughes
0228644fa2 Use libbase properties for a slight simplification. am: 3b0811b786
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: Ie38e902784dc28e049159dceeeabef42016da60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:05:39 +00:00
Maciej Żenczykowski
0133896d6c bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Ic14a52c39cde87910dc89e262ebd8093fb691456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:05:36 +00:00