From patchwork Wed Dec 6 00:01:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 844969 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ql69OCQF"; 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 3yrzLc05m5z9s7v for ; Wed, 6 Dec 2017 11:01:59 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 365E7D09; Wed, 6 Dec 2017 00:01:31 +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 6CDDBCFF for ; Wed, 6 Dec 2017 00:01:28 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 17413463 for ; Wed, 6 Dec 2017 00:01:28 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id o2so1351395pgc.8 for ; Tue, 05 Dec 2017 16:01:28 -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=4+ssdetsG4YStOXdh/mScYuPqCxDpANzxyf3fLMNcrs=; b=Ql69OCQFRe5hvYlpFx/61Qu7XqrxfUVpSYZD5wK/G3z4pYl2VTwa1EHLdr1+gXZHfH 5w1BraFHVx/sAFPOyDzVydsTSS3Wj8+6Gi3fXBc6nH6WT46OgYO2YBEWK7ujdZiE4lJk wM+4TGD2EPSzHjslz/TrYv3Ns2Ej4QmRkha5106v8Y71tVjCsVb3Wl8B61AZdByzc/ix gZRZ0OJkDUy2pCgK3GuZl6I+beYAh/Re+FQd4lMmX7hPUf0khC7dpyYgiGEALbZOFjp0 xvQw9zKeeQZCXps83HydSDZ24O0VT/8LUXQTqpywujWeKVhgTgh+c+g7EHrvq/GlWtgq nLKw== 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=4+ssdetsG4YStOXdh/mScYuPqCxDpANzxyf3fLMNcrs=; b=EdMZTO2dR7sO4gBRQsAMNRAKoOs97dBkBuSvMtjkVOIDAe8kW4nz2UTsea7orTv3Qf 57Tg0/J3fnyAGsmLdFcmFOZLLKAFCH1tW/NZWyUGM3Sl07+bG6pV6yQE7+uwVvPRez0p l11lK6qUwrT9GLhp45fpmPUjj7rgej62e3lTF0S+fSL+SjqJNPUTF+0QF1h0XNOLqcAC PE46Njz/u41O9wwanTUkcJCluNF0v3HqSt9z1KAV6r+zEsZGmcyHz5C3SameTaozwtTn JAe+aKVihhTi9uYbGMTyu1cNJnPELlIdzZ4DgvaDVOYGfV+FmnY+Y97VdwD1AiDkqPfj JKmg== X-Gm-Message-State: AJaThX4P0YJDfW1DrMh/JtYPlnf1qwjrvRUXKh8tCmKHMK/+ULjIjGVS WmfjWKZ/24MmI3EP0xXhnJbdEPfp X-Google-Smtp-Source: AGs4zMaxAnO3VWIvNm3tj3GE0Y0txggZtEgYTiPb+hv5GskW5QNQvEdOGMz33s6P+d2bdeZOFqI9fw== X-Received: by 10.99.110.79 with SMTP id j76mr19750465pgc.246.1512518487094; Tue, 05 Dec 2017 16:01:27 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id y5sm1892213pfa.128.2017.12.05.16.01.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 16:01:25 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 5 Dec 2017 16:01:16 -0800 Message-Id: <1512518481-5944-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> References: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> 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 1/6] datapath: Fix netdev_master_upper_dev_link for 4.14 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 An extended netlink ack has been added for 4.14 - add compat layer changes so that it compiles for all kernels up to and including 4.14. Signed-off-by: Greg Rose --- acinclude.m4 | 3 +++ datapath/linux/compat/include/linux/netdevice.h | 15 ++++++++++++++- datapath/vport-netdev.c | 9 ++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1179a40..6511a24 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -785,6 +785,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hook_ops], [list], [OVS_DEFINE([HAVE_LIST_IN_NF_HOOK_OPS])]) + OVS_FIND_PARAM_IFELSE([$KSRC/include/linux/netdevice.h], + [netdev_master_upper_dev_link], [extack], + [OVS_DEFINE([HAVE_UPPER_DEV_LINK_EXTACK])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h index 3c3cf42..c460332 100644 --- a/datapath/linux/compat/include/linux/netdevice.h +++ b/datapath/linux/compat/include/linux/netdevice.h @@ -101,13 +101,26 @@ static inline bool netif_needs_gso(struct sk_buff *skb, #ifndef HAVE_NETDEV_MASTER_UPPER_DEV_LINK_RH static inline int rpl_netdev_master_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, - void *upper_priv, void *upper_info) + void *upper_priv, + void *upper_info, void *extack) { return netdev_master_upper_dev_link(dev, upper_dev); } #define netdev_master_upper_dev_link rpl_netdev_master_upper_dev_link #endif +#else +#ifndef HAVE_UPPER_DEV_LINK_EXTACK +static inline int rpl_netdev_master_upper_dev_link(struct net_device *dev, + struct net_device *upper_dev, + void *upper_priv, + void *upper_info, void *extack) +{ + return netdev_master_upper_dev_link(dev, upper_dev, upper_priv, + upper_info); +} +#define netdev_master_upper_dev_link rpl_netdev_master_upper_dev_link +#endif #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c index 697c442..e2d8eaf 100644 --- a/datapath/vport-netdev.c +++ b/datapath/vport-netdev.c @@ -112,8 +112,15 @@ struct vport *ovs_netdev_link(struct vport *vport, const char *name) } rtnl_lock(); +#ifdef HAVE_NETDEV_MASTER_UPPER_DEV_LINK_RH err = netdev_master_upper_dev_link(vport->dev, - get_dpdev(vport->dp), NULL, NULL); + get_dpdev(vport->dp), + NULL, NULL); +#else + err = netdev_master_upper_dev_link(vport->dev, + get_dpdev(vport->dp), + NULL, NULL, NULL); +#endif if (err) goto error_unlock; From patchwork Wed Dec 6 00:01:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 844970 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LZhZFmqY"; 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 3yrzMD6wP3z9s7v for ; Wed, 6 Dec 2017 11:02:32 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1EB6AD0D; Wed, 6 Dec 2017 00:01:32 +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 D319FD00 for ; Wed, 6 Dec 2017 00:01:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9932179 for ; Wed, 6 Dec 2017 00:01:29 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id k15so1355663pgr.7 for ; Tue, 05 Dec 2017 16:01:29 -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=7NLzD8GIIEi3bK1jPzxeAuthO2+KTWeCECb7cUyduNA=; b=LZhZFmqYT2FvKl2usJFg2CmilbV50B41MKk5Ezlc6Koftqhw9ILuUZUb3jCYIj/z2d 4s+d50slqY5C1KedAilrRfAYDfq5Il287WywGhxJ+bjtRr/SXJdtoovbZzAaOPAbklrP eXQYDHDOLc3M86Jl4tvfuQGDOqiTwhxH9GUbGDcJBipk5YtTCVOrI2ZN5omNmdL14iWQ S2h34ufQU6EtkWYxGCPsEWFYwxDYWznBaE8C8oYYp9k7rzDz4LsSa/dVau2tuaNq1bij AmGN5ATuT/6OuzVrPWfGjvOsktrFuK2Vzae7wrKArINi4tix4nGd414I93Q0wSGQgaTh ku4w== 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=7NLzD8GIIEi3bK1jPzxeAuthO2+KTWeCECb7cUyduNA=; b=e2lbz1eaK1bhEH+nafXGGndzn6zEmhxsHABX71WU9c84Li5mM8pUH+yBXpQv2N9gp0 3uiBrXbIGmnWPm3xQ7s84siRy3On5SfIlL/Q6kx4Nj2zKzK1hNqXI9ignq0sQVhHzRuL y1bEYSFQ/aiEH8jC2iNy5qkfy9d/lN2IueyV+waLMpa+xHYU5Md2N5yQyAAWQEMlmFWJ lCOTgdS20NuA5DNq8rlRMmGDEATWQbUZ4PHGMnf6PgAh4Gnnjp8eaftqZ680aIgCA/QK pAWx6Y6T3DnQ5tQqWPxBR7JRSXnYKFv4RGNUdAfCzvV//XXp6d+nbG0y3iuSg8E2gxZV 41jg== X-Gm-Message-State: AKGB3mIWHWouBZFdYE4Doqi5NDSoJM6fMeGgLkjCb7lf2/hJrvD1kRt1 cApCpvHzvEE1Ea7Vv+5/akldI/BR X-Google-Smtp-Source: AGs4zMbeLMHCW5hF3+O58gR//desfHo2W7YFaCOAzxU9BeQs4D+kxNzl8AnDgGZ8P4vM4LctiYQVmg== X-Received: by 10.98.103.156 with SMTP id t28mr538587pfj.234.1512518488765; Tue, 05 Dec 2017 16:01:28 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id y5sm1892213pfa.128.2017.12.05.16.01.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 16:01:27 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 5 Dec 2017 16:01:17 -0800 Message-Id: <1512518481-5944-3-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> References: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> 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 2/6] compat: Do not include headers when not compiling 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 If the entire file is not going to be compiled due to compilation time directives then don't bother pulling in the headers. This fixes a compilation error on Linux 4.14. Signed-off-by: Greg Rose --- datapath/linux/compat/ip_gre.c | 2 +- datapath/linux/compat/ip_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 03c5435..2579093 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#ifndef USE_UPSTREAM_TUNNEL #include #include #include @@ -52,7 +53,6 @@ #include #include -#ifndef USE_UPSTREAM_TUNNEL #if IS_ENABLED(CONFIG_IPV6) #include #include diff --git a/datapath/linux/compat/ip_output.c b/datapath/linux/compat/ip_output.c index edca340..e2f869f 100644 --- a/datapath/linux/compat/ip_output.c +++ b/datapath/linux/compat/ip_output.c @@ -45,6 +45,7 @@ * Hirokazu Takahashi: sendfile() on UDP works now. */ +#ifndef HAVE_CORRECT_MRU_HANDLING #include #include #include @@ -82,7 +83,6 @@ #include #include -#ifndef HAVE_CORRECT_MRU_HANDLING static inline void rpl_ip_options_fragment(struct sk_buff *skb) { unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr); From patchwork Wed Dec 6 00:01:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 844971 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Zv5todQJ"; 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 3yrzMs26tmz9s7v for ; Wed, 6 Dec 2017 11:03:05 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0B054D0E; Wed, 6 Dec 2017 00:01:33 +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 8024CD00 for ; Wed, 6 Dec 2017 00:01:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4DBC879 for ; Wed, 6 Dec 2017 00:01:31 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id v26so1407561pfl.7 for ; Tue, 05 Dec 2017 16:01:31 -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=U+sqaFvo80AM3E2Rm/rmWPao+sQsMq1E9s+9rLkpwg4=; b=Zv5todQJg2gOP3pzMuW4aBoSGX0pMvLLdqnaxqfUc+Q/pLW1FWnSLaHvRJpnxvx10f 6mvRj9JR+B0IiNGvZcRyoXOkdaIKGpxaUzNbPHn81TtX1nM7Z8Fco+q8kChtqhjf55rj hCLGKjXGaicw069Nn6uF7oI48rho3WoXb4RrDWk+HBX3UORuAZ5u4BCzLBz27LrFmgkt t8QYimx2iRRehiMYQotisYruATGDlAzoKdbkVzV38TDS82OpQu1kqCRPafu40s44Dkm0 KEwrI8nk1LZ2sS8v5FLSOCpYTABeQyDQctnXXR6Qo22oxJZEaxH3bOeG0ThTb1TuOBe6 Vjhw== 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=U+sqaFvo80AM3E2Rm/rmWPao+sQsMq1E9s+9rLkpwg4=; b=pQQW3zRggJo7zgQ6i4clsSVAvU05yTY6/fXRVQCSJkzn+GbwXRRUi7uJklMZqijeDm ZZWzSoxU58lhljT5RA3IKDeoiyzHd/sQCb82DIxexX7XxEJCATPC6YTd4i3muZGkTbUM SXa9Emt/xzr+HkALwTst9MU5eHLX0W+cAUwDdsOIGVX1THe8hblB8RhqWPZMzd0MTQlB M91PXXiFjvIXTlpRnh+QFwX2rT7B8Dk548Hwk2p7E1M0Q2g1HDXCwbKNuJgypgnSQdEN i6/Wo5MwI87iFL8pm0ELS8ywHgDYhak7qBbCyu9bYD48qXyYPdTW22ouJva1VJjEMGLz W6XQ== X-Gm-Message-State: AKGB3mLpldCZegaXYW+7JDWLHqicVm+2SyvTaIvKwu67P0QKQQKxw788 IfNouzCeCuFOrV8wq6B+0PF1xuLD X-Google-Smtp-Source: AGs4zMZ1cWGvxmDyn5su5o3+zCjOV4LBUrHkNEboRb0Tnq3oNryAGb/S3r5FLiK7vPr4ewcYY27teg== X-Received: by 10.98.58.29 with SMTP id h29mr716160pfa.121.1512518490370; Tue, 05 Dec 2017 16:01:30 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id y5sm1892213pfa.128.2017.12.05.16.01.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 16:01:29 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 5 Dec 2017 16:01:18 -0800 Message-Id: <1512518481-5944-4-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> References: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> 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 3/6] datapath: Constify struct nf_conntrack_l4proto 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 Linux 4.14 requires this parameter to be constified. Signed-off-by: Greg Rose --- datapath/conntrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index d517a87..4b181ad 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -614,7 +614,7 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, u8 l3num, struct sk_buff *skb, bool natted) { struct nf_conntrack_l3proto *l3proto; - struct nf_conntrack_l4proto *l4proto; + const struct nf_conntrack_l4proto *l4proto; struct nf_conntrack_tuple tuple; struct nf_conntrack_tuple_hash *h; struct nf_conn *ct; From patchwork Wed Dec 6 00:01:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 844974 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f8ZtAsc1"; 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 3yrzNS5t1Nz9s7v for ; Wed, 6 Dec 2017 11:03:36 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id DAAF8D20; Wed, 6 Dec 2017 00:01:34 +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 4025CD15 for ; Wed, 6 Dec 2017 00:01:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EC011463 for ; Wed, 6 Dec 2017 00:01:32 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id q20so1363067pgv.2 for ; Tue, 05 Dec 2017 16:01:32 -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=g+vzTWQ6n1On+HtcTZ9+cQlxh0C8VU224aZTsIOCIwk=; b=f8ZtAsc1qRBS7koWpTHnsUE5rbtt6KYCCklsjJYonCnvxh7qIt+BojAcI69sxw+xrB +/Oj0HDOuAlJNXq2t1SyizbkB7rqntLtA6rz7lmCW9Bwijdc2LGlrJQa7bxidGohefn0 IZoiA74SH7IHtpQo8pW4XYnopcimrYm7/8azYaXpNSRHLlvRulj9Qs4vU5anX3G+yGjs R4knTYbmP1LRDM7If9fnsEbZWg6Pw2Jvcj8JV3amgkj7ACYiZkFGohNTk9cA7St19Igb CeY9gNkkGDHGiFekls6Xd0FrS7maYBa7161gfzw9ySrt8d98T8/UFGNz4a6g1HNFLrTy Uweg== 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=g+vzTWQ6n1On+HtcTZ9+cQlxh0C8VU224aZTsIOCIwk=; b=HSR/1kDzDXi4VAshBHWVFWT2N4mFwN1mlYySMZ6Njf1eikWS+1MJ21Q1C0YWS0NC/1 eEFYVdxONZfwdosGYTb30SSa747VG7Mco4dTMa5vCMR5pou5AqcacJXbzpJUpbuwivIt fwJ+GWjtDUa8PFUfl1hL3/TS0UBopNyxsgIrYroOpt0+KXUzNe0QHISYDoh1RXDmARJA rFLDK2qEgRil8NMA2RhNWj8+5sB8XKhoihT3RXRwSVUCWiUNnqsrDnlyHGrY2nBqtOmh 0QSo6fXHhopiFbqmf7GEi3J+xHnfDUucnM9Ei8/UZV9p4Y7TBq/ifoR1DEa3QtHFhK5P F/Nw== X-Gm-Message-State: AJaThX6xPNZTBr1MtCRMLXXR/4iQc61ye0RlIorPd+7/WQnkPWhI1cKb ypKwZLlg3i5S+lHqpay/kg1POgBZ X-Google-Smtp-Source: AGs4zMZQyA4Ty2hGleibeo13uXbiyz/YM4q+yW49z3yRzSXRNq4LT6OlFehbHMkIDRSEd5ECk6xYZw== X-Received: by 10.101.100.65 with SMTP id s1mr19292902pgv.185.1512518492012; Tue, 05 Dec 2017 16:01:32 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id y5sm1892213pfa.128.2017.12.05.16.01.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 16:01:30 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 5 Dec 2017 16:01:19 -0800 Message-Id: <1512518481-5944-5-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> References: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> 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 4/6] datapath: Fix SKB_GSO_UDP usage 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 Using SKB_GSO_UDP breaks the compilation on Linux 4.14. Check for the HAVE_SKB_GSO_UDP compiler #define. Signed-off-by: Greg Rose --- datapath/datapath.c | 9 ++++++--- datapath/linux/compat/stt.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index 1780819..a3fdd8f 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -339,8 +339,10 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_info *upcall_info, uint32_t cutlen) { +#ifdef HAVE_SKB_GSO_UDP unsigned short gso_type = skb_shinfo(skb)->gso_type; struct sw_flow_key later_key; +#endif struct sk_buff *segs, *nskb; struct ovs_skb_cb ovs_cb; int err; @@ -352,7 +354,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, return PTR_ERR(segs); if (segs == NULL) return -EINVAL; - +#ifdef HAVE_SKB_GSO_UDP if (gso_type & SKB_GSO_UDP) { /* The initial flow key extracted by ovs_flow_key_extract() * in this case is for a first fragment, so we need to @@ -361,14 +363,15 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, later_key = *key; later_key.ip.frag = OVS_FRAG_TYPE_LATER; } - +#endif /* Queue all of the segments. */ skb = segs; do { *OVS_CB(skb) = ovs_cb; +#ifdef HAVE_SKB_GSO_UDP if (gso_type & SKB_GSO_UDP && skb != segs) key = &later_key; - +#endif err = queue_userspace_packet(dp, skb, key, upcall_info, cutlen); if (err) break; diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c index 37d5f4b..66a97f2 100644 --- a/datapath/linux/compat/stt.c +++ b/datapath/linux/compat/stt.c @@ -81,8 +81,13 @@ struct stt_dev { #define STT_PROTO_TCP BIT(3) #define STT_PROTO_TYPES (STT_PROTO_IPV4 | STT_PROTO_TCP) +#ifdef HAVE_SKB_GSO_UDP #define SUPPORTED_GSO_TYPES (SKB_GSO_TCPV4 | SKB_GSO_UDP | SKB_GSO_DODGY | \ SKB_GSO_TCPV6) +#else +#define SUPPORTED_GSO_TYPES (SKB_GSO_TCPV4 | SKB_GSO_DODGY | \ + SKB_GSO_TCPV6) +#endif /* The length and offset of a fragment are encoded in the sequence number. * STT_SEQ_LEN_SHIFT is the left shift needed to store the length. @@ -1310,7 +1315,7 @@ static bool validate_checksum(struct sk_buff *skb) static bool set_offloads(struct sk_buff *skb) { struct stthdr *stth = stt_hdr(skb); - unsigned short gso_type; + unsigned short gso_type = 0; int l3_header_size; int l4_header_size; u16 csum_offset; @@ -1351,7 +1356,9 @@ static bool set_offloads(struct sk_buff *skb) case STT_PROTO_IPV4: /* UDP/IPv4 */ csum_offset = offsetof(struct udphdr, check); +#ifdef HAVE_SKB_GSO_UDP gso_type = SKB_GSO_UDP; +#endif l3_header_size = sizeof(struct iphdr); l4_header_size = sizeof(struct udphdr); skb->protocol = htons(ETH_P_IP); @@ -1359,7 +1366,9 @@ static bool set_offloads(struct sk_buff *skb) default: /* UDP/IPv6 */ csum_offset = offsetof(struct udphdr, check); +#ifdef HAVE_SKB_GSO_UDP gso_type = SKB_GSO_UDP; +#endif l3_header_size = sizeof(struct ipv6hdr); l4_header_size = sizeof(struct udphdr); skb->protocol = htons(ETH_P_IPV6); From patchwork Wed Dec 6 00:01:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 844977 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rf+ALGvW"; 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 3yrzPB2dc6z9s7v for ; Wed, 6 Dec 2017 11:04:14 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4BB42D2D; Wed, 6 Dec 2017 00:01:38 +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 B8731D14 for ; Wed, 6 Dec 2017 00:01:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 752F979 for ; Wed, 6 Dec 2017 00:01:34 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id a90so1420608pfk.1 for ; Tue, 05 Dec 2017 16:01:34 -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=PxR1UDsl4ZaumUHFPdfRquNQ8EyDdbPdi3nlj5TKTLk=; b=rf+ALGvWddQJykbb/oGOBwc/GUEzte3d9gGFfFielNeAhoFSTwzU3rrzvQFdmPh2th S4VsQabPNPedTSXTvVjHXF/Bj+auvy1AeA+nhUVY/Hsm3xmSl/akC62fvZYUNF2Jasbh xE0z5rMB5Ik+AaSsn35PKSoZjX9G7yDlMJE/j00LGTpRdbd4v6IIJ7G/dAfKjC9ESU89 EUCPxFrH5UpEpsusJT7XwJ6nQtpZshC53SNldmU198IK3FVCwXj0SsGQc46abtYUw+q9 G4maIh+wftNwed23Wl6Tsofovh0fR0HTB1UxZNZ1w/zCipI/h7ZSb06IaRXqUAxtgKdA RctQ== 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=PxR1UDsl4ZaumUHFPdfRquNQ8EyDdbPdi3nlj5TKTLk=; b=hbGH9E1xI5jvmUzjtAAhPd8xhrf2kjZN7RdT2E94aucU3NYZXwWaFQCN/yjzZXAeEA 8khiHqSgAOZgvtQSKZ8rTUoEcIchLDfwojFpYlK01QTCaYxiE4utwgVKnlaJe9aqhPwc MVdmmyEtxo6MV76ptAZrPiTDeB+IQzXbfbEX94xLE0ReZw9t2EC/Df6clNe/VDV2oP2U RtqPcaktUH5BaT72dhbHg2nW3kNhaqrcP2CL9BChKiKdqF6U5Zio7AUocgK6OKmchopC 6rsS7ScCV3iaoE8FYJr5fXvEGbmnGByFi7IY3a7JmIbLMgGpVcNKaDSIKO4Om4NQHXkC 70bw== X-Gm-Message-State: AJaThX5eF5r/4LtPiFWyapp63uqq/hLDeg47xwlI0uiG8/JGVxkRImtU hgimeFefBOnAiB4CANgqXtGUjKpj X-Google-Smtp-Source: AGs4zManbsBN3/b/YUaJQYKMo/3igBqWVEzKB424ookepxWN0gt88KZ2gZ+SrCAr1Y5p9bjlNVE2nw== X-Received: by 10.99.127.84 with SMTP id p20mr19555981pgn.204.1512518493601; Tue, 05 Dec 2017 16:01:33 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id y5sm1892213pfa.128.2017.12.05.16.01.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 16:01:32 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 5 Dec 2017 16:01:20 -0800 Message-Id: <1512518481-5944-6-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> References: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> 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 5/6] acinclude.m4: Enable Linux 4.14 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 Signed-off-by: Greg Rose --- acinclude.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6511a24..b815c58 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -143,10 +143,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [ AC_MSG_RESULT([$kversion]) if test "$version" -ge 4; then - if test "$version" = 4 && test "$patchlevel" -le 13; then + if test "$version" = 4 && test "$patchlevel" -le 14; then : # Linux 4.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.13.x is not supported (please refer to the FAQ for advice)]) + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.14.x is not supported (please refer to the FAQ for advice)]) fi elif test "$version" = 3 && test "$patchlevel" -ge 10; then : # Linux 3.x From patchwork Wed Dec 6 00:01:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 844978 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oN8QF8HM"; 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 3yrzPv0SfRz9s7v for ; Wed, 6 Dec 2017 11:04:51 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1B5A0D27; Wed, 6 Dec 2017 00:01:39 +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 C502CD1D for ; Wed, 6 Dec 2017 00:01:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0BA7179 for ; Wed, 6 Dec 2017 00:01:35 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id u19so1395513pfa.12 for ; Tue, 05 Dec 2017 16:01:35 -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=yJqn2b95M6yEzHnGk5hYpBs9hxNcQFXsqfMl/KZD6Y8=; b=oN8QF8HMAst9VhX8VqUZ6OALg11iDS19e4VYwa7mbwSN5Op5m+HCvHpnXlKT+cQu40 AdjmbwQFAJ4vlQxkHa6NIYHEtMbuJiFGC2SiYUYokxjDdP6JeNz0VFQSyMwr26goWwEj urNXvIHyo79wS9VzZzr19A6iP8BGiu1RfFtkAoc0ETfk6prhJp+X9X8i6ECknHAjv0DW vBW9Xsw125d7Ab/TAIDDMH1kDnfuUugZuJ9UgtkR14Ok7wHKMDPFBAaNodP0MZNU6sLv Y64MpdctJW8gpO6kBjmxr2dubT7bhXDCxzJydvjc2dZ9wrxSdNgpZeX3BsvVUs4obg4p zd6A== 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=yJqn2b95M6yEzHnGk5hYpBs9hxNcQFXsqfMl/KZD6Y8=; b=tx6bOkaXR6V4VHO7IgR/usukupqT1rTw42jbkdiVO4rYWm4oMFpelPc9H3KLaTiBFg +sq/yJLpPnP6HfSieQwfv49iSawEm+WCSKzwiiExe4KxnDA96hu+FHsAEXj4Lx+BbGme xaO1k3N/1+Pn8Dj0O4a3KsvMLYKXKhpxfUqfe5Eh8dOBudPA58eI0r8HDycZfudcoFZC 3PlN367NqsZuZmlzuiZiF8BwqjNEPDY+lWqF/fBBo3Rj0+40ovKvkRNKm9vZS+8gCLeJ up5yiEyWuzQmwNBL9gObD0Qjghpy0+9kauDzB9kcVDcm0H3F7qbhQJpnhhOU/ZcW8IHQ u7eQ== X-Gm-Message-State: AKGB3mJqO+zgFGo6j2wt0NisS0dOaljb2DXAsN2QZurmKEXsvkBGW0+f Ko43oF7LtNescsiPxpflbAo0B6Wa X-Google-Smtp-Source: AGs4zMaO6qQwMTqGa7VdesD0A1eh0ei0J0f370K7zggfL+hxdDEpUuTUU+XQvVRrn/W2E0+PRRnJFg== X-Received: by 10.99.149.76 with SMTP id t12mr8238900pgn.382.1512518495272; Tue, 05 Dec 2017 16:01:35 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id y5sm1892213pfa.128.2017.12.05.16.01.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 16:01:34 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 5 Dec 2017 16:01:21 -0800 Message-Id: <1512518481-5944-7-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> References: <1512518481-5944-1-git-send-email-gvrose8192@gmail.com> 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 6/6] travis: Update kernel test list from kernel.org 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 Signed-off-by: Greg Rose --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f217840..8ca6d75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,17 +25,16 @@ sudo: false env: - OPTS="--disable-ssl" - - TESTSUITE=1 KERNEL=3.16.47 + - TESTSUITE=1 KERNEL=3.16.51 - TESTSUITE=1 OPTS="--enable-shared" - BUILD_ENV="-m32" OPTS="--disable-ssl" - - KERNEL=3.16.47 DPDK=1 - - KERNEL=3.16.47 DPDK=1 OPTS="--enable-shared" - - KERNEL=4.13 - - KERNEL=4.12.11 - - KERNEL=4.9.48 - - KERNEL=4.4.87 - - KERNEL=4.1.43 - - KERNEL=3.10.107 + - KERNEL=3.16.51 DPDK=1 + - KERNEL=3.16.51 DPDK=1 OPTS="--enable-shared" + - KERNEL=4.14.3 + - KERNEL=4.9.66 + - KERNEL=4.4.103 + - KERNEL=4.1.46 + - KERNEL=3.10.108 - TESTSUITE=1 LIBS=-ljemalloc matrix: