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 BC818A04A4 for ; Wed, 27 May 2020 11:25:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B3A111D65D; Wed, 27 May 2020 11:25:09 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id CEB9E1D8F7 for ; Wed, 27 May 2020 11:25:08 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id u12so2330147wmd.3 for ; Wed, 27 May 2020 02:25:08 -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=XP52Z+5HBS+CW3slefn9ZNq9dPgSCRjwMU8ya4qt0b0=; b=IP+tEfNj0tCLaYUc9mLH0IPPKrSr5VYMvUniamYamE5ino0ITIYkWQ/d5p3qvJ4G4q uLjHWzoj4lTXXfz+rYh3UZzm7m4Vwv3vAt+dKU5qCtUyM1XG2M139eODBhcao+zO+xHz yrsbZz3TwaRU9ksnRaJ8RJJp+ASlW9gFDxT5DdnTc645OJdVoOJHarU8mUie7aiRGKRs 6B4GWql79z7Xb5qVka+ILdDvEOexupz6UhN34CbHLyWKBtsVX8eQfovM8+OcJAHRcJdK YHUFtmX5EY5l5v1I6qGlIn9jkkftuNCyju0EyULoSRZEWIKkjolPcBZdY/v5xI350jGI sflg== 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=XP52Z+5HBS+CW3slefn9ZNq9dPgSCRjwMU8ya4qt0b0=; b=nDDXEyg8aEvLpDIv5CYH7Z4tFEEvT+a9GRmIiFVkWysYW6fmLzE4rdS7eTZlvg+JBV NruxMULdeXQKk3NBkFY6VZ0zBPkuYALCbx+jBoKGyfVezOQgAnBaOMKqy45dxlNThwfe BSSWHc6NtBu77setHpkkiP4ghFX2TdV4Y61xibEz82eRWn+beays2mMyh/7Puquhptwb WEJZWH29/9/4MPEaQ6SecEApasnnN1mxusOK+QCqAfRVq3pEMe5QNQLxHChS1EDcnivV uoUmOvfWSKdrdTgO0fC58b7J0v7xAHYPJluq4Xe2lsNMA9o3b5v5+9XAFV315g0zzjeL OsiQ== X-Gm-Message-State: AOAM533D4H/M4Io0LXMWU3XTyZEHrxEIZA8JR2Hs4+hEDMzvOFQESH61 zJUeTjmmlEU24EWThPSnpYy/soPtEQs= X-Google-Smtp-Source: ABdhPJyiIJu5bWH+tBvju8pDkXuyJ426Y0onYAaJZVabT1CXPE8ASiHRUzptfjDeMTMnXT/r0Vro6w== X-Received: by 2002:a1c:29c2:: with SMTP id p185mr3185135wmp.7.1590571508545; Wed, 27 May 2020 02:25:08 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f9sm2178522wre.65.2020.05.27.02.25.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:25:07 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Zhao Cc: Jeff Guo , dpdk stable Date: Wed, 27 May 2020 10:24:16 +0100 Message-Id: <20200527092422.258652-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix flow director enabling' has been queued to stable release 19.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 stable release 19.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 05/29/20. 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. Thanks. Luca Boccassi --- >From 33189eecd08b48b12fc058b1b3fd38d33c0e55bb Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Thu, 21 May 2020 16:03:06 +0800 Subject: [PATCH] net/i40e: fix flow director enabling [ upstream commit be4ef2e0d09d5179e22d7574850d707d13713a87 ] When we flush flow FDIR, all queues are disabled for FDIR. If FDIR rule is created again, then the flow list is empty, as it is the first time to create rule after flush fdir filter, so we need to enable FDIR for all queues. And also, disable FDIR for queues should be done in function i40e_flow_flush_fdir_filter(). Fixes: 1491f63c7559 ("net/i40e: fix flush of flow director filter") Fixes: 6ae9b2b5e8c2 ("net/i40e: cache flow director enable value in Rx queue") Signed-off-by: Wei Zhao Reviewed-by: Jeff Guo --- drivers/net/i40e/i40e_flow.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 9b5e797d59..a83543c26e 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3224,6 +3224,10 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, } } + /* If create the first fdir rule, enable fdir check for rx queues */ + if (TAILQ_EMPTY(&pf->fdir.fdir_list)) + i40e_fdir_rx_proc_enable(dev, 1); + return 0; err: i40e_fdir_teardown(pf); @@ -4976,9 +4980,6 @@ i40e_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error) return -rte_errno; } - /* Disable FDIR processing as all FDIR rules are now flushed */ - i40e_fdir_rx_proc_enable(dev, 0); - return ret; } @@ -5014,6 +5015,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP; pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) pf->fdir.inset_flag[pctype] = 0; + + /* Disable FDIR processing as all FDIR rules are now flushed */ + i40e_fdir_rx_proc_enable(dev, 0); } return ret; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:32.083805139 +0100 +++ 0013-net-i40e-fix-flow-director-enabling.patch 2020-05-27 10:23:31.647933907 +0100 @@ -1,8 +1,10 @@ -From be4ef2e0d09d5179e22d7574850d707d13713a87 Mon Sep 17 00:00:00 2001 +From 33189eecd08b48b12fc058b1b3fd38d33c0e55bb Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Thu, 21 May 2020 16:03:06 +0800 Subject: [PATCH] net/i40e: fix flow director enabling +[ upstream commit be4ef2e0d09d5179e22d7574850d707d13713a87 ] + When we flush flow FDIR, all queues are disabled for FDIR. If FDIR rule is created again, then the flow list is empty, as it is the first time to create rule after flush fdir filter, @@ -12,7 +14,6 @@ Fixes: 1491f63c7559 ("net/i40e: fix flush of flow director filter") Fixes: 6ae9b2b5e8c2 ("net/i40e: cache flow director enable value in Rx queue") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Reviewed-by: Jeff Guo @@ -21,10 +22,10 @@ 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c -index 25c77e7aa6..8f8df6fae9 100644 +index 9b5e797d59..a83543c26e 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c -@@ -3462,6 +3462,10 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, +@@ -3224,6 +3224,10 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, } } @@ -35,7 +36,7 @@ return 0; err: i40e_fdir_teardown(pf); -@@ -5330,9 +5334,6 @@ i40e_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error) +@@ -4976,9 +4980,6 @@ i40e_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error) return -rte_errno; } @@ -45,7 +46,7 @@ return ret; } -@@ -5368,6 +5369,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) +@@ -5014,6 +5015,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP; pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) pf->fdir.inset_flag[pctype] = 0;