From patchwork Tue Aug 21 13:49:45 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: 960330 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="Xgo6PwMg"; 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 41vsWt2YKNz9s5b for ; Tue, 21 Aug 2018 23:50:50 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B0ADCE43; Tue, 21 Aug 2018 13:50:25 +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 A339AE2C for ; Tue, 21 Aug 2018 13:50:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9BE29148 for ; Tue, 21 Aug 2018 13:50:22 +0000 (UTC) Received: by mail-wm0-f46.google.com with SMTP id i134-v6so9650914wmf.0 for ; Tue, 21 Aug 2018 06:50:22 -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=FmVatVgAvH8G7DuZih/s5Y7I8beN/EDv1AWU+NGorGA=; b=Xgo6PwMgfTfRjvA+GgQ+5sH2CZ59/V/qhCjg3lYujIwGGhPT8XwyzdB/sVe/n2g4d7 i5wnuQsbKIGLIqn3invtKBsHYF4PrWfEdfnoQ9nBJQC+DW/zn6isq8QSiMgwZnClJ8vJ Id8krr5G9Q/wPSU/SLD9nCYh8haryjHkQAFriRIJVOV+3Nkk0jDpMdDEE48Q5NBLHwk7 9owi538nJN4chSQEO4z6Z4mS/65VGruTOa7fhCUo3HJt+Bx27/EJ7vbTPpOwgciCt2yA 6iUD5YqM/KTFh9VPxDAUIizFge79Ej5cv0Ca5XZT431OVvVw2VgBzjNyH14mM+tX3Kwd F9Mw== 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=FmVatVgAvH8G7DuZih/s5Y7I8beN/EDv1AWU+NGorGA=; b=LVUvxVQ003zp5KiDWOgZff7y8r1LQhACBw8JkJZIG5YFz4LCDJycxibXNFALOOcJrc jvOzVvW+r5BYaRUb410XWk9gdJWKLL/eRY9lYThMRB3RIqT+lPHStydUkCRUKu3lF9WO rRu48rJtLJLR3jmJhUHkcp5uOw33D/MmzkRoGc2NX/zMgW7nLoAYemgtyOCZWxqRhMmh 8kox+ZPXYLF+vT7BSH1GDl98XOInJ/LUAcn1cDsWpyI4kXuqB4Lty2/DxTnm7v/sOenV O68nxqxk05DmZptTo3IZf0W44xLW6/DWdWYt4fM+QKStVAXGgfzYPboeiKClLOV16yAd h7BA== X-Gm-Message-State: AOUpUlGFHSGmsNRCdy7FzZZ9upoI2VpPAyj9YeIvACv3fW+Cfu+/lJOB oedYmuxSkwO7o5GGJjlqyyDXbzF+EZc= X-Google-Smtp-Source: AA+uWPz/lK65kWJTCnmdEO+aWhhx+8ahcf0iYaq5n7OjqKm36JrU3U2vJneCCv7SKPFCPI3Itsu63g== X-Received: by 2002:a1c:b157:: with SMTP id a84-v6mr26798792wmf.18.1534859420910; Tue, 21 Aug 2018 06:50:20 -0700 (PDT) Received: from pieter-Netronome.netronome.com (host-79-78-33-110.static.as9105.net. [79.78.33.110]) by smtp.gmail.com with ESMTPSA id x125-v6sm2272795wmg.27.2018.08.21.06.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Aug 2018 06:50:20 -0700 (PDT) From: Pieter Jansen van Vuuren To: dev@openvswitch.org Date: Tue, 21 Aug 2018 14:49:45 +0100 Message-Id: <1534859386-12310-2-git-send-email-pieter.jansenvanvuuren@netronome.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1534859386-12310-1-git-send-email-pieter.jansenvanvuuren@netronome.com> References: <1534859386-12310-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: Pieter Jansen van Vuuren Subject: [ovs-dev] [PATCH ovs 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 | 106 ++++++++++++++++++++++++++- lib/tc.h | 2 + 4 files changed, 158 insertions(+), 3 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..fcaf7832e 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,44 @@ 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, + uint8_t *tun_options, int tun_opt_len) +{ + const struct geneve_opt *opt; + size_t outer, inner; + int idx = 0; + + if (!tun_opt_len) { + return; + } + + outer = nl_msg_start_nested(request, TCA_TUNNEL_KEY_ENC_OPTS); + + while (tun_opt_len) { + opt = (struct geneve_opt *) &tun_options[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_be16 tp_dst, uint8_t tos, uint8_t ttl, + void *tun_options, int tun_opt_len) { size_t offset; @@ -1304,6 +1401,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_options, tun_opt_len); } nl_msg_end_nested(request, offset); } @@ -1546,7 +1644,9 @@ 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.opts.gnv, + action->encap.data.present.len); 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; }; From patchwork Tue Aug 21 13:49:46 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: 960331 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="gpS9q9uh"; 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 41vsXH2frwz9s4v for ; Tue, 21 Aug 2018 23:51:11 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6FAD4E40; Tue, 21 Aug 2018 13:50: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 88B05E2C for ; Tue, 21 Aug 2018 13:50:24 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B88C2148 for ; Tue, 21 Aug 2018 13:50:23 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id g33-v6so5883609wrd.1 for ; Tue, 21 Aug 2018 06:50:23 -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=eILP8chfjxZtCXLyQAfV8EKjmYvO594xVVy7EoY80TI=; b=gpS9q9uh3spBxLMUtuVsffH3JacJ7CG/faCzMAQ7Ezm0/uMqnURms2GGmRvggd0k1P xUtXCRi2yBO+QryVueOjSOfGPQ7fwGccIwYGY9dToAQv9RepuyU5ahxC4ReyZHQ88jbx ab3SUXoC2aPinBVsj4qVHnKKkAEbms7cszXCFxWjUzdQtzeWe5vkV2Fs3cgz+4CG4w+d TEECSKqc41p/UNJYvkHJthnuXBUTwLeu1VBAd6HQ4S3nMXXY3HjtSxgLzMTaNlqDXHIT 2adwt49RtBNQ8nj6xU7Mtyd0ItO02DNjODfzZonNy4sU6V0E2HT/Xw9iVzY2By0gsNTn bA0Q== 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=eILP8chfjxZtCXLyQAfV8EKjmYvO594xVVy7EoY80TI=; b=XGqKZgTCgIICRFZDAMhPIEYz8XMrjVuCo3HcDpPGfhef0cXjvaJvSkNw9uuGmFoAVq pCAuhJZ4cPK8pPRfp9Ia2+bvfX/7sxwC8VIaalSZC4cDyVRyhxg4B8AoBvQyZshL8gTN bhS9eog5KeyHVcE0vtdbSqPb8PckSZsRWUtSqKvm4/KYy7ACxpiVT8y9uzzkH69s/UYU S84PAp6LBF0RMHkdY/3P1YxdsQYrbkXktt1gC++hyoWtVsdiXTOB7tcFKuOzPlo0Yw+E JGsV7Xsv6raRZrtl1M2tS1zm5WxtSUcPLBwjUq3RHV7gGrUesqTiPu4qhsOjhrX2jPXH h88A== X-Gm-Message-State: APzg51AG02YAdJOtTZRK0qxM6q0srMoJSosgMP1sxfiDW0DviIxmG0ph wx4WHj1BYq4U0S3RkIasyqTiq82gysU= X-Google-Smtp-Source: ANB0VdZ8/gu1i/oorTgO9gahjBwhL+phvkMFSArZR+sf4lHbKa+FiyfXY14+tTXNbEYfJnCu65IIAQ== X-Received: by 2002:adf:e14f:: with SMTP id f15-v6mr8706688wri.42.1534859422040; Tue, 21 Aug 2018 06:50:22 -0700 (PDT) Received: from pieter-Netronome.netronome.com (host-79-78-33-110.static.as9105.net. [79.78.33.110]) by smtp.gmail.com with ESMTPSA id x125-v6sm2272795wmg.27.2018.08.21.06.50.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Aug 2018 06:50:21 -0700 (PDT) From: Pieter Jansen van Vuuren To: dev@openvswitch.org Date: Tue, 21 Aug 2018 14:49:46 +0100 Message-Id: <1534859386-12310-3-git-send-email-pieter.jansenvanvuuren@netronome.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1534859386-12310-1-git-send-email-pieter.jansenvanvuuren@netronome.com> References: <1534859386-12310-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: Pieter Jansen van Vuuren Subject: [ovs-dev] [PATCH ovs 2/2] lib/tc: add geneve with option match 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 classifying geneve tunnels with options. Signed-off-by: Pieter Jansen van Vuuren Reviewed-by: Simon Horman --- include/linux/pkt_cls.h | 25 +++++++++++ lib/netdev-tc-offloads.c | 14 ++++++ lib/tc.c | 94 ++++++++++++++++++++++++++++++++++++++++ lib/tc.h | 1 + 4 files changed, 134 insertions(+) diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index a3300418e..1384d71f9 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -204,10 +204,35 @@ enum { TCA_FLOWER_KEY_ENC_IP_TOS_MASK, /* u8 */ TCA_FLOWER_KEY_ENC_IP_TTL, /* u8 */ TCA_FLOWER_KEY_ENC_IP_TTL_MASK, /* u8 */ + TCA_FLOWER_KEY_ENC_OPTS, + TCA_FLOWER_KEY_ENC_OPTS_MASK, __TCA_FLOWER_MAX, }; +enum { + TCA_FLOWER_KEY_ENC_OPTS_UNSPEC, + TCA_FLOWER_KEY_ENC_OPTS_GENEVE, /* Nested + * TCA_TUNNEL_KEY_ENC_OPTS_GENEVE + * attributes + */ + __TCA_FLOWER_KEY_ENC_OPTS_MAX, +}; + +#define TCA_FLOWER_KEY_ENC_OPTS_MAX (__TCA_FLOWER_KEY_ENC_OPTS_MAX - 1) + +enum { + TCA_FLOWER_KEY_ENC_OPT_GENEVE_UNSPEC, + TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS, /* u16 */ + TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE, /* u8 */ + TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA, /* 4 to 128 bytes */ + + __TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX, +}; + +#define TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX \ + (__TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX - 1) + enum { TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0), TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1), diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index 0612b1348..d3f150748 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -542,6 +542,17 @@ parse_tc_flower_to_match(struct tc_flower *flower, if (flower->tunnel.tp_dst) { match_set_tun_tp_dst(match, flower->tunnel.tp_dst); } + memcpy(match->flow.tunnel.metadata.opts.gnv, + flower->tunnel.metadata.opts.gnv, + flower->tunnel.metadata.present.len); + match->flow.tunnel.metadata.present.len = + flower->tunnel.metadata.present.len; + match->flow.tunnel.flags |= FLOW_TNL_F_UDPIF; + memset(match->wc.masks.tunnel.metadata.opts.gnv, 0xff, + flower->tunnel.metadata.present.len); + match->wc.masks.tunnel.metadata.present.len = + flower->tunnel.metadata.present.len; + match->wc.masks.tunnel.flags |= FLOW_TNL_F_UDPIF; } act_off = nl_msg_start_nested(buf, OVS_FLOW_ATTR_ACTIONS); @@ -1003,6 +1014,9 @@ netdev_tc_flow_put(struct netdev *netdev, struct match *match, flower.tunnel.ttl = tnl->ip_ttl; flower.tunnel.tp_src = tnl->tp_src; flower.tunnel.tp_dst = tnl->tp_dst; + memcpy(flower.tunnel.metadata.opts.gnv, tnl->metadata.opts.gnv, + tnl->metadata.present.len); + flower.tunnel.metadata.present.len = tnl->metadata.present.len; flower.tunnel.tunnel = true; } memset(&mask->tunnel, 0, sizeof mask->tunnel); diff --git a/lib/tc.c b/lib/tc.c index fcaf7832e..02eb08263 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -321,6 +321,8 @@ static const struct nl_policy tca_flower_policy[] = { .optional = true, }, [TCA_FLOWER_KEY_ENC_IP_TTL_MASK] = { .type = NL_A_U8, .optional = true, }, + [TCA_FLOWER_KEY_ENC_OPTS] = { .type = NL_A_NESTED, .optional = true,}, + [TCA_FLOWER_KEY_ENC_OPTS_MASK] = { .type = NL_A_NESTED, .optional = true,}, }; static void @@ -387,6 +389,63 @@ nl_parse_flower_vlan(struct nlattr **attrs, struct tc_flower *flower) } } +static void +nl_parse_geneve_key(const struct nlattr *in_nlattr, struct tc_flower *flower) +{ + 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_FLOWER_KEY_ENC_OPT_GENEVE_CLASS: + opt = &flower->tunnel.metadata.opts.gnv[cnt]; + opt->opt_class = nl_attr_get_be16(nla); + cnt += sizeof(struct geneve_opt) / 4; + flower->tunnel.metadata.present.len += sizeof(struct geneve_opt); + break; + case TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE: + opt->type = nl_attr_get_u8(nla); + break; + case TCA_FLOWER_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); + cnt += opt->length; + flower->tunnel.metadata.present.len += opt->length * 4; + break; + } + } +} + +static void +nl_parse_flower_tunnel_opts(struct nlattr *options, struct tc_flower *flower) +{ + const struct ofpbuf *msg; + struct nlattr *nla; + struct ofpbuf buf; + size_t left; + + 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_FLOWER_KEY_ENC_OPTS_GENEVE: + nl_parse_geneve_key(nla, flower); + break; + } + } +} + static void nl_parse_flower_tunnel(struct nlattr **attrs, struct tc_flower *flower) { @@ -423,6 +482,9 @@ nl_parse_flower_tunnel(struct nlattr **attrs, struct tc_flower *flower) flower->tunnel.ttl = nl_attr_get_u8(attrs[TCA_FLOWER_KEY_ENC_IP_TTL]); } + if (attrs[TCA_FLOWER_KEY_ENC_OPTS_MASK]) { + nl_parse_flower_tunnel_opts(attrs[TCA_FLOWER_KEY_ENC_OPTS], flower); + } } static void @@ -1712,6 +1774,37 @@ nl_msg_put_masked_value(struct ofpbuf *request, uint16_t type, nl_msg_put_unspec(request, type, data, len); } +static void +nl_msg_put_flower_tunnel_opts(struct ofpbuf *request, struct tc_flower *flower) +{ + struct geneve_opt *opt; + size_t outer, inner; + int len, cnt = 0; + + len = flower->tunnel.metadata.present.len; + if (!len) { + return; + } + + outer = nl_msg_start_nested(request, TCA_FLOWER_KEY_ENC_OPTS); + while (len) { + opt = &flower->tunnel.metadata.opts.gnv[cnt]; + inner = nl_msg_start_nested(request, TCA_FLOWER_KEY_ENC_OPTS_GENEVE); + + nl_msg_put_be16(request, TCA_FLOWER_KEY_ENC_OPT_GENEVE_CLASS, + opt->opt_class); + nl_msg_put_u8(request, TCA_FLOWER_KEY_ENC_OPT_GENEVE_TYPE, opt->type); + nl_msg_put_unspec(request, TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA, opt + 1, + opt->length * 4); + + cnt += sizeof(struct geneve_opt) / 4 + opt->length; + len -= sizeof(struct geneve_opt) + opt->length * 4; + + nl_msg_end_nested(request, inner); + } + nl_msg_end_nested(request, outer); +} + static void nl_msg_put_flower_tunnel(struct ofpbuf *request, struct tc_flower *flower) { @@ -1739,6 +1832,7 @@ nl_msg_put_flower_tunnel(struct ofpbuf *request, struct tc_flower *flower) } nl_msg_put_be16(request, TCA_FLOWER_KEY_ENC_UDP_DST_PORT, tp_dst); nl_msg_put_be32(request, TCA_FLOWER_KEY_ENC_KEY_ID, id); + nl_msg_put_flower_tunnel_opts(request, flower); } #define FLOWER_PUT_MASKED_VALUE(member, type) \ diff --git a/lib/tc.h b/lib/tc.h index 4ae06eb27..acc6607da 100644 --- a/lib/tc.h +++ b/lib/tc.h @@ -190,6 +190,7 @@ struct tc_flower { ovs_be16 tp_src; ovs_be16 tp_dst; ovs_be64 id; + struct tun_metadata metadata; } tunnel; struct tc_cookie act_cookie;