Skip to contentSkip to conversation

selftests: net: fix rps_default_mask with >32 CPUs

PATCH Superseded Jakub Kicinski 2 participants 3 messages Jan 20, 2024 – Jan 21, 2024

Subsystems (3)
Networking Network drivers Kselftest

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH v2 1/1 selftests: net: fix rps_default_mask with >32 CPUs

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 <[email protected]>

---
v2:
- remove all commas
v1: https://lore.kernel.org/all/[email protected]/

CC [email protected]
CC [email protected]
CC [email protected]
---
 tools/testing/selftests/net/rps_default_mask.sh | 4 ++++
 1 file changed, 4 insertions(+)
tools/testing/selftests/net/rps_default_mask.sh +4 -0
index a26c5624429f..4729e7026a73 100755
@@ -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
Signature · 1 line
2.43.0
reviewer Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines · Jakub Kicinski

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.

Quoted 6 lines
Fixes c12e0d5f267d ("self-tests: introduce self-tests for RPS default mask")
Signed-off-by Jakub Kicinski <[email protected]>

---
v2:
- remove all commas
v1: https://lore.kernel.org/all/[email protected]/

Thanks,

this version looks good to me.

Reviewed-by Simon Horman <[email protected]>
reviewer
#2 lore raw
Quoted 16 lines · Simon Horman
Quoted 8 lines · Jakub Kicinski

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.

Quoted 6 lines
Fixes c12e0d5f267d ("self-tests: introduce self-tests for RPS default mask")
Signed-off-by Jakub Kicinski <[email protected]>

---
v2:
- remove all commas
v1: https://lore.kernel.org/all/[email protected]/

Quoted 5 lines

Thanks,

this version looks good to me.

Reviewed-by Simon Horman <[email protected]>

Sorry, I may have been a bit hasty there.

When using bash the change seems to work just fine.

But when exercising this with dash I get:

sh: 10: Bad substitution