Skip to contentSkip to conversation

selftests: forwarding: Locked bridge port fixes

PATCH Applied Ido Schimmel 4 participants 6 messages Mar 21, 2022 – Mar 22, 2022

Subsystems (4)
lore
Share & tools
lore

Ido Schimmel

author maintainer
#0 lore raw

cover selftests: forwarding: Locked bridge port fixes

Two fixes for the locked bridge port selftest.

Ido Schimmel (2):
selftests: forwarding: Disable learning before link up
selftests: forwarding: Use same VRF for port and VLAN upper

 .../selftests/net/forwarding/bridge_locked_port.sh   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
Signature · 1 line
2.33.1
author maintainer
#1 lore raw

PATCH 1/2 selftests: forwarding: Disable learning before link up

Disable learning before bringing the bridge port up in order to avoid the FDB being populated and the test failing.

Before:

 # ./bridge_locked_port.sh
 RTNETLINK answers: File exists
 TEST: Locked port ipv4                                              [FAIL]
         Ping worked after locking port, but before adding FDB entry
 TEST: Locked port ipv6                                              [ OK ]
 TEST: Locked port vlan                                              [ OK ]

After:

 # ./bridge_locked_port.sh
 TEST: Locked port ipv4                                              [ OK ]
 TEST: Locked port ipv6                                              [ OK ]
 TEST: Locked port vlan                                              [ OK ]
Fixes b2b681a41251 ("selftests: forwarding: tests of locked port feature")
---
 tools/testing/selftests/net/forwarding/bridge_locked_port.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/forwarding/bridge_locked_port.sh +2 -2
index 6e98efa6d371..67ce59bb3555 100755
@@ -41,11 +41,11 @@ switch_create()
 	ip link set dev $swp1 master br0
 	ip link set dev $swp2 master br0
 
+	bridge link set dev $swp1 learning off
+
 	ip link set dev br0 up
 	ip link set dev $swp1 up
 	ip link set dev $swp2 up
-
-	bridge link set dev $swp1 learning off
 }
 
 switch_destroy()
Signature · 1 line
2.33.1
author maintainer
#2 lore raw

PATCH 2/2 selftests: forwarding: Use same VRF for port and VLAN upper

In reply to Ido Schimmel

The test creates a separate VRF for the VLAN upper, but does not destroy it during cleanup, resulting in "RTNETLINK answers: File exists" errors.

Fix by using the same VRF for the port and its VLAN upper. This is OK since their IP addresses do not overlap.

Before:

 # ./bridge_locked_port.sh
 TEST: Locked port ipv4                                              [ OK ]
 TEST: Locked port ipv6                                              [ OK ]
 TEST: Locked port vlan                                              [ OK ]
 # ./bridge_locked_port.sh
 RTNETLINK answers: File exists
 RTNETLINK answers: File exists
 RTNETLINK answers: File exists
 RTNETLINK answers: File exists
 RTNETLINK answers: File exists
 RTNETLINK answers: File exists
 TEST: Locked port ipv4                                              [ OK ]
 TEST: Locked port ipv6                                              [ OK ]
 TEST: Locked port vlan                                              [ OK ]

After:

 # ./bridge_locked_port.sh
 TEST: Locked port ipv4                                              [ OK ]
 TEST: Locked port ipv6                                              [ OK ]
 TEST: Locked port vlan                                              [ OK ]
 # ./bridge_locked_port.sh
 TEST: Locked port ipv4                                              [ OK ]
 TEST: Locked port ipv6                                              [ OK ]
 TEST: Locked port vlan                                              [ OK ]
Fixes b2b681a41251 ("selftests: forwarding: tests of locked port feature")
---
 .../selftests/net/forwarding/bridge_locked_port.sh        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
tools/testing/selftests/net/forwarding/bridge_locked_port.sh +2 -6
index 67ce59bb3555..5b02b6b60ce7 100755
@@ -9,9 +9,7 @@ source lib.sh
 h1_create()
 {
 	simple_if_init $h1 192.0.2.1/24 2001:db8:1::1/64
-	vrf_create "vrf-vlan-h1"
-	ip link set dev vrf-vlan-h1 up
-	vlan_create $h1 100 vrf-vlan-h1 198.51.100.1/24
+	vlan_create $h1 100 v$h1 198.51.100.1/24
 }
 
 h1_destroy()
@@ -23,9 +21,7 @@ h1_destroy()
 h2_create()
 {
 	simple_if_init $h2 192.0.2.2/24 2001:db8:1::2/64
-	vrf_create "vrf-vlan-h2"
-	ip link set dev vrf-vlan-h2 up
-	vlan_create $h2 100 vrf-vlan-h2 198.51.100.2/24
+	vlan_create $h2 100 v$h2 198.51.100.2/24
 }
 
 h2_destroy()
Signature · 1 line
2.33.1
#3 lore raw
In reply to Ido Schimmel
Quoted 1 line · Ido Schimmel

Two fixes for the locked bridge port selftest.

Jakub, I'm aware that net-next is closed, but these are fixes for code in net-next. If you prefer, I can resubmit later this week after you merge master to net.

maintainer
#4 lore raw
Quoted 6 lines · On Mon, 21 Mar 2022 19:53:55 +0200 Ido Schimmel wrote:
Quoted 1 line · Ido Schimmel

Two fixes for the locked bridge port selftest.

Jakub, I'm aware that net-next is closed, but these are fixes for code in net-next. If you prefer, I can resubmit later this week after you merge master to net.

That's perfectly fine, I guess saying "net-next is closed" wasn't very accurate on my side. It's still open for fixes.

#5 lore raw
In reply to Ido Schimmel
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:

Quoted 8 lines · On Mon, 21 Mar 2022 19:51:00 +0200 you wrote:

Two fixes for the locked bridge port selftest.

Ido Schimmel (2):
selftests: forwarding: Disable learning before link up
selftests: forwarding: Use same VRF for port and VLAN upper

 .../selftests/net/forwarding/bridge_locked_port.sh   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Here is the summary with links:
- [net-next,1/2] selftests: forwarding: Disable learning before link up

    https://git.kernel.org/netdev/net-next/c/917b149ac3d5
  - [net-next,2/2] selftests: forwarding: Use same VRF for port and VLAN upper
    https://git.kernel.org/netdev/net-next/c/f70f5f1a8fff

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html