* [PATCH net] selftests: net: fix rps_default_mask with >32 CPUs
@ 2024-01-19 15:12 Jakub Kicinski
2024-01-19 21:07 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Kicinski @ 2024-01-19 15:12 UTC (permalink / raw)
To: davem
Cc: netdev, edumazet, pabeni, Jakub Kicinski, shuah, horms,
linux-kselftest
If there is more than 32 cpus the bitmask will start to contain
commas, leading to:
./rps_default_mask.sh: line 36: [: 00000000,00000000: integer expression expected
Remove the commas, bash doesn't interpret leading zeroes as oct
so that should be good enough.
Fixes: c12e0d5f267d ("self-tests: introduce self-tests for RPS default mask")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: shuah@kernel.org
CC: horms@kernel.org
CC: linux-kselftest@vger.kernel.org
---
tools/testing/selftests/net/rps_default_mask.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/testing/selftests/net/rps_default_mask.sh b/tools/testing/selftests/net/rps_default_mask.sh
index a26c5624429f..f8e786e220b6 100755
--- a/tools/testing/selftests/net/rps_default_mask.sh
+++ b/tools/testing/selftests/net/rps_default_mask.sh
@@ -33,6 +33,10 @@ chk_rps() {
rps_mask=$($cmd /sys/class/net/$dev_name/queues/rx-0/rps_cpus)
printf "%-60s" "$msg"
+
+ # In case there is more than 32 CPUs we need to remove commas from masks
+ rps_mask=${rps_mask/,}
+ expected_rps_mask=${expected_rps_mask/,}
if [ $rps_mask -eq $expected_rps_mask ]; then
echo "[ ok ]"
else
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] selftests: net: fix rps_default_mask with >32 CPUs
2024-01-19 15:12 [PATCH net] selftests: net: fix rps_default_mask with >32 CPUs Jakub Kicinski
@ 2024-01-19 21:07 ` Simon Horman
2024-01-19 22:49 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Simon Horman @ 2024-01-19 21:07 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, netdev, edumazet, pabeni, shuah, linux-kselftest
On Fri, Jan 19, 2024 at 07:12:48AM -0800, Jakub Kicinski wrote:
> If there is more than 32 cpus the bitmask will start to contain
> commas, leading to:
>
> ./rps_default_mask.sh: line 36: [: 00000000,00000000: integer expression expected
>
> Remove the commas, bash doesn't interpret leading zeroes as oct
> so that should be good enough.
>
> Fixes: c12e0d5f267d ("self-tests: introduce self-tests for RPS default mask")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: shuah@kernel.org
> CC: horms@kernel.org
> CC: linux-kselftest@vger.kernel.org
> ---
> tools/testing/selftests/net/rps_default_mask.sh | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tools/testing/selftests/net/rps_default_mask.sh b/tools/testing/selftests/net/rps_default_mask.sh
> index a26c5624429f..f8e786e220b6 100755
> --- a/tools/testing/selftests/net/rps_default_mask.sh
> +++ b/tools/testing/selftests/net/rps_default_mask.sh
> @@ -33,6 +33,10 @@ chk_rps() {
>
> rps_mask=$($cmd /sys/class/net/$dev_name/queues/rx-0/rps_cpus)
> printf "%-60s" "$msg"
> +
> + # In case there is more than 32 CPUs we need to remove commas from masks
> + rps_mask=${rps_mask/,}
> + expected_rps_mask=${expected_rps_mask/,}
Hi Jakub,
AFAIK this will only remove the first incidence of a comma.
So I'm assuming this breaks with >64 CPUs.
> if [ $rps_mask -eq $expected_rps_mask ]; then
> echo "[ ok ]"
> else
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-19 22:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-19 15:12 [PATCH net] selftests: net: fix rps_default_mask with >32 CPUs Jakub Kicinski
2024-01-19 21:07 ` Simon Horman
2024-01-19 22:49 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).