commit 731e9939e679808a0c467689349409b32ba83d11
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 15 10:18:18 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 10:18:18 2020 +0000
tree 6cecee69c5e83f015236aa24ca69c243b3efbbf6
parent 007c9dd24554a6b73695498bc449e32bf1a3b4b8
parent 8586589c26f1f06d359f0467286d4e49ab5756d1

Merge "allow tagging a bpf .o as critical" into rvc-dev

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 5390fb4..9e348e5 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -72,10 +72,10 @@
 }
 
 int main() {
-    if (android::bpf::isBpfSupported()) {
-        // Load all ELF objects, create programs and maps, and pin them
-        loadAllElfObjects();
-    }
+    if (!android::bpf::isBpfSupported()) return 0;
+
+    // Load all ELF objects, create programs and maps, and pin them
+    loadAllElfObjects();
 
     if (android::base::SetProperty("bpf.progs_loaded", "1") == false) {
         ALOGE("Failed to set bpf.progs_loaded property\n");

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index aee9b3a..9f57ce6 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -657,6 +657,8 @@
 }
 
 void waitForProgsLoaded() {
+    if (!android::bpf::isBpfSupported()) return;
+
     while (!android::base::WaitForProperty("bpf.progs_loaded", "1", std::chrono::seconds(5))) {
         ALOGW("Waited 5s for bpf.progs_loaded, still waiting...");
     }