net: bridge: mcast: add delete due to fast-leave mdb flag

In user-space there's no way to distinguish why an mdb entry was deleted
and that is a problem for daemons which would like to keep the mdb in
sync with remote ends (e.g. mlag) but would also like to converge faster.
In almost all cases we'd like to age-out the remote entry for performance
and convergence reasons except when fast-leave is enabled. In that case we
want explicit immediate remote delete, thus add mdb flag which is set only
when the entry is being deleted due to fast-leave.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 773e476a8e5465d12e662d8efe37bc06f0b51279..1b3c2b643a02e611a8e45dadc46db1ef688a5dd9 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -237,6 +237,7 @@ struct br_mdb_entry {
 #define MDB_PERMANENT 1
        __u8 state;
 #define MDB_FLAGS_OFFLOAD      (1 << 0)
+#define MDB_FLAGS_FAST_LEAVE   (1 << 1)
        __u8 flags;
        __u16 vid;
        struct {

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index bf6acd34234daa8a1da4aff928c169837bcf58c1..428af1abf8cc66c4753b183026b1be040b5a32e2 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -60,6 +60,8 @@ static void __mdb_entry_fill_flags(struct br_mdb_entry *e, unsigned char flags)
        e->flags = 0;
        if (flags & MDB_PG_FLAGS_OFFLOAD)
                e->flags |= MDB_FLAGS_OFFLOAD;
+       if (flags & MDB_PG_FLAGS_FAST_LEAVE)
+               e->flags |= MDB_FLAGS_FAST_LEAVE;
 }
 
 static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 3d8deac2353d045964c52981a1eaac96d6f23025..3d4b2817687f6b6a93694aa7d537d2989858955f 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1393,7 +1393,7 @@ br_multicast_leave_group(struct net_bridge *br,
                        del_timer(&p->timer);
                        kfree_rcu(p, rcu);
                        br_mdb_notify(br->dev, port, group, RTM_DELMDB,
-                                     p->flags);
+                                     p->flags | MDB_PG_FLAGS_FAST_LEAVE);
 
                        if (!mp->ports && !mp->host_joined &&
                            netif_running(br->dev))

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index e8cf03b43b7d6c5225f6be08d285a2cbe0307fa2..c4fd307fbfdc2bed3053a101d22209dd3d5f921d 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -199,6 +199,7 @@ struct net_bridge_fdb_entry {
 
 #define MDB_PG_FLAGS_PERMANENT BIT(0)
 #define MDB_PG_FLAGS_OFFLOAD   BIT(1)
+#define MDB_PG_FLAGS_FAST_LEAVE        BIT(2)
 
 struct net_bridge_port_group {
        struct net_bridge_port          *port;