From ff505eaaeab391a715b586b658b7b8cc9aa31b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 11 Sep 2025 11:28:28 -0700 Subject: [PATCH] NetBpfLoad: reduce log spam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit by joining two log lines into one with effectively the same info (the kernel version is already printed during startup) Test: TreeHugger Flag: EXEMPT mainline / logging Signed-off-by: Maciej Żenczykowski Change-Id: Ide066edf2d54ffd6a61fdcb115a249bff80cdff9 --- bpf/loader/NetBpfLoad.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 858b6531a1..3a598cad67 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1076,20 +1076,15 @@ static int loadCodeSections(ElfObject& elfObj, vector& cs, const st return -EINVAL; } - unsigned min_kver = cs[i].prog_def->min_kver; - unsigned max_kver = cs[i].prog_def->max_kver; - ALOGD("cs[%d].name:%s min_kver:%x .max_kver:%x (kernelVer:%x)", - i, cs[i].prog_def->name(), min_kver, max_kver, kernelVer); - if (kernelVer < min_kver) continue; - if (kernelVer >= max_kver) continue; + ALOGD("cs[%d].name:%s kver in [%x,%x) bpfloader ver in [0x%05x,0x%05x)", + i, cs[i].prog_def->name(), + cs[i].prog_def->min_kver, cs[i].prog_def->max_kver, + cs[i].prog_def->bpfloader_min_ver, cs[i].prog_def->bpfloader_max_ver); - unsigned bpfMinVer = cs[i].prog_def->bpfloader_min_ver; - unsigned bpfMaxVer = cs[i].prog_def->bpfloader_max_ver; - - ALOGD("cs[%d].name:%s requires bpfloader version [0x%05x,0x%05x)", - i, cs[i].prog_def->name(), bpfMinVer, bpfMaxVer); - if (bpfloader_ver < bpfMinVer) continue; - if (bpfloader_ver >= bpfMaxVer) continue; + if (kernelVer < cs[i].prog_def->min_kver) continue; + if (kernelVer >= cs[i].prog_def->max_kver) continue; + if (bpfloader_ver < cs[i].prog_def->bpfloader_min_ver) continue; + if (bpfloader_ver >= cs[i].prog_def->bpfloader_max_ver) continue; bool reuse = false; if (access(cs[i].prog_def->pin_location, F_OK) == 0) {