diff mbox series

[bpf-next] selftests/bpf: Don't assume page size is 4096

Message ID 20230326095341.816023-1-hengqi.chen@gmail.com (mailing list archive)
State Accepted
Commit 7283137a7622292076dd8b7f3b8b2bb203ce5a14
Delegated to: BPF
Headers show
Series [bpf-next] selftests/bpf: Don't assume page size is 4096 | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-34 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-35 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-8 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for test_maps on aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-11 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-13 success Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for test_progs on aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-16 success Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-18 success Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-19 success Logs for test_progs_no_alu32 on aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-21 success Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-23 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for test_progs_no_alu32_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-25 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-27 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-28 success Logs for test_progs_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-29 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-31 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-32 success Logs for test_verifier on aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-33 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 fail Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for test_maps on s390x with gcc
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 20 this patch: 20
netdev/cc_maintainers fail 14 maintainers not CCed: linux-kselftest@vger.kernel.org mykolal@fb.com andrii@kernel.org song@kernel.org shuah@kernel.org sdf@google.com haoluo@google.com yhs@fb.com daniel@iogearbox.net john.fastabend@gmail.com kpsingh@kernel.org jolsa@kernel.org martin.lau@linux.dev ast@kernel.org
netdev/build_clang success Errors and warnings before: 18 this patch: 18
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 20 this patch: 20
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-7 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-2 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-3 success Logs for build for aarch64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-5 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-6 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-4 success Logs for build for s390x with gcc

Commit Message

Hengqi Chen March 26, 2023, 9:53 a.m. UTC 
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.

Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
---
 tools/testing/selftests/bpf/test_verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.31.1

Comments

Stanislav Fomichev March 27, 2023, 4:37 p.m. UTC | #1 
On 03/26, Hengqi Chen 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. Use getpagesize() instead.

> Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>

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 :-)


> ---
>   tools/testing/selftests/bpf/test_verifier.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/tools/testing/selftests/bpf/test_verifier.c  
> b/tools/testing/selftests/bpf/test_verifier.c
> index 5b90eef09ade..e4657c5bc3f1 100644
> --- a/tools/testing/selftests/bpf/test_verifier.c
> +++ b/tools/testing/selftests/bpf/test_verifier.c
> @@ -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
Andrii Nakryiko March 27, 2023, 6:41 p.m. UTC | #2 
On Mon, Mar 27, 2023 at 9:37 AM Stanislav Fomichev <sdf@google.com> wrote:
>
> On 03/26, Hengqi Chen 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. Use getpagesize() instead.
>
> > Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
>
> 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!

>
>
> > ---
> >   tools/testing/selftests/bpf/test_verifier.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
>
> > diff --git a/tools/testing/selftests/bpf/test_verifier.c
> > b/tools/testing/selftests/bpf/test_verifier.c
> > index 5b90eef09ade..e4657c5bc3f1 100644
> > --- a/tools/testing/selftests/bpf/test_verifier.c
> > +++ b/tools/testing/selftests/bpf/test_verifier.c
> > @@ -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
patchwork-bot+netdevbpf@kernel.org March 27, 2023, 6:50 p.m. UTC | #3 
Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

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. Use getpagesize() instead.
> 
> Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
> ---
>  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!
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 5b90eef09ade..e4657c5bc3f1 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -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++;