joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

NetBpfLoad: reduce log spam

Browse source 
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 <maze@google.com>
Change-Id: Ide066edf2d54ffd6a61fdcb115a249bff80cdff9
This commit is contained in:
Maciej Żenczykowski 2025-09-11 11:28:28 -07:00
commit ff505eaaea
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bpf/loader/NetBpfLoad.cpp
View file

@ -1076,20 +1076,15 @@ static int loadCodeSections(ElfObject& elfObj, vector<codeSection>& 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) {