From patchwork Wed Apr 25 16:21:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 904606 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a3gwDuj3"; 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 40WQlt3NjFz9ryk for ; Thu, 26 Apr 2018 02:35:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D6EF9950; Wed, 25 Apr 2018 16:21:57 +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 32D7998B for ; Wed, 25 Apr 2018 16:21:56 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DBA2942D for ; Wed, 25 Apr 2018 16:21:55 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id a13so9231550pgu.4 for ; Wed, 25 Apr 2018 09:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=778yNH3LrOSJMbQkpuaab+YP1TfKk6FB1cn3kv5nrB8=; b=a3gwDuj3krq+sgSmc2KONUl7mZ9Z7L+0pewRLxZOIuvbObEml97DY7z+DownG6z32s 61k2Z9wAEuz38VfBDw0WwrqmYUTF/NOiITHHtEvXt0C8pgSwhbP7AFy6VkgCfNPL09uE jKMSGFOA1X+jVOlOSqXGEjlEAldOPcxLCF4VwR8hmi2pN7IkCgPF+p7YiHxqLatgxsjU Kn36ag6pDlFGXIlbfge1Twy5H95/ozctb7mwyvJGwP925ywQ3IAfBL+yObODeFYQtrSe 7SkOcPylLPFLA1apES6engYDm2gIvyBNtNXJRa7QjmLGp4vRKAKjxhaNyTZBhw4191nc w0JQ== 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=778yNH3LrOSJMbQkpuaab+YP1TfKk6FB1cn3kv5nrB8=; b=eJUbUsL0rEvTRqc8gH1Gwu5YBqjM15sTosUly6/gI6jxwLIPLzxw2B+Z+1rSyED/jk 0RXUbrK1ZxbA4O1QrKiZDLHlZ4m6O784vBARfslxE3xcXpypU+BAHYsKxDWm/pWrIPot v7mzqkq3EAm1DhSI5p2Fd/l9/HKSTGM4keml1fKh7va42cVtIKW9TXodXm39bob3QDJm mrjRiH9+uvtc7h9Rd5KAiDQZocSMDkxvup9y0H2yMILN8ApwspnLyUWIvyAIZZnneGVq 0AbSc4HoRA1dE6GhOh8jWpzztCPxe1h9hNeBu75qTXRw6gPqQg8svkWF8s9yenj5WFL5 8MaA== X-Gm-Message-State: ALQs6tD62I7GfAt8mfYIUBTzJRJHZFjTTQr9KNUxMuFDLLoSxLyvF9Ky 80YzuPEUWGASw0wQxOJNlgIrow== X-Google-Smtp-Source: AIpwx49YZwt6Q3+n+EDKiwHuCvtEBpl1xLrCKOUhypLeQ1Ob125mFJHjOG7uG7Kyni5aGQw9lts8tg== X-Received: by 10.98.103.154 with SMTP id t26mr28884996pfj.24.1524673314773; Wed, 25 Apr 2018 09:21:54 -0700 (PDT) Received: from gizo.domain (67-5-146-204.ptld.qwest.net. [67.5.146.204]) by smtp.gmail.com with ESMTPSA id o64sm32800694pfb.62.2018.04.25.09.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 09:21:54 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org, pshelar@ovn.org Date: Wed, 25 Apr 2018 09:21:38 -0700 Message-Id: <1524673309-30044-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 00/11] Patches 1-11 of ERSPAN backport 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 This series of patches is the first half of the backport of the Linux kernel upstream ERSPAN feature support. The first patch does some cleanup of unsupported kernel code. The remaining patches in the series begin the backport of the actual ERSPAN code. As part of the ERSPAN backport it was necessary to fixup the current out of tree GRE and IP tunneling support by pulling in code from the upstream Linux kernel. There was a great deal of infrastructure missing so much of this patch series is actually devoted to making sure the proper IPV4 tunneling code is pulled in from the upstream kernel. Currently the series only builds on kernels <= 4.9. A future patch will enable builds on kernels greater than 4.9. Greg Rose (1): compat: Remove unsupported kernel compat code William Tu (7): gre: introduce native tunnel support for ERSPAN gre: fix goto statement typo gre: refactor the gre_fb_xmit compat/gre: add collect_md mode ip_gre: check packet length and mtu correctly in erspan tx ip_gre: Refactor the erpsan tunnel code. compat/erspan: refactor existing erspan code Xin Long (3): ip_gre: get key from session_id correctly in erspan_rcv ip_gre: set tunnel hlen properly in erspan_tunnel_init ip_gre: erspan device should keep dst acinclude.m4 | 49 +- datapath/linux/Modules.mk | 3 +- datapath/linux/compat/gre.c | 222 ++-- datapath/linux/compat/include/linux/etherdevice.h | 30 - datapath/linux/compat/include/linux/if_ether.h | 4 + datapath/linux/compat/include/linux/if_vlan.h | 11 - datapath/linux/compat/include/linux/kconfig.h | 8 - datapath/linux/compat/include/linux/kernel.h | 38 - .../linux/compat/include/linux/netdev_features.h | 19 - datapath/linux/compat/include/linux/netdevice.h | 5 - datapath/linux/compat/include/linux/skbuff.h | 36 +- datapath/linux/compat/include/linux/workqueue.h | 4 - datapath/linux/compat/include/net/checksum.h | 6 - datapath/linux/compat/include/net/dst.h | 28 +- datapath/linux/compat/include/net/dst_metadata.h | 23 +- datapath/linux/compat/include/net/erspan.h | 116 ++ datapath/linux/compat/include/net/genetlink.h | 11 - datapath/linux/compat/include/net/gre.h | 13 +- datapath/linux/compat/include/net/ip6_route.h | 23 - datapath/linux/compat/include/net/ip_tunnels.h | 226 +++- datapath/linux/compat/include/net/ipv6.h | 15 - .../include/net/netfilter/nf_conntrack_zones.h | 2 - datapath/linux/compat/include/net/netlink.h | 15 - datapath/linux/compat/include/net/route.h | 105 -- datapath/linux/compat/ip_gre.c | 1103 ++++++++++++++++++-- datapath/linux/compat/ip_tunnel.c | 501 ++++++++- datapath/linux/compat/ip_tunnels_core.c | 41 + datapath/linux/compat/lisp.c | 2 - datapath/linux/compat/stt.c | 6 - datapath/linux/compat/udp_tunnel.c | 2 - datapath/linux/compat/utils.c | 22 - 31 files changed, 2046 insertions(+), 643 deletions(-) create mode 100644 datapath/linux/compat/include/net/erspan.h