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

Merge branch 'net-bridge-vlan-options-nest-the-tunnel-options' 



Nikolay Aleksandrov says:

====================
net: bridge: vlan options: nest the tunnel options

After a discussion with Roopa about the new tunnel vlan option, she
suggested that we'll be adding more tunnel options and attributes, so
it'd be better to have them all grouped together under one main vlan
entry tunnel attribute instead of making them all main attributes. Since
the tunnel code was added in this net-next cycle and still hasn't been
released we can easily nest the BRIDGE_VLANDB_ENTRY_TUNNEL_ID attribute
in BRIDGE_VLANDB_ENTRY_TUNNEL_INFO and allow for any new tunnel
attributes to be added there. In addition one positive side-effect is
that we can remove the outside vlan info flag which controlled the
operation (setlink/dellink) and move it under a new nested attribute so
user-space can specify it explicitly.

Thus the vlan tunnel format becomes:
 [BRIDGE_VLANDB_ENTRY]
     [BRIDGE_VLANDB_ENTRY_TUNNEL_INFO]
         [BRIDGE_VLANDB_TINFO_ID]
         [BRIDGE_VLANDB_TINFO_CMD]
         ...
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ee9d0cb6 c443758b

include/uapi/linux/if_bridge.h

+16 −2
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ enum { 
#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 */

#define BRIDGE_VLAN_INFO_REMOVE_TUN	(1<<7) /* Remove tunnel mapping */



struct bridge_vlan_info {

	__u16 flags;
@@ -203,12 +202,27 @@ enum { 
	BRIDGE_VLANDB_ENTRY_INFO,

	BRIDGE_VLANDB_ENTRY_RANGE,

	BRIDGE_VLANDB_ENTRY_STATE,

	BRIDGE_VLANDB_ENTRY_TUNNEL_ID,

	BRIDGE_VLANDB_ENTRY_TUNNEL_INFO,

	BRIDGE_VLANDB_ENTRY_STATS,

	__BRIDGE_VLANDB_ENTRY_MAX,

};

#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)



/* [BRIDGE_VLANDB_ENTRY] = {

 *     [BRIDGE_VLANDB_ENTRY_TUNNEL_INFO] = {

 *         [BRIDGE_VLANDB_TINFO_ID]

 *         ...

 *     }

 * }

 */

enum {

	BRIDGE_VLANDB_TINFO_UNSPEC,

	BRIDGE_VLANDB_TINFO_ID,

	BRIDGE_VLANDB_TINFO_CMD,

	__BRIDGE_VLANDB_TINFO_MAX,

};

#define BRIDGE_VLANDB_TINFO_MAX (__BRIDGE_VLANDB_TINFO_MAX - 1)



/* [BRIDGE_VLANDB_ENTRY] = {

 *     [BRIDGE_VLANDB_ENTRY_STATS] = {

 *         [BRIDGE_VLANDB_STATS_RX_BYTES]

net/bridge/br_vlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ static const struct nla_policy br_vlan_db_policy[BRIDGE_VLANDB_ENTRY_MAX + 1] = 
					    .len = sizeof(struct bridge_vlan_info) },

	[BRIDGE_VLANDB_ENTRY_RANGE]	= { .type = NLA_U16 },

	[BRIDGE_VLANDB_ENTRY_STATE]	= { .type = NLA_U8 },

	[BRIDGE_VLANDB_ENTRY_TUNNEL_ID] = { .type = NLA_U32 },

	[BRIDGE_VLANDB_ENTRY_TUNNEL_INFO] = { .type = NLA_NESTED },

};



static int br_vlan_rtm_process_one(struct net_device *dev,

net/bridge/br_vlan_options.c

+57 −19
Original line number Diff line number Diff line
@@ -12,12 +12,21 @@ 
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);

	struct nlattr *nest;



	if (!v->tinfo.tunnel_dst)

		return true;



	return !nla_put_u32(skb, BRIDGE_VLANDB_ENTRY_TUNNEL_ID,

			    be32_to_cpu(tid));

	nest = nla_nest_start(skb, BRIDGE_VLANDB_ENTRY_TUNNEL_INFO);

	if (!nest)

		return false;

	if (nla_put_u32(skb, BRIDGE_VLANDB_TINFO_ID, be32_to_cpu(tid))) {

		nla_nest_cancel(skb, nest);

		return false;

	}

	nla_nest_end(skb, nest);



	return true;

}



static bool __vlan_tun_can_enter_range(const struct net_bridge_vlan *v_curr,
@@ -45,7 +54,8 @@ bool br_vlan_opts_fill(struct sk_buff *skb, const struct net_bridge_vlan *v) 
size_t br_vlan_opts_nl_size(void)

{

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

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

	       + nla_total_size(0) /* BRIDGE_VLANDB_ENTRY_TUNNEL_INFO */

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

}



static int br_vlan_modify_state(struct net_bridge_vlan_group *vg,
@@ -85,15 +95,21 @@ static int br_vlan_modify_state(struct net_bridge_vlan_group *vg, 
	return 0;

}



static const struct nla_policy br_vlandb_tinfo_pol[BRIDGE_VLANDB_TINFO_MAX + 1] = {

	[BRIDGE_VLANDB_TINFO_ID]	= { .type = NLA_U32 },

	[BRIDGE_VLANDB_TINFO_CMD]	= { .type = NLA_U32 },

};



static int br_vlan_modify_tunnel(const struct net_bridge_port *p,

				 struct net_bridge_vlan *v,

				 struct nlattr **tb,

				 bool *changed,

				 struct netlink_ext_ack *extack)

{

	struct nlattr *tun_tb[BRIDGE_VLANDB_TINFO_MAX + 1], *attr;

	struct bridge_vlan_info *vinfo;

	int cmdmap;

	u32 tun_id;

	u32 tun_id = 0;

	int cmd, err;



	if (!p) {

		NL_SET_ERR_MSG_MOD(extack, "Can't modify tunnel mapping of non-port vlans");
@@ -104,19 +120,41 @@ static int br_vlan_modify_tunnel(const struct net_bridge_port *p, 
		return -EINVAL;

	}



	/* vlan info attribute is guaranteed by br_vlan_rtm_process_one */

	attr = tb[BRIDGE_VLANDB_ENTRY_TUNNEL_INFO];

	err = nla_parse_nested(tun_tb, BRIDGE_VLANDB_TINFO_MAX, attr,

			       br_vlandb_tinfo_pol, extack);

	if (err)

		return err;



	if (!tun_tb[BRIDGE_VLANDB_TINFO_CMD]) {

		NL_SET_ERR_MSG_MOD(extack, "Missing tunnel command attribute");

		return -ENOENT;

	}

	cmd = nla_get_u32(tun_tb[BRIDGE_VLANDB_TINFO_CMD]);

	switch (cmd) {

	case RTM_SETLINK:

		if (!tun_tb[BRIDGE_VLANDB_TINFO_ID]) {

			NL_SET_ERR_MSG_MOD(extack, "Missing tunnel id attribute");

			return -ENOENT;

		}

		/* when working on vlan ranges this is the starting tunnel id */

		tun_id = nla_get_u32(tun_tb[BRIDGE_VLANDB_TINFO_ID]);

		/* vlan info attr is guaranteed by br_vlan_rtm_process_one */

		vinfo = nla_data(tb[BRIDGE_VLANDB_ENTRY_INFO]);

	cmdmap = vinfo->flags & BRIDGE_VLAN_INFO_REMOVE_TUN ? RTM_DELLINK :

							      RTM_SETLINK;

	/* when working on vlan ranges this represents the starting tunnel id */

	tun_id = nla_get_u32(tb[BRIDGE_VLANDB_ENTRY_TUNNEL_ID]);

		/* tunnel ids are mapped to each vlan in increasing order,

		 * the starting vlan is in BRIDGE_VLANDB_ENTRY_INFO and v is the

		 * current vlan, so we compute: tun_id + v - vinfo->vid

		 */

		tun_id += v->vid - vinfo->vid;

		break;

	case RTM_DELLINK:

		break;

	default:

		NL_SET_ERR_MSG_MOD(extack, "Unsupported tunnel command");

		return -EINVAL;

	}



	return br_vlan_tunnel_info(p, cmdmap, v->vid, tun_id, changed);

	return br_vlan_tunnel_info(p, cmd, v->vid, tun_id, changed);

}



static int br_vlan_process_one_opts(const struct net_bridge *br,
@@ -137,7 +175,7 @@ static int br_vlan_process_one_opts(const struct net_bridge *br, 
		if (err)

			return err;

	}

	if (tb[BRIDGE_VLANDB_ENTRY_TUNNEL_ID]) {

	if (tb[BRIDGE_VLANDB_ENTRY_TUNNEL_INFO]) {

		err = br_vlan_modify_tunnel(p, v, tb, changed, extack);

		if (err)

			return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE