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 B88FDA0A00 for ; Mon, 28 Dec 2020 07:24:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 850DDC9BA; Mon, 28 Dec 2020 07:24:49 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 73DCD2C2D; Mon, 28 Dec 2020 07:24:45 +0100 (CET) IronPort-SDR: kG9mWTYdr5G6JV7mumiLX1T+pNot0GitOWJiEidV14Ly5PfiMKBmpDMeboTNPMwrJ8sEXwrvnz kwz1543R3/OQ== X-IronPort-AV: E=McAfee;i="6000,8403,9847"; a="240433391" X-IronPort-AV: E=Sophos;i="5.78,454,1599548400"; d="scan'208";a="240433391" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2020 22:24:43 -0800 IronPort-SDR: Dz9woEhmCO1fjjJfJPTBUxb/kvkv+8/KFk+2YQvWEd00Tc5IqFCx0TrtwTCWJZ17n4ibr2F1YN ZISNkug4W+AQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,454,1599548400"; d="scan'208";a="375502111" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.150]) by orsmga008.jf.intel.com with ESMTP; 27 Dec 2020 22:24:41 -0800 From: beilei.xing@intel.com To: jia.guo@intel.com, dev@dpdk.org Cc: Beilei Xing , stable@dpdk.org, Chenmin Sun Date: Tue, 29 Dec 2020 14:17:36 +0800 Message-Id: <20201229061736.92666-1-beilei.xing@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201229054639.92132-1-beilei.xing@intel.com> References: <20201229054639.92132-1-beilei.xing@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2] net/i40e: fix flex payload rule conflict issue 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" From: Beilei Xing With the following commands, the second flow can't be created successfully. 1. flow create 0 ingress pattern eth / ipv4 / udp / raw relative is 1 pattern is 0102030405 / end actions drop / end 2. flow destroy 0 rule 0 3. flow create 0 ingress pattern eth / ipv4 / udp / raw relative is 1 pattern is 010203040506 / end actions drop / end The root cause is that a flag for flex pit isn't reset. Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR") Cc: stable@dpdk.org Reported-by: Chenmin Sun Signed-off-by: Beilei Xing --- v2 changes: - Add fix line. - Refine comments. drivers/net/i40e/i40e_flow.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index b09ff6590d..65e0b69356 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -5284,6 +5284,7 @@ i40e_flow_destroy(struct rte_eth_dev *dev, enum rte_filter_type filter_type = flow->filter_type; struct i40e_fdir_info *fdir_info = &pf->fdir; int ret = 0; + int i; switch (filter_type) { case RTE_ETH_FILTER_ETHERTYPE: @@ -5299,9 +5300,13 @@ i40e_flow_destroy(struct rte_eth_dev *dev, &((struct i40e_fdir_filter *)flow->rule)->fdir, 0); - /* If the last flow is destroyed, disable fdir. */ + /* When the last flow is destroyed. */ if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { + /* Disable FDIR processing. */ i40e_fdir_rx_proc_enable(dev, 0); + /* Reset the flex_pit_flag. */ + for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++) + pf->fdir.flex_pit_flag[i] = 0; } break; case RTE_ETH_FILTER_HASH: @@ -5515,6 +5520,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) pf->fdir.flex_mask_flag[pctype] = 0; } + for (i = 0; i < I40E_MAX_FLXPLD_LAYER; i++) + pf->fdir.flex_pit_flag[i] = 0; + /* Disable FDIR processing as all FDIR rules are now flushed */ i40e_fdir_rx_proc_enable(dev, 0); } -- 2.26.2