From patchwork Mon Sep 11 17:55:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812512 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="Lij5kbqJ"; 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 3xrbFz6Zghz9sBd for ; Tue, 12 Sep 2017 03:56:23 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5814CA85; Mon, 11 Sep 2017 17:56:21 +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 DE22040F for ; Mon, 11 Sep 2017 17:56:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EFB89E0 for ; Mon, 11 Sep 2017 17:56:18 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id h4so5199800pfk.0 for ; Mon, 11 Sep 2017 10:56:18 -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=cLOriGy/joL8MYl4vFtEcJGP66SpCfNiqeu7LW3J3lI=; b=Lij5kbqJUWdKlbOok/KYBTRHjFNz/R1axoKPg70KiVNjjw/aGnAr0Wezqro+QJ4F0G xnd+XBU9fqhkJAx3fXoP6nTOm9EQ7T/jcCDWNwFRIQWVmK9tK+Zt+nQvgN46NW5vz8CG /phU/sZO3/NY1ComOTbNXWMS8LoQicK82ot7cLXCnkKHCruJHzx/oBcTav5JtD3VJ6er cqnBH5okE6M/ouIYLN5+kmJbk61AWD4oGtvGwXDuFbO5b0fO7kLqnBqaC0z5OxrHLXb2 SfwISyx5iFBKWe8M1gLF1TS5GxV9Ft8CiktxbtW+nPuAfEjxxjnIUQ9FCyNNlCU+oket cyiQ== 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=cLOriGy/joL8MYl4vFtEcJGP66SpCfNiqeu7LW3J3lI=; b=Wess89OGpJo16WVsuBhMWcHmSvHzLUDFxeL2NciIvqsb9/Rt0I6q011IfwBeXCbMAO BXorAydeZSDa9dgdyRoacTv/znmSH2CWdOpqUtdAAvedhektmJ70yH33jj+qDi2XT9pr a1sKbANf1xG12MQoVVaaAS132ILivl16pfevk+t++U5rlG5o7wWX5RDLwxjYIi7UvTIk FiOwB2PeJOPfLuBUg9MdsL/ySGRVWe8sIv3aeUJVaO0hUFiOm0Al4IjkAyN6PHb7iI0O N7QVbeI0LTWRYHauq3vz4fRGrwGdXphLCQeZmSGXulskdJHULehLW5OnUMe+Fsf2Hx2m mK4Q== X-Gm-Message-State: AHPjjUhjG6aU3y5oVXxPjsHDC/oI5LVdX3LOq/bbbneRqC8L3qWjIlRO t38N9TSjOk4TZ3n4 X-Google-Smtp-Source: ADKCNb4EfKjYnXTa26e1Uk6gBjBnf3H47zokQFulP03uxJ9WTVQH7SwLMlZZhS0cm6svwKs+WgZjaw== X-Received: by 10.84.236.75 with SMTP id h11mr14388415pln.7.1505152577400; Mon, 11 Sep 2017 10:56:17 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:14 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:55:56 -0700 Message-Id: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 01/15] acinclude: Check for SKB_GSO_UDP 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 Removed in kernel 4.13 Signed-off-by: Greg Rose --- acinclude.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index aeb594a..0e98ade 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -767,6 +767,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_VXLAN_DEV_CFG])]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h], [nf_conntrack_helper_put]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],[SKB_GSO_UDP], + [OVS_DEFINE([HAVE_SKB_GSO_UDP])]) + if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then From patchwork Mon Sep 11 17:55:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812514 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="plzsg1hE"; 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 3xrbGb695nz9s7F for ; Tue, 12 Sep 2017 03:56:55 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5C48CA7F; Mon, 11 Sep 2017 17:56:22 +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 A20A240F for ; Mon, 11 Sep 2017 17:56:20 +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 B3CA4180 for ; Mon, 11 Sep 2017 17:56:19 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id i23so401004pfi.2 for ; Mon, 11 Sep 2017 10:56:19 -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:in-reply-to:references; bh=FYHdRzxaSJxtDHuBMqsiQvS/yatwvTh7L+4GBaQczNk=; b=plzsg1hEBjd75s82cZvFDE7O93kF3Grkd1pJj2647Iq8G2cmdBX4p+FQgCOy5jzss9 Ib9ke+pJdjkJMBsxEntt/zDN/HmbVkolWu6Mzx46ePmPPuvIdLWyVyMUxzenUKeqLKa7 k4ojz5/3vyiS5iHN01z2UpV7z9by1xNo0pN5p1AYfVNDvi1S0yqctDvDZx2GdU1Ov28g OcgDcjjl9TFy2fa2m8HmGVa3WKrFlo0O/3+3LZDuEPUdn6o9eLvY2A55bWB+JxndMhEt AS1T+2yn9splYmhdaAseHWSOcjIf/tp8mD1EVdpJH7HcJjCuGz5VL97sMdHe8epdGLrz pXrQ== 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=FYHdRzxaSJxtDHuBMqsiQvS/yatwvTh7L+4GBaQczNk=; b=AiWEc4mpujSiRQ+haA40YAGWkX5UuSHjnpaBYfWOgen0q+JTR7g2w8AyJAxRHpQfj+ iNDtAm1kjYHxMycgmNhFjRLZ8XGfIqlCmF6fqcRXBfnDfHQNGsza6ZXiFTkSNYtcLpQr jT8ihgFAf/0A/fBA+7vLGkmbVQNJXK84P+8p+uHtUPuHlR8ljLbuN1d/1a+Oe3NtDpfk loS/UsN1nnCRoBao1LzcmHuJ0ZRM2qwjCp85GQtMHuqbBjesxARmkFBmtCe6R4SxRIZ5 bA1u3CK19HnWOOY3zaNRVmQT2xb2AiVgEQNhPke0VSHYr7rrOw+5p7/HaMLqUh5nwst2 DlvA== X-Gm-Message-State: AHPjjUjtA87N8Sb27LqnAqj2GgBqE4lHmf2qj+nnuWOY6gF19SYPzZI6 oBLCKqykChiBG0+9 X-Google-Smtp-Source: ADKCNb4jEgG4KfN/Ej/B6w+gZj65ec5QTRX5NOdvTW+E1ZSE0O0lrBBupF7TllVjVm92yA1ewMKeHA== X-Received: by 10.98.93.85 with SMTP id r82mr12827910pfb.327.1505152578926; Mon, 11 Sep 2017 10:56:18 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:17 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:55:57 -0700 Message-Id: <1505152570-6143-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 02/15] datapath: Remove all references to SKB_GSO_UDP. 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 Upstream commit: commit 880388aa3c07fdea4f9b85e35641753017b1852f Author: David S. Miller Date: Mon Jul 3 07:29:12 2017 -0700 net: Remove all references to SKB_GSO_UDP. Such packets are no longer possible. Signed-off-by: David S. Miller SKB_GSO_UDP is removed in the upstream kernel. Use HAVE_SKB_GSO_UDP define from acinclude to detect if SKB_GSO_UDP exists and if so apply openvswitch section of this upstream patch. Signed-off-by: Greg Rose --- datapath/flow.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datapath/flow.c b/datapath/flow.c index c4f63b0..599b4e5 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -589,8 +589,12 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) key->ip.frag = OVS_FRAG_TYPE_LATER; return 0; } +#ifdef HAVE_SKB_GSO_UDP if (nh->frag_off & htons(IP_MF) || skb_shinfo(skb)->gso_type & SKB_GSO_UDP) +#else + if (nh->frag_off & htons(IP_MF)) +#endif key->ip.frag = OVS_FRAG_TYPE_FIRST; else key->ip.frag = OVS_FRAG_TYPE_NONE; @@ -707,9 +711,11 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) if (key->ip.frag == OVS_FRAG_TYPE_LATER) return 0; +#ifdef HAVE_SKB_GSO_UDP if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) key->ip.frag = OVS_FRAG_TYPE_FIRST; +#endif /* Transport layer. */ if (key->ip.proto == NEXTHDR_TCP) { if (tcphdr_ok(skb)) { From patchwork Mon Sep 11 17:55:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812515 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="MMz9bDkG"; 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 3xrbHL64Yjz9s7F for ; Tue, 12 Sep 2017 03:57:34 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 61D85AD2; Mon, 11 Sep 2017 17:56:23 +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 59C85A86 for ; Mon, 11 Sep 2017 17:56:21 +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 275F9D3 for ; Mon, 11 Sep 2017 17:56:21 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id i23so401030pfi.2 for ; Mon, 11 Sep 2017 10:56:21 -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:in-reply-to:references; bh=yHqpAVnwZ5598nsvJT24Ki7ePIntNOD9TQ05S8Hu91s=; b=MMz9bDkGMXLKBiT35ENZsfM4sUvlGaZHSmPtEgDE4DR3X3dKgfOIsrWIUg1rZd95tM 2fajvODSUbo7jiZUBZYnPXZFNIKZckqw1BeSS6tVOq3+YdzOHl/9ZdpN7UwxCE7QtPfv CH9ne0unaCYBkJIqR/Npt7daPc/Cj5z+MipluXVJxufhz/MeChQPpSeX5uFPMzg0cO2q YWJ9qVacQJOt5z/hI1NJtQm2eBzjI/1xrKodMJWK9mmIXiTyU33lpfK0kbKgHoaGSPvf yZh14Ob2N6Gfz959OAXy2ZEPAU+2xYjbgYOJLNGojMFmcvFYKAhs2awOQ2GxN5KRpt3E mPRw== 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=yHqpAVnwZ5598nsvJT24Ki7ePIntNOD9TQ05S8Hu91s=; b=uk/9fTqMyJDVmR84EFZ2PvuDmFFkzuGF83vUmuPBGJAjWVYsYO+NkWfiHiJThoqJlS Du3YAmDscMii5364ZAvA4Si5MiefzJKCp38tKFw2xCKP8a3H1J7lpgDqv2IehghaxwJm bn5lXI6Vm4vXCg9ZpBx/sK/UCu7xLGf9oP7USMd3EErb9U+KKn9nx9qRl45V5VK2+6oP 9j4F/8du22qAL2bOB2ZXWNaHXkEzNryfCjVuVulxMPcmoP4Le6BajIgYUt5TBhVBAjC0 rR+C+0sXt4XwtSwLJW9QBAjRwTk30E6/g5WzlyCdpwFUgiJRvsaoJf7FZrnrCoLOMs6f RzNA== X-Gm-Message-State: AHPjjUid7X73YATGcUGiYuRKPUtx1kayUrHTAFENx7k779aNFGg3lviU XOuWW69SJRA6k4nK X-Google-Smtp-Source: ADKCNb5Lz/QBeW2OZl/Lrm+OcDJj6OyhxGdYvF02VFtewoDPl/D1rotys0GpthcXPJRJ7vc636UxCA== X-Received: by 10.98.31.217 with SMTP id l86mr12357931pfj.136.1505152580380; Mon, 11 Sep 2017 10:56:20 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:19 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:55:58 -0700 Message-Id: <1505152570-6143-3-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 03/15] datapath: Optimize updating for OvS flow_stats. 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 Upstream commit: commit c57c054eb5b1ccf230c49f736f7a018fcbc3e952 Author: Tonghao Zhang Date: Mon Jul 17 23:28:05 2017 -0700 openvswitch: Optimize updating for OvS flow_stats. In the ovs_flow_stats_update(), we only use the node var to alloc flow_stats struct. But this is not a common case, it is unnecessary to call the numa_node_id() everytime. This patch is not a bugfix, but there maybe a small increase. Signed-off-by: Tonghao Zhang Signed-off-by: David S. Miller Signed-off-by: Greg Rose --- datapath/flow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index 599b4e5..30e4d21 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -71,7 +71,6 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, const struct sk_buff *skb) { struct flow_stats *stats; - int node = numa_node_id(); int cpu = smp_processor_id(); int len = skb->len + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); @@ -107,7 +106,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, __GFP_THISNODE | __GFP_NOWARN | __GFP_NOMEMALLOC, - node); + numa_node_id()); if (likely(new_stats)) { new_stats->used = jiffies; new_stats->packet_count = 1; From patchwork Mon Sep 11 17:55:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812518 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="HwzaI3tx"; 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 3xrbJ56GrDz9s7F for ; Tue, 12 Sep 2017 03:58:13 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 49652B0A; Mon, 11 Sep 2017 17:56:24 +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 36A61AC9 for ; Mon, 11 Sep 2017 17:56:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9A2DCD3 for ; Mon, 11 Sep 2017 17:56:22 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id e69so3400875pfg.4 for ; Mon, 11 Sep 2017 10:56:22 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/XSTG34Q8GxNSzWNs3owPR5+/APDMgxxJfnT4f3elck=; b=HwzaI3txac/5Rhdu60gFtXZSxxIaZ1NZ6ANOFfySBKy0B4BsE5njdIYMfUJyhEHDbP kJ1Dlb7vprYBRtSMndP1/NDfUJnEbIjD2LxSlVBVt/cN/hfl77KBiBIF0qC++/hFFCCA hLm5ZpZ6VvNayhBHFw3C0I08oeZtv+JHsjWx45kr+3uABf/t6QWpJ6OK6pRGN7QzFglx 70aXWgLgQV+lFOlSSuHQLqW6yEb4cJgQc6DYDjdJTm+nmLNiv5kdETqnJQVYEMDraXkB 32HikndtmyLaW+CsvvxYha7mzp5o2Sf7LGlrkTuOOFM2ZjnG9O/08tQB6dupfjXF/2Hj l6XA== 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:mime-version:content-transfer-encoding; bh=/XSTG34Q8GxNSzWNs3owPR5+/APDMgxxJfnT4f3elck=; b=AFbZmp4WBZOoXifbr4rgvUYpwH5Ij0vxJ9oh8bQy8zURog0GwLLU9Rl3vjqm3glpyQ gwtKg/eqjQiEHam9a8WnqhWxbt42xqxY3y9dYptasOHLxepo1d77g8uMXuqjV6tNZD1S wbuRmB7Aueo2ZtWMztbcmsvPvK0pq6x3EkeKCvGKU+ykz9Ms0AzCJg68LvQEwudgxrIS CWlrzCOfVZK2j1bn1OoVh9FNmBgU9S5/cown8qPeQHytoNlzvvPE7C4RwNURl7YQnU6O 9vzov7kzGEsadMM2T3tyysh8Om6Pzfw/pphT93yxULBWyFPwx6IjkwxE6IKohaYgoh+v wEBg== X-Gm-Message-State: AHPjjUjRl9s+qF8YVLvYx5Bhl9nCYaUroU+YzJy9aEV8r5L0Okuziu9w RbHrf6WRDmcfc6os X-Google-Smtp-Source: ADKCNb4hVCoDu0+2KoLS7vYmN1OhZskq0Y/JpnAhBSpPBw3Tx1PaTlIJAx10lqBgmX3AuSprQvZlNw== X-Received: by 10.98.204.69 with SMTP id a66mr12854833pfg.132.1505152581736; Mon, 11 Sep 2017 10:56:21 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:20 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:55:59 -0700 Message-Id: <1505152570-6143-4-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 04/15] datapath: Optimize operations for OvS flow_stats. 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Upstream commit: commit c4b2bf6b4a35348fe6d1eb06928eb68d7b9d99a9 Author: Tonghao Zhang Date: Mon Jul 17 23:28:06 2017 -0700 openvswitch: Optimize operations for OvS flow_stats. When calling the flow_free() to free the flow, we call many times (cpu_possible_mask, eg. 128 as default) cpumask_next(). That will take up our CPU usage if we call the flow_free() frequently. When we put all packets to userspace via upcall, and OvS will send them back via netlink to ovs_packet_cmd_execute(will call flow_free). The test topo is shown as below. VM01 sends TCP packets to VM02, and OvS forward packtets. When testing, we use perf to report the system performance. VM01 --- OvS-VM --- VM02 Without this patch, perf-top show as below: The flow_free() is 3.02% CPU usage. 4.23% [kernel] [k] _raw_spin_unlock_irqrestore 3.62% [kernel] [k] __do_softirq 3.16% [kernel] [k] __memcpy 3.02% [kernel] [k] flow_free 2.42% libc-2.17.so [.] __memcpy_ssse3_back 2.18% [kernel] [k] copy_user_generic_unrolled 2.17% [kernel] [k] find_next_bit When applied this patch, perf-top show as below: Not shown on the list anymore. 4.11% [kernel] [k] _raw_spin_unlock_irqrestore 3.79% [kernel] [k] __do_softirq 3.46% [kernel] [k] __memcpy 2.73% libc-2.17.so [.] __memcpy_ssse3_back 2.25% [kernel] [k] copy_user_generic_unrolled 1.89% libc-2.17.so [.] _int_malloc 1.53% ovs-vswitchd [.] xlate_actions With this patch, the TCP throughput(we dont use Megaflow Cache + Microflow Cache) between VMs is 1.18Gbs/sec up to 1.30Gbs/sec (maybe ~10% performance imporve). This patch adds cpumask struct, the cpu_used_mask stores the cpu_id that the flow used. And we only check the flow_stats on the cpu we used, and it is unncessary to check all possible cpu when getting, cleaning, and updating the flow_stats. Adding the cpu_used_mask to sw_flow struct does’t increase the cacheline number. Signed-off-by: Tonghao Zhang Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Signed-off-by: Greg Rose --- datapath/flow.c | 7 ++++--- datapath/flow.h | 2 ++ datapath/flow_table.c | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index 30e4d21..5da7e3e 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -71,7 +71,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, const struct sk_buff *skb) { struct flow_stats *stats; - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); int len = skb->len + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); stats = rcu_dereference(flow->stats[cpu]); @@ -116,6 +116,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, rcu_assign_pointer(flow->stats[cpu], new_stats); + cpumask_set_cpu(cpu, &flow->cpu_used_mask); goto unlock; } } @@ -143,7 +144,7 @@ void ovs_flow_stats_get(const struct sw_flow *flow, memset(ovs_stats, 0, sizeof(*ovs_stats)); /* We open code this to make sure cpu 0 is always considered */ - for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, cpu_possible_mask)) { + for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { struct flow_stats *stats = rcu_dereference_ovsl(flow->stats[cpu]); if (stats) { @@ -167,7 +168,7 @@ void ovs_flow_stats_clear(struct sw_flow *flow) int cpu; /* We open code this to make sure cpu 0 is always considered */ - for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, cpu_possible_mask)) { + for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { struct flow_stats *stats = ovsl_dereference(flow->stats[cpu]); if (stats) { diff --git a/datapath/flow.h b/datapath/flow.h index 07af912..0796b09 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -218,6 +219,7 @@ struct sw_flow { */ struct sw_flow_key key; struct sw_flow_id id; + struct cpumask cpu_used_mask; struct sw_flow_mask *mask; struct sw_flow_actions __rcu *sf_acts; struct flow_stats __rcu *stats[]; /* One for each CPU. First one diff --git a/datapath/flow_table.c b/datapath/flow_table.c index 6fe3739..47057a1 100644 --- a/datapath/flow_table.c +++ b/datapath/flow_table.c @@ -104,6 +104,8 @@ struct sw_flow *ovs_flow_alloc(void) RCU_INIT_POINTER(flow->stats[0], stats); + cpumask_set_cpu(0, &flow->cpu_used_mask); + return flow; err: kmem_cache_free(flow_cache, flow); @@ -147,7 +149,7 @@ static void flow_free(struct sw_flow *flow) if (flow->sf_acts) ovs_nla_free_flow_actions((struct sw_flow_actions __force *)flow->sf_acts); /* We open code this to make sure cpu 0 is always considered */ - for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, cpu_possible_mask)) + for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) if (flow->stats[cpu]) kmem_cache_free(flow_stats_cache, rcu_dereference_raw(flow->stats[cpu])); From patchwork Mon Sep 11 17:56:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812520 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="jlL0TCqr"; 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 3xrbJm4sMJz9s7F for ; Tue, 12 Sep 2017 03:58:48 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3E9D8B2A; Mon, 11 Sep 2017 17:56: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 13132B08 for ; Mon, 11 Sep 2017 17:56:25 +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 01A54E0 for ; Mon, 11 Sep 2017 17:56:23 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id i23so401089pfi.2 for ; Mon, 11 Sep 2017 10:56:23 -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:in-reply-to:references; bh=0+aUV5igeT+9+FLHYM4g+qIb6RSjylqrQrjIkbzhqlA=; b=jlL0TCqryuXcZwrEAKi3CXj5T9Y0jEGozT4Xnkz2R8z2RJP91CgP1RKnZjswILYrYN 9QCJG95OgKNdW7HsPiVVtFyxOGmAwUdH7dEkn6oQGFLgqfsbUgNFr6b8oz9oSJswtAnJ gnbzrMrO9VTBiSmd4dKdrwbRNnelDGq44c5r+PbFgkeGiOTFFg9z/D4VSHxEkElPbbCM m1ibFAIssvYWWiWTKX85lzLhR4y34/RsgKFZpUT41l6vEFuzZJCNbWetRJ/UzuaEIgyl /O9DpM3nEtohYqsXW5AJpBRHkwbsztKZG+jonSKhHv7K7A+tIRe2Wtq+DhgZ2nuBQrtU ST5Q== 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=0+aUV5igeT+9+FLHYM4g+qIb6RSjylqrQrjIkbzhqlA=; b=HjIV4FIxlgerNwdJWMVTMMPOfrgaG7G0veWvAs45XS7qG1z7QK3ra/6b6Yee0mKhQb IAEGkgknA5Igxx1cdMPcmj2Fv+DW1d7QcpJfGPnj2P85juxH6Wt9A4bgBADGraY1IXIk UVRvmQoBDRBWPDGpqTizrKTKxbDPvgGpvC7k3o1mObwK798dRvTfOac2LVIP1skXDR0L xe2F0WRme0z1gnbZzeQqXb8VL37rLU05McLz/VLJmxHhybdrJI7ZXRVh7VmBDq/0M/sW sUAvD4CjCjl34jM1HH745x//rC0N5E4tNUPQs01TBvW6BrWq9UTvh3YfImHNvDvh9c3K cc4A== X-Gm-Message-State: AHPjjUgiSAu0dFkGe0frBbPDMfXznWzh1nYdOu7SwbyCZTvzF5C+j6Yn mrj7NJ4UiNGBXPiX X-Google-Smtp-Source: ADKCNb40eVdjjXDB7F4FUUzlPE1RMgu/O7HH7sddInJwvMkIA3tAd/wYepkvY9zNgieL/Gqz30sj9g== X-Received: by 10.98.10.146 with SMTP id 18mr12342497pfk.346.1505152583300; Mon, 11 Sep 2017 10:56:23 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:22 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:00 -0700 Message-Id: <1505152570-6143-5-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 05/15] datapath: Remove unnecessary newlines from OVS_NLERR uses 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 Upstream commit: commit 0ed80da518a1f27562a013f106505e495e891fe4 Author: Joe Perches Date: Fri Aug 11 04:26:26 2017 -0700 openvswitch: Remove unnecessary newlines from OVS_NLERR uses OVS_NLERR already adds a newline so these just add blank lines to the logging. Signed-off-by: Joe Perches Acked-by: Joe Stringer Signed-off-by: David S. Miller Signed-off-by: Greg Rose --- datapath/conntrack.c | 14 +++++--------- datapath/flow_netlink.c | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index b645ab1..d517a87 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -1221,15 +1221,13 @@ static int parse_nat(const struct nlattr *attr, int type = nla_type(a); if (type > OVS_NAT_ATTR_MAX) { - OVS_NLERR(log, - "Unknown NAT attribute (type=%d, max=%d).\n", + OVS_NLERR(log, "Unknown NAT attribute (type=%d, max=%d)", type, OVS_NAT_ATTR_MAX); return -EINVAL; } if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) { - OVS_NLERR(log, - "NAT attribute type %d has unexpected length (%d != %d).\n", + OVS_NLERR(log, "NAT attribute type %d has unexpected length (%d != %d)", type, nla_len(a), ovs_nat_attr_lens[type][ip_vers]); return -EINVAL; @@ -1239,9 +1237,7 @@ static int parse_nat(const struct nlattr *attr, case OVS_NAT_ATTR_SRC: case OVS_NAT_ATTR_DST: if (info->nat) { - OVS_NLERR(log, - "Only one type of NAT may be specified.\n" - ); + OVS_NLERR(log, "Only one type of NAT may be specified"); return -ERANGE; } info->nat |= OVS_CT_NAT; @@ -1291,13 +1287,13 @@ static int parse_nat(const struct nlattr *attr, break; default: - OVS_NLERR(log, "Unknown nat attribute (%d).\n", type); + OVS_NLERR(log, "Unknown nat attribute (%d)", type); return -EINVAL; } } if (rem > 0) { - OVS_NLERR(log, "NAT attribute has %d unknown bytes.\n", rem); + OVS_NLERR(log, "NAT attribute has %d unknown bytes", rem); return -EINVAL; } if (!info->nat) { diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 9b48612..df9d88e 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1257,7 +1257,7 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match, } if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) { - OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n", + OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x)", ntohl(ipv6_key->ipv6_label), (1 << 20) - 1); return -EINVAL; } From patchwork Mon Sep 11 17:56:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812521 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="Ddtbgt8i"; 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 3xrbKf4yzjz9s7F for ; Tue, 12 Sep 2017 03:59:34 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A1129B56; Mon, 11 Sep 2017 17:56:29 +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 48C25B30 for ; Mon, 11 Sep 2017 17:56:26 +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 BC96AA4 for ; Mon, 11 Sep 2017 17:56:25 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id i23so401123pfi.2 for ; Mon, 11 Sep 2017 10:56:25 -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:in-reply-to:references; bh=VyC5nfaIBsQFXfPun5s8FCA08bl6efNI8b/Cc/PCfkY=; b=Ddtbgt8iCeiq/KMbxxqjPL7vw45VNxWPRl5GDDvWR5r2mWbgS2FFK8pc3vwGOu1H4Y PLq62aqzbdx4D2kz9DvilRMKpyfbi5jsR+CaSDNGozer6Xu7PvE52w44gBbo0xudXeqt PaKSB/tBUMgfJlJ98K49hi8p3BbCWixOuVs0ezoRFbcL6YU0gz24HUcpwqkltcfkad+h +6N0ZNpvOV4ZRh2MM7VjZdAxbm9FPKt2W7lG955ZdQ9jzWsCb6OFW3HtM/CofYsZyAte BvRDq7YbC4qUEXgjfEGvjCaz7MsRwJ0uO+dOlJ50ZOsWZwBtz+T4U2oH3oEUTpzzSI+N YoTg== 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=VyC5nfaIBsQFXfPun5s8FCA08bl6efNI8b/Cc/PCfkY=; b=UcEnwZ48A1hDhqHGkABx+1LBEkzxZyEOwcMTSUqXjh9PNxMFPL8b3fD/rQz6BNdkja 5Slxb9a4NotIleGxMU8ZxN0Ql1tM5q/xtw7Sjt7Ro+C5//7H34oIhQdmyOdRuiuezBDa LJa37xiTrQUJCMTG+2DUNdIXIs+1v/iflHYxILYl1YuOgxz+u8arW8usB1OJNUNZwiHM x1pvnmm79pc3wRKPT1Pr/uC+u2Eim1l4H+cNasI/3gnAt8TF4chJbgzoq0Z2yQyEGqAi CFlJ+ZQXNFZgucZUZcbbXy4MSsg4e6BVY81xubnxYQ2UzIFPF5bhVZMlNxCfe69TEpEc pGiw== X-Gm-Message-State: AHPjjUjzQ8YhKLaFHhUN1cF/bSKb1dz33SwVg3P9FaWmIlqEoUDLZWOk dMwtCgod9z9My7W8 X-Google-Smtp-Source: ADKCNb7iE6JrJ7GEOwFcTR0wxhMaybhpNoQITKg2CfYXGD2voeRVvef6B1neTvXJBf7PZbnzGdnVIA== X-Received: by 10.98.236.17 with SMTP id k17mr11802579pfh.191.1505152584891; Mon, 11 Sep 2017 10:56:24 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:23 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:01 -0700 Message-Id: <1505152570-6143-6-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 06/15] datapath: fix skb_panic due to the incorrect actions attrlen 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 Upstream commit: commit 494bea39f3201776cdfddc232705f54a0bd210c4 Author: Liping Zhang Date: Wed Aug 16 13:30:07 2017 +0800 openvswitch: fix skb_panic due to the incorrect actions attrlen For sw_flow_actions, the actions_len only represents the kernel part's size, and when we dump the actions to the userspace, we will do the convertions, so it's true size may become bigger than the actions_len. But unfortunately, for OVS_PACKET_ATTR_ACTIONS, we use the actions_len to alloc the skbuff, so the user_skb's size may become insufficient and oops will happen like this: skbuff: skb_over_panic: text:ffffffff8148fabf len:1749 put:157 head: ffff881300f39000 data:ffff881300f39000 tail:0x6d5 end:0x6c0 dev: ------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:129! [...] Call Trace: [] skb_put+0x43/0x44 [] skb_zerocopy+0x6c/0x1f4 [] queue_userspace_packet+0x3a3/0x448 [openvswitch] [] ovs_dp_upcall+0x30/0x5c [openvswitch] [] output_userspace+0x132/0x158 [openvswitch] [] ? ip6_rcv_finish+0x74/0x77 [ipv6] [] do_execute_actions+0xcc1/0xdc8 [openvswitch] [] ovs_execute_actions+0x74/0x106 [openvswitch] [] ovs_dp_process_packet+0xe1/0xfd [openvswitch] [] ? key_extract+0x63c/0x8d5 [openvswitch] [] ovs_vport_receive+0xa1/0xc3 [openvswitch] [...] Also we can find that the actions_len is much little than the orig_len: crash> struct sw_flow_actions 0xffff8812f539d000 struct sw_flow_actions { rcu = { next = 0xffff8812f5398800, func = 0xffffe3b00035db32 }, orig_len = 1384, actions_len = 592, actions = 0xffff8812f539d01c } So as a quick fix, use the orig_len instead of the actions_len to alloc the user_skb. Last, this oops happened on our system running a relative old kernel, but the same risk still exists on the mainline, since we use the wrong actions_len from the beginning. Fixes: ccea74457bbd ("openvswitch: include datapath actions with sampled-pac Cc: Neil McKee Signed-off-by: Liping Zhang Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Fixes: 0e469d3b380c ("datapath: Include datapath actions with sampled-packet upcall to userspace.") Signed-off-by: Greg Rose --- datapath/actions.c | 1 + datapath/datapath.c | 7 ++++--- datapath/datapath.h | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/datapath/actions.c b/datapath/actions.c index 59d91b2..ad18c2c 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -1348,6 +1348,7 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, goto out; } + OVS_CB(skb)->acts_origlen = acts->orig_len; err = do_execute_actions(dp, skb, key, acts->actions, acts->actions_len); diff --git a/datapath/datapath.c b/datapath/datapath.c index b565fc5..1780819 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -388,7 +388,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, } static size_t upcall_msg_size(const struct dp_upcall_info *upcall_info, - unsigned int hdrlen) + unsigned int hdrlen, int actions_attrlen) { size_t size = NLMSG_ALIGN(sizeof(struct ovs_header)) + nla_total_size(hdrlen) /* OVS_PACKET_ATTR_PACKET */ @@ -405,7 +405,7 @@ static size_t upcall_msg_size(const struct dp_upcall_info *upcall_info, /* OVS_PACKET_ATTR_ACTIONS */ if (upcall_info->actions_len) - size += nla_total_size(upcall_info->actions_len); + size += nla_total_size(actions_attrlen); /* OVS_PACKET_ATTR_MRU */ if (upcall_info->mru) @@ -472,7 +472,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, else hlen = skb->len; - len = upcall_msg_size(upcall_info, hlen - cutlen); + len = upcall_msg_size(upcall_info, hlen - cutlen, + OVS_CB(skb)->acts_origlen); user_skb = genlmsg_new(len, GFP_ATOMIC); if (!user_skb) { err = -ENOMEM; diff --git a/datapath/datapath.h b/datapath/datapath.h index f20deed..70ad0ac 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -100,11 +100,13 @@ struct datapath { * when a packet is received by OVS. * @mru: The maximum received fragement size; 0 if the packet is not * fragmented. + * @acts_origlen: The netlink size of the flow actions applied to this skb. * @cutlen: The number of bytes from the packet end to be removed. */ struct ovs_skb_cb { struct vport *input_vport; u16 mru; + u16 acts_origlen; u32 cutlen; }; #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) From patchwork Mon Sep 11 17:56:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812523 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="WZs0znBz"; 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 3xrbLK0KTqz9s83 for ; Tue, 12 Sep 2017 04:00:08 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id AB00DB5F; Mon, 11 Sep 2017 17:56:30 +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 0B8EAB43 for ; Mon, 11 Sep 2017 17:56:27 +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 D1CFE442 for ; Mon, 11 Sep 2017 17:56:26 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id e69so3400949pfg.4 for ; Mon, 11 Sep 2017 10:56:26 -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:in-reply-to:references; bh=tgkf12Ulg+rVemNIcsMd79J+NNsjh3ZLY1W5f6p1XsM=; b=WZs0znBz9mUjsSir/WG81gEIxkGouOVj4HF3VmnOCgUka96fYKKbDXfwXZCVJLFDud e43q50UBUPgtLLcl/VLoAGFkGfKCqdsZYvDIK7drl3ydhESKOum8z+rGCzn+ZyhZVf2w rw3w6ZYnfhlEBY5yv6ruHevOdE5TpxaXlfeGOwgiIRfp5NxZxew/eqdy+CWZwziqCTpa gidkt9qn4/hG+1RVW0s9Pg2FBZLW+cjxwuC6DKB92ZweSWg0r3pnT9OUa9KdGvn+eOsk yR2Yg1XjI9xvUmVoeukPcJiI4cjRU58zxD3J4gLFMmbynGmZKKI3opQteCMrWybYQmVy l9XQ== 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=tgkf12Ulg+rVemNIcsMd79J+NNsjh3ZLY1W5f6p1XsM=; b=PilX2674xChGarDiIY1LiR5DYd1OTXCf38pdyTg+WkJ5YvSyskrQ6Ga+79BwbnyF5f ac1zD+2zGVGbd2TKNP6ozRvXzIxbmYmx+L/W9i7rHtUB4BEw10SnD/LckMSf1AhPOW7B E0G2sIQi/9+CJtPvYLXpLkTXMHTP54MBaeu2kaaYBrcS2tRskYvEDdeV5oHVVqUvJhKO nGt2YuWxupF5RPCfbmdIvu3VocuHd3r3vtjnzbiLqsh2lGjVeo1KfVZ4lEfeEKVL9LRT g18pHaE34tvM661+fIQEc8pDPDI1P3GsiwxBD2P8Qn0Om7piKry9qM2JU2aRniGMXw7i EZFg== X-Gm-Message-State: AHPjjUhpqqMmY39gAO/2P8EXoVaJytHukc1J7qv9RzJ4tZ7cbP8I7iui f+Wxv+TSi2GYpRvn X-Google-Smtp-Source: ADKCNb4Bqd9bpsysCoGhhgUYmg/Z6HslLhuAUBblyY/1p21eI9p49YoG5Rn65VcW3al0bRiPMjfdVQ== X-Received: by 10.98.10.153 with SMTP id 25mr12539838pfk.254.1505152586180; Mon, 11 Sep 2017 10:56:26 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:25 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:02 -0700 Message-Id: <1505152570-6143-7-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 07/15] acinclude: Add compat define for DST_NOCACHE 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 DST_NOCACHE is removed in the 4.13 Linux kernel - add check for it and if found set HAVE_DST_NOCACHE. Signed-off-by: Greg Rose --- acinclude.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 0e98ade..772ff03 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -769,6 +769,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [nf_conntrack_helper_put]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],[SKB_GSO_UDP], [OVS_DEFINE([HAVE_SKB_GSO_UDP])]) + OVS_GREP_IFELSE([$KSRC/include/net/dst.h],[DST_NOCACHE], + [OVS_DEFINE([HAVE_DST_NOCACHE])]) if cmp -s datapath/linux/kcompat.h.new \ From patchwork Mon Sep 11 17:56:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812524 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="fD52xaxD"; 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 3xrbM00r2mz9s7F for ; Tue, 12 Sep 2017 04:00:42 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B4084B00; Mon, 11 Sep 2017 17:56: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 87DFAB00 for ; Mon, 11 Sep 2017 17:56:28 +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 4CA55D3 for ; Mon, 11 Sep 2017 17:56:28 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id e69so3400973pfg.4 for ; Mon, 11 Sep 2017 10:56:28 -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:in-reply-to:references; bh=IKrdHeopdQgCSK5k/p82LIktc2ZAU+0pOt30MD1XmKM=; b=fD52xaxDMzPxfD9+M76dBLAfyujbZd4hg89tP+9RO1qMAARznoBhaqx1/tguLt1Evz r+zeicMryxrz3ERBC/C1KmZ+4aeb20zszsooBKPuoHT54kzwHyqxkgf1MFItVcfQJKWy zfHe6cY6UXHuX6H31wMv6k4JmuKkVas37t/fmA8TXWdTGatAr9qoD9Xhb/vaw4H/Dszq nxKxzoVHG1v+ElDTMclaVY7U9ALdptLTjf8D6NXLqBXOE6XUG3t99dnYOjig/oqZkEH/ Tdf/59BwF77xPPAdkrdd5wrBmGlZr2AkcqF6LqYeWlFiYbom9MXFiXs7tB4IGwNvqnEM VGzg== 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=IKrdHeopdQgCSK5k/p82LIktc2ZAU+0pOt30MD1XmKM=; b=REOEf3gv+Te+AW1uRz4GQqOvtjpf5zobQQ+3s/zmmd8mGBnwOnsuKTlTaZbadABB1d XFb1cwGWXxD1lksSRx5pLDrieg6SO6tIrWu0uYWk5HFgIKqNbOLsio7ZPv0T0ghXyLsP Hyxj9gkANDQsj7wBKNsS8zgPaj8dzpO3kceEXIujsomaoQmgd597jqTn2rpyPjh3nqJ5 uPbG1sldkfm28ED6qNRRRa+S8nOGmY6DS21MyxsJI4DOf1A+0HC7VbVUugI1fkXKD/U6 tv2dUbpP/wzMlvJBniG/QgNFIjO4Bi6ywjVUrR6PVvg4cUWqum/cIin/zFpw5C9Kx/ok 6n0Q== X-Gm-Message-State: AHPjjUjjdcV7ouTzV90sC04uNkgZBrX1wubS0wTwWL2NaaZB81qH0dID DkhLS2ZMCypeQ5YN X-Google-Smtp-Source: ADKCNb7sfgeXM8W5xjWUJezFcByR1SrsoOplUMBk50hUR8pIKINEj358MrmIXXm13UA0ia54iKjUXg== X-Received: by 10.98.14.213 with SMTP id 82mr13009848pfo.274.1505152587635; Mon, 11 Sep 2017 10:56:27 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:26 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:03 -0700 Message-Id: <1505152570-6143-8-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 08/15] compat: Add check for DST_NOCACHE 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 DST_NOCACHE was removed from the Linux 4.13 kernel. Check if HAVE_DST_NOCACHE is defined for older kernels. Signed-off-by: Greg Rose --- datapath/linux/compat/include/net/ip6_fib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datapath/linux/compat/include/net/ip6_fib.h b/datapath/linux/compat/include/net/ip6_fib.h index 2c8a513..4d58375 100644 --- a/datapath/linux/compat/include/net/ip6_fib.h +++ b/datapath/linux/compat/include/net/ip6_fib.h @@ -27,7 +27,11 @@ static inline u32 rt6_get_cookie(const struct rt6_info *rt) { if (rt->rt6i_flags & RTF_PCPU || - (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from)) +#ifdef HAVE_DST_NOCACHE + (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from)) +#else + (unlikely(!list_empty(&rt->rt6i_uncached)) && rt->dst.from)) +#endif rt = (struct rt6_info *)(rt->dst.from); return rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; From patchwork Mon Sep 11 17:56:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812526 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="mEYtSA7W"; 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 3xrbMf4Gvdz9sBd for ; Tue, 12 Sep 2017 04:01:18 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A8846B6D; Mon, 11 Sep 2017 17:56: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 01BA8B5A for ; Mon, 11 Sep 2017 17:56:30 +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 CDA30E0 for ; Mon, 11 Sep 2017 17:56:29 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id i23so401185pfi.2 for ; Mon, 11 Sep 2017 10:56:29 -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:in-reply-to:references; bh=8MppXH1k+6z9KRxvIW3y+CDDyyigPBF7tcgmXy6kasM=; b=mEYtSA7WS1hR46cTxVSqvJY46+7o+XJOps1c1d0jPUACSBnHUoDq+B94XPePivXFSg D2+VSWtBwBNR2DZ+W5q4pRNqKFcmZ2ZnsppALfK9peyfrFVhB8aSoW/fueN2xxAY7cGc TkcQ0j5sbk1tgWOZd7y8am+YUeAl+f1SSND9UfqABt9lQ+y34kcnG1tTarGUyS9Y7PSX X9QdQpYgAW8upR16aBGws6I7154sgPKptvfZQxvXRJn6PzpYBm45wwWUkO3xsWoovVvU NJGBYZlIINKi8MUUYATXdzAEC+d5iPUtaZkZ0+rkRy7SaR16xricGaa97CVcvTLy2+38 cUVg== 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=8MppXH1k+6z9KRxvIW3y+CDDyyigPBF7tcgmXy6kasM=; b=rU8L1G5hHzq4e9Mi8JUMp3r73HcQPwWIz7+Wnop/lB3JP3SWdJoXInb/dJ32YeVyC7 NGFBXFluhh/d7t0dDp4YMteI1eR8A9kxiym3d/G+EXSaqrmJekSVM1dGSbfbJrdmKq8P h5FoYkRf/brn2jWn5HVyFOvwUU0DFBvkYbI8kHIDiAxoq49cHHos7r9jnBvKsrvMjokH +n57VwmYtTnxKFokiM13V7gBMfrbhnn0uJkRa77jDIDtH/1gzRTzeYTRgAN95TdUAjWN 1UTfFSRzER8mrRErA28IkPWHDEXeIXLAB8Zascu0MzDogyP7mnZmfPdzpCIJL9xC7qAw hizg== X-Gm-Message-State: AHPjjUikTqWK00gUVcStn12s7R6MQQAiU41GqgK8Yh1py5UaUM6J28Nj VFTEQLkzskT/uaK6 X-Google-Smtp-Source: ADKCNb6wZzejVBjCBSvLqg9PSxQkYTpLhz7hPvN/fXRuuTxb6CjJZxOwgXnxpvWvUGZOh3wScBELhw== X-Received: by 10.99.127.4 with SMTP id a4mr12313151pgd.124.1505152589149; Mon, 11 Sep 2017 10:56:29 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:28 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:04 -0700 Message-Id: <1505152570-6143-9-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 09/15] acinclude: Check for extended netlink ack presence 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 RTNL ops validate and newlink now include the extended netlink ack feature. Check for it and set HAVE_EXT_ACK_IN_RTNL_LINKOPS if found. Signed-off-by: Greg Rose --- acinclude.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 772ff03..46efa69 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -771,6 +771,12 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_SKB_GSO_UDP])]) OVS_GREP_IFELSE([$KSRC/include/net/dst.h],[DST_NOCACHE], [OVS_DEFINE([HAVE_DST_NOCACHE])]) + OVS_FIND_FIELD_IFELSE([$KSRC/include/net/rtnetlink.h], [rtnl_link_ops], + [extack], + [OVS_DEFINE([HAVE_EXT_ACK_IN_RTNL_LINKOPS])]) + OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hook_ops], + [list], + [OVS_DEFINE([HAVE_LIST_IN_NF_HOOK_OPS])]) if cmp -s datapath/linux/kcompat.h.new \ From patchwork Mon Sep 11 17:56:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812528 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="jt1sxWVy"; 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 3xrbNc2X12z9sNV for ; Tue, 12 Sep 2017 04:02:06 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B58ABB6A; Mon, 11 Sep 2017 17:56: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 7846AB00 for ; Mon, 11 Sep 2017 17:56:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3583C1D7 for ; Mon, 11 Sep 2017 17:56:31 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id f84so5199146pfj.3 for ; Mon, 11 Sep 2017 10:56:31 -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:in-reply-to:references; bh=Fp0jy2VWVzdGePQ9IHOwA0mTmBpFVj4rHwVBjorT0ss=; b=jt1sxWVyNwC+q+AjUuiPvOHINDUyc1QyA1VLHb0E5LyBpSXUz3u4RZeO7Vt0xolus6 6IbnD9HaztrUgA/QBOzb3Khuu+SZ4vGdVJQYJxU1sQmU0twTKW+wZDIANMG/z0MoVtug G87lWeKfmUlzBOC3QuUhH+dZ5FuJgsulkAQHTYdzlmJRAdvPwI/DJQ6Yy+TN+TGuqOmq LnFWNpy/SZeq7dX6DWM+AHquDvlr0/u/3TYUkkC3VAO0lYhUE+VM+MZecvNQQN0HBIgC kp9gAa2GzZkfdTvFnjSNqY99fdL/aKMuh5lmd1ZSuZCjaQAS6YEmqbYdMpQPCKGG9r2M 0veA== 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=Fp0jy2VWVzdGePQ9IHOwA0mTmBpFVj4rHwVBjorT0ss=; b=CbRE/oqOsHK6a1oRcMzzqSNU9bJpvrnMrqezyWkKALHsgqqA1LqSH56Ov1D0ICpWoV RzunvZW+Pdz3gjlFpN8aXUWT8XMbNRPtn0JpZ1dEoLap9U8AVvWrENBigKKaUqKthlIi el4DhyZuoG1oKlnrMUr2XGzzLE3gZ5FCPYA75tV6h0WZf+48uIct2pCZsQmWvhDQ1jU1 k6HxHYQWUMd9xbsHCQNqkhrN7dDYKPx0ZEJZIuhJW2AqGcIaE8jwNVoMRx5Mrn9op+gj vyy+SV8XbVM52iA0WlWNtxYPIjykb3NT0ZjTst0mmIrpzOKuZb+xFIWwqYkfO8SRUgIb gz4g== X-Gm-Message-State: AHPjjUhy1OU3CMcvMavdIKDOPYiXmPM3Mf6+UXoOFYficv2jv8Kh87S/ a2RX95rp6TCHXfp8 X-Google-Smtp-Source: ADKCNb5lmeu9IGOFgtmAHS/F7g6vZeK6IGx73adPAQdH3nk3QG+tOCOOzaBWG8Y7gOlf1tW7ORhJIg== X-Received: by 10.99.99.197 with SMTP id x188mr12323551pgb.38.1505152590501; Mon, 11 Sep 2017 10:56:30 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:29 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:05 -0700 Message-Id: <1505152570-6143-10-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 10/15] datapath: Fixup RTNL ops for kernel 4.13 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 The RTNL ops validate and newlink functions now take the extended netlink ack parameter. Use the new HAVE_EXT_ACK_IN_RTNL_LINKOPS define to check if the additional parameter is present and add the parameter if so. While in the modules remove the checks for Linux kernels < 2.3.39 since they are no longer supported since 2.5.x. Signed-off-by: Greg Rose --- datapath/linux/compat/lisp.c | 21 ++++++++++----------- datapath/linux/compat/stt.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/datapath/linux/compat/lisp.c b/datapath/linux/compat/lisp.c index c505fad..34f8232 100644 --- a/datapath/linux/compat/lisp.c +++ b/datapath/linux/compat/lisp.c @@ -608,7 +608,12 @@ static const struct nla_policy lisp_policy[IFLA_LISP_MAX + 1] = { [IFLA_LISP_PORT] = { .type = NLA_U16 }, }; +#ifdef HAVE_EXT_ACK_IN_RTNL_LINKOPS +static int lisp_validate(struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack __always_unused *extack) +#else static int lisp_validate(struct nlattr *tb[], struct nlattr *data[]) +#endif { if (tb[IFLA_ADDRESS]) { if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) @@ -660,17 +665,15 @@ static int lisp_configure(struct net *net, struct net_device *dev, return 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) +#ifdef HAVE_EXT_ACK_IN_RTNL_LINKOPS static int lisp_newlink(struct net *net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) -{ + struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack __always_unused *extack) #else -static int lisp_newlink(struct net_device *dev, +static int lisp_newlink(struct net *net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) - -{ - struct net *net = &init_net; #endif +{ __be16 dst_port = htons(LISP_UDP_PORT); if (data[IFLA_LISP_PORT]) @@ -679,11 +682,7 @@ static int lisp_newlink(struct net_device *dev, return lisp_configure(net, dev, dst_port); } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) static void lisp_dellink(struct net_device *dev, struct list_head *head) -#else -static void lisp_dellink(struct net_device *dev) -#endif { struct lisp_dev *lisp = netdev_priv(dev); diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c index 964d993..07f5892 100644 --- a/datapath/linux/compat/stt.c +++ b/datapath/linux/compat/stt.c @@ -1909,7 +1909,12 @@ static const struct nla_policy stt_policy[IFLA_STT_MAX + 1] = { [IFLA_STT_PORT] = { .type = NLA_U16 }, }; +#ifdef HAVE_EXT_ACK_IN_RTNL_LINKOPS +static int stt_validate(struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack __always_unused *extack) +#else static int stt_validate(struct nlattr *tb[], struct nlattr *data[]) +#endif { if (tb[IFLA_ADDRESS]) { if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) @@ -1961,8 +1966,14 @@ static int stt_configure(struct net *net, struct net_device *dev, return 0; } +#ifdef HAVE_EXT_ACK_IN_RTNL_LINKOPS +static int stt_newlink(struct net *net, struct net_device *dev, + struct nlattr *tb[], struct nlattr *data[], + struct netlink_ext_ack __always_unused *extack) +#else static int stt_newlink(struct net *net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) +#endif { __be16 dst_port = htons(STT_DST_PORT); From patchwork Mon Sep 11 17:56:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812529 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="aNy5MFfl"; 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 3xrbPG6kS6z9s83 for ; Tue, 12 Sep 2017 04:02:42 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 33EEDB94; Mon, 11 Sep 2017 17:56:35 +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 A9B4DB7A for ; Mon, 11 Sep 2017 17:56:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6E689A4 for ; Mon, 11 Sep 2017 17:56:32 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id v82so4965847pgb.1 for ; Mon, 11 Sep 2017 10:56:32 -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:in-reply-to:references; bh=nPdlOTHNVb3WRrDRBSU7ayog3o492lnv6hbUgsalfX4=; b=aNy5MFfl4WziDM6CGtB5wBKPeFexBETEnwX5q/q4Cl0j5hlj6It5D0MkkEYnQt842m z8gYflCtNXkmw+213TMCf87mZ4fVKyVlwPHKh9c+/fvyCGu92ykcV0TmYlgwi5CfQAlV vWt6VvnsPfmo4qpnVjPur1pGkefFjO5WzbXbxxJo712lq+PUeR60TZeSz1rtYc5UN0a3 3AB23KH5aVOHDaUJTby0elmKs12mYZDQxuJnbR6MYdTflSZXFNJGgY2XZCSG0fjI56s1 NO+ZeqGBT71s2QOPAeykEaHZkuHiCfMXBM7lJ//fulNDNpw2+uEsFzXZqnvtMRn2b2Y4 vl7w== 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=nPdlOTHNVb3WRrDRBSU7ayog3o492lnv6hbUgsalfX4=; b=ZEnopNmXYpMPC+UIxeTqWFywMumHiRHj8b8NHTs8FY8Hj07YeFLcavoP06/f5q4QEW r/bND8FjioOrAsud3gvtIl93jlAbOecdWjOSlOQZzyKMwT0zGsdgRXDGJWSJ9kS/nffP AY3kvV3rpm77fdmDs8DbBAIk6NxlPqAT9M0etdmgh2fBqpFjqN0vS8XfZS7CPhEbFGb2 6r7xf/cGJ3d8bDZ06AAFvEv3RnKdabYyiMKSt9h7zbJ+SQ2WKqemff57OArUlvbzDjNa E7BvjqheKk2ch/F08xE/plvxAjWzfNP4x0rANMcAK6tsiHbdemelrnq1YIUQW63NqaS7 jRiw== X-Gm-Message-State: AHPjjUgTzhHf4TKY8hl2uemsYR9EXANOKQCIvUiNQMXaLXVsAWf6jJkR 8f68z3KZvj9IImRk X-Google-Smtp-Source: ADKCNb6UkrixHTzmzXEWyI29qEVdqeEcrAT8BhWxTuGE2pJinElMBgRG0qaqr2yvDJXo8usOqiP0vQ== X-Received: by 10.99.61.143 with SMTP id k137mr12098573pga.389.1505152591765; Mon, 11 Sep 2017 10:56:31 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:30 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:06 -0700 Message-Id: <1505152570-6143-11-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 11/15] datapath: Check for existence of nf_hook_ops member list 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 The list member of nf_hook_ops has been removed in Linux kernel release 4.13. Check for the definition of it in pre-4.13 kernels. Signed-off-by: Greg Rose --- datapath/linux/compat/stt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c index 07f5892..37d5f4b 100644 --- a/datapath/linux/compat/stt.c +++ b/datapath/linux/compat/stt.c @@ -2110,7 +2110,9 @@ int stt_init_module(void) if (rc) goto out2; +#ifdef HAVE_LIST_IN_NF_HOOK_OPS INIT_LIST_HEAD(&nf_hook_ops.list); +#endif pr_info("STT tunneling driver\n"); return 0; out2: From patchwork Mon Sep 11 17:56:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812530 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="GY8VLvjz"; 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 3xrbPs1Qmvz9s7F for ; Tue, 12 Sep 2017 04:03:13 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 63857BBD; Mon, 11 Sep 2017 17:56:37 +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 70DF3B8A for ; Mon, 11 Sep 2017 17:56:34 +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 367A4E0 for ; Mon, 11 Sep 2017 17:56:34 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id i130so2961779pgc.0 for ; Mon, 11 Sep 2017 10:56:34 -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:in-reply-to:references; bh=GtvOG6nV2JH+Y7/d1ncsC6tRujV+5/9Tjcr9aMNbjbM=; b=GY8VLvjzet+ZkFdodrWIVs8bpPn3/iBBzEPMee/zjyxqy7g0lor2Csp17KbiBSbZB8 ILmW62eeAHgGlmFkQyCmLCW/C0FIRJP6DTfQZTw2x7ONtQKIyNA7XKiSL1AeHRWGurF5 iBr3rpTZWDBpZElL8f4rpSzz7O9wdl88dwfUKDDvbuUxqp9QgpV8JDXOWS5uB/l60Fii g2Yj+xRv8Uie1mxbjEkr2cOaIXPhPhQRyYs9HzAAQNe257a6HybVxqvxRFMJkQ5FTPQK MlBJTvr+9Ry6ji0wS2LCubE1BDvd4mUvU2PmQ0kVySMQg4lFK2P9ucHVnj/jt+y55mep jcDQ== 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=GtvOG6nV2JH+Y7/d1ncsC6tRujV+5/9Tjcr9aMNbjbM=; b=lUuTphzn8xm25NeK9cSNLIr8D0VWXt54LAhilccIQM1DXomoi0mAGdzIg2KoMys34M HQ8x1dGIrkOx0q0cpWczZJgJjWzuLEh2GkpYz/8tcT2QzP4IsYeSbUHee/p3wRWprnEF 1EkFkLZpSg5I7ZubG193mLUJYVxU94rW+ocjjqRqtlVYnO+SGMsOw/uACA1l0JN4etVf d2cHwVgT4aEO5fx4ZVLE7zW5Pt0iNS02FqR3Xs10Z6dLDT6/h65aPeLq3L8mvVmvFWRA jnqC7cKhIV3OB77AhMFSjRhV7B7tnt6MVZPJXI4FFJFWj9Da1Wba+FJ0kX8UI0DimcyN W97g== X-Gm-Message-State: AHPjjUiPmxMPGuQDZGfcG+KiJ8LHn4ToH9UHdJfVka7kjOYIITZc2fH8 fOLeczmT6YKeqHSs X-Google-Smtp-Source: ADKCNb654dT71JvszH9CDCCx2DfC0gRd9do9BVQX5Rl5MYkpupZPayeKG89QlnW4RS0ZWGjXRLTJSg== X-Received: by 10.101.85.70 with SMTP id t6mr12090464pgr.255.1505152593416; Mon, 11 Sep 2017 10:56:33 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:32 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:07 -0700 Message-Id: <1505152570-6143-12-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 12/15] datapath: Fix up vxlan device flags 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 I missed a couple of usages of the flags parameter from vxlan_dev while adding compatibility code to handle the removal of the flags. Add the checks so that the module can compile for Linux kernel release 4.13 Fixes: 143656435c ("datapath: get rid of redundant vxlan_dev.flags") Signed-off-by: Greg Rose --- datapath/vport-vxlan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index 2910694..c7139ab 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Nicira, Inc. + * Copyright (c) 2015,2017 Nicira, Inc. * Copyright (c) 2013 Cisco Systems, Inc. * * This program is free software; you can redistribute it and/or @@ -60,14 +60,22 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb) return -EMSGSIZE; nla_nest_end(skb, exts); +#ifdef HAVE_VXLAN_DEV_CFG + } else if (vxlan->cfg.flags & VXLAN_F_GPE) { +#else } else if (vxlan->flags & VXLAN_F_GPE) { +#endif struct nlattr *exts; exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION); if (!exts) return -EMSGSIZE; +#ifdef HAVE_VXLAN_DEV_CFG + if (vxlan->cfg.flags & VXLAN_F_GPE && +#else if (vxlan->flags & VXLAN_F_GPE && +#endif nla_put_flag(skb, OVS_VXLAN_EXT_GPE)) return -EMSGSIZE; From patchwork Mon Sep 11 17:56:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812532 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="sjAN/TAD"; 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 3xrbQS01jYz9sNr for ; Tue, 12 Sep 2017 04:03:44 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 56B42BA3; Mon, 11 Sep 2017 17:56: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 C55E1BA9 for ; Mon, 11 Sep 2017 17:56:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9988CD3 for ; Mon, 11 Sep 2017 17:56:35 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id h4so5200095pfk.0 for ; Mon, 11 Sep 2017 10:56:35 -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:in-reply-to:references; bh=nrnfv0FqOkgsuL7eWsOQ3OejoRsOyWgE8r6t6Mo5kx4=; b=sjAN/TAD5MHuQRP4f3PDuDqCfMgozggOiJhX/hJERx7rxD7wRAIRb1YheyHPUcSdzE 1KQ3PXbd4NbEum6yp54n4GNhL22Ba0TCS5NMX0H/wYyIbdlVcw1NWLgsEhYajhLlSvFl cywWLR8eq8kOnkTPpnsni0dpyF51+KvQJ1xWVAjYW+FPFWufm/RjnBSMm7h7554LimJ2 BFga376w2Wfo/+nWos64/acZcC+7F4Osj8b+AfwCILR5diTHm+xHT8SnO3WtUstiwz/M X2rYl6hyXaNlZZpTS3m7wMuHzEHYFtqO3qk8g4PLuhhfdjiZbzBgF5oh6GO7GmE6d8rp pdPA== 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=nrnfv0FqOkgsuL7eWsOQ3OejoRsOyWgE8r6t6Mo5kx4=; b=XI3i5DE7vYpTGIHO0nRPJcgSFRmp634DsWIy/sFjG+WhiknOdpf7ocz6YUVXN/exzv sTf0aMNumH09qFEZ1P8lU3c1BsUs8BVFG3jxsZQX1+ZKgFrx3dslvryaU5N2b+Oxjqt5 yl33ZqgG3p6JpZVp0SHnhQJkH2fzn/IKbv6O3ZVb2VJJXhT+6XEEcjzb2frRHp+GQi4i 1I2FPpKGCb88VGJjcdeKkx2c6afFi08OlPZzfh3CwARIZct9aO3p3mZ4W5LWHKbaBlMX PL13qGmKgt9mnFVGZc8siMC7T9wRe8t5zDwnTaP9Ab7GWvSWGJiCB0bEFCFfO8tHciHo rJPg== X-Gm-Message-State: AHPjjUj4ydLa++0otTqI30JdOaicLlOUlDMmYnJmRoDubqhmn54p4/kp 7E84APdKsHfyqdXx X-Google-Smtp-Source: ADKCNb4e5qn7q3Z4A8cx0eW5sM2Q673/+PLPOoT18jGeAGKnRDeYTJAaNbi+ZjXfOVBAVCC9XAnVsg== X-Received: by 10.98.87.219 with SMTP id i88mr12295870pfj.81.1505152594926; Mon, 11 Sep 2017 10:56:34 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:33 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:08 -0700 Message-Id: <1505152570-6143-13-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 13/15] acinclude: Add support for Linux 4.13 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 configuration support for the just released 4.13 Linux kernel. Signed-off-by: Greg Rose --- acinclude.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 46efa69..cb5f3ae 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 12; then + if test "$version" = 4 && test "$patchlevel" -le 13; then : # Linux 4.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.11.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.13.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 Mon Sep 11 17:56:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812533 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="p+mCiKGc"; 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 3xrbRV32Jmz9s7F for ; Tue, 12 Sep 2017 04:04:38 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 64424BBF; Mon, 11 Sep 2017 17:56: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 3DE97B30 for ; Mon, 11 Sep 2017 17:56:37 +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 00E7FE7 for ; Mon, 11 Sep 2017 17:56:36 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id j16so1866351pga.2 for ; Mon, 11 Sep 2017 10:56:36 -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:in-reply-to:references; bh=wAjMGrRFMCwj5JQ184SgyfxvtliONuyj2bXhHASoWU8=; b=p+mCiKGcFIltgY58l6jhN1lb/CYQiBb2WzFBbb6Br3WQGKSz870jLYMbr3rRfZ3Pv0 GMqt9fFQdjS1w/cP1Tie+zkeIFLbG23nZqzfUCoAnw9zh8510Is/BmdPuqItVpZ0oy+N PcRcYM3cDFltnRkuTQqZmeiGCz9X02nVYuQI7wgSG+2CDKqc2tTxm1GFgT859NM12H/R Qnl+w2HyHUk9oOn79oGGgyBTDT7xNzlu0u18HgNk7uIrdsDYi0nzjxx2WwMadiJbZEz7 0aYlpz4hKOTCvUbI5EXC6n0aX9uFLX6osWMwy0PRHkIibcSL5wRYcE2IeLj13EocxNXx yAGQ== 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=wAjMGrRFMCwj5JQ184SgyfxvtliONuyj2bXhHASoWU8=; b=P+Fm9Wh/fgoSiFcjcWhkx9dA/IYy2Gn54wt1REqlW51lscjNPUs2z4WoANzgzNdVMF JRkfv5wGn76XpNsyYbrYHHLSTR0dswHFwSC3mh7juycPl3hwaYN2KCzrK9xQB712HV2K d/t3t2fmL0cFaV6WKSiZhS35TehyYYHQvLKW8S2QzpY8sQbtWk4p2/CerKCNN/Vs5bky Gl9iLGdiHWHzCsVm7kD9dxHreUKEZ/Eg/bUz6r3j1bqetVR9+g2UU6j6/k0pZMVLdGT7 Rtsc9TQnEjvPNMMMqjZS+Ztpyv+ydfgi4JRIQcD294GHK8IKXb6WmoEmGnd8p2nDDLTW iEbA== X-Gm-Message-State: AHPjjUiJ+Byjbei6r2z+dq6RP+T38Vqv2A5mYGPE6PWD5Ww0igwKE2ZN zGAxYmgxHrH531Ee X-Google-Smtp-Source: ADKCNb6DPcz9W8eJZOqguweNPE3hH1bTonaeXhqa7UgWhZ/X2ZhdZbjf/QEuR3cldYHXl+GohBvihA== X-Received: by 10.84.218.71 with SMTP id f7mr14267570plm.145.1505152596233; Mon, 11 Sep 2017 10:56:36 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:35 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:09 -0700 Message-Id: <1505152570-6143-14-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 14/15] Documentation: Update NEWS and FAQ. 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 Document Open vSwitch Linux kernel support for the 4.13 kernel release. Signed-off-by: Greg Rose --- Documentation/faq/releases.rst | 2 +- NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index c785529..064a496 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -65,7 +65,7 @@ Q: What Linux kernel versions does each Open vSwitch release work with? 2.5.x 2.6.32 to 4.3 2.6.x 3.10 to 4.7 2.7.x 3.10 to 4.9 - 2.8.x 3.10 to 4.12 + 2.8.x 3.10 to 4.13 ============ ============== Open vSwitch userspace should also work with the Linux kernel module built diff --git a/NEWS b/NEWS index 6a5d2bf..a3c1a02 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ Post-v2.8.0 - OVN: * The "requested-chassis" option for a logical switch port now accepts a chassis "hostname" in addition to a chassis "name". + - Linux kernel 4.13 + * Add support for compiling OVS with the latest Linux 4.13 kernel v2.8.0 - xx xxx xxxx --------------------- From patchwork Mon Sep 11 17:56:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812534 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="bpnmgqCl"; 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 3xrbS6670fz9s83 for ; Tue, 12 Sep 2017 04:05:10 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 530BFBA9; Mon, 11 Sep 2017 17:56:41 +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 9CDC5B7B for ; Mon, 11 Sep 2017 17:56:38 +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 7349BA4 for ; Mon, 11 Sep 2017 17:56:38 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id d8so4958003pgt.3 for ; Mon, 11 Sep 2017 10:56:38 -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:in-reply-to:references; bh=q3ZnW1mJcWcDX/cbifyJkUIkRAi8ZaHjhCmEhEEce80=; b=bpnmgqCl0suG69RqHfKNwVmqgOtFH7kZYc0pZ4fqGEBKiuXMOlfUv4jWwDrwXd9fq7 6L33F2M5iUpsoz/gebH9QP2msSu3K3Hu30KB0ZjTMhOca5O9sfZznuHrwRNa1n7ual8U VDcpk6M5G+DID3taggzFTuY+ZyYF7SuZa5x6GES6ioqNyWiT61QL7HoP/dTAECcv4t1t Ahj3zz0z7fKzuLdRkOZWYBLA1j8GwPxITwx5c6618+c+7Ic2WqwLYTVOmB8vAzll2NUM yBdcL2xuPQnCiN/Du+l8smz4kRFFLTwU7izDgNZrbyqBwF3V3Xy+aszF3MQLXPAkWS02 95Ww== 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=q3ZnW1mJcWcDX/cbifyJkUIkRAi8ZaHjhCmEhEEce80=; b=WmE5jkyyJZqYg+rL10GPy0bRkRANDa4ErMtUi442gpkd8w34RlGxft1of/YbQkZR5O i8aqWW0uftXBkJPf1BZa22W+vBB0rTWsLBlTfA5fG8WXCrJnPlsjfZhEeQyQyCHNHrMP 0/EotvULiy9aXYyjPL61a3E5ItwlbGPIEnYijovRD8cgxn1Q4ljIDxK3I0aQ7hXlwjGn Me/2g/kYb/3oKPj0py8eKaF2Y9rw4zhvnzgMG9vyR6yNmWRsPyy8GoCRrdiw77olqtMm 4g8q/2BdQxyfFYVX6cMplibUSsKosadJqsxbhSieFRwTUen6JXLtWWvclG+pVzekR2aO ebFQ== X-Gm-Message-State: AHPjjUjkN6lXvrHnDf5CHyJFw1G8iLjcWABFNqz6/sR6QZx64ZdEubqr HeSzBxgWc84tW7x8 X-Google-Smtp-Source: ADKCNb585J1KFzh3Je3umQzFkwx4ZmzuR7Xy7KnYXmQ6KG3/gHuiGC6CVDw8ObMfQO71A579DejFVA== X-Received: by 10.98.80.13 with SMTP id e13mr12635541pfb.341.1505152597755; Mon, 11 Sep 2017 10:56:37 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:36 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:10 -0700 Message-Id: <1505152570-6143-15-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 15/15] travis: Update build kernel list 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 kernel 4.13 has been released. Update the kernel build list to the current list of kernels from kernel.org. Signed-off-by: Greg Rose --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d0fd44..f217840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,16 +25,16 @@ sudo: false env: - OPTS="--disable-ssl" - - TESTSUITE=1 KERNEL=3.16.46 + - TESTSUITE=1 KERNEL=3.16.47 - TESTSUITE=1 OPTS="--enable-shared" - BUILD_ENV="-m32" OPTS="--disable-ssl" - - KERNEL=3.16.46 DPDK=1 - - KERNEL=3.16.46 DPDK=1 OPTS="--enable-shared" - - KERNEL=4.12.2 - - KERNEL=4.11.11 - - KERNEL=4.9.38 - - KERNEL=4.4.77 - - KERNEL=4.1.42 + - 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 - TESTSUITE=1 LIBS=-ljemalloc