Commit 188c67dd authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: vlan options: add support for tunnel id dumping 



Add a new option - BRIDGE_VLANDB_ENTRY_TUNNEL_ID which is used to dump
the tunnel id mapping. Since they're unique per vlan they can enter a
vlan range if they're consecutive, thus we can calculate the tunnel id
range map simply as: vlan range end id - vlan range start id. The
starting point is the tunnel id in BRIDGE_VLANDB_ENTRY_TUNNEL_ID. This
is similar to how the tunnel entries can be created in a range via the
old API (a vlan range maps to a tunnel range).

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53e96632

include/uapi/linux/if_bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ enum { 
	BRIDGE_VLANDB_ENTRY_INFO,

	BRIDGE_VLANDB_ENTRY_RANGE,

	BRIDGE_VLANDB_ENTRY_STATE,

	BRIDGE_VLANDB_ENTRY_TUNNEL_ID,

	__BRIDGE_VLANDB_ENTRY_MAX,

};

#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)

net/bridge/br_netlink_tunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ static size_t __get_vlan_tinfo_size(void) 
		  nla_total_size(sizeof(u16)); /* IFLA_BRIDGE_VLAN_TUNNEL_FLAGS */

}



static bool vlan_tunid_inrange(struct net_bridge_vlan *v_curr,

			       struct net_bridge_vlan *v_last)

bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,

			const struct net_bridge_vlan *v_last)

{

	__be32 tunid_curr = tunnel_id_to_key32(v_curr->tinfo.tunnel_id);

	__be32 tunid_last = tunnel_id_to_key32(v_last->tinfo.tunnel_id);

net/bridge/br_private_tunnel.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ int br_handle_ingress_vlan_tunnel(struct sk_buff *skb, 
				  struct net_bridge_vlan_group *vg);

int br_handle_egress_vlan_tunnel(struct sk_buff *skb,

				 struct net_bridge_vlan *vlan);

bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,

			const struct net_bridge_vlan *v_last);

#else

static inline int vlan_tunnel_init(struct net_bridge_vlan_group *vg)

{

net/bridge/br_vlan_options.c

+26 −3
Original line number Diff line number Diff line
@@ -4,25 +4,48 @@ 
#include <linux/netdevice.h>

#include <linux/rtnetlink.h>

#include <linux/slab.h>

#include <net/ip_tunnels.h>



#include "br_private.h"

#include "br_private_tunnel.h"



static bool __vlan_tun_put(struct sk_buff *skb, const struct net_bridge_vlan *v)

{

	__be32 tid = tunnel_id_to_key32(v->tinfo.tunnel_id);



	if (!v->tinfo.tunnel_dst)

		return true;



	return !nla_put_u32(skb, BRIDGE_VLANDB_ENTRY_TUNNEL_ID,

			    be32_to_cpu(tid));

}



static bool __vlan_tun_can_enter_range(const struct net_bridge_vlan *v_curr,

				       const struct net_bridge_vlan *range_end)

{

	return (!v_curr->tinfo.tunnel_dst && !range_end->tinfo.tunnel_dst) ||

	       vlan_tunid_inrange(v_curr, range_end);

}



/* check if the options' state of v_curr allow it to enter the range */

bool br_vlan_opts_eq_range(const struct net_bridge_vlan *v_curr,

			   const struct net_bridge_vlan *range_end)

{

	return v_curr->state == range_end->state;

	return v_curr->state == range_end->state &&

	       __vlan_tun_can_enter_range(v_curr, range_end);

}



bool br_vlan_opts_fill(struct sk_buff *skb, const struct net_bridge_vlan *v)

{

	return !nla_put_u8(skb, BRIDGE_VLANDB_ENTRY_STATE,

			   br_vlan_get_state(v));

			   br_vlan_get_state(v)) &&

	       __vlan_tun_put(skb, v);

}



size_t br_vlan_opts_nl_size(void)

{

	return nla_total_size(sizeof(u8)); /* BRIDGE_VLANDB_ENTRY_STATE */

	return nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_ENTRY_STATE */

	       + nla_total_size(sizeof(u32)); /* BRIDGE_VLANDB_ENTRY_TUNNEL_ID */

}



static int br_vlan_modify_state(struct net_bridge_vlan_group *vg,