[PATCH] selftests: net: forwarding: bridge_vlan_mcast: Allow default startup query interval to vary by HZ

[PATCH] selftests: net: forwarding: bridge_vlan_mcast: Allow default startup query interval to vary by HZ

[Jin Li]

The mcast_startup_query_interval default value is calculated as
125 * HZ / 4. With CONFIG_HZ=250, this results in 3124 instead of
3125 due to integer truncation. The test currently hardcodes 3125,
which fails on kernels built with CONFIG_HZ=250.

Allow a +/- 1 tolerance for the default value check to account for
this rounding, while still catching genuine regressions in the
default value.

Signed-off-by: Jin Li <jinli@lanxincomputing.com>
---
 tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
index c4cd2078a8db..e72680869721 100755
--- a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
@@ -383,7 +383,7 @@ vlmc_startup_query_test()
 
 	echo -n $goutput |
 		jq -e ".[].vlans[] | select(.vlan == 10 and \
-					    .mcast_startup_query_interval == 3125) " &>/dev/null
+                                           .mcast_startup_query_interval >= 3124 and .mcast_startup_query_interval <= 3126) " &>/dev/null
 	check_err $? "Wrong default mcast_startup_query_interval global vlan option value"
 	log_test "Vlan mcast_startup_query_interval global option default value"
 
-- 
2.53.0

Re: [PATCH] selftests: net: forwarding: bridge_vlan_mcast: Allow default startup query interval to vary by HZ

[Ido Schimmel]

Subject prefix should be "[PATCH net-next]" given that this never
worked. See:

https://docs.kernel.org/next/process/maintainer-netdev.html

On Fri, Oct 09, 2026 at 10:41:09AM +0000, Jin Li wrote:
> The mcast_startup_query_interval default value is calculated as
> 125 * HZ / 4. With CONFIG_HZ=250, this results in 3124 instead of
> 3125 due to integer truncation. The test currently hardcodes 3125,
> which fails on kernels built with CONFIG_HZ=250.
> 
> Allow a +/- 1 tolerance for the default value check to account for
> this rounding, while still catching genuine regressions in the
> default value.
> 
> Signed-off-by: Jin Li <jinli@lanxincomputing.com>
> ---
>  tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
> index c4cd2078a8db..e72680869721 100755
> --- a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
> +++ b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
> @@ -383,7 +383,7 @@ vlmc_startup_query_test()
>  
>  	echo -n $goutput |
>  		jq -e ".[].vlans[] | select(.vlan == 10 and \
> -					    .mcast_startup_query_interval == 3125) " &>/dev/null
> +                                           .mcast_startup_query_interval >= 3124 and .mcast_startup_query_interval <= 3126) " &>/dev/null

Maintain the same type of indentation (tabs) as the current line and
fold it:

diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
index c4cd2078a8db..c07c2af5df94 100755
--- a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
@@ -383,7 +383,8 @@ vlmc_startup_query_test()
 
 	echo -n $goutput |
 		jq -e ".[].vlans[] | select(.vlan == 10 and \
-					    .mcast_startup_query_interval == 3125) " &>/dev/null
+					    .mcast_startup_query_interval >= 3124 and \
+					    .mcast_startup_query_interval <= 3126) " &>/dev/null
 	check_err $? "Wrong default mcast_startup_query_interval global vlan option value"
 	log_test "Vlan mcast_startup_query_interval global option default value"