From 52863b6ba69fec4ff66d766bf3e95bfe1c519e43 Mon Sep 17 00:00:00 2001 From: Connor O'Brien Date: Tue, 11 Jan 2022 18:38:15 -0800 Subject: [PATCH] Update Loader.cpp for updated bcc bpf_create_map and bpf_prog_load have been renamed, so update those calls. bcc now depends on upstream libbpf and has deleted its redundant implementations of bpf_obj_pin and bpf_obj_get, so add upstream libbpf as a dependency. Test: m libbpf_android Bug: 203823368 Signed-off-by: Connor O'Brien Change-Id: I324cab44227b0e2f73873f37a28d640ab2373204 --- libbpf_android/Android.bp | 2 ++ libbpf_android/Loader.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp index 3b58c00..abda8b8 100644 --- a/libbpf_android/Android.bp +++ b/libbpf_android/Android.bp @@ -59,6 +59,7 @@ cc_library { "libutils", "liblog", "libbpf_bcc", + "libbpf_minimal", ], header_libs: [ "bpf_headers", @@ -95,6 +96,7 @@ cc_test { shared_libs: [ "libbpf_android", "libbpf_bcc", + "libbpf_minimal", "libbase", "liblog", "libutils", diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp index abe1704..cd799e4 100644 --- a/libbpf_android/Loader.cpp +++ b/libbpf_android/Loader.cpp @@ -575,7 +575,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector& // programs as being 5.4+... type = BPF_MAP_TYPE_HASH; } - fd.reset(bpf_create_map(type, mapNames[i].c_str(), md[i].key_size, md[i].value_size, + fd.reset(bcc_create_map(type, mapNames[i].c_str(), md[i].key_size, md[i].value_size, md[i].max_entries, md[i].map_flags)); saved_errno = errno; ALOGD("bpf_create_map name %s, ret: %d\n", mapNames[i].c_str(), fd.get()); @@ -724,7 +724,7 @@ static int loadCodeSections(const char* elfPath, vector& cs, const } else { vector log_buf(BPF_LOAD_LOG_SZ, 0); - fd = bpf_prog_load(cs[i].type, name.c_str(), (struct bpf_insn*)cs[i].data.data(), + fd = bcc_prog_load(cs[i].type, name.c_str(), (struct bpf_insn*)cs[i].data.data(), cs[i].data.size(), license.c_str(), kvers, 0, log_buf.data(), log_buf.size()); ALOGD("bpf_prog_load lib call for %s (%s) returned fd: %d (%s)\n", elfPath,