From patchwork Fri Jan 12 20:29:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 860186 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="uk3KrtXN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zJDr7484mz9sNV for ; Sat, 13 Jan 2018 07:29:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965083AbeALU3l (ORCPT ); Fri, 12 Jan 2018 15:29:41 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:40902 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964847AbeALU3j (ORCPT ); Fri, 12 Jan 2018 15:29:39 -0500 Received: by mail-wm0-f66.google.com with SMTP id v123so4943437wmd.5 for ; Fri, 12 Jan 2018 12:29:39 -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; bh=xPBhWrxzT+RoRhRZ6rbrI0oLu+90BIjI5r+2wT6ztok=; b=uk3KrtXNKDcwPhMQnRFOmMExRoMq7c18SiK0A2cKRLdwe/lar+G3BlWEfsce02dkmP qn+PT9d7V0HgAaeINwZjzGM2TVijtpZSTXcElku8jKhLd8z4KMcgS+qsVg5lKr1BfN6F Jk3q9pJkFR2W/Nh8A2X+I1gTQPi2KeXXa+OABFLB0ZD0MmtjoKdE7rj6uHd/yL/b/b+J qTYD82WowTitU0gk6+sWaCO31yXvkrNvJpvVLWqRXbmXNNF5Sdt/wKVA6HW1UL5NdCy9 EftyCwTv7VT4JJg0+07zw60/vdDX/V3KOOw429qqkwtuuT+vZQV93kEJvlBLEVRnnQFU HjkQ== 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; bh=xPBhWrxzT+RoRhRZ6rbrI0oLu+90BIjI5r+2wT6ztok=; b=RypjeEMU9BL5aX6Ef/gUPykna1U0h014ubjwpGJrFXJZOOMkoXZAglLde1WQbLCT2F I6iAcDCmq5CLEUSPML/RLEWg6FER2dDQCmuopAgT10SlF7yBKAMRseg+WtUMnUiToiPB +N/l/4UnFtfE96FejdbPs17fQa5qZJCbPxxxwPH9OEn1ayBaqP2jV77QcZzHsPlp1Ojv RzlcpyW3g7zzTCcp5veWzAvWhRXvpy/1DovYt/GkEltbzLdzjZ/jH8K+yV2ylPS3+cnZ ax9+IjlEd0dgRaA2LlJCcLJmP1/7dnTKABkwudfdsg0+2ahF4oRVyYGAwCki5S+FtYGd 0PWA== X-Gm-Message-State: AKGB3mLaSr/H/ppxqZMDiriagNfcSZvrEPLAUpqZ3VX18FSGpDRASL90 dfXz1+s2pWQl3riiKLoC7yfy9zkA X-Google-Smtp-Source: ACJfBovXY7Y/4P8JzL5kg1MqV4KTsZjqjjlga47DbimmhQEtblyvTlQq24o4JtcahqGHmMIm5x4Pvw== X-Received: by 10.80.213.7 with SMTP id u7mr36584411edi.224.1515788978241; Fri, 12 Jan 2018 12:29:38 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id s8sm11974014edh.51.2018.01.12.12.29.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 12:29:37 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: Jiri Benc , Pravin Shelar Subject: [PATCH net] Revert "openvswitch: Add erspan tunnel support." Date: Fri, 12 Jan 2018 12:29:22 -0800 Message-Id: <1515788962-124081-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit ceaa001a170e43608854d5290a48064f57b565ed. The OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS attr should be designed as a nested attribute to support all ERSPAN v1 and v2's fields. The current attr is a be32 supporting only one field. Thus, this patch reverts it and later patch will redo it using nested attr. Signed-off-by: William Tu Cc: Jiri Benc Cc: Pravin Shelar Acked-by: Jiri Benc Acked-by: Pravin B Shelar --- include/uapi/linux/openvswitch.h | 1 - net/openvswitch/flow_netlink.c | 51 +--------------------------------------- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 4265d7f9e1f2..dcfab5e3b55c 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -363,7 +363,6 @@ 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_MAX }; diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 624ea74353dd..f143908b651d 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -49,7 +49,6 @@ #include #include #include -#include #include "flow_netlink.h" @@ -334,8 +333,7 @@ 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 */ } static size_t ovs_nsh_key_attr_size(void) @@ -402,7 +400,6 @@ 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) }, }; static const struct ovs_len_tbl @@ -634,33 +631,6 @@ static int vxlan_tun_opt_from_nlattr(const struct nlattr *attr, return 0; } -static int erspan_tun_opt_from_nlattr(const struct nlattr *attr, - struct sw_flow_match *match, bool is_mask, - bool log) -{ - unsigned long opt_key_offset; - struct erspan_metadata opts; - - BUILD_BUG_ON(sizeof(opts) > sizeof(match->key->tun_opts)); - - memset(&opts, 0, sizeof(opts)); - opts.index = nla_get_be32(attr); - - /* Index has only 20-bit */ - if (ntohl(opts.index) & ~INDEX_MASK) { - OVS_NLERR(log, "ERSPAN index number %x too large.", - ntohl(opts.index)); - return -EINVAL; - } - - SW_FLOW_KEY_PUT(match, tun_opts_len, sizeof(opts), is_mask); - opt_key_offset = TUN_METADATA_OFFSET(sizeof(opts)); - SW_FLOW_KEY_MEMCPY_OFFSET(match, opt_key_offset, &opts, sizeof(opts), - is_mask); - - return 0; -} - static int ip_tun_from_nlattr(const struct nlattr *attr, struct sw_flow_match *match, bool is_mask, bool log) @@ -768,19 +738,6 @@ static int ip_tun_from_nlattr(const struct nlattr *attr, break; case OVS_TUNNEL_KEY_ATTR_PAD: break; - case OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS: - if (opts_type) { - OVS_NLERR(log, "Multiple metadata blocks provided"); - return -EINVAL; - } - - err = erspan_tun_opt_from_nlattr(a, match, is_mask, log); - if (err) - return err; - - tun_flags |= TUNNEL_ERSPAN_OPT; - opts_type = type; - break; default: OVS_NLERR(log, "Unknown IP tunnel attribute %d", type); @@ -905,10 +862,6 @@ static int __ip_tun_to_nlattr(struct sk_buff *skb, else if (output->tun_flags & TUNNEL_VXLAN_OPT && 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)->index)) - return -EMSGSIZE; } return 0; @@ -2533,8 +2486,6 @@ static int validate_and_copy_set_tun(const struct nlattr *attr, break; case OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS: break; - case OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS: - break; } };