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 54020A04DB for ; Fri, 11 Dec 2020 10:03:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 271E6C970; Fri, 11 Dec 2020 10:03:52 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 4A5E0C968 for ; Fri, 11 Dec 2020 10:03:49 +0100 (CET) IronPort-SDR: Y7XOqw+HdCc/GihtxF7W7VuOJGlKXcAmHRbElTbvuYx655iyJWecJV3y3m1K77Sc9tG7rC5m2M Zs8890zTyHdg== X-IronPort-AV: E=McAfee;i="6000,8403,9831"; a="259118462" X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="259118462" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Dec 2020 01:03:48 -0800 IronPort-SDR: E0Cy1e9lMx61GHnSUNaLqzs98vbOMwzdM7WtMA0A1U9+p6Ze0Z/aGYm6Tj1sugx8z+dA6CPfwL Vf+vIy6TmCbQ== X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="321662518" Received: from intel-npg-odc-srv01.cd.intel.com ([10.240.178.136]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Dec 2020 01:03:47 -0800 From: Steve Yang To: stable@dpdk.org Cc: beilei.xing@intel.com, jia.guo@intel.com, Guinan Sun Date: Fri, 11 Dec 2020 09:01:05 +0000 Message-Id: <20201211090105.28432-5-stevex.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201211090105.28432-1-stevex.yang@intel.com> References: <20201211090105.28432-1-stevex.yang@intel.com> Subject: [dpdk-stable] [DPDK 18.11] net/i40e: fix recreating flexible flow director rule 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: Guinan Sun [ upstream commit 0acf70d473072fd77b667a0419f8b9ab70b35b39 ] This patch fixes the failure of recreate flexible fdir rule. The root cause is that the flex_mask_flag is not reset during flow destroy and flow flush. Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR") Cc: stable@dpdk.org Acked-by: Qi Zhang Signed-off-by: Guinan Sun --- drivers/net/i40e/i40e_fdir.c | 6 ++++++ drivers/net/i40e/i40e_flow.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index 35be846fbd..fc58647998 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1626,6 +1626,12 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, rte_free(fdir_filter); } else { ret = i40e_sw_fdir_filter_del(pf, &node->fdir.input); + if (ret < 0) { + PMD_DRV_LOG(ERR, + "Error deleting fdir rule from hash table!"); + return -EINVAL; + } + pf->fdir.flex_mask_flag[pctype] = 0; } return ret; diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 2198473411..6e3e6b8447 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4965,8 +4965,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) } for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP; - pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) + pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) { pf->fdir.inset_flag[pctype] = 0; + pf->fdir.flex_mask_flag[pctype] = 0; + } } return ret; -- 2.17.1