bpf: remove no longer used expected attach type
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I513d9b22bf57a19d1b33cd37bf3a6f3ae06d969f
diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index cdeca4e..341a9c3 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -55,9 +55,6 @@
// Size of the BPF log buffer for verifier logging
#define BPF_LOAD_LOG_SZ 0xfffff
-// Unspecified attach type is 0 which is BPF_CGROUP_INET_INGRESS.
-#define BPF_ATTACH_TYPE_UNSPEC BPF_CGROUP_INET_INGRESS
-
using android::base::EndsWith;
using android::base::StartsWith;
using android::base::unique_fd;
@@ -86,7 +83,6 @@
typedef struct {
const char* name;
enum bpf_prog_type type;
- enum bpf_attach_type expected_attach_type;
} sectionType;
/*
@@ -100,18 +96,17 @@
* Instead use the DEFINE_(BPF|XDP)_(PROG|MAP)... & LICENSE/CRITICAL macros.
*/
sectionType sectionNameTypes[] = {
- {"kprobe/", BPF_PROG_TYPE_KPROBE, BPF_ATTACH_TYPE_UNSPEC},
- {"kretprobe/", BPF_PROG_TYPE_KPROBE, BPF_ATTACH_TYPE_UNSPEC},
- {"perf_event/", BPF_PROG_TYPE_PERF_EVENT, BPF_ATTACH_TYPE_UNSPEC},
- {"skfilter/", BPF_PROG_TYPE_SOCKET_FILTER, BPF_ATTACH_TYPE_UNSPEC},
- {"tracepoint/", BPF_PROG_TYPE_TRACEPOINT, BPF_ATTACH_TYPE_UNSPEC},
- {"uprobe/", BPF_PROG_TYPE_KPROBE, BPF_ATTACH_TYPE_UNSPEC},
- {"uretprobe/", BPF_PROG_TYPE_KPROBE, BPF_ATTACH_TYPE_UNSPEC},
+ {"kprobe/", BPF_PROG_TYPE_KPROBE},
+ {"kretprobe/", BPF_PROG_TYPE_KPROBE},
+ {"perf_event/", BPF_PROG_TYPE_PERF_EVENT},
+ {"skfilter/", BPF_PROG_TYPE_SOCKET_FILTER},
+ {"tracepoint/", BPF_PROG_TYPE_TRACEPOINT},
+ {"uprobe/", BPF_PROG_TYPE_KPROBE},
+ {"uretprobe/", BPF_PROG_TYPE_KPROBE},
};
typedef struct {
enum bpf_prog_type type;
- enum bpf_attach_type expected_attach_type;
string name;
vector<char> data;
vector<char> rel_data;
@@ -304,12 +299,6 @@
return BPF_PROG_TYPE_UNSPEC;
}
-static enum bpf_attach_type getExpectedAttachType(string& name) {
- for (auto& snt : sectionNameTypes)
- if (StartsWith(name, snt.name)) return snt.expected_attach_type;
- return BPF_ATTACH_TYPE_UNSPEC;
-}
-
static string getSectionName(enum bpf_prog_type type)
{
for (auto& snt : sectionNameTypes)
@@ -427,9 +416,6 @@
return -1;
}
- // This must be done before '/' is replaced with '_'.
- cs_temp.expected_attach_type = getExpectedAttachType(name);
-
string oldName = name;
// convert all slashes to underscores
@@ -774,7 +760,6 @@
.log_level = 1,
.log_buf = ptr_to_u64(log_buf.data()),
.log_size = static_cast<__u32>(log_buf.size()),
- .expected_attach_type = cs[i].expected_attach_type,
};
strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
fd.reset(bpf(BPF_PROG_LOAD, req));