diff mbox

[iproute2,1/3] vxlan: add support for collect metadata flag

Message ID c83d317f4849cbbb1b0551d450c3972c5bc73e2b.1450193891.git.pabeni@redhat.com
State Superseded, archived
Delegated to: stephen hemminger
Headers show

Commit Message

Paolo Abeni Dec. 15, 2015, 3:48 p.m. UTC 
This patch add support for IFLA_VXLAN_COLLECT_METADATA via the
'collectmetadata' keyword to the vxlan link.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 ip/iplink_vxlan.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Jiri Benc Dec. 16, 2015, 10:50 a.m. UTC | #1 
On Tue, 15 Dec 2015 16:48:25 +0100, Paolo Abeni wrote:
> This patch add support for IFLA_VXLAN_COLLECT_METADATA via the
> 'collectmetadata' keyword to the vxlan link.

Could we give this more understandable name? I've never liked the
COLLECT_METADATA name as it describes the actual implementation, not
the intention of the flag.

The name should express that the vxlan interface is driven by an
external control plane instead of the internal fdb. This could be ovs,
a route, tc action, etc. Something like "external" would be better
name, I think.

Also, as a related remark, please note that IFLA_VXLAN_COLLECT_METADATA
is mutually exclusive with many other flags. It's currently not
enforced correctly at the kernel level (instead, you get weird
behavior). I'll fix this on the kernel side but we may want to enforce
this on the iproute2 side, too, to get a better error message. This is
not to be addressed by this patch, though.

 Jiri
diff mbox

Patch

diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index db29bf0..a943e03 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -31,7 +31,7 @@  static void print_explain(FILE *f)
 	fprintf(f, "                 [ ageing SECONDS ] [ maxaddress NUMBER ]\n");
 	fprintf(f, "                 [ [no]udpcsum ] [ [no]udp6zerocsumtx ] [ [no]udp6zerocsumrx ]\n");
 	fprintf(f, "                 [ [no]remcsumtx ] [ [no]remcsumrx ]\n");
-	fprintf(f, "                 [ gbp ]\n");
+	fprintf(f, "                 [ [no]collectmetadata ] [ gbp ]\n");
 	fprintf(f, "\n");
 	fprintf(f, "Where: VNI := 0-16777215\n");
 	fprintf(f, "       ADDR := { IP_ADDRESS | any }\n");
@@ -72,6 +72,7 @@  static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 	__u8 udp6zerocsumrx = 0;
 	__u8 remcsumtx = 0;
 	__u8 remcsumrx = 0;
+	__u8 metadata = 0;
 	__u8 gbp = 0;
 	int dst_port_set = 0;
 	struct ifla_vxlan_port_range range = { 0, 0 };
@@ -210,6 +211,10 @@  static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 			remcsumrx = 1;
 		} else if (!matches(*argv, "noremcsumrx")) {
 			remcsumrx = 0;
+		} else if (!matches(*argv, "collectmetadata")) {
+			metadata = 1;
+		} else if (!matches(*argv, "nocollectmetadata")) {
+			metadata = 0;
 		} else if (!matches(*argv, "gbp")) {
 			gbp = 1;
 		} else if (matches(*argv, "help") == 0) {
@@ -272,6 +277,7 @@  static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 	addattr8(n, 1024, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, udp6zerocsumrx);
 	addattr8(n, 1024, IFLA_VXLAN_REMCSUM_TX, remcsumtx);
 	addattr8(n, 1024, IFLA_VXLAN_REMCSUM_RX, remcsumrx);
+	addattr8(n, 1024, IFLA_VXLAN_COLLECT_METADATA, metadata);
 
 	if (noage)
 		addattr32(n, 1024, IFLA_VXLAN_AGEING, 0);
@@ -428,6 +434,10 @@  static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 	    rta_getattr_u8(tb[IFLA_VXLAN_REMCSUM_RX]))
 		fputs("remcsumrx ", f);
 
+	if (tb[IFLA_VXLAN_COLLECT_METADATA] &&
+	    rta_getattr_u8(tb[IFLA_VXLAN_COLLECT_METADATA]))
+		fputs("collectmetadata ", f);
+
 	if (tb[IFLA_VXLAN_GBP])
 		fputs("gbp ", f);
 }