Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278ed676 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'br-next' 



Nikolay Aleksandrov says:

====================
net: bridge: add per-port unknown multicast flood control

The first patch prepares the forwarding path by having the exact packet
type passed down so we can later filter based on it and the per-port
unknown mcast flood flag introduced in the second patch. It is similar to
how the per-port unknown unicast flood flag works.
Nice side-effects of patch 01 are the slight reduction of tests in the
fast-path and a few minor checkpatch fixes.

v3: don't change br_auto_mask as that will change user-visible behaviour
v2: make pkt_type an enum as per Stephen's comment
====================

Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d297653d b6cb5ac8

include/linux/if_bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct br_ip_list { 
#define BR_PROXYARP		BIT(8)

#define BR_LEARNING_SYNC	BIT(9)

#define BR_PROXYARP_WIFI	BIT(10)

#define BR_MCAST_FLOOD		BIT(11)



#define BR_DEFAULT_AGEING_TIME	(300 * HZ)

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ enum { 
	IFLA_BRPORT_FLUSH,

	IFLA_BRPORT_MULTICAST_ROUTER,

	IFLA_BRPORT_PAD,

	IFLA_BRPORT_MCAST_FLOOD,

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_device.c

+4 −4
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
		goto out;



	if (is_broadcast_ether_addr(dest)) {

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

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

	} else if (is_multicast_ether_addr(dest)) {

		if (unlikely(netpoll_tx_running(dev))) {

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

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

			goto out;

		}

		if (br_multicast_rcv(br, NULL, skb, vid)) {
@@ -78,11 +78,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
		    br_multicast_querier_exists(br, eth_hdr(skb)))

			br_multicast_flood(mdst, skb, false, true);

		else

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

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

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

		br_forward(dst->dst, skb, false, true);

	} else {

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

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

	}

out:

	rcu_read_unlock();

net/bridge/br_forward.c

+5 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct net_bridge_port *maybe_deliver( 


/* called under rcu_read_lock */

void br_flood(struct net_bridge *br, struct sk_buff *skb,

	      bool unicast, bool local_rcv, bool local_orig)

	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)

{

	u8 igmp_type = br_multicast_igmp_type(skb);

	struct net_bridge_port *prev = NULL;
@@ -184,7 +184,10 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, 


	list_for_each_entry_rcu(p, &br->port_list, list) {

		/* Do not flood unicast traffic to ports that turn it off */

		if (unicast && !(p->flags & BR_FLOOD))

		if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD))

			continue;

		if (pkt_type == BR_PKT_MULTICAST &&

		    !(p->flags & BR_MCAST_FLOOD))

			continue;



		/* Do not flood to ports that enable proxy ARP */

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, 
	p->path_cost = port_cost(dev);

	p->priority = 0x8000 >> BR_PORT_BITS;

	p->port_no = index;

	p->flags = BR_LEARNING | BR_FLOOD;

	p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD;

	br_init_port(p);

	br_set_state(p, BR_STATE_DISABLED);

	br_stp_port_timer_init(p);