On Mon, May 1, 2023 at 5:52 PM Daniel Rosenberg <drosen@xxxxxxxxxx> wrote:
>
> bpf_dynptr_slice(_rw) no longer requires a buffer for verification. If the
> buffer is needed, but not present, the function will return NULL.
>
> Signed-off-by: Daniel Rosenberg <drosen@xxxxxxxxxx>
> ---
> tools/testing/selftests/bpf/prog_tests/dynptr.c | 1 +
> .../selftests/bpf/progs/dynptr_success.c | 17 +++++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/dynptr.c b/tools/testing/selftests/bpf/prog_tests/dynptr.c
> index d176c34a7d2e..ac1fcaddcddf 100644
> --- a/tools/testing/selftests/bpf/prog_tests/dynptr.c
> +++ b/tools/testing/selftests/bpf/prog_tests/dynptr.c
> @@ -20,6 +20,7 @@ static struct {
> {"test_ringbuf", SETUP_SYSCALL_SLEEP},
> {"test_skb_readonly", SETUP_SKB_PROG},
> {"test_dynptr_skb_data", SETUP_SKB_PROG},
> + {"test_dynptr_skb_no_buff", SETUP_SKB_PROG},
> };
Please rebase and resubmit targeting bpf-next and with [PATCH bpf-next] subject.
It doesn't apply:
Using index info to reconstruct a base tree...
M tools/testing/selftests/bpf/prog_tests/dynptr.c
M tools/testing/selftests/bpf/progs/dynptr_success.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/progs/dynptr_success.c
CONFLICT (content): Merge conflict in
tools/testing/selftests/bpf/progs/dynptr_success.c
Auto-merging tools/testing/selftests/bpf/prog_tests/dynptr.c
CONFLICT (content): Merge conflict in
tools/testing/selftests/bpf/prog_tests/dynptr.c
error: Failed to merge in the changes.
Patch failed at 0002 selftests/bpf: Test allowing NULL buffer in dynptr slice
