[PATCH] net: bridge: fix switchdev host mdb entry updates

Felix Fietkau posted 1 patch 1 year, 5 months ago
net/bridge/br_switchdev.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
[PATCH] net: bridge: fix switchdev host mdb entry updates
Posted by Felix Fietkau 1 year, 5 months ago
When a mdb entry is removed, the bridge switchdev code can issue a
switchdev_port_obj_del call for a port that was not offloaded.

This leads to an imbalance in switchdev_port_obj_add/del calls, since
br_switchdev_mdb_replay has not been called for the port before.

This can lead to potential multicast forwarding issues and messages such as:
mt7915e 0000:01:00.0 wl1-ap0: Failed to del Host Multicast Database entry
	(object id=3) with error: -ENOENT (-2).

Fix this issue by checking the port offload status when iterating over
lower devs.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 net/bridge/br_switchdev.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 7b41ee8740cb..3490c3968638 100644
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -568,10 +568,18 @@ static void br_switchdev_host_mdb(struct net_device *dev,
 				  struct net_bridge_mdb_entry *mp, int type)
 {
 	struct net_device *lower_dev;
+	struct net_bridge_port *port;
 	struct list_head *iter;
 
-	netdev_for_each_lower_dev(dev, lower_dev, iter)
+	rcu_read_lock();
+	netdev_for_each_lower_dev(dev, lower_dev, iter) {
+		port = br_port_get_rcu(lower_dev);
+		if (!port || !port->offload_count)
+			continue;
+
 		br_switchdev_host_mdb_one(dev, lower_dev, mp, type);
+	}
+	rcu_read_unlock();
 }
 
 static int
-- 
2.46.0
Re: [PATCH] net: bridge: fix switchdev host mdb entry updates
Posted by Paolo Abeni 1 year, 5 months ago
Hi,

On 8/22/24 18:38, Felix Fietkau wrote:
> When a mdb entry is removed, the bridge switchdev code can issue a
> switchdev_port_obj_del call for a port that was not offloaded.
> 
> This leads to an imbalance in switchdev_port_obj_add/del calls, since
> br_switchdev_mdb_replay has not been called for the port before.
> 
> This can lead to potential multicast forwarding issues and messages such as:
> mt7915e 0000:01:00.0 wl1-ap0: Failed to del Host Multicast Database entry
> 	(object id=3) with error: -ENOENT (-2).
> 
> Fix this issue by checking the port offload status when iterating over
> lower devs.
> 
> Signed-off-by: Felix Fietkau <nbd@nbd.name>

This looks like a fix suitable for the net tree and deserving a fixes 
tag. Could you please repost adding both the target tree prefix and tag?

Thanks,

Paolo
Re: [PATCH] net: bridge: fix switchdev host mdb entry updates
Posted by Felix Fietkau 1 year, 5 months ago
On 27.08.24 13:03, Paolo Abeni wrote:
> Hi,
> 
> On 8/22/24 18:38, Felix Fietkau wrote:
>> When a mdb entry is removed, the bridge switchdev code can issue a
>> switchdev_port_obj_del call for a port that was not offloaded.
>> 
>> This leads to an imbalance in switchdev_port_obj_add/del calls, since
>> br_switchdev_mdb_replay has not been called for the port before.
>> 
>> This can lead to potential multicast forwarding issues and messages such as:
>> mt7915e 0000:01:00.0 wl1-ap0: Failed to del Host Multicast Database entry
>> 	(object id=3) with error: -ENOENT (-2).
>> 
>> Fix this issue by checking the port offload status when iterating over
>> lower devs.
>> 
>> Signed-off-by: Felix Fietkau <nbd@nbd.name>
> 
> This looks like a fix suitable for the net tree and deserving a fixes
> tag. Could you please repost adding both the target tree prefix and tag?

Looking at the code changes, I wasn't able to figure out which commit 
introduced the bug. Do you have any ideas what commit I could reference 
in the Fixes tag?

- Felix