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

Commit 99f906e9 authored by Mike Manning's avatar Mike Manning Committed by David S. Miller
Browse files

bridge: add per-port broadcast flood flag 



Support for l2 multicast flood control was added in commit b6cb5ac8
("net: bridge: add per-port multicast flood flag"). It allows broadcast
as it was introduced specifically for unknown multicast flood control.
But as broadcast is a special case of multicast, this may also need to
be disabled. For this purpose, introduce a flag to disable the flooding
of received l2 broadcasts. This approach is backwards compatible and
provides flexibility in filtering for the desired packet types.

Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarMike Manning <mmanning@brocade.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06b4fc52

include/linux/if_bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct br_ip_list { 
#define BR_MCAST_FLOOD		BIT(11)

#define BR_MULTICAST_TO_UNICAST	BIT(12)

#define BR_VLAN_TUNNEL		BIT(13)

#define BR_BCAST_FLOOD		BIT(14)



#define BR_DEFAULT_AGEING_TIME	(300 * HZ)

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ enum { 
	IFLA_BRPORT_MCAST_FLOOD,

	IFLA_BRPORT_MCAST_TO_UCAST,

	IFLA_BRPORT_VLAN_TUNNEL,

	IFLA_BRPORT_BCAST_FLOOD,

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_forward.c

+17 −7
Original line number Diff line number Diff line
@@ -183,13 +183,23 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, 
	struct net_bridge_port *p;



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

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

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

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

		 * other traffic if flood off, except for traffic we originate

		 */

		switch (pkt_type) {

		case BR_PKT_UNICAST:

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

				continue;

			break;

		case BR_PKT_MULTICAST:

			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)

				continue;

		/* Do not flood if mc off, except for traffic we originate */

		if (pkt_type == BR_PKT_MULTICAST &&

		    !(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)

			break;

		case BR_PKT_BROADCAST:

			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)

				continue;

			break;

		}



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

		if (p->flags & BR_PROXYARP)

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,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 | BR_MCAST_FLOOD;

	p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD | BR_BCAST_FLOOD;

	br_init_port(p);

	br_set_state(p, BR_STATE_DISABLED);

	br_stp_port_timer_init(p);

net/bridge/br_netlink.c

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ static int br_port_fill_attrs(struct sk_buff *skb, 
		       !!(p->flags & BR_FLOOD)) ||

	    nla_put_u8(skb, IFLA_BRPORT_MCAST_FLOOD,

		       !!(p->flags & BR_MCAST_FLOOD)) ||

	    nla_put_u8(skb, IFLA_BRPORT_BCAST_FLOOD,

		       !!(p->flags & BR_BCAST_FLOOD)) ||

	    nla_put_u8(skb, IFLA_BRPORT_PROXYARP, !!(p->flags & BR_PROXYARP)) ||

	    nla_put_u8(skb, IFLA_BRPORT_PROXYARP_WIFI,

		       !!(p->flags & BR_PROXYARP_WIFI)) ||
@@ -683,6 +685,7 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[]) 
	br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD);

	br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD);

	br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST);

	br_set_port_flag(p, tb, IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD);

	br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP);

	br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI);