commit 9a2093d38c2f9e1f8f2f5341cc8b6fd9ad8b2dec
author Maciej Żenczykowski <maze@google.com> Fri Dec 02 13:46:53 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Fri Dec 02 13:51:25 2022 +0000
tree df2d091bc2210a871acbd159bbb0be7db6d02f36
parent 90a866ed34d844a97559e0178b75d0ef2d8fbfe5

Bpfloader - minimal fs_bpf_loader support

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

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index bc7ea76..0d7483e 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.29
+// This is BpfLoader v0.30
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 29u
+#define BPFLOADER_VERSION_MINOR 30u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"
@@ -87,6 +87,7 @@
         case domain::netd_readonly: return "fs_bpf_netd_readonly";
         case domain::netd_shared:   return "fs_bpf_netd_shared";
         case domain::vendor:        return "fs_bpf_vendor";
+        case domain::loader:        return "fs_bpf_loader";
         default:                    return "(unrecognized)";
     }
 }
@@ -118,6 +119,7 @@
         case domain::netd_readonly: return "netd_readonly/";
         case domain::netd_shared:   return "netd_shared/";
         case domain::vendor:        return "vendor/";
+        case domain::loader:        return "loader/";
         default:                    return "(unrecognized)";
     }
 };

libbpf_android/include/libbpf_android.h

diff --git a/libbpf_android/include/libbpf_android.h b/libbpf_android/include/libbpf_android.h
index 2218215..95e1f19 100644
--- a/libbpf_android/include/libbpf_android.h
+++ b/libbpf_android/include/libbpf_android.h
@@ -45,6 +45,7 @@
     netd_readonly,      // (T+) fs_bpf_netd_readonly /sys/fs/bpf/netd_readonly
     netd_shared,        // (T+) fs_bpf_netd_shared   /sys/fs/bpf/netd_shared
     vendor,             // (T+) fs_bpf_vendor        /sys/fs/bpf/vendor
+    loader,             // (U+) fs_bpf_loader        /sys/fs/bpf/loader
 };
 
 // Note: this does not include domain::unrecognized, but does include domain::unspecified
@@ -57,6 +58,7 @@
     domain::netd_readonly,
     domain::netd_shared,
     domain::vendor,
+    domain::loader,
 };
 
 static constexpr bool unrecognized(domain d) {