commit 9b15fa040f06b23c373d8ef16ef17e5122b21d46
author Yu-Ting Tseng <yutingtseng@google.com> Mon Oct 28 11:16:35 2024 -0700
committer Yu-Ting Tseng <yutingtseng@google.com> Mon Nov 04 11:25:23 2024 -0800
tree 19c8d6c69bb88cdd1b4d15e3a8c5f579f5a7a388
parent 8589c09369ce407ec9df80e862ccb95f5eb0617d

Make netbpfload invoke uprobestatsbpfload

Bug: 355315669
Test: TH
Change-Id: Ie545a27c723b156b7d548e8f86e0da5303e99503

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 9a049c7..c2a1d6e 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1288,6 +1288,8 @@
 
 #define APEX_MOUNT_POINT "/apex/com.android.tethering"
 const char * const platformBpfLoader = "/system/bin/bpfloader";
+const char *const uprobestatsBpfLoader =
+    "/apex/com.android.uprobestats/bin/uprobestatsbpfload";
 
 static int logTetheringApexVersion(void) {
     char * found_blockdev = NULL;
@@ -1657,8 +1659,17 @@
     }
 
     // unreachable before U QPR3
-    ALOGI("done, transferring control to platform bpfloader.");
+    {
+      ALOGI("done, transferring control to uprobestatsbpfload.");
+      const char *args[] = {
+          uprobestatsBpfLoader,
+          NULL,
+      };
+      execve(args[0], (char **)args, envp);
+    }
 
+    ALOGI("unable to execute uprobestatsbpfload, transferring control to "
+          "platform bpfloader.");
     // platform BpfLoader *needs* to run as root
     const char * args[] = { platformBpfLoader, NULL, };
     execve(args[0], (char**)args, envp);