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

Commit 2e422069 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bridge_flags' 



Vlad Yasevich says:

====================
The following series adds 2 new flags to bridge.  One flag allows
the user to control whether mac learning is performed on the interface
or not.  By default mac learning is on.
The other flag allows the user to control whether unicast traffic
is flooded (send without an fdb) to a given unicast port.  Default is
on.

Changes since v4:
 - Implemented Stephen's suggestions.

Changes since v2:
 - removed unused "unlock" tag.

Changes since v1:
 - Integrated suggestion from MST to not impact RTM_NEWNEIGH and to
   skip lookups when learning is disabled.

Vlad Yasevich (2):
  bridge: Add flag to control mac learning.
  bridge: Add a flag to control unicast packet flood.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30f3a40f 867a5943

include/uapi/linux/if_link.h

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ enum { 
	IFLA_BRPORT_GUARD,	/* bpdu guard              */

	IFLA_BRPORT_PROTECT,	/* root port protection    */

	IFLA_BRPORT_FAST_LEAVE,	/* multicast fast leave    */

	IFLA_BRPORT_LEARNING,	/* mac learning */

	IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */

	__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
@@ -58,10 +58,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
	skb_pull(skb, ETH_HLEN);



	if (is_broadcast_ether_addr(dest))

		br_flood_deliver(br, skb);

		br_flood_deliver(br, skb, false);

	else if (is_multicast_ether_addr(dest)) {

		if (unlikely(netpoll_tx_running(dev))) {

			br_flood_deliver(br, skb);

			br_flood_deliver(br, skb, false);

			goto out;

		}

		if (br_multicast_rcv(br, NULL, skb)) {
@@ -73,11 +73,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))

			br_multicast_deliver(mdst, skb);

		else

			br_flood_deliver(br, skb);

			br_flood_deliver(br, skb, false);

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

		br_deliver(dst->dst, skb);

	else

		br_flood_deliver(br, skb);

		br_flood_deliver(br, skb, true);



out:

	rcu_read_unlock();

net/bridge/br_forward.c

+9 −5
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ out: 
static void br_flood(struct net_bridge *br, struct sk_buff *skb,

		     struct sk_buff *skb0,

		     void (*__packet_hook)(const struct net_bridge_port *p,

					   struct sk_buff *skb))

					   struct sk_buff *skb),

		     bool unicast)

{

	struct net_bridge_port *p;

	struct net_bridge_port *prev;
@@ -182,6 +183,9 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb, 
	prev = NULL;



	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))

			continue;

		prev = maybe_deliver(prev, p, skb, __packet_hook);

		if (IS_ERR(prev))

			goto out;
@@ -203,16 +207,16 @@ out: 




/* called with rcu_read_lock */

void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)

void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)

{

	br_flood(br, skb, NULL, __br_deliver);

	br_flood(br, skb, NULL, __br_deliver, unicast);

}



/* called under bridge lock */

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

		      struct sk_buff *skb2)

		      struct sk_buff *skb2, bool unicast)

{

	br_flood(br, skb, skb2, __br_forward);

	br_flood(br, skb, skb2, __br_forward, unicast);

}



#ifdef CONFIG_BRIDGE_IGMP_SNOOPING

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,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 = 0;

	p->flags = BR_LEARNING | BR_FLOOD;

	br_init_port(p);

	p->state = BR_STATE_DISABLED;

	br_stp_port_timer_init(p);

net/bridge/br_input.c

+10 −5
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ int br_handle_frame_finish(struct sk_buff *skb) 
	struct net_bridge_fdb_entry *dst;

	struct net_bridge_mdb_entry *mdst;

	struct sk_buff *skb2;

	bool unicast = true;

	u16 vid = 0;



	if (!p || p->state == BR_STATE_DISABLED)
@@ -75,6 +76,7 @@ int br_handle_frame_finish(struct sk_buff *skb) 


	/* insert into forwarding database after filtering to avoid spoofing */

	br = p->br;

	if (p->flags & BR_LEARNING)

		br_fdb_update(br, p, eth_hdr(skb)->h_source, vid);



	if (!is_broadcast_ether_addr(dest) && is_multicast_ether_addr(dest) &&
@@ -94,9 +96,10 @@ int br_handle_frame_finish(struct sk_buff *skb) 


	dst = NULL;



	if (is_broadcast_ether_addr(dest))

	if (is_broadcast_ether_addr(dest)) {

		skb2 = skb;

	else if (is_multicast_ether_addr(dest)) {

		unicast = false;

	} else if (is_multicast_ether_addr(dest)) {

		mdst = br_mdb_get(br, skb, vid);

		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {

			if ((mdst && mdst->mglist) ||
@@ -109,6 +112,7 @@ int br_handle_frame_finish(struct sk_buff *skb) 
		} else

			skb2 = skb;



		unicast = false;

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

	} else if ((dst = __br_fdb_get(br, dest, vid)) &&

			dst->is_local) {
@@ -122,7 +126,7 @@ int br_handle_frame_finish(struct sk_buff *skb) 
			dst->used = jiffies;

			br_forward(dst->dst, skb, skb2);

		} else

			br_flood_forward(br, skb, skb2);

			br_flood_forward(br, skb, skb2, unicast);

	}



	if (skb2)
@@ -142,6 +146,7 @@ static int br_handle_local_finish(struct sk_buff *skb) 
	u16 vid = 0;



	br_vlan_get_tag(skb, &vid);

	if (p->flags & BR_LEARNING)

		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);

	return 0;	 /* process further */

}