Patch "selftests: udpgro: no need to load xdp for gro" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    selftests: udpgro: no need to load xdp for gro

to the 6.10-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-udpgro-no-need-to-load-xdp-for-gro.patch
and it can be found in the queue-6.10 subdirectory.

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



commit 33efe9cbe41850fe89a226ed16c07525c810c2ad
Author: Hangbin Liu <liuhangbin@xxxxxxxxx>
Date:   Thu Aug 15 15:59:51 2024 +0800

    selftests: udpgro: no need to load xdp for gro
    
    [ Upstream commit d7818402b1d80347c764001583f6d63fa68c2e1a ]
    
    After commit d7db7775ea2e ("net: veth: do not manipulate GRO when using
    XDP"), there is no need to load XDP program to enable GRO. On the other
    hand, the current test is failed due to loading the XDP program. e.g.
    
     # selftests: net: udpgro.sh
     # ipv4
     #  no GRO              ok
     #  no GRO chk cmsg     ok
     #  GRO                 ./udpgso_bench_rx: recv: bad packet len, got 1472, expected 14720
     #
     # failed
    
     [...]
    
     #  bad GRO lookup      ok
     #  multiple GRO socks  ./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520
     #
     # ./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520
     #
     # failed
     ok 1 selftests: net: udpgro.sh
    
    After fix, all the test passed.
    
     # ./udpgro.sh
     ipv4
      no GRO                                  ok
      [...]
      multiple GRO socks                      ok
    
    Fixes: d7db7775ea2e ("net: veth: do not manipulate GRO when using XDP")
    Reported-by: Yi Chen <yiche@xxxxxxxxxx>
    Closes: https://issues.redhat.com/browse/RHEL-53858
    Reviewed-by: Toke Høiland-Jørgensen <toke@xxxxxxxxxx>
    Acked-by: Paolo Abeni <pabeni@xxxxxxxxxx>
    Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/net/udpgro.sh b/tools/testing/selftests/net/udpgro.sh
index 4659cf01e4384..d5ffd8c9172e1 100755
--- a/tools/testing/selftests/net/udpgro.sh
+++ b/tools/testing/selftests/net/udpgro.sh
@@ -7,8 +7,6 @@ source net_helper.sh
 
 readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"
 
-BPF_FILE="xdp_dummy.bpf.o"
-
 # set global exit status, but never reset nonzero one.
 check_err()
 {
@@ -38,7 +36,7 @@ cfg_veth() {
 	ip -netns "${PEER_NS}" addr add dev veth1 192.168.1.1/24
 	ip -netns "${PEER_NS}" addr add dev veth1 2001:db8::1/64 nodad
 	ip -netns "${PEER_NS}" link set dev veth1 up
-	ip -n "${PEER_NS}" link set veth1 xdp object ${BPF_FILE} section xdp
+	ip netns exec "${PEER_NS}" ethtool -K veth1 gro on
 }
 
 run_one() {
@@ -206,11 +204,6 @@ run_all() {
 	return $ret
 }
 
-if [ ! -f ${BPF_FILE} ]; then
-	echo "Missing ${BPF_FILE}. Run 'make' first"
-	exit -1
-fi
-
 if [[ $# -eq 0 ]]; then
 	run_all
 elif [[ $1 == "__subprocess" ]]; then