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: Joseph Huang <Joseph.Huang@garmin.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20250411150323.1117797-2-Joseph.Huang@garmin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index a5b743a2f77500238b0dfe0f919284dabd671581..f2a6de424f3f9dc3390c5f68aabe4d623b198453 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -699,10 +699,11 @@ struct br_mdb_entry {
 #define MDB_TEMPORARY 0
 #define MDB_PERMANENT 1
        __u8 state;
-#define MDB_FLAGS_OFFLOAD      (1 << 0)
-#define MDB_FLAGS_FAST_LEAVE   (1 << 1)
-#define MDB_FLAGS_STAR_EXCL    (1 << 2)
-#define MDB_FLAGS_BLOCKED      (1 << 3)
+#define MDB_FLAGS_OFFLOAD              (1 << 0)
+#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 {

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 722203b98ff7483d6d69a5ecee9ecbcafd53e1c1..aac96bf4ba44af555fc9107307c01599e26a0ddc 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -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,

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index d5b3c5936a79e1c6b52b51e53c34cd1af6bfa1f9..d9b8ed316040db17d7920f175484971e1bdf91b2 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -306,11 +306,12 @@ struct net_bridge_fdb_flush_desc {
        u16                             vlan_id;
 };
 
-#define MDB_PG_FLAGS_PERMANENT BIT(0)
-#define MDB_PG_FLAGS_OFFLOAD   BIT(1)
-#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_PERMANENT         BIT(0)
+#define MDB_PG_FLAGS_OFFLOAD           BIT(1)
+#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,

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 7b41ee8740cbbaf6b959d9273c49ebcd4830a5c8..2d769ef3cb8ac0ee9a0ae28b1faa13870aa53d7d 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -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);
 }