commit bd39eed44d46e868b2cc069d9abd8c20eb97dce7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 05 05:45:37 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 05 05:45:37 2024 +0000
tree eda036d883f47cbe927af02f7ebce2765dfd02c5
parent 772a89f1789a31e651877567d74a72c74dc10350
parent ea44c94fbfc0c850446d30d4185025b3eba35134

Merge "Adding memevents subdirectory for bpf" into main am: ea44c94fbf

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

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

loader/Loader.cpp

diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index 3eac78d..cf6bf36 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -877,6 +877,11 @@
         BPF_PROG_TYPE_UNSPEC,  // Will be replaced with fuse bpf program type
 };
 
+constexpr bpf_prog_type kMemEventsAllowedProgTypes[] = {
+        BPF_PROG_TYPE_TRACEPOINT,
+        BPF_PROG_TYPE_SOCKET_FILTER,
+};
+
 constexpr bpf_prog_type kUprobestatsAllowedProgTypes[] = {
         BPF_PROG_TYPE_KPROBE,
 };
@@ -897,6 +902,13 @@
                 .allowedProgTypes = kPlatformAllowedProgTypes,
                 .allowedProgTypesLength = arraysize(kPlatformAllowedProgTypes),
         },
+        // memevents
+        {
+                .dir = "/system/etc/bpf/memevents/",
+                .prefix = "memevents/",
+                .allowedProgTypes = kMemEventsAllowedProgTypes,
+                .allowedProgTypesLength = arraysize(kMemEventsAllowedProgTypes),
+        },
         // uprobestats
         {
                 .dir = "/system/etc/bpf/uprobestats/",