Skip to content

Commit 61f2183

Browse files
idoschkuba-moo
idosch
authored and
kuba-moo
committed
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 <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1d7b66a commit 61f2183

File tree

2 files changed

+98
-5
lines changed

2 files changed

+98
-5
lines changed

‎net/bridge/br_mdb.c

Lines changed: 97 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,27 @@ __br_mdb_choose_context(struct net_bridge *br,
802802
return brmctx;
803803
}
804804

805+
static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,
806+
struct net_bridge_mdb_entry *mp,
807+
struct net_bridge_port_group *pg,
808+
struct net_bridge_mcast *brmctx,
809+
unsigned char flags)
810+
{
811+
unsigned long now = jiffies;
812+
813+
pg->flags = flags;
814+
pg->rt_protocol = cfg->rt_protocol;
815+
if (!(flags & MDB_PG_FLAGS_PERMANENT) && !cfg->src_entry)
816+
mod_timer(&pg->timer,
817+
now + brmctx->multicast_membership_interval);
818+
else
819+
del_timer(&pg->timer);
820+
821+
br_mdb_notify(cfg->br->dev, mp, pg, RTM_NEWMDB);
822+
823+
return 0;
824+
}
825+
805826
static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,
806827
struct net_bridge_mdb_entry *mp,
807828
struct net_bridge_mcast *brmctx,
@@ -816,8 +837,12 @@ static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,
816837
(p = mlock_dereference(*pp, cfg->br)) != NULL;
817838
pp = &p->next) {
818839
if (p->key.port == cfg->p) {
819-
NL_SET_ERR_MSG_MOD(extack, "(S, G) group is already joined by port");
820-
return -EEXIST;
840+
if (!(cfg->nlflags & NLM_F_REPLACE)) {
841+
NL_SET_ERR_MSG_MOD(extack, "(S, G) group is already joined by port");
842+
return -EEXIST;
843+
}
844+
return br_mdb_replace_group_sg(cfg, mp, p, brmctx,
845+
flags);
821846
}
822847
if ((unsigned long)p->key.port < (unsigned long)cfg->p)
823848
break;
@@ -883,6 +908,7 @@ static int br_mdb_add_group_src_fwd(const struct br_mdb_config *cfg,
883908
sg_cfg.src_entry = true;
884909
sg_cfg.filter_mode = MCAST_INCLUDE;
885910
sg_cfg.rt_protocol = cfg->rt_protocol;
911+
sg_cfg.nlflags = cfg->nlflags;
886912
return br_mdb_add_group_sg(&sg_cfg, sgmp, brmctx, flags, extack);
887913
}
888914

@@ -903,7 +929,7 @@ static int br_mdb_add_group_src(const struct br_mdb_config *cfg,
903929
NL_SET_ERR_MSG_MOD(extack, "Failed to add new source entry");
904930
return -ENOSPC;
905931
}
906-
} else {
932+
} else if (!(cfg->nlflags & NLM_F_REPLACE)) {
907933
NL_SET_ERR_MSG_MOD(extack, "Source entry already exists");
908934
return -EEXIST;
909935
}
@@ -961,6 +987,67 @@ static int br_mdb_add_group_srcs(const struct br_mdb_config *cfg,
961987
return err;
962988
}
963989

990+
static int br_mdb_replace_group_srcs(const struct br_mdb_config *cfg,
991+
struct net_bridge_port_group *pg,
992+
struct net_bridge_mcast *brmctx,
993+
struct netlink_ext_ack *extack)
994+
{
995+
struct net_bridge_group_src *ent;
996+
struct hlist_node *tmp;
997+
int err;
998+
999+
hlist_for_each_entry(ent, &pg->src_list, node)
1000+
ent->flags |= BR_SGRP_F_DELETE;
1001+
1002+
err = br_mdb_add_group_srcs(cfg, pg, brmctx, extack);
1003+
if (err)
1004+
goto err_clear_delete;
1005+
1006+
hlist_for_each_entry_safe(ent, tmp, &pg->src_list, node) {
1007+
if (ent->flags & BR_SGRP_F_DELETE)
1008+
br_multicast_del_group_src(ent, false);
1009+
}
1010+
1011+
return 0;
1012+
1013+
err_clear_delete:
1014+
hlist_for_each_entry(ent, &pg->src_list, node)
1015+
ent->flags &= ~BR_SGRP_F_DELETE;
1016+
return err;
1017+
}
1018+
1019+
static int br_mdb_replace_group_star_g(const struct br_mdb_config *cfg,
1020+
struct net_bridge_mdb_entry *mp,
1021+
struct net_bridge_port_group *pg,
1022+
struct net_bridge_mcast *brmctx,
1023+
unsigned char flags,
1024+
struct netlink_ext_ack *extack)
1025+
{
1026+
unsigned long now = jiffies;
1027+
int err;
1028+
1029+
err = br_mdb_replace_group_srcs(cfg, pg, brmctx, extack);
1030+
if (err)
1031+
return err;
1032+
1033+
pg->flags = flags;
1034+
pg->filter_mode = cfg->filter_mode;
1035+
pg->rt_protocol = cfg->rt_protocol;
1036+
if (!(flags & MDB_PG_FLAGS_PERMANENT) &&
1037+
cfg->filter_mode == MCAST_EXCLUDE)
1038+
mod_timer(&pg->timer,
1039+
now + brmctx->multicast_membership_interval);
1040+
else
1041+
del_timer(&pg->timer);
1042+
1043+
br_mdb_notify(cfg->br->dev, mp, pg, RTM_NEWMDB);
1044+
1045+
if (br_multicast_should_handle_mode(brmctx, cfg->group.proto))
1046+
br_multicast_star_g_handle_mode(pg, cfg->filter_mode);
1047+
1048+
return 0;
1049+
}
1050+
9641051
static int br_mdb_add_group_star_g(const struct br_mdb_config *cfg,
9651052
struct net_bridge_mdb_entry *mp,
9661053
struct net_bridge_mcast *brmctx,
@@ -976,8 +1063,12 @@ static int br_mdb_add_group_star_g(const struct br_mdb_config *cfg,
9761063
(p = mlock_dereference(*pp, cfg->br)) != NULL;
9771064
pp = &p->next) {
9781065
if (p->key.port == cfg->p) {
979-
NL_SET_ERR_MSG_MOD(extack, "(*, G) group is already joined by port");
980-
return -EEXIST;
1066+
if (!(cfg->nlflags & NLM_F_REPLACE)) {
1067+
NL_SET_ERR_MSG_MOD(extack, "(*, G) group is already joined by port");
1068+
return -EEXIST;
1069+
}
1070+
return br_mdb_replace_group_star_g(cfg, mp, p, brmctx,
1071+
flags, extack);
9811072
}
9821073
if ((unsigned long)p->key.port < (unsigned long)cfg->p)
9831074
break;
@@ -1223,6 +1314,7 @@ static int br_mdb_config_init(struct net *net, const struct nlmsghdr *nlh,
12231314
memset(cfg, 0, sizeof(*cfg));
12241315
cfg->filter_mode = MCAST_EXCLUDE;
12251316
cfg->rt_protocol = RTPROT_STATIC;
1317+
cfg->nlflags = nlh->nlmsg_flags;
12261318

12271319
bpm = nlmsg_data(nlh);
12281320
if (!bpm->ifindex) {

‎net/bridge/br_private.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ struct br_mdb_config {
104104
struct br_ip group;
105105
bool src_entry;
106106
u8 filter_mode;
107+
u16 nlflags;
107108
struct br_mdb_src_entry *src_entries;
108109
int num_src_entries;
109110
u8 rt_protocol;

0 commit comments

Comments
 (0)