diff mbox series

[net] selftests: Fix failing VXLAN VNI filtering test

Message ID 20230207141819.256689-1-idosch@nvidia.com (mailing list archive)
State Accepted
Commit b963d9d5b9437a6b99504987310f98537c9e77d4
Delegated to: Netdev Maintainers
Headers show
Series [net] selftests: Fix failing VXLAN VNI filtering test | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/fixes_present success Fixes tag present in non-next series
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 2 maintainers not CCed: linux-kselftest@vger.kernel.org shuah@kernel.org
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success net selftest script(s) already in Makefile
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: line length of 90 exceeds 80 columns WARNING: line length of 91 exceeds 80 columns
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Ido Schimmel Feb. 7, 2023, 2:18 p.m. UTC
iproute2 does not recognize the "group6" and "remote6" keywords. Fix by
using "group" and "remote" instead.

Before:

 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  25
 Tests failed:   2

After:

 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  27
 Tests failed:   0

Fixes: 3edf5f66c12a ("selftests: add new tests for vxlan vnifiltering")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 .../selftests/net/test_vxlan_vnifiltering.sh   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

Comments

Alexander H Duyck Feb. 8, 2023, 5:13 p.m. UTC | #1
On Tue, 2023-02-07 at 16:18 +0200, Ido Schimmel wrote:
> iproute2 does not recognize the "group6" and "remote6" keywords. Fix by
> using "group" and "remote" instead.
> 
> Before:
> 
>  # ./test_vxlan_vnifiltering.sh
>  [...]
>  Tests passed:  25
>  Tests failed:   2
> 
> After:
> 
>  # ./test_vxlan_vnifiltering.sh
>  [...]
>  Tests passed:  27
>  Tests failed:   0
> 
> Fixes: 3edf5f66c12a ("selftests: add new tests for vxlan vnifiltering")
> Signed-off-by: Ido Schimmel <idosch@nvidia.com>

Looks good to me. From what I can tell the group6/remote6 stuff does
apply to the ip link VXLAN stuff but doesn't apply the VNI stuff for
the bridge. I'm suspecting that may be where they picked it up from.

Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
patchwork-bot+netdevbpf@kernel.org Feb. 9, 2023, 1 a.m. UTC | #2
Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue,  7 Feb 2023 16:18:19 +0200 you wrote:
> iproute2 does not recognize the "group6" and "remote6" keywords. Fix by
> using "group" and "remote" instead.
> 
> Before:
> 
>  # ./test_vxlan_vnifiltering.sh
>  [...]
>  Tests passed:  25
>  Tests failed:   2
> 
> [...]

Here is the summary with links:
  - [net] selftests: Fix failing VXLAN VNI filtering test
    https://git.kernel.org/netdev/net/c/b963d9d5b943

You are awesome, thank you!
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/test_vxlan_vnifiltering.sh b/tools/testing/selftests/net/test_vxlan_vnifiltering.sh
index 704997ffc244..8c3ac0a72545 100755
--- a/tools/testing/selftests/net/test_vxlan_vnifiltering.sh
+++ b/tools/testing/selftests/net/test_vxlan_vnifiltering.sh
@@ -293,19 +293,11 @@  setup-vm() {
 	elif [[ -n $vtype && $vtype == "vnifilterg" ]]; then
 	   # Add per vni group config with 'bridge vni' api
 	   if [ -n "$group" ]; then
-	      if [ "$family" == "v4" ]; then
-		 if [ $mcast -eq 1 ]; then
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid group $group
-		 else
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid remote $group
-		 fi
-	      else
-		 if [ $mcast -eq 1 ]; then
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid group6 $group
-		 else
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid remote6 $group
-		 fi
-	      fi
+		if [ $mcast -eq 1 ]; then
+			bridge -netns hv-$hvid vni add dev $vxlandev vni $tid group $group
+		else
+			bridge -netns hv-$hvid vni add dev $vxlandev vni $tid remote $group
+		fi
 	   fi
 	fi
 	done