Patch "selftests/bpf: Fix error failure of case test_xdp_adjust_tail_grow" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/bpf: Fix error failure of case test_xdp_adjust_tail_grow

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-bpf-fix-error-failure-of-case-test_xdp_adj.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit ad8ca1ce062a39eb83a7820a302cffd4b14ce828
Author: Xu Kuohai <xukuohai@xxxxxxxxxx>
Date:   Tue Oct 11 08:01:07 2022 -0400

    selftests/bpf: Fix error failure of case test_xdp_adjust_tail_grow
    
    [ Upstream commit 4abdb1d5b250df4b5b3afd394d5e2fa516064c04 ]
    
    test_xdp_adjust_tail_grow failed with ipv6:
      test_xdp_adjust_tail_grow:FAIL:ipv6 unexpected error: -28 (errno 28)
    
    The reason is that this test case tests ipv4 before ipv6, and when ipv4
    test finished, topts.data_size_out was set to 54, which is smaller than the
    ipv6 output data size 114, so ipv6 test fails with NOSPC error.
    
    Fix it by reset topts.data_size_out to sizeof(buf) before testing ipv6.
    
    Fixes: 04fcb5f9a104 ("selftests/bpf: Migrate from bpf_prog_test_run")
    Signed-off-by: Xu Kuohai <xukuohai@xxxxxxxxxx>
    Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
    Acked-by: Martin KaFai Lau <martin.lau@xxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20221011120108.782373-6-xukuohai@xxxxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
index 9b9cf8458adf..009ee37607df 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
@@ -63,6 +63,7 @@ static void test_xdp_adjust_tail_grow(void)
 	expect_sz = sizeof(pkt_v6) + 40; /* Test grow with 40 bytes */
 	topts.data_in = &pkt_v6;
 	topts.data_size_in = sizeof(pkt_v6);
+	topts.data_size_out = sizeof(buf);
 	err = bpf_prog_test_run_opts(prog_fd, &topts);
 	ASSERT_OK(err, "ipv6");
 	ASSERT_EQ(topts.retval, XDP_TX, "ipv6 retval");