From 66373cc86a92570198bc282fde92782d8a256966 Mon Sep 17 00:00:00 2001

From: Phil Sutter <psutter@redhat.com>

Date: Sat, 2 Jul 2016 12:42:24 +0200

Subject: [PATCH] iproute2: GENEVE support

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1339178

Upstream Status: iproute2.git commit 908755dc49df0

Conflicts:

 - Context changes due to missing interface type support for hsr, fou

   and ipvlan.

 - Added missing IFLA_GENEVE_* defines.

commit 908755dc49df0beffd12c8cad91e425e5be76888

Author: John W. Linville <linville@tuxdriver.com>

Date:   Fri May 8 13:27:08 2015 -0400

    iproute2: GENEVE support

    Signed-off-by: John W. Linville <linville@tuxdriver.com>

---

 include/linux/if_link.h |   5 ++

 ip/Makefile             |   3 +-

 ip/iplink.c             |   2 +-

 ip/iplink_geneve.c      | 122 ++++++++++++++++++++++++++++++++++++++++++++++++

 4 files changed, 130 insertions(+), 2 deletions(-)

 create mode 100644 ip/iplink_geneve.c

diff --git a/include/linux/if_link.h b/include/linux/if_link.h

index ca9a681..73b5556 100644

--- a/include/linux/if_link.h

+++ b/include/linux/if_link.h

@@ -410,6 +410,11 @@ enum {

 	IFLA_GENEVE_TOS,

 	IFLA_GENEVE_PORT,	/* destination port */

 	IFLA_GENEVE_COLLECT_METADATA,

+	IFLA_GENEVE_REMOTE6,

+	IFLA_GENEVE_UDP_CSUM,

+	IFLA_GENEVE_UDP_ZERO_CSUM6_TX,

+	IFLA_GENEVE_UDP_ZERO_CSUM6_RX,

+	IFLA_GENEVE_LABEL,

 	__IFLA_GENEVE_MAX

 };

 #define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)

diff --git a/ip/Makefile b/ip/Makefile

index e4f0507..5aad224 100644

--- a/ip/Makefile

+++ b/ip/Makefile

@@ -6,7 +6,8 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \

     iplink_macvlan.o ipl2tp.o link_vti.o link_vti6.o \

     iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \

     link_iptnl.o link_gre6.o iplink_bond.o iplink_bond_slave.o \

-    iplink_bridge.o iplink_bridge_slave.o

+    iplink_bridge.o iplink_bridge_slave.o \

+    iplink_geneve.o

 RTMONOBJ=rtmon.o

diff --git a/ip/iplink.c b/ip/iplink.c

index 84bdc56..0e2390d 100644

--- a/ip/iplink.c

+++ b/ip/iplink.c

@@ -93,7 +93,7 @@ void iplink_usage(void)

 		fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");

 		fprintf(stderr, "          bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");

 		fprintf(stderr, "          gre | gretap | ip6gre | ip6gretap | vti | nlmon |\n");

-		fprintf(stderr, "          bond_slave }\n");

+		fprintf(stderr, "          bond_slave | geneve }\n");

 	}

 	exit(-1);

 }

diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c

new file mode 100644

index 0000000..74703e1

--- /dev/null

+++ b/ip/iplink_geneve.c

@@ -0,0 +1,122 @@

+/*

+ * iplink_geneve.c	GENEVE device support

+ *

+ *              This program is free software; you can redistribute it and/or

+ *              modify it under the terms of the GNU General Public License

+ *              as published by the Free Software Foundation; either version

+ *              2 of the License, or (at your option) any later version.

+ *

+ * Authors:     John W. Linville <linville@tuxdriver.com>

+ */

+

+#include <stdio.h>

+

+#include "utils.h"

+#include "ip_common.h"

+

+static void print_explain(FILE *f)

+{

+	fprintf(f, "Usage: ... geneve id VNI remote ADDR\n");

+	fprintf(f, "\n");

+	fprintf(f, "Where: VNI  := 0-16777215\n");

+	fprintf(f, "       ADDR := IP_ADDRESS\n");

+}

+

+static void explain(void)

+{

+	print_explain(stderr);

+}

+

+static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,

+			  struct nlmsghdr *n)

+{

+	__u32 vni = 0;

+	int vni_set = 0;

+	__u32 daddr = 0;

+	struct in6_addr daddr6 = IN6ADDR_ANY_INIT;

+

+

+	while (argc > 0) {

+		if (!matches(*argv, "id") ||

+		    !matches(*argv, "vni")) {

+			NEXT_ARG();

+			if (get_u32(&vni, *argv, 0) ||

+			    vni >= 1u << 24)

+				invarg("invalid id", *argv);

+			vni_set = 1;

+		} else if (!matches(*argv, "remote")) {

+			NEXT_ARG();

+			if (!inet_get_addr(*argv, &daddr, &daddr6)) {

+				fprintf(stderr, "Invalid address \"%s\"\n", *argv);

+				return -1;

+			}

+			if (IN_MULTICAST(ntohl(daddr)))

+				invarg("invalid remote address", *argv);

+		} else if (matches(*argv, "help") == 0) {

+			explain();

+			return -1;

+		} else {

+			fprintf(stderr, "geneve: unknown command \"%s\"?\n", *argv);

+			explain();

+			return -1;

+		}

+		argc--, argv++;

+	}

+

+	if (!vni_set) {

+		fprintf(stderr, "geneve: missing virtual network identifier\n");

+		return -1;

+	}

+

+	if (!daddr) {

+		fprintf(stderr, "geneve: remove link partner not specified\n");

+		return -1;

+	}

+	if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0) {

+		fprintf(stderr, "geneve: remove link over IPv6 not supported\n");

+		return -1;

+	}

+

+	addattr32(n, 1024, IFLA_GENEVE_ID, vni);

+	if (daddr)

+		addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4);

+

+	return 0;

+}

+

+static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

+{

+	__u32 vni;

+	char s1[1024];

+

+	if (!tb)

+		return;

+

+	if (!tb[IFLA_GENEVE_ID] ||

+	    RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) < sizeof(__u32))

+		return;

+

+	vni = rta_getattr_u32(tb[IFLA_GENEVE_ID]);

+	fprintf(f, "id %u ", vni);

+

+	if (tb[IFLA_GENEVE_REMOTE]) {

+		__be32 addr = rta_getattr_u32(tb[IFLA_GENEVE_REMOTE]);

+		if (addr)

+			fprintf(f, "remote %s ",

+				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));

+	}

+}

+

+static void geneve_print_help(struct link_util *lu, int argc, char **argv,

+	FILE *f)

+{

+	print_explain(f);

+}

+

+struct link_util geneve_link_util = {

+	.id		= "geneve",

+	.maxattr	= IFLA_GENEVE_MAX,

+	.parse_opt	= geneve_parse_opt,

+	.print_opt	= geneve_print_opt,

+	.print_help	= geneve_print_help,

+};

-- 

1.8.3.1