From 95f2a6b5b5d0065cd08cf23bb0ad6dda510454cf Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sat, 2 Jul 2016 12:46:04 +0200 Subject: [PATCH] geneve: Add support for configuring UDP checksums. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1339178 Upstream Status: iproute2.git commit 325d02b44ce31 commit 325d02b44ce3194a6d7a57e6a46b5ed767b61025 Author: Jesse Gross Date: Fri Mar 18 17:51:09 2016 -0700 geneve: Add support for configuring UDP checksums. Enable support for configuring outer UDP checksums on Geneve tunnels: ip link add type geneve id 10 remote 10.0.0.2 udpcsum Signed-off-by: Jesse Gross --- ip/iplink_geneve.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c index 30b16b9..13a6d80 100644 --- a/ip/iplink_geneve.c +++ b/ip/iplink_geneve.c @@ -20,6 +20,7 @@ static void print_explain(FILE *f) fprintf(f, "Usage: ... geneve id VNI remote ADDR\n"); fprintf(f, " [ ttl TTL ] [ tos TOS ]\n"); fprintf(f, " [ dstport PORT ] [ [no]external ]\n"); + fprintf(f, " [ [no]udpcsum ] [ [no]udp6zerocsumtx ] [ [no]udp6zerocsumrx ]\n"); fprintf(f, "\n"); fprintf(f, "Where: VNI := 0-16777215\n"); fprintf(f, " ADDR := IP_ADDRESS\n"); @@ -43,6 +44,12 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, __u8 tos = 0; __u16 dstport = 0; bool metadata = 0; + __u8 udpcsum = 0; + bool udpcsum_set = false; + __u8 udp6zerocsumtx = 0; + bool udp6zerocsumtx_set = false; + __u8 udp6zerocsumrx = 0; + bool udp6zerocsumrx_set = false; while (argc > 0) { if (!matches(*argv, "id") || @@ -91,6 +98,24 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, metadata = true; } else if (!matches(*argv, "noexternal")) { metadata = false; + } else if (!matches(*argv, "udpcsum")) { + udpcsum = 1; + udpcsum_set = true; + } else if (!matches(*argv, "noudpcsum")) { + udpcsum = 0; + udpcsum_set = true; + } else if (!matches(*argv, "udp6zerocsumtx")) { + udp6zerocsumtx = 1; + udp6zerocsumtx_set = true; + } else if (!matches(*argv, "noudp6zerocsumtx")) { + udp6zerocsumtx = 0; + udp6zerocsumtx_set = true; + } else if (!matches(*argv, "udp6zerocsumrx")) { + udp6zerocsumrx = 1; + udp6zerocsumrx_set = true; + } else if (!matches(*argv, "noudp6zerocsumrx")) { + udp6zerocsumrx = 0; + udp6zerocsumrx_set = true; } else if (matches(*argv, "help") == 0) { explain(); return -1; @@ -131,6 +156,12 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, addattr16(n, 1024, IFLA_GENEVE_PORT, htons(dstport)); if (metadata) addattr(n, 1024, IFLA_GENEVE_COLLECT_METADATA); + if (udpcsum_set) + addattr8(n, 1024, IFLA_GENEVE_UDP_CSUM, udpcsum); + if (udp6zerocsumtx_set) + addattr8(n, 1024, IFLA_GENEVE_UDP_ZERO_CSUM6_TX, udp6zerocsumtx); + if (udp6zerocsumrx_set) + addattr8(n, 1024, IFLA_GENEVE_UDP_ZERO_CSUM6_RX, udp6zerocsumrx); return 0; } @@ -187,6 +218,23 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_GENEVE_COLLECT_METADATA]) fputs("external ", f); + if (tb[IFLA_GENEVE_UDP_CSUM]) { + if (!rta_getattr_u8(tb[IFLA_GENEVE_UDP_CSUM])) + fputs("no", f); + fputs("udpcsum ", f); + } + + if (tb[IFLA_GENEVE_UDP_ZERO_CSUM6_TX]) { + if (!rta_getattr_u8(tb[IFLA_GENEVE_UDP_ZERO_CSUM6_TX])) + fputs("no", f); + fputs("udp6zerocsumtx ", f); + } + + if (tb[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]) { + if (!rta_getattr_u8(tb[IFLA_GENEVE_UDP_ZERO_CSUM6_RX])) + fputs("no", f); + fputs("udp6zerocsumrx ", f); + } } static void geneve_print_help(struct link_util *lu, int argc, char **argv, -- 1.8.3.1