net: bridge: mcast: add rt_protocol field to the port group struct

We need to be able to differentiate between pg entries created by user-space and the kernel when we start generating S,G entries for IGMPv3/MLDv2's fast path. User-space entries are created by default as RTPROT_STATIC and the kernel entries are RTPROT_KERNEL. Later we can allow user-space to provide the entry rt_protocol so we can differentiate between who added the entries specifically (e.g. clag, admin, frr etc).

Nikolay Aleksandrov committed 6 years ago

Commit 8f8cb771 parent 7d07a684 files · +34 −19Browse files

Unified · Split

4 files

include/uapi/linux/if_bridge.h +1 −0
net/bridge/br_mdb.c +26 −16
net/bridge/br_multicast.c +5 −2
net/bridge/br_private.h +2 −1

include/uapi/linux/if_bridge.h+1−0

@@ -458,6 +458,7 @@ enum { · 457 unmodified lines
458	458	MDBA_MDB_EATTR_SRC_LIST,
459	459	MDBA_MDB_EATTR_GROUP_MODE,
460	460	MDBA_MDB_EATTR_SOURCE,
	461	+ MDBA_MDB_EATTR_RTPROT,
461	462	__MDBA_MDB_EATTR_MAX
462	463	};
463	464	#define MDBA_MDB_EATTR_MAX (__MDBA_MDB_EATTR_MAX - 1)

net/bridge/br_mdb.c+26−16

@@ -184,6 +184,7 @@ static int __mdb_fill_info(struct sk_buff *skb, · 183 unmodified lines
184	184	MDBA_MDB_EATTR_TIMER,
185	185	br_timer_value(mtimer)))
186	186	goto nest_err;
	187	+
187	188	switch (mp->addr.proto) {
188	189	case htons(ETH_P_IP):
189	190	dump_srcs_mode = !!(mp->br->multicast_igmp_version == 3);
@@ -206,10 +207,15 @@ static int __mdb_fill_info(struct sk_buff *skb, · 16 unmodified lines
206	207	break;
207	208	#endif
208	209	}
209		− if (p && dump_srcs_mode &&
210		− (__mdb_fill_srcs(skb, p) \|\|
211		− nla_put_u8(skb, MDBA_MDB_EATTR_GROUP_MODE, p->filter_mode)))
212		− goto nest_err;
	210	+ if (p) {
	211	+ if (nla_put_u8(skb, MDBA_MDB_EATTR_RTPROT, p->rt_protocol))
	212	+ goto nest_err;
	213	+ if (dump_srcs_mode &&
	214	+ (__mdb_fill_srcs(skb, p) \|\|
	215	+ nla_put_u8(skb, MDBA_MDB_EATTR_GROUP_MODE,
	216	+ p->filter_mode)))
	217	+ goto nest_err;
	218	+ }
213	219	nla_nest_end(skb, nest_ent);
214	220
215	221	return 0;
@@ -414,6 +420,9 @@ static size_t rtnl_mdb_nlmsg_size(struct net_bridge_port_group *pg) · 198 unmodified lines
414	420	if (!pg)
415	421	goto out;
416	422
	423	+ /* MDBA_MDB_EATTR_RTPROT */
	424	+ nlmsg_size += nla_total_size(sizeof(u8));
	425	+
417	426	switch (pg->addr.proto) {
418	427	case htons(ETH_P_IP):
419	428	/* MDBA_MDB_EATTR_SOURCE */
@@ -809,16 +818,20 @@ static int br_mdb_parse(struct sk_buff skb, struct nlmsghdr nlh, · 389 unmodified lines
809	818	}
810	819
811	820	static int br_mdb_add_group(struct net_bridge br, struct net_bridge_port port,
812		− struct br_ip group, struct br_mdb_entry entry,
	821	+ struct br_mdb_entry *entry,
	822	+ struct nlattr **mdb_attrs,
813	823	struct netlink_ext_ack *extack)
814	824	{
815	825	struct net_bridge_mdb_entry *mp;
816	826	struct net_bridge_port_group *p;
817	827	struct net_bridge_port_group __rcu **pp;
818	828	unsigned long now = jiffies;
	829	+ struct br_ip group;
819	830	u8 filter_mode;
820	831	int err;
821	832
	833	+ __mdb_entry_to_br_ip(entry, &group, mdb_attrs);
	834	+
822	835	/* host join errors which can happen before creating the group */
823	836	if (!port) {
824	837	/* don't allow any flags for host-joined groups */
@@ -826,15 +839,15 @@ static int br_mdb_add_group(struct net_bridge br, struct net_bridge_port port, · 1 unmodified line
826	839	NL_SET_ERR_MSG_MOD(extack, "Flags are not allowed for host groups");
827	840	return -EINVAL;
828	841	}
829		− if (!br_multicast_is_star_g(group)) {
	842	+ if (!br_multicast_is_star_g(&group)) {
830	843	NL_SET_ERR_MSG_MOD(extack, "Groups with sources cannot be manually host joined");
831	844	return -EINVAL;
832	845	}
833	846	}
834	847
835		− mp = br_mdb_ip_get(br, group);
	848	+ mp = br_mdb_ip_get(br, &group);
836	849	if (!mp) {
837		− mp = br_multicast_new_group(br, group);
	850	+ mp = br_multicast_new_group(br, &group);
838	851	err = PTR_ERR_OR_ZERO(mp);
839	852	if (err)
840	853	return err;
@@ -864,11 +877,11 @@ static int br_mdb_add_group(struct net_bridge br, struct net_bridge_port port, · 23 unmodified lines
864	877	break;
865	878	}
866	879
867		− filter_mode = br_multicast_is_star_g(group) ? MCAST_EXCLUDE :
868		− MCAST_INCLUDE;
	880	+ filter_mode = br_multicast_is_star_g(&group) ? MCAST_EXCLUDE :
	881	+ MCAST_INCLUDE;
869	882
870		− p = br_multicast_new_port_group(port, group, *pp, entry->state, NULL,
871		− filter_mode);
	883	+ p = br_multicast_new_port_group(port, &group, *pp, entry->state, NULL,
	884	+ filter_mode, RTPROT_STATIC);
872	885	if (unlikely(!p)) {
873	886	NL_SET_ERR_MSG_MOD(extack, "Couldn't allocate new port group");
874	887	return -ENOMEM;
@@ -887,13 +900,10 @@ static int __br_mdb_add(struct net net, struct net_bridge br, · 12 unmodified lines
887	900	struct nlattr **mdb_attrs,
888	901	struct netlink_ext_ack *extack)
889	902	{
890		− struct br_ip ip;
891	903	int ret;
892	904
893		− __mdb_entry_to_br_ip(entry, &ip, mdb_attrs);
894		−
895	905	spin_lock_bh(&br->multicast_lock);
896		− ret = br_mdb_add_group(br, p, &ip, entry, extack);
	906	+ ret = br_mdb_add_group(br, p, entry, mdb_attrs, extack);
897	907	spin_unlock_bh(&br->multicast_lock);
898	908
899	909	return ret;

net/bridge/br_multicast.c+5−2

@@ -795,7 +795,8 @@ struct net_bridge_port_group *br_multicast_new_port_group( · 794 unmodified lines
795	795	struct net_bridge_port_group __rcu *next,
796	796	unsigned char flags,
797	797	const unsigned char *src,
798		− u8 filter_mode)
	798	+ u8 filter_mode,
	799	+ u8 rt_protocol)
799	800	{
800	801	struct net_bridge_port_group *p;
801	802
@@ -807,6 +808,7 @@ struct net_bridge_port_group *br_multicast_new_port_group( · 5 unmodified lines
807	808	p->port = port;
808	809	p->flags = flags;
809	810	p->filter_mode = filter_mode;
	811	+ p->rt_protocol = rt_protocol;
810	812	p->mcast_gc.destroy = br_multicast_destroy_port_group;
811	813	INIT_HLIST_HEAD(&p->src_list);
812	814	rcu_assign_pointer(p->next, next);
@@ -892,7 +894,8 @@ static int br_multicast_add_group(struct net_bridge *br, · 79 unmodified lines
892	894	break;
893	895	}
894	896
895		− p = br_multicast_new_port_group(port, group, *pp, 0, src, filter_mode);
	897	+ p = br_multicast_new_port_group(port, group, *pp, 0, src, filter_mode,
	898	+ RTPROT_KERNEL);
896	899	if (unlikely(!p))
897	900	goto err;
898	901	rcu_assign_pointer(*pp, p);

net/bridge/br_private.h+2−1

@@ -246,6 +246,7 @@ struct net_bridge_port_group { · 245 unmodified lines
246	246	unsigned char flags;
247	247	unsigned char filter_mode;
248	248	unsigned char grp_query_rexmit_cnt;
	249	+ unsigned char rt_protocol;
249	250
250	251	struct hlist_head src_list;
251	252	unsigned int src_ents;
@@ -804,7 +805,7 @@ struct net_bridge_port_group * · 552 unmodified lines
804	805	br_multicast_new_port_group(struct net_bridge_port port, struct br_ip group,
805	806	struct net_bridge_port_group __rcu *next,
806	807	unsigned char flags, const unsigned char *src,
807		− u8 filter_mode);
	808	+ u8 filter_mode, u8 rt_protocol);
808	809	int br_mdb_hash_init(struct net_bridge *br);
809	810	void br_mdb_hash_fini(struct net_bridge *br);
810	811	void br_mdb_notify(struct net_device dev, struct net_bridge_mdb_entry mp,

net: bridge: mcast: add rt_protocol field to the port group struct

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code