From 9c0cd85f66adbd78fec7b141b86ef39693aa0d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 4 Aug 2025 14:01:51 -0700 Subject: [PATCH] NetBpfLoad: loadAllObjects - introduce libbpf bool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (for ease of testing non-libbpf code path) Test: TreeHugger Flag: EXEMPT mainline/noop Signed-off-by: Maciej Żenczykowski Change-Id: I98927b328753914359136ae3f4a723f42256d0a0 --- bpf/loader/NetBpfLoad.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index d224932925..3a2b462ab9 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1453,12 +1453,13 @@ static bool loadObject(const unsigned int bpfloader_ver, #define BPFROOT APEXROOT "/etc/bpf/mainline/" static bool loadAllObjects(const unsigned int bpfloader_ver) { + bool libbpf = isAtLeast25Q3; if (!loadObject(bpfloader_ver, BPFROOT "offload.o")) return false; - if (!loadObject(bpfloader_ver, BPFROOT "test.o", isAtLeast25Q3)) return false; + if (!loadObject(bpfloader_ver, BPFROOT "test.o", libbpf)) return false; if (isAtLeastT) { - if (!loadObject(bpfloader_ver, BPFROOT "clatd.o", isAtLeast25Q3)) return false; - if (!loadObject(bpfloader_ver, BPFROOT "dscpPolicy.o", isAtLeast25Q3)) return false; - if (!loadObject(bpfloader_ver, BPFROOT "netd.o", isAtLeast25Q3)) return false; + if (!loadObject(bpfloader_ver, BPFROOT "clatd.o", libbpf)) return false; + if (!loadObject(bpfloader_ver, BPFROOT "dscpPolicy.o", libbpf)) return false; + if (!loadObject(bpfloader_ver, BPFROOT "netd.o", libbpf)) return false; } return true; }