Skip to contentSkip to conversation

vxlan: Allow setting destination to unicast address.

PATCH Superseded Atzm Watanabe 4 participants 6 messages Apr 11, 2013 – Apr 12, 2013

Subsystems (2)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vxlan: Allow setting destination to unicast address.

This patch allows setting VXLAN destination to unicast address. It allows that VXLAN can be used as peer-to-peer tunnel without multicast.

v2: use a new argument "remote" instead of "group" based by
Stephen Hemminger's comments.

---
 include/linux/if_link.h |  1 +
 ip/iplink_vxlan.c       | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
include/linux/if_link.h +1 -0
index 40167af..0bf03dc 100644
@@ -296,6 +296,7 @@ enum {
 	IFLA_VXLAN_GROUP,
 	IFLA_VXLAN_LINK,
 	IFLA_VXLAN_LOCAL,
+	IFLA_VXLAN_REMOTE,
 	IFLA_VXLAN_TTL,
 	IFLA_VXLAN_TOS,
 	IFLA_VXLAN_LEARNING,
ip/iplink_vxlan.c +23 -2
index 1025326..ce2c30c 100644
@@ -23,7 +23,8 @@
 
 static void explain(void)
 {
-	fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ local ADDR ]\n");
+	fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ remote ADDR ]\n");
+	fprintf(stderr, "                 [ local ADDR ]\n");
 	fprintf(stderr, "                 [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n");
 	fprintf(stderr, "                 [ port MIN MAX ] [ [no]learning ]\n");
 	fprintf(stderr, "                 [ [no]proxy ] [ [no]rsc ]\n");
@@ -41,6 +42,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 	__u32 vni = 0;
 	int vni_set = 0;
 	__u32 saddr = 0;
+	__u32 daddr = 0;
 	__u32 gaddr = 0;
 	unsigned link = 0;
 	__u8 tos = 0;
@@ -68,7 +70,13 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 			gaddr = get_addr32(*argv);
 
 			if (!IN_MULTICAST(ntohl(gaddr)))
-				invarg("invald group address", *argv);
+				invarg("invalid group address", *argv);
+		} else if (!matches(*argv, "remote")) {
+			NEXT_ARG();
+			daddr = get_addr32(*argv);
+
+			if (IN_MULTICAST(ntohl(daddr)))
+				invarg("invalid remote address", *argv);
 		} else if (!matches(*argv, "local")) {
 			NEXT_ARG();
 			if (strcmp(*argv, "any"))
@@ -160,9 +168,15 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 		fprintf(stderr, "vxlan: missing virtual network identifier\n");
 		return -1;
 	}
+	if (gaddr && daddr) {
+		fprintf(stderr, "vxlan: both group and remote cannot be specified\n");
+		return -1;
+	}
 	addattr32(n, 1024, IFLA_VXLAN_ID, vni);
 	if (gaddr)
 		addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);
+	else if (daddr)
+		addattr_l(n, 1024, IFLA_VXLAN_REMOTE, &daddr, 4);
 	if (saddr)
 		addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);
 	if (link)
@@ -213,6 +227,13 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
 	}
 
+	if (tb[IFLA_VXLAN_REMOTE]) {
+		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_REMOTE]);
+		if (addr)
+			fprintf(f, "remote %s ",
+				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
+	}
+
 	if (tb[IFLA_VXLAN_LOCAL]) {
 		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);
 		if (addr)
Signature · 1 line
1.8.1.5
#1 lore raw

include/linux/if_link.h enum { · line 301

Quoted 11 lines · On Thu, 11 Apr 2013 19:17:54 +0900 Atzm Watanabe <[email protected]>…
include/linux/if_link.h +1 -0
index 40167af..0bf03dc 100644
@@ -296,6 +296,7 @@ enum {
 	IFLA_VXLAN_GROUP,
 	IFLA_VXLAN_LINK,
 	IFLA_VXLAN_LOCAL,
+	IFLA_VXLAN_REMOTE,
 	IFLA_VXLAN_TTL,
 	IFLA_VXLAN_TOS,

You can't insert another value into the middle of an enum list. It changes the kernel-userspace ABI values.

maintainer
#2 lore raw

From: Stephen Hemminger <[email protected]>
Date: Thu, 11 Apr 2013 08:24:38 -0700

Quoted 17 lines

include/linux/if_link.h enum { · line 301

Quoted 11 lines · On Thu, 11 Apr 2013 19:17:54 +0900 Atzm Watanabe <[email protected]>…
include/linux/if_link.h +1 -0
index 40167af..0bf03dc 100644
@@ -296,6 +296,7 @@ enum {
 	IFLA_VXLAN_GROUP,
 	IFLA_VXLAN_LINK,
 	IFLA_VXLAN_LOCAL,
+	IFLA_VXLAN_REMOTE,
 	IFLA_VXLAN_TTL,
 	IFLA_VXLAN_TOS,

You can't insert another value into the middle of an enum list. It changes the kernel-userspace ABI values.

Right.

#3 lore raw

At Thu, 11 Apr 2013 13:30:14 -0400 (EDT),

Quoted 22 lines · David Miller

From: Stephen Hemminger <[email protected]>
Date: Thu, 11 Apr 2013 08:24:38 -0700

Quoted 17 lines

include/linux/if_link.h enum { · line 301

Quoted 11 lines · On Thu, 11 Apr 2013 19:17:54 +0900 Atzm Watanabe <[email protected]>…
include/linux/if_link.h +1 -0
index 40167af..0bf03dc 100644
@@ -296,6 +296,7 @@ enum {
 	IFLA_VXLAN_GROUP,
 	IFLA_VXLAN_LINK,
 	IFLA_VXLAN_LOCAL,
+	IFLA_VXLAN_REMOTE,
 	IFLA_VXLAN_TTL,
 	IFLA_VXLAN_TOS,

You can't insert another value into the middle of an enum list. It changes the kernel-userspace ABI values.

Quoted 1 line

Right.

Thank you for pointing it out.
I'll move IFLA_VXLAN_REMOTE to the last and resend the patch.

Thanks.

#4 lore raw
In reply to Atzm Watanabe
Quoted 8 lines · Atzm Watanabe

This patch allows setting VXLAN destination to unicast address. It allows that VXLAN can be used as peer-to-peer tunnel without multicast.

v2: use a new argument "remote" instead of "group" based by
Stephen Hemminger's comments.

[...]

ip/iplink_vxlan.c line 26

Quoted 8 lines
ip/iplink_vxlan.c +1 -1
@@ -23,7 +23,8 @@
 
 static void explain(void)
 {
-	fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ local ADDR ]\n");
+	fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ remote ADDR ]\n");

[...]

Shouldn't that be "[ group|remote ADDR ]", to show that you can specify one or the other?

Ben.

Signature · 3 lines
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
#5 lore raw

At Thu, 11 Apr 2013 18:48:20 +0100,

Quoted 15 lines · Ben Hutchings
Quoted 8 lines · Atzm Watanabe

This patch allows setting VXLAN destination to unicast address. It allows that VXLAN can be used as peer-to-peer tunnel without multicast.

v2: use a new argument "remote" instead of "group" based by
Stephen Hemminger's comments.

[...]

Quoted 4 lines
ip/iplink_vxlan.c +0 -0
@@ -23,7 +23,8 @@
 
Quoted 8 lines

ip/iplink_vxlan.c line 26

Quoted 4 lines
ip/iplink_vxlan.c +1 -1
 static void explain(void)
 {
-	fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ local ADDR ]\n");
+	fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ remote ADDR ]\n");

[...]

Shouldn't that be "[ group|remote ADDR ]", to show that you can specify one or the other?

Yes, basically I agreed.
I think this should be "[ { group | remote } ADDR ]", to accommodate the notation to others.
I'll fix this and resend the patch.

Thanks.