BPF List
 help / color / mirror / Atom feed
From: Anton Protopopov <a.s.protopopov@gmail.com>
To: bpf@vger.kernel.org
Cc: Anton Protopopov <a.s.protopopov@gmail.com>,
	Puranjay Mohan <puranjay@kernel.org>
Subject: [PATCH bpf-next] selftests/bpf: fix build with new LLVM
Date: Thu, 18 Sep 2025 09:36:06 +0000	[thread overview]
Message-ID: <20250918093606.454541-1-a.s.protopopov@gmail.com> (raw)

The progs/stream.c BPF program now uses arena helpers, so it includes
bpf_arena_common.h, which conflicts with the declarations generated
in vmlinux.h. This leads to the following build errors with the recent
LLVM:

    In file included from progs/stream.c:8:
    .../tools/testing/selftests/bpf/bpf_arena_common.h:47:15: error: conflicting types for 'bpf_arena_alloc_pages'
       47 | void __arena* bpf_arena_alloc_pages(void *map, void __arena *addr, __u32 page_cnt,
          |               ^
    .../tools/testing/selftests/bpf/tools/include/vmlinux.h:229284:14: note: previous declaration is here
     229284 | extern void *bpf_arena_alloc_pages(void *p__map, void *addr__ign, u32 page_cnt, int node_id, u64 flags) __weak __ksym;
            |              ^

    ... etc

Fix this by analogy with the 6a8260147745 ("bpf: selftests: Do not
use generated kfunc prototypes for arena progs") commit by adding the
BPF_NO_KFUNC_PROTOTYPES. As the test uses other kfuncs, declare them
specifically.

Fixes: 86f2225065be ("selftests/bpf: Add tests for arena fault reporting")
Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
---
 tools/testing/selftests/bpf/progs/stream.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/testing/selftests/bpf/progs/stream.c b/tools/testing/selftests/bpf/progs/stream.c
index 4a5bd852f10c..900da666d182 100644
--- a/tools/testing/selftests/bpf/progs/stream.c
+++ b/tools/testing/selftests/bpf/progs/stream.c
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */
+
+#define BPF_NO_KFUNC_PROTOTYPES
 #include <vmlinux.h>
 #include <bpf/bpf_tracing.h>
 #include <bpf/bpf_helpers.h>
@@ -7,6 +9,13 @@
 #include "bpf_experimental.h"
 #include "bpf_arena_common.h"
 
+/*
+ * Declare kfuncs here, as BPF_NO_KFUNC_PROTOTYPES is used
+ * to exclude improper arena kfuncs declarations
+ */
+extern int bpf_res_spin_lock(struct bpf_res_spin_lock *lock) __weak __ksym;
+extern void bpf_res_spin_unlock(struct bpf_res_spin_lock *lock) __weak __ksym;
+
 struct arr_elem {
 	struct bpf_res_spin_lock lock;
 };
-- 
2.34.1


             reply	other threads:[~2025-09-18  9:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-18  9:36 Anton Protopopov [this message]
2025-09-18 15:02 ` [PATCH bpf-next] selftests/bpf: fix build with new LLVM Alexei Starovoitov
2025-09-18 16:27   ` Anton Protopopov
2025-09-18 16:26     ` Alexei Starovoitov
2025-09-19 22:29       ` Andrii Nakryiko
2025-10-20  9:06       ` Anton Protopopov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250918093606.454541-1-a.s.protopopov@gmail.com \
    --to=a.s.protopopov@gmail.com \
    --cc=bpf@vger.kernel.org \
    --cc=puranjay@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox