selftests/bpf: Don't assume page size is 4096
Subsystems (3)
PATCH 1/1 selftests/bpf: Don't assume page size is 4096
The verifier test creates BPF ringbuf maps using hard-coded 4096 as max_entries. Some tests will fail if the page size of the running kernel is not 4096. Use getpagesize() instead.
--- tools/testing/selftests/bpf/test_verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_verifier.c +1 -1
@@ -1079,7 +1079,7 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, }if (*fixup_map_ringbuf) { map_fds[20 ] =create_map (BPF_MAP_TYPE_RINGBUF ,0 , -0 ,4096 ); +0 ,getpagesize ()); do { prog[*fixup_map_ringbuf].imm = map_fds[20]; fixup_map_ringbuf++;
--
2.31.1
Quoted 5 lines · Hengqi Chen
The verifier test creates BPF ringbuf maps using hard-coded 4096 as
max_entries. Some tests will fail if the page size of the running kernel is not 4096. Usegetpagesize()instead.Signed-off-by Hengqi Chen <[email protected]>
Can you share which platform that is? The fix seems ok, but I'm assuming that we have many more places where 4k is hardcoded :-)
Quoted 20 lines
--- tools/testing/selftests/bpf/test_verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/bpf/test_verifier.c +1
-1@@ -1079,7 +1079,7 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, }if (*fixup_map_ringbuf) { map_fds[20 ] =create_map (BPF_MAP_TYPE_RINGBUF ,0 , -0 ,4096 ); +0 ,getpagesize ()); do { prog[*fixup_map_ringbuf].imm = map_fds[20];fixup_map_ringbuf++;
--
2.31.1
Quoted 10 lines · Stanislav Fomichev
Quoted 5 lines · Hengqi Chen
The verifier test creates BPF ringbuf maps using hard-coded 4096 as
max_entries. Some tests will fail if the page size of the running kernel is not 4096. Usegetpagesize()instead.Signed-off-by Hengqi Chen <[email protected]>Can you share which platform that is? The fix seems ok, but I'm assuming that we have many more places where 4k is hardcoded :-)
We did have a bunch of fixes over time removing hard-coded page size usage, so there should be fewer such places than you might think :) But quick grepping for "4096" shows a bunch of matches. Not all of them are page size, but it would indeed be good to audit.
For now, I applied this patch, as it is correct and helps. Thanks!
Quoted 23 lines
Quoted 23 lines
--- tools/testing/selftests/bpf/test_verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/bpf/test_verifier.c +1
-1@@ -1079,7 +1079,7 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, }if (*fixup_map_ringbuf) { map_fds[20 ] =create_map (BPF_MAP_TYPE_RINGBUF ,0 , -0 ,4096 ); +0 ,getpagesize ()); do { prog[*fixup_map_ringbuf].imm = map_fds[20];fixup_map_ringbuf++;--
2.31.1
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 10 lines · On Sun, 26 Mar 2023 09:53:41 +0000 you wrote:
The verifier test creates BPF ringbuf maps using hard-coded 4096 as
max_entries. Some tests will fail if the page size of the running kernel is not 4096. Usegetpagesize()instead.Signed-off-by Hengqi Chen <[email protected]>--- tools/testing/selftests/bpf/test_verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)[...]
Here is the summary with links:
- [bpf-next] selftests/bpf: Don't assume page size is 4096
https://git.kernel.org/bpf/bpf-next/c/7283137a7622
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html