bridge: mcast: Support replacement of MDB port group entries

Now that user space can specify additional attributes of port group
entries such as filter mode and source list, it makes sense to allow
user space to atomically modify these attributes by replacing entries
instead of forcing user space to delete the entries and add them back.

Replace MDB port group entries when the 'NLM_F_REPLACE' flag is
specified in the netlink message header.

When a (*, G) entry is replaced, update the following attributes: Source
list, state, filter mode, protocol and flags. If the entry is temporary
and in EXCLUDE mode, reset the group timer to the group membership
interval. If the entry is temporary and in INCLUDE mode, reset the
source timers of associated sources to the group membership interval.

Examples:

 # bridge mdb replace dev br0 port dummy10 grp 239.1.1.1 permanent source_list 192.0.2.1,192.0.2.2 filter_mode include
 # bridge -d -s mdb show
 dev br0 port dummy10 grp 239.1.1.1 src 192.0.2.2 permanent filter_mode include proto static     0.00
 dev br0 port dummy10 grp 239.1.1.1 src 192.0.2.1 permanent filter_mode include proto static     0.00
 dev br0 port dummy10 grp 239.1.1.1 permanent filter_mode include source_list 192.0.2.2/0.00,192.0.2.1/0.00 proto static     0.00

 # bridge mdb replace dev br0 port dummy10 grp 239.1.1.1 permanent source_list 192.0.2.1,192.0.2.3 filter_mode exclude proto zebra
 # bridge -d -s mdb show
 dev br0 port dummy10 grp 239.1.1.1 src 192.0.2.3 permanent filter_mode include proto zebra  blocked    0.00
 dev br0 port dummy10 grp 239.1.1.1 src 192.0.2.1 permanent filter_mode include proto zebra  blocked    0.00
 dev br0 port dummy10 grp 239.1.1.1 permanent filter_mode exclude source_list 192.0.2.3/0.00,192.0.2.1/0.00 proto zebra     0.00

 # bridge mdb replace dev br0 port dummy10 grp 239.1.1.1 temp source_list 192.0.2.4,192.0.2.3 filter_mode include proto bgp
 # bridge -d -s mdb show
 dev br0 port dummy10 grp 239.1.1.1 src 192.0.2.4 temp filter_mode include proto bgp     0.00
 dev br0 port dummy10 grp 239.1.1.1 src 192.0.2.3 temp filter_mode include proto bgp     0.00
 dev br0 port dummy10 grp 239.1.1.1 temp filter_mode include source_list 192.0.2.4/259.44,192.0.2.3/259.44 proto bgp     0.00

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 72d4e53..00e5743 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -802,6 +802,27 @@ out:
        return brmctx;
 }
 
+static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,
+                                  struct net_bridge_mdb_entry *mp,
+                                  struct net_bridge_port_group *pg,
+                                  struct net_bridge_mcast *brmctx,
+                                  unsigned char flags)
+{
+       unsigned long now = jiffies;
+
+       pg->flags = flags;
+       pg->rt_protocol = cfg->rt_protocol;
+       if (!(flags & MDB_PG_FLAGS_PERMANENT) && !cfg->src_entry)
+               mod_timer(&pg->timer,
+                         now + brmctx->multicast_membership_interval);
+       else
+               del_timer(&pg->timer);
+
+       br_mdb_notify(cfg->br->dev, mp, pg, RTM_NEWMDB);
+
+       return 0;
+}
+
 static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,
                               struct net_bridge_mdb_entry *mp,
                               struct net_bridge_mcast *brmctx,
@@ -816,8 +837,12 @@ static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,
             (p = mlock_dereference(*pp, cfg->br)) != NULL;
             pp = &p->next) {
                if (p->key.port == cfg->p) {
-                       NL_SET_ERR_MSG_MOD(extack, "(S, G) group is already joined by port");
-                       return -EEXIST;
+                       if (!(cfg->nlflags & NLM_F_REPLACE)) {
+                               NL_SET_ERR_MSG_MOD(extack, "(S, G) group is already joined by port");
+                               return -EEXIST;
+                       }
+                       return br_mdb_replace_group_sg(cfg, mp, p, brmctx,
+                                                      flags);
                }
                if ((unsigned long)p->key.port < (unsigned long)cfg->p)
                        break;
@@ -883,6 +908,7 @@ static int br_mdb_add_group_src_fwd(const struct br_mdb_config *cfg,
        sg_cfg.src_entry = true;
        sg_cfg.filter_mode = MCAST_INCLUDE;
        sg_cfg.rt_protocol = cfg->rt_protocol;
+       sg_cfg.nlflags = cfg->nlflags;
        return br_mdb_add_group_sg(&sg_cfg, sgmp, brmctx, flags, extack);
 }
 
@@ -903,7 +929,7 @@ static int br_mdb_add_group_src(const struct br_mdb_config *cfg,
                        NL_SET_ERR_MSG_MOD(extack, "Failed to add new source entry");
                        return -ENOSPC;
                }
-       } else {
+       } else if (!(cfg->nlflags & NLM_F_REPLACE)) {
                NL_SET_ERR_MSG_MOD(extack, "Source entry already exists");
                return -EEXIST;
        }
@@ -961,6 +987,67 @@ err_del_group_srcs:
        return err;
 }
 
+static int br_mdb_replace_group_srcs(const struct br_mdb_config *cfg,
+                                    struct net_bridge_port_group *pg,
+                                    struct net_bridge_mcast *brmctx,
+                                    struct netlink_ext_ack *extack)
+{
+       struct net_bridge_group_src *ent;
+       struct hlist_node *tmp;
+       int err;
+
+       hlist_for_each_entry(ent, &pg->src_list, node)
+               ent->flags |= BR_SGRP_F_DELETE;
+
+       err = br_mdb_add_group_srcs(cfg, pg, brmctx, extack);
+       if (err)
+               goto err_clear_delete;
+
+       hlist_for_each_entry_safe(ent, tmp, &pg->src_list, node) {
+               if (ent->flags & BR_SGRP_F_DELETE)
+                       br_multicast_del_group_src(ent, false);
+       }
+
+       return 0;
+
+err_clear_delete:
+       hlist_for_each_entry(ent, &pg->src_list, node)
+               ent->flags &= ~BR_SGRP_F_DELETE;
+       return err;
+}
+
+static int br_mdb_replace_group_star_g(const struct br_mdb_config *cfg,
+                                      struct net_bridge_mdb_entry *mp,
+                                      struct net_bridge_port_group *pg,
+                                      struct net_bridge_mcast *brmctx,
+                                      unsigned char flags,
+                                      struct netlink_ext_ack *extack)
+{
+       unsigned long now = jiffies;
+       int err;
+
+       err = br_mdb_replace_group_srcs(cfg, pg, brmctx, extack);
+       if (err)
+               return err;
+
+       pg->flags = flags;
+       pg->filter_mode = cfg->filter_mode;
+       pg->rt_protocol = cfg->rt_protocol;
+       if (!(flags & MDB_PG_FLAGS_PERMANENT) &&
+           cfg->filter_mode == MCAST_EXCLUDE)
+               mod_timer(&pg->timer,
+                         now + brmctx->multicast_membership_interval);
+       else
+               del_timer(&pg->timer);
+
+       br_mdb_notify(cfg->br->dev, mp, pg, RTM_NEWMDB);
+
+       if (br_multicast_should_handle_mode(brmctx, cfg->group.proto))
+               br_multicast_star_g_handle_mode(pg, cfg->filter_mode);
+
+       return 0;
+}
+
 static int br_mdb_add_group_star_g(const struct br_mdb_config *cfg,
                                   struct net_bridge_mdb_entry *mp,
                                   struct net_bridge_mcast *brmctx,
@@ -976,8 +1063,12 @@ static int br_mdb_add_group_star_g(const struct br_mdb_config *cfg,
             (p = mlock_dereference(*pp, cfg->br)) != NULL;
             pp = &p->next) {
                if (p->key.port == cfg->p) {
-                       NL_SET_ERR_MSG_MOD(extack, "(*, G) group is already joined by port");
-                       return -EEXIST;
+                       if (!(cfg->nlflags & NLM_F_REPLACE)) {
+                               NL_SET_ERR_MSG_MOD(extack, "(*, G) group is already joined by port");
+                               return -EEXIST;
+                       }
+                       return br_mdb_replace_group_star_g(cfg, mp, p, brmctx,
+                                                          flags, extack);
                }
                if ((unsigned long)p->key.port < (unsigned long)cfg->p)
                        break;
@@ -1223,6 +1314,7 @@ static int br_mdb_config_init(struct net *net, const struct nlmsghdr *nlh,
        memset(cfg, 0, sizeof(*cfg));
        cfg->filter_mode = MCAST_EXCLUDE;
        cfg->rt_protocol = RTPROT_STATIC;
+       cfg->nlflags = nlh->nlmsg_flags;
 
        bpm = nlmsg_data(nlh);
        if (!bpm->ifindex) {

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index cdc9e04..15ef7fd 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -104,6 +104,7 @@ struct br_mdb_config {
        struct br_ip                    group;
        bool                            src_entry;
        u8                              filter_mode;
+       u16                             nlflags;
        struct br_mdb_src_entry         *src_entries;
        int                             num_src_entries;
        u8                              rt_protocol;