From eb55711799d9f0dcfb77307358469d48fc055f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 4 Aug 2025 14:57:56 -0700 Subject: [PATCH] bpf: rename 'progs' section to '.android_progs' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (this matches what we did for maps) Test: TreeHugger Flag: EXEMPT mainline Signed-off-by: Maciej Żenczykowski Change-Id: I2d75fb519f00471a6f1e6b0ffded9f327ecae7b4 --- bpf/loader/NetBpfLoad.cpp | 4 ++-- bpf/progs/include/bpf_helpers.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 5162aa781f..a3aff734e1 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -402,10 +402,10 @@ int readCodeSections(ElfObject& elfObj, vector& cs) { entries = shTable.size(); vector pd; - ret = elfObj.readSectionByName("progs", pd); + ret = elfObj.readSectionByName(".android_progs", pd); if (ret) return ret; vector progDefNames; - ret = elfObj.getSectionSymNames("progs", progDefNames); + ret = elfObj.getSectionSymNames(".android_progs", progDefNames); if (!pd.empty() && ret) return ret; for (int i = 0; i < entries; i++) { diff --git a/bpf/progs/include/bpf_helpers.h b/bpf/progs/include/bpf_helpers.h index ac95de2c2e..59e118d732 100644 --- a/bpf/progs/include/bpf_helpers.h +++ b/bpf/progs/include/bpf_helpers.h @@ -535,7 +535,7 @@ static int (*bpf_trace_printk)(const char* fmt, int fmt_size, ...) = (void*) BPF min_loader, max_loader, opt, selinux, pindir) \ VALIDATE_SELINUX_CONTEXT(min_loader, selinux); \ VALIDATE_PIN_DIR(min_loader, pindir); \ - const struct bpf_prog_def SECTION("progs") the_prog##_def = { \ + const struct bpf_prog_def SECTION(".android_progs") the_prog##_def = { \ .type = BPF_PROG_TYPE_##TYPE, \ .attach_type = BPF_PROG_ATTACH_TYPE_##TYPE, \ .uid = (prog_uid), \