only set 'bpf.progs_loaded' property on eBPF capable devices... am: 007c9dd245 am: d16be56e73

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

Change-Id: I75ae16f3ebc871c33501f60f199bd72998a43eb0

2 files changed, 6 insertions, 4 deletions

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 @@ void loadAllElfObjects(void) {
 }
 
 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");
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index f808dc6..4244eb7 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -650,6 +650,8 @@ int loadProg(const char* elfPath) {
 }
 
 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...");
     }