From patchwork Sun Sep 2 13:07:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter Jansen van Vuuren X-Patchwork-Id: 965090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="GEyaxIqm"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 423D0p0FxSz9sNr for ; Sun, 2 Sep 2018 23:07:54 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id AF607BAE; Sun, 2 Sep 2018 13:07:26 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id A7BB8707 for ; Sun, 2 Sep 2018 13:07:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D1E795E2 for ; Sun, 2 Sep 2018 13:07:24 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id h4-v6so19309167qtj.7 for ; Sun, 02 Sep 2018 06:07:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lElOMHC9sZhhjrktTSUTY6Z0qSy+wf5z2ja0vVCWFrc=; b=GEyaxIqmhfzQomGajCLcRcyvvz5vb6v6kUoZPHBK9A+ueiYx15ItBoDZR0MGfS7uIn iq2z+uKrgI6f0QcjibPC1p0fKvqjr3m49aCqSzU0yeftpIp7ZPmIE3nj369VPhiBfKK2 YAkYyu+jyfGktWEv/jQG1Cgg4Q67dUNdhxEk90lCl9meAOu/DZaj+VvURRpNUDrFxd6L ivE8eVQZupPu0q2pc6EwCaFqqFBX/5dlbuPJ/7N+S/21grz8VmYi5jMtjPPaDv3JlIEq sJDUJWRfAZZAOWzZRJ+pO08EozFp/HVdi4I88gsqPAd71ph2AUlI579djOOXqB7GTTo+ lJOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lElOMHC9sZhhjrktTSUTY6Z0qSy+wf5z2ja0vVCWFrc=; b=S+kU3B/dGZwJ0PXw8myf7zm68HM60Xdb+JSu/7vGGbnqzmttM4bd/k5UqzkSmMRNhJ J1F0IBf2f0KXOwUwqxbYWFxwlnviLQLM76405TYp0Dz0/BYFNzzKbPswjzehb4jhCYgt IzTJKEad3Z4BCF5W/aRmdm5XA7rn+VQVM19T6QTJaVzqu0a1IpKrV1hPiRdexI6WChUX Vlk18d0yJpEC5Gg7mCBUWWs3kT60M4S//KFUhgLnsj22O0LvHrHnguqugfyegxzwz8VZ nzPGIKOW29tPYf6zmP0UKUjUpBHVV7H7ermAGrw91PYnkakOx5dUUwKbOlcYdAydPXdv w4rw== X-Gm-Message-State: APzg51Bg0Ie1+KusyPXMC6rKXxHQEUSHD+906c8d9SdElDprxPu1t0Ge eNxQ9/mCadRCli4f0kPKv5w1Kx5skaw= X-Google-Smtp-Source: ANB0VdbaobBHFPATDfErSEyyJX/Yzf0MARgE1jlN7S7K3STDT4SFo2eqyJ8GyJ1Y6tnGH7G6/LFHGg== X-Received: by 2002:a0c:d647:: with SMTP id e7-v6mr21436824qvj.238.1535893643766; Sun, 02 Sep 2018 06:07:23 -0700 (PDT) Received: from pieter-Netronome.netronome.com (host81-150-168-85.in-addr.btopenworld.com. [81.150.168.85]) by smtp.gmail.com with ESMTPSA id g37-v6sm10387537qte.36.2018.09.02.06.07.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Sep 2018 06:07:23 -0700 (PDT) From: Pieter Jansen van Vuuren To: dev@openvswitch.org Date: Sun, 2 Sep 2018 14:07:13 +0100 Message-Id: <1535893634-12076-2-git-send-email-pieter.jansenvanvuuren@netronome.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535893634-12076-1-git-send-email-pieter.jansenvanvuuren@netronome.com> References: <1535893634-12076-1-git-send-email-pieter.jansenvanvuuren@netronome.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: simon.horman@netronome.com, Pieter Jansen van Vuuren Subject: [ovs-dev] [PATCH v2 1/2] lib/tc: add geneve with option encap action offload X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Add TC offload support for encapsulating geneve tunnels with options. Signed-off-by: Pieter Jansen van Vuuren Reviewed-by: Simon Horman --- include/linux/tc_act/tc_tunnel_key.h | 23 ++++++ lib/netdev-tc-offloads.c | 30 +++++++ lib/tc.c | 113 +++++++++++++++++++++++++-- lib/tc.h | 2 + 4 files changed, 162 insertions(+), 6 deletions(-) diff --git a/include/linux/tc_act/tc_tunnel_key.h b/include/linux/tc_act/tc_tunnel_key.h index 26cbd2ff1..f13acf17d 100644 --- a/include/linux/tc_act/tc_tunnel_key.h +++ b/include/linux/tc_act/tc_tunnel_key.h @@ -47,6 +47,29 @@ enum { #define TCA_TUNNEL_KEY_MAX (__TCA_TUNNEL_KEY_MAX - 1) +enum { + TCA_TUNNEL_KEY_ENC_OPTS_UNSPEC, + TCA_TUNNEL_KEY_ENC_OPTS_GENEVE, /* Nested + * TCA_TUNNEL_KEY_ENC_OPTS_GENEVE + * attributes + */ + __TCA_TUNNEL_KEY_ENC_OPTS_MAX, +}; + +#define TCA_TUNNEL_KEY_ENC_OPTS_MAX (__TCA_TUNNEL_KEY_ENC_OPTS_MAX - 1) + +enum { + TCA_TUNNEL_KEY_ENC_OPT_GENEVE_UNSPEC, + TCA_TUNNEL_KEY_ENC_OPT_GENEVE_CLASS, /* be16 */ + TCA_TUNNEL_KEY_ENC_OPT_GENEVE_TYPE, /* u8 */ + TCA_TUNNEL_KEY_ENC_OPT_GENEVE_DATA, /* 4 to 128 bytes */ + + __TCA_TUNNEL_KEY_ENC_OPT_GENEVE_MAX, +}; + +#define TCA_TUNNEL_KEY_ENC_OPT_GENEVE_MAX \ + (__TCA_TUNNEL_KEY_ENC_OPT_GENEVE_MAX - 1) + #endif /* __KERNEL__ || HAVE_TCA_TUNNEL_KEY_ENC_TTL */ #endif /* __LINUX_TC_ACT_TC_TUNNEL_KEY_WRAPPER_H */ diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index 7bc745e95..0612b1348 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -409,6 +409,29 @@ parse_flower_rewrite_to_netlink_action(struct ofpbuf *buf, } } +static void parse_tc_flower_geneve_opts(struct tc_action *action, + struct ofpbuf *buf) +{ + int tun_opt_len = action->encap.data.present.len; + size_t geneve_off; + int idx = 0; + + if (!tun_opt_len) { + return; + } + + geneve_off = nl_msg_start_nested(buf, OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS); + while (tun_opt_len) { + struct geneve_opt *opt; + + opt = &action->encap.data.opts.gnv[idx]; + nl_msg_put(buf, opt, sizeof(struct geneve_opt) + opt->length * 4); + idx += sizeof(struct geneve_opt) + opt->length * 4; + tun_opt_len -= sizeof(struct geneve_opt) + opt->length * 4; + } + nl_msg_end_nested(buf, geneve_off); +} + static int parse_tc_flower_to_match(struct tc_flower *flower, struct match *match, @@ -580,6 +603,7 @@ parse_tc_flower_to_match(struct tc_flower *flower, nl_msg_put_be16(buf, OVS_TUNNEL_KEY_ATTR_TP_DST, action->encap.tp_dst); + parse_tc_flower_geneve_opts(action, buf); nl_msg_end_nested(buf, tunnel_offset); nl_msg_end_nested(buf, set_offset); } @@ -786,6 +810,12 @@ parse_put_flow_set_action(struct tc_flower *flower, struct tc_action *action, action->encap.tp_dst = nl_attr_get_be16(tun_attr); } break; + case OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS: { + memcpy(action->encap.data.opts.gnv, nl_attr_get(tun_attr), + nl_attr_get_size(tun_attr)); + action->encap.data.present.len = nl_attr_get_size(tun_attr); + } + break; } } diff --git a/lib/tc.c b/lib/tc.c index bbc382326..749e658eb 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -659,8 +659,72 @@ static const struct nl_policy tunnel_key_policy[] = { [TCA_TUNNEL_KEY_ENC_DST_PORT] = { .type = NL_A_U16, .optional = true, }, [TCA_TUNNEL_KEY_ENC_TOS] = { .type = NL_A_U8, .optional = true, }, [TCA_TUNNEL_KEY_ENC_TTL] = { .type = NL_A_U8, .optional = true, }, + [TCA_TUNNEL_KEY_ENC_OPTS] = { .type = NL_A_NESTED, .optional = true,}, }; +static void +nl_parse_act_geneve_opts(const struct nlattr *in_nlattr, + struct tc_action *action) +{ + struct geneve_opt *opt = NULL; + const struct ofpbuf *msg; + struct nlattr *nla; + struct ofpbuf buf; + size_t left; + int cnt; + + nl_attr_get_nested(in_nlattr, &buf); + msg = &buf; + + cnt = 0; + NL_ATTR_FOR_EACH (nla, left, ofpbuf_at(msg, 0, 0), msg->size) { + uint16_t type = nl_attr_type(nla); + + switch (type) { + case TCA_TUNNEL_KEY_ENC_OPT_GENEVE_CLASS: + opt = (struct geneve_opt *) &action->encap.data.opts.gnv[cnt]; + opt->opt_class = nl_attr_get_be16(nla); + action->encap.data.present.len += sizeof(struct geneve_opt); + cnt += sizeof(struct geneve_opt); + break; + case TCA_TUNNEL_KEY_ENC_OPT_GENEVE_TYPE: + opt->type = nl_attr_get_u8(nla); + break; + case TCA_TUNNEL_KEY_ENC_OPT_GENEVE_DATA: + opt->length = nl_attr_get_size(nla) / 4; + memcpy(opt + 1, nl_attr_get_unspec(nla, 1), opt->length * 4); + action->encap.data.present.len += opt->length * 4; + cnt += opt->length * 4; + break; + } + } +} + +static void +nl_parse_act_tunnel_opts(struct nlattr *options, struct tc_action *action) +{ + const struct ofpbuf *msg; + struct nlattr *nla; + struct ofpbuf buf; + size_t left; + + if (!options) { + return; + } + + nl_attr_get_nested(options, &buf); + msg = &buf; + + NL_ATTR_FOR_EACH (nla, left, ofpbuf_at(msg, 0, 0), msg->size) { + uint16_t type = nl_attr_type(nla); + switch (type) { + case TCA_TUNNEL_KEY_ENC_OPTS_GENEVE: + nl_parse_act_geneve_opts(nla, action); + break; + } + } +} + static int nl_parse_act_tunnel_key(struct nlattr *options, struct tc_flower *flower) { @@ -686,6 +750,7 @@ nl_parse_act_tunnel_key(struct nlattr *options, struct tc_flower *flower) struct nlattr *ipv6_dst = tun_attrs[TCA_TUNNEL_KEY_ENC_IPV6_DST]; struct nlattr *tos = tun_attrs[TCA_TUNNEL_KEY_ENC_TOS]; struct nlattr *ttl = tun_attrs[TCA_TUNNEL_KEY_ENC_TTL]; + struct nlattr *tun_opt = tun_attrs[TCA_TUNNEL_KEY_ENC_OPTS]; action = &flower->actions[flower->action_count++]; action->type = TC_ACT_ENCAP; @@ -701,6 +766,7 @@ nl_parse_act_tunnel_key(struct nlattr *options, struct tc_flower *flower) action->encap.tp_dst = dst_port ? nl_attr_get_be16(dst_port) : 0; action->encap.tos = tos ? nl_attr_get_u8(tos) : 0; action->encap.ttl = ttl ? nl_attr_get_u8(ttl) : 0; + nl_parse_act_tunnel_opts(tun_opt, action); } else if (tun->t_action == TCA_TUNNEL_KEY_ACT_RELEASE) { flower->tunnel.tunnel = true; } else { @@ -1268,13 +1334,46 @@ nl_msg_put_act_tunnel_key_release(struct ofpbuf *request) nl_msg_end_nested(request, offset); } +static void +nl_msg_put_act_tunnel_geneve_option(struct ofpbuf *request, + struct tun_metadata tun_metadata) +{ + const struct geneve_opt *opt; + size_t outer, inner; + int tun_opt_len; + int idx = 0; + + tun_opt_len = tun_metadata.present.len; + if (!tun_opt_len) { + return; + } + + outer = nl_msg_start_nested(request, TCA_TUNNEL_KEY_ENC_OPTS); + + while (tun_opt_len) { + opt = &tun_metadata.opts.gnv[idx]; + inner = nl_msg_start_nested(request, TCA_TUNNEL_KEY_ENC_OPTS_GENEVE); + nl_msg_put_be16(request, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_CLASS, + opt->opt_class); + nl_msg_put_u8(request, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_TYPE, opt->type); + nl_msg_put_unspec(request, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_DATA, opt + 1, + opt->length * 4); + nl_msg_end_nested(request, inner); + + idx += sizeof(struct geneve_opt) + opt->length * 4; + tun_opt_len -= sizeof(struct geneve_opt) + opt->length * 4; + } + + nl_msg_end_nested(request, outer); +} + static void nl_msg_put_act_tunnel_key_set(struct ofpbuf *request, ovs_be64 id, - ovs_be32 ipv4_src, ovs_be32 ipv4_dst, - struct in6_addr *ipv6_src, - struct in6_addr *ipv6_dst, - ovs_be16 tp_dst, - uint8_t tos, uint8_t ttl) + ovs_be32 ipv4_src, ovs_be32 ipv4_dst, + struct in6_addr *ipv6_src, + struct in6_addr *ipv6_dst, + ovs_be16 tp_dst, uint8_t tos, uint8_t ttl, + struct tun_metadata tun_metadata) { size_t offset; @@ -1304,6 +1403,7 @@ nl_msg_put_act_tunnel_key_set(struct ofpbuf *request, ovs_be64 id, nl_msg_put_u8(request, TCA_TUNNEL_KEY_ENC_TTL, ttl); } nl_msg_put_be16(request, TCA_TUNNEL_KEY_ENC_DST_PORT, tp_dst); + nl_msg_put_act_tunnel_geneve_option(request, tun_metadata); } nl_msg_end_nested(request, offset); } @@ -1546,7 +1646,8 @@ nl_msg_put_flower_acts(struct ofpbuf *request, struct tc_flower *flower) &action->encap.ipv6.ipv6_dst, action->encap.tp_dst, action->encap.tos, - action->encap.ttl); + action->encap.ttl, + action->encap.data); nl_msg_end_nested(request, act_offset); } break; diff --git a/lib/tc.h b/lib/tc.h index aa8805df2..4ae06eb27 100644 --- a/lib/tc.h +++ b/lib/tc.h @@ -27,6 +27,7 @@ #include "odp-netlink.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/flow.h" +#include "openvswitch/tun-metadata.h" /* For backwards compatability with older kernels */ #ifndef TC_H_CLSACT @@ -140,6 +141,7 @@ struct tc_action { struct in6_addr ipv6_src; struct in6_addr ipv6_dst; } ipv6; + struct tun_metadata data; } encap; };