From 9fef930ff1e740256c76e319b3f98bcfa7c9e8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 18 Mar 2025 20:09:34 -0700 Subject: [PATCH] NetBpfLoad: merge two map creation ALOGs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One ALOG to record whether the map is created by btf or not. Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I5da3af67ba28b01ee4e7b08e61f1fedc24e2840f --- bpf/loader/NetBpfLoad.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 28cb09e3e7..f11b9a372b 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -997,7 +997,8 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector& if (isAtLeastKernelVersion(4, 15, 0)) strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name)); - if (isBtfSupported(type)) { + bool haveBtf = isBtfSupported(type); + if (haveBtf) { uint32_t kTid, vTid; ret = getKeyValueTids(btf, mapNames[i].c_str(), md[i].key_size, md[i].value_size, &kTid, &vTid); @@ -1005,17 +1006,16 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector& req.btf_fd = btf__fd(btf); req.btf_key_type_id = kTid; req.btf_value_type_id = vTid; - ALOGI("Create map with BTF, map: %s", mapNames[i].c_str()); - } else { - ALOGI("Create map without BTF, map: %s", mapNames[i].c_str()); } fd.reset(bpf(BPF_MAP_CREATE, req)); saved_errno = errno; if (fd.ok()) { - ALOGD("bpf_create_map[%s] -> %d", mapNames[i].c_str(), fd.get()); + ALOGD("bpf_create_map[%s] btf:%d -> %d", + mapNames[i].c_str(), haveBtf, fd.get()); } else { - ALOGE("bpf_create_map[%s] -> %d errno:%d", mapNames[i].c_str(), fd.get(), saved_errno); + ALOGE("bpf_create_map[%s] btf:%d -> %d errno:%d", + mapNames[i].c_str(), haveBtf, fd.get(), saved_errno); } }