Patch "selftests/bpf: Fix up xdp bonding test wrt feature flags" has been added to the 6.6-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 up xdp bonding test wrt feature flags

to the 6.6-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-up-xdp-bonding-test-wrt-feature-fl.patch
and it can be found in the queue-6.6 subdirectory.

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



commit a6f152df2cbde8b259fc235abb95ac01b2bb7d30
Author: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Date:   Tue Mar 5 10:08:29 2024 +0100

    selftests/bpf: Fix up xdp bonding test wrt feature flags
    
    [ Upstream commit 0bfc0336e1348883fdab4689f0c8c56458f36dd8 ]
    
    Adjust the XDP feature flags for the bond device when no bond slave
    devices are attached. After 9b0ed890ac2a ("bonding: do not report
    NETDEV_XDP_ACT_XSK_ZEROCOPY"), the empty bond device must report 0
    as flags instead of NETDEV_XDP_ACT_MASK.
    
      # ./vmtest.sh -- ./test_progs -t xdp_bond
      [...]
      [    3.983311] bond1 (unregistering): (slave veth1_1): Releasing backup interface
      [    3.995434] bond1 (unregistering): Released all slaves
      [    4.022311] bond2: (slave veth2_1): Releasing backup interface
      #507/1   xdp_bonding/xdp_bonding_attach:OK
      #507/2   xdp_bonding/xdp_bonding_nested:OK
      #507/3   xdp_bonding/xdp_bonding_features:OK
      #507/4   xdp_bonding/xdp_bonding_roundrobin:OK
      #507/5   xdp_bonding/xdp_bonding_activebackup:OK
      #507/6   xdp_bonding/xdp_bonding_xor_layer2:OK
      #507/7   xdp_bonding/xdp_bonding_xor_layer23:OK
      #507/8   xdp_bonding/xdp_bonding_xor_layer34:OK
      #507/9   xdp_bonding/xdp_bonding_redirect_multi:OK
      #507     xdp_bonding:OK
      Summary: 1/9 PASSED, 0 SKIPPED, 0 FAILED
      [    4.185255] bond2 (unregistering): Released all slaves
      [...]
    
    Fixes: 9b0ed890ac2a ("bonding: do not report NETDEV_XDP_ACT_XSK_ZEROCOPY")
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Reviewed-by: Toke Høiland-Jørgensen <toke@xxxxxxxxxx>
    Message-ID: <20240305090829.17131-2-daniel@xxxxxxxxxxxxx>
    Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_bonding.c b/tools/testing/selftests/bpf/prog_tests/xdp_bonding.c
index c3b45745cbccd..6d8b54124cb35 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_bonding.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_bonding.c
@@ -511,7 +511,7 @@ static void test_xdp_bonding_features(struct skeletons *skeletons)
 	if (!ASSERT_OK(err, "bond bpf_xdp_query"))
 		goto out;
 
-	if (!ASSERT_EQ(query_opts.feature_flags, NETDEV_XDP_ACT_MASK,
+	if (!ASSERT_EQ(query_opts.feature_flags, 0,
 		       "bond query_opts.feature_flags"))
 		goto out;
 
@@ -601,7 +601,7 @@ static void test_xdp_bonding_features(struct skeletons *skeletons)
 	if (!ASSERT_OK(err, "bond bpf_xdp_query"))
 		goto out;
 
-	ASSERT_EQ(query_opts.feature_flags, NETDEV_XDP_ACT_MASK,
+	ASSERT_EQ(query_opts.feature_flags, 0,
 		  "bond query_opts.feature_flags");
 out:
 	bpf_link__destroy(link);