[PATCH net v3 0/2] check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()

[PATCH net v3 0/2] check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()

[Liu Jian]

v2->v3: 
	Filter using vlan_hw_filter_capable().
	Add one basic test.

Liu Jian (2):
  net: check vlan filter feature in vlan_vids_add_by_dev() and
    vlan_vids_del_by_dev()
  selftests: add vlan hw filter tests

 net/8021q/vlan_core.c                         |  9 +++++-
 tools/testing/selftests/net/Makefile          |  1 +
 tools/testing/selftests/net/vlan_hw_filter.sh | 29 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100755 tools/testing/selftests/net/vlan_hw_filter.sh

-- 
2.34.1

[PATCH net v3 1/2] net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()

[Liu Jian]

I got the below warning trace:

WARNING: CPU: 4 PID: 4056 at net/core/dev.c:11066 unregister_netdevice_many_notify
CPU: 4 PID: 4056 Comm: ip Not tainted 6.7.0-rc4+ #15
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014
RIP: 0010:unregister_netdevice_many_notify+0x9a4/0x9b0
Call Trace:
 rtnl_dellink
 rtnetlink_rcv_msg
 netlink_rcv_skb
 netlink_unicast
 netlink_sendmsg
 __sock_sendmsg
 ____sys_sendmsg
 ___sys_sendmsg
 __sys_sendmsg
 do_syscall_64
 entry_SYSCALL_64_after_hwframe

It can be repoduced via:

    ip netns add ns1
    ip netns exec ns1 ip link add bond0 type bond mode 0
    ip netns exec ns1 ip link add bond_slave_1 type veth peer veth2
    ip netns exec ns1 ip link set bond_slave_1 master bond0
[1] ip netns exec ns1 ethtool -K bond0 rx-vlan-filter off
[2] ip netns exec ns1 ip link add link bond_slave_1 name bond_slave_1.0 type vlan id 0
[3] ip netns exec ns1 ip link add link bond0 name bond0.0 type vlan id 0
[4] ip netns exec ns1 ip link set bond_slave_1 nomaster
[5] ip netns exec ns1 ip link del veth2
    ip netns del ns1

This is all caused by command [1] turning off the rx-vlan-filter function
of bond0. The reason is the same as commit 01f4fd270870 ("bonding: Fix
incorrect deletion of ETH_P_8021AD protocol vid from slaves"). Commands
[2] [3] add the same vid to slave and master respectively, causing
command [4] to empty slave->vlan_info. The following command [5] triggers
this problem.

To fix this problem, we should add VLAN_FILTER feature checks in
vlan_vids_add_by_dev() and vlan_vids_del_by_dev() to prevent incorrect
addition or deletion of vlan_vid information.

Fixes: 348a1443cc43 ("vlan: introduce functions to do mass addition/deletion of vids by another device")
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
 net/8021q/vlan_core.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 0beb44f2fe1f..f00158234505 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -407,6 +407,8 @@ int vlan_vids_add_by_dev(struct net_device *dev,
 		return 0;
 
 	list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
+		if (!vlan_hw_filter_capable(by_dev, vid_info->proto))
+			continue;
 		err = vlan_vid_add(dev, vid_info->proto, vid_info->vid);
 		if (err)
 			goto unwind;
@@ -417,6 +419,8 @@ int vlan_vids_add_by_dev(struct net_device *dev,
 	list_for_each_entry_continue_reverse(vid_info,
 					     &vlan_info->vid_list,
 					     list) {
+		if (!vlan_hw_filter_capable(by_dev, vid_info->proto))
+			continue;
 		vlan_vid_del(dev, vid_info->proto, vid_info->vid);
 	}
 
@@ -436,8 +440,11 @@ void vlan_vids_del_by_dev(struct net_device *dev,
 	if (!vlan_info)
 		return;
 
-	list_for_each_entry(vid_info, &vlan_info->vid_list, list)
+	list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
+		if (!vlan_hw_filter_capable(by_dev, vid_info->proto))
+			continue;
 		vlan_vid_del(dev, vid_info->proto, vid_info->vid);
+	}
 }
 EXPORT_SYMBOL(vlan_vids_del_by_dev);
 
-- 
2.34.1

[PATCH net v3 2/2] selftests: add vlan hw filter tests

[Liu Jian]

Add one basic vlan hw filter test.

Signed-off-by: Liu Jian <liujian56@huawei.com>
---
 tools/testing/selftests/net/Makefile          |  1 +
 tools/testing/selftests/net/vlan_hw_filter.sh | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100755 tools/testing/selftests/net/vlan_hw_filter.sh

diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 5b2aca4c5f10..9e5bf59a20bf 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -91,6 +91,7 @@ TEST_PROGS += test_bridge_neigh_suppress.sh
 TEST_PROGS += test_vxlan_nolocalbypass.sh
 TEST_PROGS += test_bridge_backup_port.sh
 TEST_PROGS += fdb_flush.sh
+TEST_PROGS += vlan_hw_filter.sh
 
 TEST_FILES := settings
 
diff --git a/tools/testing/selftests/net/vlan_hw_filter.sh b/tools/testing/selftests/net/vlan_hw_filter.sh
new file mode 100755
index 000000000000..7bc804ffaf7c
--- /dev/null
+++ b/tools/testing/selftests/net/vlan_hw_filter.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+readonly NETNS="ns-$(mktemp -u XXXXXX)"
+
+ret=0
+
+cleanup() {
+	ip netns del $NETNS
+}
+
+trap cleanup EXIT
+
+fail() {
+    echo "ERROR: ${1:-unexpected return code} (ret: $_)" >&2
+    ret=1
+}
+
+ip netns add ${NETNS}
+ip netns exec ${NETNS} ip link add bond0 type bond mode 0
+ip netns exec ${NETNS} ip link add bond_slave_1 type veth peer veth2
+ip netns exec ${NETNS} ip link set bond_slave_1 master bond0
+ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter off
+ip netns exec ${NETNS} ip link add link bond_slave_1 name bond_slave_1.0 type vlan id 0
+ip netns exec ${NETNS} ip link add link bond0 name bond0.0 type vlan id 0
+ip netns exec ${NETNS} ip link set bond_slave_1 nomaster
+ip netns exec ${NETNS} ip link del veth2 || fail "Please check vlan HW filter function"
+
+exit $ret
-- 
2.34.1

Re: [PATCH net v3 2/2] selftests: add vlan hw filter tests

[Hangbin Liu]

On Sat, Dec 16, 2023 at 03:52:19PM +0800, Liu Jian wrote:
> Add one basic vlan hw filter test.
> 
> Signed-off-by: Liu Jian <liujian56@huawei.com>
> ---
>  tools/testing/selftests/net/Makefile          |  1 +
>  tools/testing/selftests/net/vlan_hw_filter.sh | 29 +++++++++++++++++++
>  2 files changed, 30 insertions(+)
>  create mode 100755 tools/testing/selftests/net/vlan_hw_filter.sh
> 
> diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
> index 5b2aca4c5f10..9e5bf59a20bf 100644
> --- a/tools/testing/selftests/net/Makefile
> +++ b/tools/testing/selftests/net/Makefile
> @@ -91,6 +91,7 @@ TEST_PROGS += test_bridge_neigh_suppress.sh
>  TEST_PROGS += test_vxlan_nolocalbypass.sh
>  TEST_PROGS += test_bridge_backup_port.sh
>  TEST_PROGS += fdb_flush.sh
> +TEST_PROGS += vlan_hw_filter.sh
>  
>  TEST_FILES := settings
>  
> diff --git a/tools/testing/selftests/net/vlan_hw_filter.sh b/tools/testing/selftests/net/vlan_hw_filter.sh
> new file mode 100755
> index 000000000000..7bc804ffaf7c
> --- /dev/null
> +++ b/tools/testing/selftests/net/vlan_hw_filter.sh
> @@ -0,0 +1,29 @@
> +#!/bin/sh
> +# SPDX-License-Identifier: GPL-2.0
> +
> +readonly NETNS="ns-$(mktemp -u XXXXXX)"
> +
> +ret=0
> +
> +cleanup() {
> +	ip netns del $NETNS
> +}
> +
> +trap cleanup EXIT
> +
> +fail() {
> +    echo "ERROR: ${1:-unexpected return code} (ret: $_)" >&2
> +    ret=1
> +}
> +
> +ip netns add ${NETNS}
> +ip netns exec ${NETNS} ip link add bond0 type bond mode 0
> +ip netns exec ${NETNS} ip link add bond_slave_1 type veth peer veth2
> +ip netns exec ${NETNS} ip link set bond_slave_1 master bond0
> +ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter off
> +ip netns exec ${NETNS} ip link add link bond_slave_1 name bond_slave_1.0 type vlan id 0
> +ip netns exec ${NETNS} ip link add link bond0 name bond0.0 type vlan id 0
> +ip netns exec ${NETNS} ip link set bond_slave_1 nomaster
> +ip netns exec ${NETNS} ip link del veth2 || fail "Please check vlan HW filter function"
> +
> +exit $ret
> -- 
> 2.34.1
> 

Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>

Thanks
Hangbin

Re: [PATCH net v3 0/2] check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Sat, 16 Dec 2023 15:52:17 +0800 you wrote:
> v2->v3:
> 	Filter using vlan_hw_filter_capable().
> 	Add one basic test.
> 
> Liu Jian (2):
>   net: check vlan filter feature in vlan_vids_add_by_dev() and
>     vlan_vids_del_by_dev()
>   selftests: add vlan hw filter tests
> 
> [...]

Here is the summary with links:
  - [net,v3,1/2] net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()
    https://git.kernel.org/netdev/net/c/01a564bab487
  - [net,v3,2/2] selftests: add vlan hw filter tests
    https://git.kernel.org/netdev/net/c/2258b666482d

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html