Commit adc47037 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: multicast: use multicast contexts instead of bridge or port 



Pass multicast context pointers to multicast functions instead of bridge/port.
This would make it easier later to switch these contexts to their per-vlan
versions. The patch is basically search and replace, no functional changes.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3d065c0

net/bridge/br_device.c

+5 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ EXPORT_SYMBOL_GPL(nf_br_ops); 
netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct net_bridge *br = netdev_priv(dev);

	struct net_bridge_mcast *brmctx = &br->multicast_ctx;

	struct net_bridge_fdb_entry *dst;

	struct net_bridge_mdb_entry *mdst;

	const struct nf_br_ops *nf_ops;
@@ -82,15 +83,15 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
			br_flood(br, skb, BR_PKT_MULTICAST, false, true);

			goto out;

		}

		if (br_multicast_rcv(br, NULL, skb, vid)) {

		if (br_multicast_rcv(brmctx, NULL, skb, vid)) {

			kfree_skb(skb);

			goto out;

		}



		mdst = br_mdb_get(br, skb, vid);

		mdst = br_mdb_get(brmctx, skb, vid);

		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&

		    br_multicast_querier_exists(br, eth_hdr(skb), mdst))

			br_multicast_flood(mdst, skb, false, true);

		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))

			br_multicast_flood(mdst, skb, brmctx, false, true);

		else

			br_flood(br, skb, BR_PKT_MULTICAST, false, true);

	} else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) {

net/bridge/br_forward.c

+3 −4
Original line number Diff line number Diff line
@@ -267,20 +267,19 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, 
/* called with rcu_read_lock */

void br_multicast_flood(struct net_bridge_mdb_entry *mdst,

			struct sk_buff *skb,

			struct net_bridge_mcast *brmctx,

			bool local_rcv, bool local_orig)

{

	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;

	struct net_bridge *br = netdev_priv(dev);

	struct net_bridge_port *prev = NULL;

	struct net_bridge_port_group *p;

	bool allow_mode_include = true;

	struct hlist_node *rp;



	rp = br_multicast_get_first_rport_node(br, skb);

	rp = br_multicast_get_first_rport_node(brmctx, skb);



	if (mdst) {

		p = rcu_dereference(mdst->ports);

		if (br_multicast_should_handle_mode(br, mdst->addr.proto) &&

		if (br_multicast_should_handle_mode(brmctx, mdst->addr.proto) &&

		    br_multicast_is_star_g(&mdst->addr))

			allow_mode_include = false;

	} else {

net/bridge/br_input.c

+9 −5
Original line number Diff line number Diff line
@@ -69,8 +69,10 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
	struct net_bridge_port *p = br_port_get_rcu(skb->dev);

	enum br_pkt_type pkt_type = BR_PKT_UNICAST;

	struct net_bridge_fdb_entry *dst = NULL;

	struct net_bridge_mcast_port *pmctx;

	struct net_bridge_mdb_entry *mdst;

	bool local_rcv, mcast_hit = false;

	struct net_bridge_mcast *brmctx;

	struct net_bridge *br;

	u16 vid = 0;

	u8 state;
@@ -78,6 +80,8 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
	if (!p || p->state == BR_STATE_DISABLED)

		goto drop;



	brmctx = &p->br->multicast_ctx;

	pmctx = &p->multicast_ctx;

	state = p->state;

	if (!br_allowed_ingress(p->br, nbp_vlan_group_rcu(p), skb, &vid,

				&state))
@@ -98,7 +102,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
			local_rcv = true;

		} else {

			pkt_type = BR_PKT_MULTICAST;

			if (br_multicast_rcv(br, p, skb, vid))

			if (br_multicast_rcv(brmctx, pmctx, skb, vid))

				goto drop;

		}

	}
@@ -128,11 +132,11 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 


	switch (pkt_type) {

	case BR_PKT_MULTICAST:

		mdst = br_mdb_get(br, skb, vid);

		mdst = br_mdb_get(brmctx, skb, vid);

		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&

		    br_multicast_querier_exists(br, eth_hdr(skb), mdst)) {

		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) {

			if ((mdst && mdst->host_joined) ||

			    br_multicast_is_router(br, skb)) {

			    br_multicast_is_router(brmctx, skb)) {

				local_rcv = true;

				br->dev->stats.multicast++;

			}
@@ -162,7 +166,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
		if (!mcast_hit)

			br_flood(br, skb, pkt_type, local_rcv, false);

		else

			br_multicast_flood(mdst, skb, local_rcv, false);

			br_multicast_flood(mdst, skb, brmctx, local_rcv, false);

	}



	if (local_rcv)

net/bridge/br_mdb.c

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, 
	 * a new INCLUDE port (S,G) then all of *,G EXCLUDE ports need to be

	 * added to it for proper replication

	 */

	if (br_multicast_should_handle_mode(br, group.proto)) {

	if (br_multicast_should_handle_mode(&br->multicast_ctx, group.proto)) {

		switch (filter_mode) {

		case MCAST_EXCLUDE:

			br_multicast_star_g_handle_mode(p, MCAST_EXCLUDE);

net/bridge/br_multicast.c

+465 −424

File changed.

Preview size limit exceeded, changes collapsed.