Commit e846fb5e authored by Joseph Huang's avatar Joseph Huang Committed by Jakub Kicinski
Browse files

net: bridge: mcast: Add offload failed mdb flag 



Add MDB_FLAGS_OFFLOAD_FAILED and MDB_PG_FLAGS_OFFLOAD_FAILED to indicate
that an attempt to offload the MDB entry to switchdev has failed.

Signed-off-by: default avatarJoseph Huang <Joseph.Huang@garmin.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20250411150323.1117797-2-Joseph.Huang@garmin.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1450e452

include/uapi/linux/if_bridge.h

+5 −4
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ struct br_mdb_entry { 
#define MDB_FLAGS_FAST_LEAVE		(1 << 1)

#define MDB_FLAGS_STAR_EXCL		(1 << 2)

#define MDB_FLAGS_BLOCKED		(1 << 3)

#define MDB_FLAGS_OFFLOAD_FAILED	(1 << 4)

	__u8 flags;

	__u16 vid;

	struct {

net/bridge/br_mdb.c

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ static void __mdb_entry_fill_flags(struct br_mdb_entry *e, unsigned char flags) 
		e->flags |= MDB_FLAGS_STAR_EXCL;

	if (flags & MDB_PG_FLAGS_BLOCKED)

		e->flags |= MDB_FLAGS_BLOCKED;

	if (flags & MDB_PG_FLAGS_OFFLOAD_FAILED)

		e->flags |= MDB_FLAGS_OFFLOAD_FAILED;

}



static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip,

net/bridge/br_private.h

+15 −5
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ struct net_bridge_fdb_flush_desc { 
#define MDB_PG_FLAGS_FAST_LEAVE		BIT(2)

#define MDB_PG_FLAGS_STAR_EXCL		BIT(3)

#define MDB_PG_FLAGS_BLOCKED		BIT(4)

#define MDB_PG_FLAGS_OFFLOAD_FAILED	BIT(5)



#define PG_SRC_ENT_LIMIT	32
@@ -1342,6 +1343,15 @@ br_multicast_ctx_matches_vlan_snooping(const struct net_bridge_mcast *brmctx) 


	return !!(vlan_snooping_enabled == br_multicast_ctx_is_vlan(brmctx));

}



static inline void

br_multicast_set_pg_offload_flags(struct net_bridge_port_group *p,

				  bool offloaded)

{

	p->flags &= ~(MDB_PG_FLAGS_OFFLOAD | MDB_PG_FLAGS_OFFLOAD_FAILED);

	p->flags |= (offloaded ? MDB_PG_FLAGS_OFFLOAD :

		MDB_PG_FLAGS_OFFLOAD_FAILED);

}

#else

static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx,

				   struct net_bridge_mcast_port **pmctx,

net/bridge/br_switchdev.c

+5 −4
Original line number Diff line number Diff line
@@ -505,8 +505,8 @@ static void br_switchdev_mdb_complete(struct net_device *dev, int err, void *pri 
	struct net_bridge_port *port = data->port;

	struct net_bridge *br = port->br;



	if (err)

		goto err;

	if (err == -EOPNOTSUPP)

		goto out_free;



	spin_lock_bh(&br->multicast_lock);

	mp = br_mdb_ip_get(br, &data->ip);
@@ -516,11 +516,12 @@ static void br_switchdev_mdb_complete(struct net_device *dev, int err, void *pri 
	     pp = &p->next) {

		if (p->key.port != port)

			continue;

		p->flags |= MDB_PG_FLAGS_OFFLOAD;



		br_multicast_set_pg_offload_flags(p, !err);

	}

out:

	spin_unlock_bh(&br->multicast_lock);

err:

out_free:

	kfree(priv);

}