Commit 23f4eacd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-bridge-add-per-vlan-state-option' 



Nikolay Aleksandrov says:

====================
net: bridge: add per-vlan state option

This set adds the first per-vlan option - state, which uses the new vlan
infrastructure that was recently added. It gives us forwarding control on
per-vlan basis. The first 3 patches prepare the vlan code to support option
dumping and modification. We still compress vlan ranges which have equal
options, each new option will have to add its own equality check to
br_vlan_opts_eq(). The vlans are created in forwarding state by default to
be backwards compatible and vlan state is considered only when the port
state is forwarding (more info in patch 4).
I'll send the selftest for the vlan state with the iproute2 patch-set.

v2: patch 3: do full (all-vlan) notification only on vlan
    create/delete, otherwise use the per-vlan notifications only,
    rework how option change ranges are detected, add more verbose error
    messages when setting options and add checks if a vlan should be used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9bbc8be2 a580c76d

include/uapi/linux/if_bridge.h

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ enum { 
#define BRIDGE_VLAN_INFO_RANGE_BEGIN	(1<<3) /* VLAN is start of vlan range */

#define BRIDGE_VLAN_INFO_RANGE_END	(1<<4) /* VLAN is end of vlan range */

#define BRIDGE_VLAN_INFO_BRENTRY	(1<<5) /* Global bridge VLAN entry */

#define BRIDGE_VLAN_INFO_ONLY_OPTS	(1<<6) /* Skip create/delete/flags */



struct bridge_vlan_info {

	__u16 flags;
@@ -190,6 +191,7 @@ enum { 
	BRIDGE_VLANDB_ENTRY_UNSPEC,

	BRIDGE_VLANDB_ENTRY_INFO,

	BRIDGE_VLANDB_ENTRY_RANGE,

	BRIDGE_VLANDB_ENTRY_STATE,

	__BRIDGE_VLANDB_ENTRY_MAX,

};

#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)

net/bridge/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o 


bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o



bridge-$(CONFIG_BRIDGE_VLAN_FILTERING) += br_vlan.o br_vlan_tunnel.o

bridge-$(CONFIG_BRIDGE_VLAN_FILTERING) += br_vlan.o br_vlan_tunnel.o br_vlan_options.o



bridge-$(CONFIG_NET_SWITCHDEV) += br_switchdev.o

net/bridge/br_device.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct net_bridge_mdb_entry *mdst;

	struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);

	const struct nf_br_ops *nf_ops;

	u8 state = BR_STATE_FORWARDING;

	const unsigned char *dest;

	struct ethhdr *eth;

	u16 vid = 0;
@@ -56,7 +57,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
	eth = eth_hdr(skb);

	skb_pull(skb, ETH_HLEN);



	if (!br_allowed_ingress(br, br_vlan_group_rcu(br), skb, &vid))

	if (!br_allowed_ingress(br, br_vlan_group_rcu(br), skb, &vid, &state))

		goto out;



	if (IS_ENABLED(CONFIG_INET) &&

net/bridge/br_forward.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static inline int should_deliver(const struct net_bridge_port *p, 


	vg = nbp_vlan_group_rcu(p);

	return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&

		br_allowed_egress(vg, skb) && p->state == BR_STATE_FORWARDING &&

		p->state == BR_STATE_FORWARDING && br_allowed_egress(vg, skb) &&

		nbp_switchdev_allowed_egress(p, skb) &&

		!br_skb_isolated(p, skb);

}

net/bridge/br_input.c

+5 −2
Original line number Diff line number Diff line
@@ -76,11 +76,14 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
	bool local_rcv, mcast_hit = false;

	struct net_bridge *br;

	u16 vid = 0;

	u8 state;



	if (!p || p->state == BR_STATE_DISABLED)

		goto drop;



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

	state = p->state;

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

				&state))

		goto out;



	nbp_switchdev_frame_mark(p, skb);
@@ -103,7 +106,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
		}

	}



	if (p->state == BR_STATE_LEARNING)

	if (state == BR_STATE_LEARNING)

		goto drop;



	BR_INPUT_SKB_CB(skb)->brdev = br->dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE