bridge: Add a flag to control unicast packet flood. (867a5943) · Commits · e / devices / android_kernel_xiaomi_nabu

include/uapi/linux/if_link.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -222,6 +222,7 @@ enum {
	IFLA_BRPORT_PROTECT, /* root port protection */		IFLA_BRPORT_PROTECT, /* root port protection */
	IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */		IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */
	IFLA_BRPORT_LEARNING, /* mac learning */		IFLA_BRPORT_LEARNING, /* mac learning */
			IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
	__IFLA_BRPORT_MAX		__IFLA_BRPORT_MAX
	};		};
	#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)		#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_device.c

+4 −4

Original line number	Original line	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);		skb_pull(skb, ETH_HLEN);

	if (is_broadcast_ether_addr(dest))		if (is_broadcast_ether_addr(dest))
	br_flood_deliver(br, skb);		br_flood_deliver(br, skb, false);
	else if (is_multicast_ether_addr(dest)) {		else if (is_multicast_ether_addr(dest)) {
	if (unlikely(netpoll_tx_running(dev))) {		if (unlikely(netpoll_tx_running(dev))) {
	br_flood_deliver(br, skb);		br_flood_deliver(br, skb, false);
	goto out;		goto out;
	}		}
	if (br_multicast_rcv(br, NULL, skb)) {		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))		if (mdst \|\| BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))
	br_multicast_deliver(mdst, skb);		br_multicast_deliver(mdst, skb);
	else		else
	br_flood_deliver(br, skb);		br_flood_deliver(br, skb, false);
	} else if ((dst = __br_fdb_get(br, dest, vid)) != NULL)		} else if ((dst = __br_fdb_get(br, dest, vid)) != NULL)
	br_deliver(dst->dst, skb);		br_deliver(dst->dst, skb);
	else		else
	br_flood_deliver(br, skb);		br_flood_deliver(br, skb, true);

	out:		out:
	rcu_read_unlock();		rcu_read_unlock();

net/bridge/br_forward.c

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -174,7 +174,8 @@ static struct net_bridge_port *maybe_deliver(
	static void br_flood(struct net_bridge br, struct sk_buff skb,		static void br_flood(struct net_bridge br, struct sk_buff skb,
	struct sk_buff *skb0,		struct sk_buff *skb0,
	void (__packet_hook)(const struct net_bridge_port p,		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 *p;
	struct net_bridge_port *prev;		struct net_bridge_port *prev;
	@@ -182,6 +183,9 @@ static void br_flood(struct net_bridge br, struct sk_buff skb,
	prev = NULL;		prev = NULL;

	list_for_each_entry_rcu(p, &br->port_list, list) {		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);		prev = maybe_deliver(prev, p, skb, __packet_hook);
	if (IS_ERR(prev))		if (IS_ERR(prev))
	goto out;		goto out;
	@@ -203,16 +207,16 @@ static void br_flood(struct net_bridge br, struct sk_buff skb,


	/* called with rcu_read_lock */		/* 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 */		/* called under bridge lock */
	void br_flood_forward(struct net_bridge br, struct sk_buff skb,		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		#ifdef CONFIG_BRIDGE_IGMP_SNOOPING

net/bridge/br_if.c

+1 −1

Original line number	Original line	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->path_cost = port_cost(dev);
	p->priority = 0x8000 >> BR_PORT_BITS;		p->priority = 0x8000 >> BR_PORT_BITS;
	p->port_no = index;		p->port_no = index;
	p->flags = BR_LEARNING;		p->flags = BR_LEARNING \| BR_FLOOD;
	br_init_port(p);		br_init_port(p);
	p->state = BR_STATE_DISABLED;		p->state = BR_STATE_DISABLED;
	br_stp_port_timer_init(p);		br_stp_port_timer_init(p);

net/bridge/br_input.c

+6 −3

Original line number	Original line	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_fdb_entry *dst;
	struct net_bridge_mdb_entry *mdst;		struct net_bridge_mdb_entry *mdst;
	struct sk_buff *skb2;		struct sk_buff *skb2;
			bool unicast = true;
	u16 vid = 0;		u16 vid = 0;

	if (!p \|\| p->state == BR_STATE_DISABLED)		if (!p \|\| p->state == BR_STATE_DISABLED)
	@@ -95,9 +96,10 @@ int br_handle_frame_finish(struct sk_buff *skb)

	dst = NULL;		dst = NULL;

	if (is_broadcast_ether_addr(dest))		if (is_broadcast_ether_addr(dest)) {
	skb2 = skb;		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);		mdst = br_mdb_get(br, skb, vid);
	if (mdst \|\| BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {		if (mdst \|\| BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
	if ((mdst && mdst->mglist) \|\|		if ((mdst && mdst->mglist) \|\|
	@@ -110,6 +112,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
	} else		} else
	skb2 = skb;		skb2 = skb;

			unicast = false;
	br->dev->stats.multicast++;		br->dev->stats.multicast++;
	} else if ((dst = __br_fdb_get(br, dest, vid)) &&		} else if ((dst = __br_fdb_get(br, dest, vid)) &&
	dst->is_local) {		dst->is_local) {
	@@ -123,7 +126,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
	dst->used = jiffies;		dst->used = jiffies;
	br_forward(dst->dst, skb, skb2);		br_forward(dst->dst, skb, skb2);
	} else		} else
	br_flood_forward(br, skb, skb2);		br_flood_forward(br, skb, skb2, unicast);
	}		}

	if (skb2)		if (skb2)