From patchwork Fri Jan 5 22:29:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 856190 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="egNtkb5b"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zD08n3Ywrz9t3H for ; Sat, 6 Jan 2018 09:44:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753240AbeAEWaJ (ORCPT ); Fri, 5 Jan 2018 17:30:09 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:38837 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191AbeAEWaG (ORCPT ); Fri, 5 Jan 2018 17:30:06 -0500 Received: by mail-wm0-f65.google.com with SMTP id 64so4945034wme.3 for ; Fri, 05 Jan 2018 14:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fm20i9wQBxQ/4Wqj4ZiFNhwyc74dbI5JyUEUvpWNPtA=; b=egNtkb5bJM4OZ36m2SPVAP6v7r2FbeME2KforQFnEhHhpb00V8pCZggJTEQ4Q4JUwJ IszoHItPkhPqztHV/kYZ7y4UMnvFDyCb+a4I9hwbQMvDVni/1eqGosNFDceZJWgzD6qR 2Ru1PehD25V5zTWzJybxYsOPJ8wHfOdJ2kKyY/GEmZL8gdlM8hwwKJUcwKVOpZOMXm7c UrniWVWfBLp1tvT3Jj1iNWrdZG5h9lN+qqMSc9NpbXh0f6GyCQkUT6PcwkT89GuWH9wH xCPKWJe8bkmhRzsM913cvfYCDaPk5waoJpOwQmoUaCPTHCc6uuhgl1OPJsF9c6Rw5Whf qWKQ== 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=fm20i9wQBxQ/4Wqj4ZiFNhwyc74dbI5JyUEUvpWNPtA=; b=opjb+EBgHHO+P0ayzvyUk1/LCvSbzK+cvXbmKbPwQ7CdRrw0hEkyAcXY1jg/MVCdM0 N5ud59UkokGR1yhg4b+xigGgd/U90TH5UM7dMOo/DyjeBlqPH5Kft2YckUNWeFknNg2U +Q2CR7KoEImCdhqkXYxTe2M2nuL8A+H2g4kv+PHbKYW23uYR13+35PSImaX+vCPl+eDp 0Y7/+vTBZU1wSWDXd3yjwvN0i6R1P0t4m/Ot0mi60k52XCdcqI7eSbjTdMRRGhm/Sv4v J8fuyQ1zZvqW9pIOreJsXOHOkPHtAKzZ80GJWj5gtrSybnbPelw2lIYVsgCW9OvSWzpg /o/Q== X-Gm-Message-State: AKGB3mLV9F6qtxldk1Z9RfjaFy10Msrl1fx2enM0dSSEfqF/DA4Z2d8s //0DjknMXlzM0H4N5wYDFWiuA+/4 X-Google-Smtp-Source: ACJfBotofk8AtPX9y0pHf5WJDjvK18F5ns5tOp4W3bqIVeq6mhKEd2Xnn+rT+FloS3XxLvtE4yqQWw== X-Received: by 10.80.153.1 with SMTP id k1mr5867293edb.11.1515191404537; Fri, 05 Jan 2018 14:30:04 -0800 (PST) Received: from sc9-mailhost1.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id w2sm4895163edb.4.2018.01.05.14.30.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jan 2018 14:30:03 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: pshelar@ovn.org Subject: [PATCH net-next 2/2] openvswitch: add erspan version II support Date: Fri, 5 Jan 2018 14:29:21 -0800 Message-Id: <1515191361-107730-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515191361-107730-1-git-send-email-u9012063@gmail.com> References: <1515191361-107730-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds support for configuring the erspan version II fields for openvswitch. Signed-off-by: William Tu --- include/uapi/linux/openvswitch.h | 12 +++- net/openvswitch/flow_netlink.c | 125 +++++++++++++++++++++++++++++++++++---- 2 files changed, 126 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 4265d7f9e1f2..3b1950c59a0c 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -273,6 +273,16 @@ enum { #define OVS_VXLAN_EXT_MAX (__OVS_VXLAN_EXT_MAX - 1) +enum { + OVS_ERSPAN_OPT_UNSPEC, + OVS_ERSPAN_OPT_IDX, /* be32 index */ + OVS_ERSPAN_OPT_VER, /* u8 version number */ + OVS_ERSPAN_OPT_DIR, /* u8 direction */ + OVS_ERSPAN_OPT_HWID, /* u8 hardware ID */ + __OVS_ERSPAN_OPT_MAX, +}; + +#define OVS_ERSPAN_OPT_MAX (__OVS_ERSPAN_OPT_MAX - 1) /* OVS_VPORT_ATTR_OPTIONS attributes for tunnels. */ @@ -363,7 +373,7 @@ enum ovs_tunnel_key_attr { OVS_TUNNEL_KEY_ATTR_IPV6_SRC, /* struct in6_addr src IPv6 address. */ OVS_TUNNEL_KEY_ATTR_IPV6_DST, /* struct in6_addr dst IPv6 address. */ OVS_TUNNEL_KEY_ATTR_PAD, - OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* be32 ERSPAN index. */ + OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* Nested OVS_ERSPAN_OPT_* */ __OVS_TUNNEL_KEY_ATTR_MAX }; diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index bce1f78b0de5..696198cf3765 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -334,8 +334,10 @@ size_t ovs_tun_key_attr_size(void) * OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS and covered by it. */ + nla_total_size(2) /* OVS_TUNNEL_KEY_ATTR_TP_SRC */ - + nla_total_size(2) /* OVS_TUNNEL_KEY_ATTR_TP_DST */ - + nla_total_size(4); /* OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS */ + + nla_total_size(2); /* OVS_TUNNEL_KEY_ATTR_TP_DST */ + /* OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS is mutually exclusive with + * OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS and covered by it. + */ } static size_t ovs_nsh_key_attr_size(void) @@ -386,6 +388,13 @@ static const struct ovs_len_tbl ovs_vxlan_ext_key_lens[OVS_VXLAN_EXT_MAX + 1] = [OVS_VXLAN_EXT_GBP] = { .len = sizeof(u32) }, }; +static const struct ovs_len_tbl ovs_erspan_opt_lens[OVS_ERSPAN_OPT_MAX + 1] = { + [OVS_ERSPAN_OPT_IDX] = { .len = sizeof(u32) }, + [OVS_ERSPAN_OPT_VER] = { .len = sizeof(u8) }, + [OVS_ERSPAN_OPT_DIR] = { .len = sizeof(u8) }, + [OVS_ERSPAN_OPT_HWID] = { .len = sizeof(u8) }, +}; + static const struct ovs_len_tbl ovs_tunnel_key_lens[OVS_TUNNEL_KEY_ATTR_MAX + 1] = { [OVS_TUNNEL_KEY_ATTR_ID] = { .len = sizeof(u64) }, [OVS_TUNNEL_KEY_ATTR_IPV4_SRC] = { .len = sizeof(u32) }, @@ -402,7 +411,8 @@ static const struct ovs_len_tbl ovs_tunnel_key_lens[OVS_TUNNEL_KEY_ATTR_MAX + 1] .next = ovs_vxlan_ext_key_lens }, [OVS_TUNNEL_KEY_ATTR_IPV6_SRC] = { .len = sizeof(struct in6_addr) }, [OVS_TUNNEL_KEY_ATTR_IPV6_DST] = { .len = sizeof(struct in6_addr) }, - [OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS] = { .len = sizeof(u32) }, + [OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS] = { .len = OVS_ATTR_NESTED, + .next = ovs_erspan_opt_lens }, }; static const struct ovs_len_tbl @@ -640,16 +650,78 @@ static int erspan_tun_opt_from_nlattr(const struct nlattr *attr, { unsigned long opt_key_offset; struct erspan_metadata opts; + struct nlattr *a; + u16 hwid, dir; + int rem; BUILD_BUG_ON(sizeof(opts) > sizeof(match->key->tun_opts)); memset(&opts, 0, sizeof(opts)); - opts.u.index = nla_get_be32(attr); + nla_for_each_nested(a, attr, rem) { + int type = nla_type(a); - /* Index has only 20-bit */ - if (ntohl(opts.u.index) & ~INDEX_MASK) { - OVS_NLERR(log, "ERSPAN index number %x too large.", - ntohl(opts.u.index)); + if (type > OVS_ERSPAN_OPT_MAX) { + OVS_NLERR(log, "ERSPAN option %d out of range max %d", + type, OVS_ERSPAN_OPT_MAX); + return -EINVAL; + } + + if (!check_attr_len(nla_len(a), + ovs_erspan_opt_lens[type].len)) { + OVS_NLERR(log, "ERSPAN option %d has unexpected len %d expected %d", + type, nla_len(a), + ovs_erspan_opt_lens[type].len); + return -EINVAL; + } + + switch (type) { + case OVS_ERSPAN_OPT_IDX: + opts.u.index = nla_get_be32(a); + if (ntohl(opts.u.index) & ~INDEX_MASK) { + OVS_NLERR(log, + "ERSPAN index number %x too large.", + ntohl(opts.u.index)); + return -EINVAL; + } + break; + case OVS_ERSPAN_OPT_VER: + opts.version = nla_get_u8(a); + if (opts.version != 1 && opts.version != 2) { + OVS_NLERR(log, + "ERSPAN version %d not supported.", + opts.version); + return -EINVAL; + } + break; + case OVS_ERSPAN_OPT_DIR: + dir = nla_get_u8(a); + if (dir != 0 && dir != 1) { + OVS_NLERR(log, + "ERSPAN direction %d invalid.", + dir); + return -EINVAL; + } + opts.u.md2.dir = dir; + break; + case OVS_ERSPAN_OPT_HWID: + hwid = nla_get_u8(a); + if (hwid & ~(HWID_MASK >> HWID_OFFSET)) { + OVS_NLERR(log, + "ERSPAN hardware ID %x invalid.", + hwid); + return -EINVAL; + } + set_hwid(&opts.u.md2, hwid); + break; + default: + OVS_NLERR(log, "Unknown ERSPAN opt attribute %d", + type); + return -EINVAL; + } + } + if (rem) { + OVS_NLERR(log, "ERSPAN opt message has %d unknown bytes.", + rem); return -EINVAL; } @@ -846,6 +918,39 @@ static int vxlan_opt_to_nlattr(struct sk_buff *skb, return 0; } +static int erspan_opt_to_nlattr(struct sk_buff *skb, + const void *tun_opts, int swkey_tun_opts_len) +{ + const struct erspan_metadata *opts = tun_opts; + struct nlattr *nla; + + nla = nla_nest_start(skb, OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS); + if (!nla) + return -EMSGSIZE; + + if (nla_put_u8(skb, OVS_ERSPAN_OPT_VER, opts->version) < 0) + return -EMSGSIZE; + + if (opts->version == 1) { + if (nla_put_be32(skb, OVS_ERSPAN_OPT_IDX, opts->u.index) < 0) + return -EMSGSIZE; + + } else if (opts->version == 2) { + if (nla_put_u8(skb, OVS_ERSPAN_OPT_DIR, + opts->u.md2.dir) < 0) + return -EMSGSIZE; + + if (nla_put_u8(skb, OVS_ERSPAN_OPT_HWID, + get_hwid(&opts->u.md2)) < 0) + return -EMSGSIZE; + } else { + return -EINVAL; + } + + nla_nest_end(skb, nla); + return 0; +} + static int __ip_tun_to_nlattr(struct sk_buff *skb, const struct ip_tunnel_key *output, const void *tun_opts, int swkey_tun_opts_len, @@ -906,8 +1011,8 @@ static int __ip_tun_to_nlattr(struct sk_buff *skb, vxlan_opt_to_nlattr(skb, tun_opts, swkey_tun_opts_len)) return -EMSGSIZE; else if (output->tun_flags & TUNNEL_ERSPAN_OPT && - nla_put_be32(skb, OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, - ((struct erspan_metadata *)tun_opts)->u.index)) + erspan_opt_to_nlattr(skb, tun_opts, + swkey_tun_opts_len)) return -EMSGSIZE; }