* [PATCH bpf-next v2] selftests/bpf: Use vmlinux.h for BPF programs
@ 2025-08-18 4:30 Hengqi Chen
2025-08-20 21:49 ` Andrii Nakryiko
0 siblings, 1 reply; 3+ messages in thread
From: Hengqi Chen @ 2025-08-18 4:30 UTC (permalink / raw)
To: bpf, ast, daniel, andrii, martin.lau; +Cc: hengqi.chen
Some of the bpf test progs still use linux/libc headers.
Let's use vmlinux.h instead like the rest of test progs.
This will also ease cross compiling.
Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
---
tools/testing/selftests/bpf/progs/loop1.c | 7 +------
tools/testing/selftests/bpf/progs/loop2.c | 7 +------
tools/testing/selftests/bpf/progs/loop3.c | 7 +------
tools/testing/selftests/bpf/progs/loop6.c | 15 ++++-----------
tools/testing/selftests/bpf/progs/test_overhead.c | 5 +----
5 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/tools/testing/selftests/bpf/progs/loop1.c b/tools/testing/selftests/bpf/progs/loop1.c
index 50e66772c046..b0fa26fb4760 100644
--- a/tools/testing/selftests/bpf/progs/loop1.c
+++ b/tools/testing/selftests/bpf/progs/loop1.c
@@ -1,11 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2019 Facebook
-#include <linux/sched.h>
-#include <linux/ptrace.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <linux/bpf.h>
+#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
diff --git a/tools/testing/selftests/bpf/progs/loop2.c b/tools/testing/selftests/bpf/progs/loop2.c
index 947bb7e988c2..0227409d4b0e 100644
--- a/tools/testing/selftests/bpf/progs/loop2.c
+++ b/tools/testing/selftests/bpf/progs/loop2.c
@@ -1,11 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2019 Facebook
-#include <linux/sched.h>
-#include <linux/ptrace.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <linux/bpf.h>
+#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
diff --git a/tools/testing/selftests/bpf/progs/loop3.c b/tools/testing/selftests/bpf/progs/loop3.c
index 717dab14322b..5d1c9a775e6b 100644
--- a/tools/testing/selftests/bpf/progs/loop3.c
+++ b/tools/testing/selftests/bpf/progs/loop3.c
@@ -1,11 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2019 Facebook
-#include <linux/sched.h>
-#include <linux/ptrace.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <linux/bpf.h>
+#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
diff --git a/tools/testing/selftests/bpf/progs/loop6.c b/tools/testing/selftests/bpf/progs/loop6.c
index e4ff97fbcce1..f48e5599d4fd 100644
--- a/tools/testing/selftests/bpf/progs/loop6.c
+++ b/tools/testing/selftests/bpf/progs/loop6.c
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
-#include <linux/ptrace.h>
-#include <stddef.h>
-#include <linux/bpf.h>
+#include <vmlinux.h>
+#include <bpf/bpf_core_read.h>
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
#include "bpf_misc.h"
@@ -26,12 +25,6 @@ char _license[] SEC("license") = "GPL";
#define SG_CHAIN 0x01UL
#define SG_END 0x02UL
-struct scatterlist {
- unsigned long page_link;
- unsigned int offset;
- unsigned int length;
-};
-
#define sg_is_chain(sg) ((sg)->page_link & SG_CHAIN)
#define sg_is_last(sg) ((sg)->page_link & SG_END)
#define sg_chain_ptr(sg) \
@@ -80,7 +73,7 @@ int BPF_KPROBE(trace_virtqueue_add_sgs, void *unused, struct scatterlist **sgs,
__sink(out_sgs);
for (n = 0, sgp = get_sgp(sgs, i); sgp && (n < SG_MAX);
sgp = __sg_next(sgp)) {
- bpf_probe_read_kernel(&len, sizeof(len), &sgp->length);
+ len = BPF_CORE_READ(sgp, length);
length1 += len;
n++;
}
@@ -90,7 +83,7 @@ int BPF_KPROBE(trace_virtqueue_add_sgs, void *unused, struct scatterlist **sgs,
__sink(in_sgs);
for (n = 0, sgp = get_sgp(sgs, i); sgp && (n < SG_MAX);
sgp = __sg_next(sgp)) {
- bpf_probe_read_kernel(&len, sizeof(len), &sgp->length);
+ len = BPF_CORE_READ(sgp, length);
length2 += len;
n++;
}
diff --git a/tools/testing/selftests/bpf/progs/test_overhead.c b/tools/testing/selftests/bpf/progs/test_overhead.c
index abb7344b531f..5edf3cdc213d 100644
--- a/tools/testing/selftests/bpf/progs/test_overhead.c
+++ b/tools/testing/selftests/bpf/progs/test_overhead.c
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2019 Facebook */
-#include <stdbool.h>
-#include <stddef.h>
-#include <linux/bpf.h>
-#include <linux/ptrace.h>
+#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
--
2.43.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v2] selftests/bpf: Use vmlinux.h for BPF programs
2025-08-18 4:30 [PATCH bpf-next v2] selftests/bpf: Use vmlinux.h for BPF programs Hengqi Chen
@ 2025-08-20 21:49 ` Andrii Nakryiko
2025-08-21 1:35 ` Hengqi Chen
0 siblings, 1 reply; 3+ messages in thread
From: Andrii Nakryiko @ 2025-08-20 21:49 UTC (permalink / raw)
To: Hengqi Chen; +Cc: bpf, ast, daniel, andrii, martin.lau
On Sun, Aug 17, 2025 at 11:31 PM Hengqi Chen <hengqi.chen@gmail.com> wrote:
>
> Some of the bpf test progs still use linux/libc headers.
> Let's use vmlinux.h instead like the rest of test progs.
> This will also ease cross compiling.
>
> Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
> ---
> tools/testing/selftests/bpf/progs/loop1.c | 7 +------
> tools/testing/selftests/bpf/progs/loop2.c | 7 +------
> tools/testing/selftests/bpf/progs/loop3.c | 7 +------
> tools/testing/selftests/bpf/progs/loop6.c | 15 ++++-----------
> tools/testing/selftests/bpf/progs/test_overhead.c | 5 +----
> 5 files changed, 8 insertions(+), 33 deletions(-)
>
I'm getting this:
progs/loop6.c:58:5: error: redefinition of 'config' as different kind of symbol
58 | int config = 0;
| CLNG-BPF [test_progs] sock_addr_kern.bpf.o
^
/data/users/andriin/linux/tools/testing/selftests/bpf/tools/include/vmlinux.h:71906:25:
note: previous definition is here
71906 | typedef struct config_s config;
| ^
progs/loop6.c:69:6: error: unexpected type name 'config': expected expression
69 | if (config != 0)
| ^
CLNG-BPF [test_progs] sock_destroy_prog.bpf.o
progs/loop6.c:92:9: error: expected identifier or '('
92 | config = 1;
| ^
So let's rename a too generically named variable?
pw-bot: cr
[...]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v2] selftests/bpf: Use vmlinux.h for BPF programs
2025-08-20 21:49 ` Andrii Nakryiko
@ 2025-08-21 1:35 ` Hengqi Chen
0 siblings, 0 replies; 3+ messages in thread
From: Hengqi Chen @ 2025-08-21 1:35 UTC (permalink / raw)
To: Andrii Nakryiko; +Cc: bpf, ast, daniel, andrii, martin.lau
On Thu, Aug 21, 2025 at 5:49 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Sun, Aug 17, 2025 at 11:31 PM Hengqi Chen <hengqi.chen@gmail.com> wrote:
> >
> > Some of the bpf test progs still use linux/libc headers.
> > Let's use vmlinux.h instead like the rest of test progs.
> > This will also ease cross compiling.
> >
> > Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
> > ---
> > tools/testing/selftests/bpf/progs/loop1.c | 7 +------
> > tools/testing/selftests/bpf/progs/loop2.c | 7 +------
> > tools/testing/selftests/bpf/progs/loop3.c | 7 +------
> > tools/testing/selftests/bpf/progs/loop6.c | 15 ++++-----------
> > tools/testing/selftests/bpf/progs/test_overhead.c | 5 +----
> > 5 files changed, 8 insertions(+), 33 deletions(-)
> >
>
> I'm getting this:
>
>
> progs/loop6.c:58:5: error: redefinition of 'config' as different kind of symbol
> 58 | int config = 0;
> | CLNG-BPF [test_progs] sock_addr_kern.bpf.o
> ^
> /data/users/andriin/linux/tools/testing/selftests/bpf/tools/include/vmlinux.h:71906:25:
> note: previous definition is here
> 71906 | typedef struct config_s config;
> | ^
> progs/loop6.c:69:6: error: unexpected type name 'config': expected expression
> 69 | if (config != 0)
> | ^
> CLNG-BPF [test_progs] sock_destroy_prog.bpf.o
> progs/loop6.c:92:9: error: expected identifier or '('
> 92 | config = 1;
> | ^
>
>
> So let's rename a too generically named variable?
>
OK. Will rename to `run_once` based on the context as AI suggested.
> pw-bot: cr
>
>
> [...]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-21 1:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-18 4:30 [PATCH bpf-next v2] selftests/bpf: Use vmlinux.h for BPF programs Hengqi Chen
2025-08-20 21:49 ` Andrii Nakryiko
2025-08-21 1:35 ` Hengqi Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).