commit c76a0dca67488fe06e1c1bee1b020deb3df3d139
author Maciej Żenczykowski <maze@google.com> Mon Oct 09 16:19:13 2023 -0700
committer Maciej Żenczykowski <maze@google.com> Tue Oct 10 00:53:29 2023 -0700
tree 6e5e8fdfa33022c81b4c30763744d27cd4b98da3
parent 50fdc95894d8283f43d81d3b5e2724a784fef64d

bpfloader: start netbpfload after bpfloader

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib052eddc1cc3585c108b7715af99bab63d012021

bpfloader/Android.bp

diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp
index 2ddf463..981c207 100644
--- a/bpfloader/Android.bp
+++ b/bpfloader/Android.bp
@@ -51,7 +51,8 @@
     init_rc: ["bpfloader.rc"],
 
     required: [
-        "timeInState.o"
+        "netbpfload",
+        "timeInState.o",
     ],
 
     product_variables: {

bpfloader/bpfloader.rc

diff --git a/bpfloader/bpfloader.rc b/bpfloader/bpfloader.rc
index 1f4016d..1f7f815 100644
--- a/bpfloader/bpfloader.rc
+++ b/bpfloader/bpfloader.rc
@@ -16,6 +16,7 @@
 #
 on load_bpf_programs
     exec_start bpfloader
+    exec_start netbpfload
 
 service bpfloader /system/bin/bpfloader
     capabilities CHOWN SYS_ADMIN
@@ -82,3 +83,14 @@
     reboot_on_failure reboot,bpfloader-failed
     # we're not really updatable, but want to be able to load bpf programs shipped in apexes
     updatable
+
+# Note: comments for 'bpfloader' from up above also apply here.
+# Use: adb logcat -s 'NetBpfLoad:*' 'NetBpfLoader:*'
+service netbpfload /system/bin/netbpfload
+    capabilities CHOWN SYS_ADMIN NET_ADMIN
+    group root network_stack net_admin net_bw_acct net_bw_stats net_raw system
+    user root
+    rlimit memlock 1073741824 1073741824
+    oneshot
+    reboot_on_failure reboot,netbpfload-failed
+    updatable