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

Commit cd7918b3 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

geneve: Make dst-port configurable. 



Add netlink interface to configure Geneve UDP port number.
So that user can configure it for a Gevene device.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Reviewed-by: default avatarJesse Gross <jesse@nicira.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c29a70d2

drivers/net/geneve.c

+21 −4
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct geneve_dev { 
	u8                 tos;		/* TOS override */

	struct sockaddr_in remote;	/* IPv4 address for link partner */

	struct list_head   next;	/* geneve's per namespace list */

	__be16		   dst_port;

};



static int geneve_net_id;
@@ -64,6 +65,7 @@ static inline __u32 geneve_net_vni_hash(u8 vni[3]) 
/* geneve receive/decap routine */

static void geneve_rx(struct geneve_sock *gs, struct sk_buff *skb)

{

	struct inet_sock *sk = inet_sk(gs->sock->sk);

	struct genevehdr *gnvh = geneve_hdr(skb);

	struct geneve_dev *dummy, *geneve = NULL;

	struct geneve_net *gn;
@@ -82,7 +84,8 @@ static void geneve_rx(struct geneve_sock *gs, struct sk_buff *skb) 
	vni_list_head = &gn->vni_list[hash];

	hlist_for_each_entry_rcu(dummy, vni_list_head, hlist) {

		if (!memcmp(gnvh->vni, dummy->vni, sizeof(dummy->vni)) &&

		    iph->saddr == dummy->remote.sin_addr.s_addr) {

		    iph->saddr == dummy->remote.sin_addr.s_addr &&

		    sk->inet_sport == dummy->dst_port) {

			geneve = dummy;

			break;

		}
@@ -157,7 +160,7 @@ static int geneve_open(struct net_device *dev) 
	struct geneve_net *gn = net_generic(geneve->net, geneve_net_id);

	struct geneve_sock *gs;



	gs = geneve_sock_add(net, htons(GENEVE_UDP_PORT), geneve_rx, gn,

	gs = geneve_sock_add(net, geneve->dst_port, geneve_rx, gn,

	                     false, false);

	if (IS_ERR(gs))

		return PTR_ERR(gs);
@@ -228,7 +231,7 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* no need to handle local destination and encap bypass...yet... */



	err = geneve_xmit_skb(gs, rt, skb, fl4.saddr, fl4.daddr,

	                      tos, ttl, 0, sport, htons(GENEVE_UDP_PORT), 0,

			      tos, ttl, 0, sport, geneve->dst_port, 0,

	                      geneve->vni, 0, NULL, false,

	                      !net_eq(geneve->net, dev_net(geneve->dev)));

	if (err < 0)
@@ -308,6 +311,7 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = { 
	[IFLA_GENEVE_REMOTE]		= { .len = FIELD_SIZEOF(struct iphdr, daddr) },

	[IFLA_GENEVE_TTL]		= { .type = NLA_U8 },

	[IFLA_GENEVE_TOS]		= { .type = NLA_U8 },

	[IFLA_GENEVE_PORT]		= { .type = NLA_U16 },

};



static int geneve_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -341,6 +345,7 @@ static int geneve_newlink(struct net *net, struct net_device *dev, 
	struct hlist_head *vni_list_head;

	struct sockaddr_in remote;	/* IPv4 address for link partner */

	__u32 vni, hash;

	__be16 dst_port;

	int err;



	if (!data[IFLA_GENEVE_ID] || !data[IFLA_GENEVE_REMOTE])
@@ -359,14 +364,21 @@ static int geneve_newlink(struct net *net, struct net_device *dev, 
	if (IN_MULTICAST(ntohl(geneve->remote.sin_addr.s_addr)))

		return -EINVAL;



	if (data[IFLA_GENEVE_PORT])

		dst_port = htons(nla_get_u16(data[IFLA_GENEVE_PORT]));

	else

		dst_port = htons(GENEVE_UDP_PORT);



	remote = geneve->remote;

	hash = geneve_net_vni_hash(geneve->vni);

	vni_list_head = &gn->vni_list[hash];

	hlist_for_each_entry_rcu(dummy, vni_list_head, hlist) {

		if (!memcmp(geneve->vni, dummy->vni, sizeof(dummy->vni)) &&

		    !memcmp(&remote, &dummy->remote, sizeof(dummy->remote)))

		    !memcmp(&remote, &dummy->remote, sizeof(dummy->remote)) &&

		    dst_port == dummy->dst_port) {

			return -EBUSY;

		}

	}



	err = register_netdevice(dev);

	if (err)
@@ -378,6 +390,7 @@ static int geneve_newlink(struct net *net, struct net_device *dev, 
	if (data[IFLA_GENEVE_TOS])

		geneve->tos = nla_get_u8(data[IFLA_GENEVE_TOS]);



	geneve->dst_port = dst_port;

	list_add(&geneve->next, &gn->geneve_list);



	hlist_add_head_rcu(&geneve->hlist, &gn->vni_list[hash]);
@@ -402,6 +415,7 @@ static size_t geneve_get_size(const struct net_device *dev) 
		nla_total_size(sizeof(struct in_addr)) + /* IFLA_GENEVE_REMOTE */

		nla_total_size(sizeof(__u8)) +  /* IFLA_GENEVE_TTL */

		nla_total_size(sizeof(__u8)) +  /* IFLA_GENEVE_TOS */

		nla_total_size(sizeof(__u16)) +  /* IFLA_GENEVE_PORT */

		0;

}
@@ -422,6 +436,9 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	    nla_put_u8(skb, IFLA_GENEVE_TOS, geneve->tos))

		goto nla_put_failure;



	if (nla_put_u16(skb, IFLA_GENEVE_PORT, ntohs(geneve->dst_port)))

		goto nla_put_failure;



	return 0;



nla_put_failure:

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ enum { 
	IFLA_GENEVE_REMOTE,

	IFLA_GENEVE_TTL,

	IFLA_GENEVE_TOS,

	IFLA_GENEVE_PORT,	/* destination port */

	__IFLA_GENEVE_MAX

};

#define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)