commit 91d60440f5ebcc34e4faf101a3d8148dc31d4fd9
author Maciej Żenczykowski <maze@google.com> Wed May 01 12:29:32 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 01 12:29:32 2024 +0000
tree bd675d184fd2541957cf82c654376a90d14f05b9
parent 2b2df86de7b2f6512d2595e552e0dc70121bde9d
parent 95c6fff6a22f541038bd3a397d68fed9a14e49eb

BpfLoader: exec mainline netbpfload for finalization am: 95c6fff6a2

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

Change-Id: I6ae9b1697f9f67d9bfa4c6f155a4a61fe6a48c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

loader/BpfLoader.cpp

diff --git a/loader/BpfLoader.cpp b/loader/BpfLoader.cpp
index 9f61ba1..db86854 100644
--- a/loader/BpfLoader.cpp
+++ b/loader/BpfLoader.cpp
@@ -40,7 +40,6 @@
 
 #include <android-base/logging.h>
 #include <android-base/macros.h>
-#include <android-base/properties.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
@@ -147,8 +146,7 @@
     return 0;
 }
 
-int main(int argc, char** argv) {
-    (void)argc;
+int main(int __unused argc, char** argv, char * const envp[]) {
     android::base::InitLogging(argv, &android::base::KernelLogger);
 
     // Load all ELF objects, create programs and maps, and pin them
@@ -160,14 +158,12 @@
                   "problems or startup script race.");
             ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
             sleep(20);
-            return 2;
+            return 120;
         }
     }
 
-    if (!android::base::SetProperty("bpf.progs_loaded", "1")) {
-        ALOGE("Failed to set bpf.progs_loaded property");
-        return 1;
-    }
-
-    return 0;
+    const char * args[] = { "/apex/com.android.tethering/bin/netbpfload", "done", NULL, };
+    execve(args[0], (char**)args, envp);
+    ALOGE("FATAL: execve(): %d[%s]", errno, strerror(errno));
+    return 121;
 }

loader/Loader.cpp

diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index dd242e2..d3cfe81 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -46,7 +46,6 @@
 
 #include <android-base/cmsg.h>
 #include <android-base/file.h>
-#include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>