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 730E3A0613 for ; Wed, 28 Aug 2019 15:44:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 601DE1C22D; Wed, 28 Aug 2019 15:44:07 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A69F21BF82 for ; Wed, 28 Aug 2019 15:44:05 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 26B68A53265; Wed, 28 Aug 2019 13:44:05 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A233194BE; Wed, 28 Aug 2019 13:44:03 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Beilei Xing , dpdk stable Date: Wed, 28 Aug 2019 14:42:33 +0100 Message-Id: <20190828134234.20547-57-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Wed, 28 Aug 2019 13:44:05 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix flow director rule destroy' 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/04/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/f03e7709b780b3f25470596db9a66ccbb296302b Thanks. Kevin Traynor --- >From f03e7709b780b3f25470596db9a66ccbb296302b Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 22 Jul 2019 20:06:38 +0800 Subject: [PATCH] net/i40e: fix flow director rule destroy [ upstream commit 4fe1af80dd50bc44ac8ff2f395e8584f305b879c ] We should tear down the fdir when the last flow is destroyed, current logic is opposite to expected behavior, this patch fixes this issue. Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") Signed-off-by: Xiaolong Ye Acked-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 1699578ff..4208d8306 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4744,5 +4744,5 @@ i40e_flow_destroy(struct rte_eth_dev *dev, /* If the last flow is destroyed, disable fdir. */ - if (!ret && !TAILQ_EMPTY(&pf->fdir.fdir_list)) { + if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { i40e_fdir_teardown(pf); dev->data->dev_conf.fdir_conf.mode = -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:35.260852884 +0100 +++ 0058-net-i40e-fix-flow-director-rule-destroy.patch 2019-08-28 14:32:31.739955175 +0100 @@ -1 +1 @@ -From 4fe1af80dd50bc44ac8ff2f395e8584f305b879c Mon Sep 17 00:00:00 2001 +From f03e7709b780b3f25470596db9a66ccbb296302b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4fe1af80dd50bc44ac8ff2f395e8584f305b879c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3c0af70c0..c60c9e240 100644 +index 1699578ff..4208d8306 100644 @@ -22 +23 @@ -@@ -4772,5 +4772,5 @@ i40e_flow_destroy(struct rte_eth_dev *dev, +@@ -4744,5 +4744,5 @@ i40e_flow_destroy(struct rte_eth_dev *dev,