From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1CCC5A0613 for ; Tue, 27 Aug 2019 11:31:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 12ACF1BFE1; Tue, 27 Aug 2019 11:31:41 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3724E1C0D6 for ; Tue, 27 Aug 2019 11:31:39 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A441858E23; Tue, 27 Aug 2019 09:31:38 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 973715C22F; Tue, 27 Aug 2019 09:31:37 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Beilei Xing , dpdk stable Date: Tue, 27 Aug 2019 10:30:15 +0100 Message-Id: <20190827093032.20423-38-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 27 Aug 2019 09:31:38 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix unexpected skip FDIR setup' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/0f37091a96106722aa811bba83ea1ab1d46c3e05 Thanks. Kevin Traynor --- >From 0f37091a96106722aa811bba83ea1ab1d46c3e05 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 3 Jul 2019 14:34:49 +0800 Subject: [PATCH] net/i40e: fix unexpected skip FDIR setup [ upstream commit c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb ] In i40e_flow_flush_fdir_filter, i40e_fdir_teardown is called, so i40e_fdir_setup is required to be called before create a new fdir flow. Bugzilla ID: 265 Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index a614ec1d0..3c3b69b9f 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3148,6 +3148,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, cons_filter_type = RTE_ETH_FILTER_FDIR; - if (dev->data->dev_conf.fdir_conf.mode != - RTE_FDIR_MODE_PERFECT) { + if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT || + pf->fdir.fdir_vsi == NULL) { /* Enable fdir when fdir flow is added at first time. */ ret = i40e_fdir_setup(pf); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:12.988132851 +0100 +++ 0038-net-i40e-fix-unexpected-skip-FDIR-setup.patch 2019-08-27 09:40:10.932144097 +0100 @@ -1 +1 @@ -From c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb Mon Sep 17 00:00:00 2001 +From 0f37091a96106722aa811bba83ea1ab1d46c3e05 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d62b32f17..48a6782a8 100644 +index a614ec1d0..3c3b69b9f 100644 @@ -23 +24 @@ -@@ -3176,6 +3176,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, +@@ -3148,6 +3148,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,