bpf: Fix error message on kfunc arg type mismatch

Browse source

When "arg#%d expected pointer to ctx, but got %s" error is printed, both
template parts actually point to the type of the argument, therefore, it
will also say "but got PTR", regardless of what was the actual register
type.

Fix the message to print the register type in the second part of the
template, change the existing test to adapt to the new format, and add a
new test to test the case when arg is a pointer to context, but reg is a
scalar.

Fixes: 00b85860fe ("bpf: Rewrite kfunc argument handling")
Signed-off-by: Maxim Mikityanskiy <maxim@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/bpf/20240909133909.1315460-1-maxim@isovalent.com

...

This commit is contained in:

Maxim Mikityanskiy 2024-09-09 16:39:09 +03:00 • committed by Andrii Nakryiko

parent f028d7716c

commit bee109b7b3

4 changed files with 11 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

kernel/bpf/verifier.c

View file

1

tools/testing/selftests/bpf/prog_tests/kfunc_call.c

View file

7

tools/testing/selftests/bpf/progs/kfunc_call_fail.c

View file

2

tools/testing/selftests/bpf/verifier/calls.c

View file