From 5f924d567ff138f6214e5272b041a6851c7af09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 29 Jul 2025 16:23:39 -0700 Subject: [PATCH 1/2] bpf_helpers: require DEFAULT_BPF_PIN_SUBDIR to be defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (all our .o's already do this) Test: TreeHugger Flag: EXEMPT mainline/noop Signed-off-by: Maciej Żenczykowski Change-Id: I1ac99c201731a99663e89afc0bf639c9b600ab6d --- bpf/progs/include/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bpf/progs/include/bpf_helpers.h b/bpf/progs/include/bpf_helpers.h index f891f8ded4..e7f992ac0c 100644 --- a/bpf/progs/include/bpf_helpers.h +++ b/bpf/progs/include/bpf_helpers.h @@ -368,7 +368,7 @@ static int (*bpf_sk_storage_delete_unsafe) (const void* sk_storage, #endif #ifndef DEFAULT_BPF_PIN_SUBDIR -#define DEFAULT_BPF_PIN_SUBDIR "" +#error "Must define DEFAULT_BPF_PIN_SUBDIR" #endif #ifndef DEFAULT_BPF_MAP_UID From 4997a8acad62a3ecc9bbdf1b331f2bf206731e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 29 Jul 2025 22:59:06 -0700 Subject: [PATCH 2/2] bpf: remove BPFLOADER_MIN_VER check on BPF_MAP_UID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not relevant with mainline NetBpfLoad. Test: TreeHugger Flag: EXEMPT mainline/noop Signed-off-by: Maciej Żenczykowski Change-Id: I35cf433a02a32ccf3ff48e4ea06b7bbe68c5f90b --- bpf/progs/include/bpf_helpers.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/bpf/progs/include/bpf_helpers.h b/bpf/progs/include/bpf_helpers.h index e7f992ac0c..063ff942e2 100644 --- a/bpf/progs/include/bpf_helpers.h +++ b/bpf/progs/include/bpf_helpers.h @@ -373,8 +373,6 @@ static int (*bpf_sk_storage_delete_unsafe) (const void* sk_storage, #ifndef DEFAULT_BPF_MAP_UID #define DEFAULT_BPF_MAP_UID AID_ROOT -#elif BPFLOADER_MIN_VER < 28u -#error "Bpf Map UID must be left at default of AID_ROOT for BpfLoader prior to v0.28" #endif // for maps not meant to be accessed from userspace