Patch "selftests: forwarding: skip if kernel not support setting bridge fdb learning limit" 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: forwarding: skip if kernel not support setting bridge fdb learning limit

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-forwarding-skip-if-kernel-not-support-sett.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 a701d15869bc899c92c76581096e3ba6e5c4f972
Author: Hangbin Liu <liuhangbin@xxxxxxxxx>
Date:   Tue Jul 23 16:22:52 2024 +0800

    selftests: forwarding: skip if kernel not support setting bridge fdb learning limit
    
    [ Upstream commit 863ff546fb62a8fa75757a30794ab6ec6cc4bab7 ]
    
    If the testing kernel doesn't support setting fdb_max_learned or show
    fdb_n_learned, just skip it. Or we will get errors like
    
    ./bridge_fdb_learning_limit.sh: line 218: [: null: integer expression expected
    ./bridge_fdb_learning_limit.sh: line 225: [: null: integer expression expected
    
    Fixes: 6f84090333bb ("selftests: forwarding: bridge_fdb_learning_limit: Add a new selftest")
    Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxx>
    Acked-by: Nikolay Aleksandrov <razor@xxxxxxxxxxxxx>
    Reviewed-by: Johannes Nixdorf <jnixdorf-oss@xxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/net/forwarding/bridge_fdb_learning_limit.sh b/tools/testing/selftests/net/forwarding/bridge_fdb_learning_limit.sh
index 0760a34b71146..a21b7085da2e9 100755
--- a/tools/testing/selftests/net/forwarding/bridge_fdb_learning_limit.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_fdb_learning_limit.sh
@@ -178,6 +178,22 @@ fdb_del()
 	check_err $? "Failed to remove a FDB entry of type ${type}"
 }
 
+check_fdb_n_learned_support()
+{
+	if ! ip link help bridge 2>&1 | grep -q "fdb_max_learned"; then
+		echo "SKIP: iproute2 too old, missing bridge max learned support"
+		exit $ksft_skip
+	fi
+
+	ip link add dev br0 type bridge
+	local learned=$(fdb_get_n_learned)
+	ip link del dev br0
+	if [ "$learned" == "null" ]; then
+		echo "SKIP: kernel too old; bridge fdb_n_learned feature not supported."
+		exit $ksft_skip
+	fi
+}
+
 check_accounting_one_type()
 {
 	local type=$1 is_counted=$2 overrides_learned=$3
@@ -274,6 +290,8 @@ check_limit()
 	done
 }
 
+check_fdb_n_learned_support
+
 trap cleanup EXIT
 
 setup_prepare