From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5E31DA0C41 for ; Thu, 24 Jun 2021 09:42:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80C9E4115E; Thu, 24 Jun 2021 09:42:53 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 50D514003C; Thu, 24 Jun 2021 09:42:50 +0200 (CEST) IronPort-SDR: YsrjIBCQKlTU6WaFPmeEVpd+4KNjgE9yU8OrFXQBWe8oRQPuwZ3szn6T0TxqCYON7nLlrvk+IV z/XE5C/ZQ2PA== X-IronPort-AV: E=McAfee;i="6200,9189,10024"; a="293052039" X-IronPort-AV: E=Sophos;i="5.83,296,1616482800"; d="scan'208";a="293052039" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2021 00:42:48 -0700 IronPort-SDR: utAvbzVJHxDxH6LHZ8AchdQdHW97tDek1cr4jQzxYD8tG+x2gNKweeZq+l7Kfogf6pOEHzmr5M 6GoJS8mCBrkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,296,1616482800"; d="scan'208";a="487657314" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.182]) by orsmga001.jf.intel.com with ESMTP; 24 Jun 2021 00:42:46 -0700 From: beilei.xing@intel.com To: qi.z.zhang@intel.com Cc: dev@dpdk.org, Beilei Xing , stable@dpdk.org Date: Thu, 24 Jun 2021 15:29:56 +0800 Message-Id: <20210624072956.45489-1-beilei.xing@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210624070759.45204-1-beilei.xing@intel.com> References: <20210624070759.45204-1-beilei.xing@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2] net/i40e: fix FDIR input set conflict issue X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Currently, there'll be conflict error when running the following commands: 1. flow create 0 ingress pattern eth / ipv4 / udp src is 32 / end actions queue index 2 / end 2. flow destroy 0 rule 0 3. flow create 0 ingress pattern eth / ipv4 / udp dst is 32 / end actions queue index 2 / end This patch fixes the input set conflict issue. Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR") Fixes: 4a072ad43442 ("net/i40e: fix flow director config after flow validate") Cc: stable@dpdk.org Signed-off-by: Beilei Xing --- V2 change: - fix typo. drivers/net/i40e/i40e_ethdev.c | 5 +++++ drivers/net/i40e/i40e_ethdev.h | 2 +- drivers/net/i40e/i40e_fdir.c | 7 ++++--- drivers/net/i40e/i40e_flow.c | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index dd61258739..df716c180f 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1087,6 +1087,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) char fdir_hash_name[RTE_HASH_NAMESIZE]; uint32_t alloc = hw->func_caps.fd_filters_guaranteed; uint32_t best = hw->func_caps.fd_filters_best_effort; + enum i40e_filter_pctype pctype; struct rte_bitmap *bmp = NULL; uint32_t bmp_size; void *mem = NULL; @@ -1135,6 +1136,10 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) goto err_fdir_filter_array_alloc; } + for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP; + pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) + pf->fdir.flow_count[pctype] = 0; + fdir_info->fdir_space_size = alloc + best; fdir_info->fdir_actual_cnt = 0; fdir_info->fdir_guarantee_total_space = alloc; diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index ba6acd1878..585a0d8eb2 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -788,7 +788,7 @@ struct i40e_fdir_info { bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER]; bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX]; - bool inset_flag[I40E_FILTER_PCTYPE_MAX]; /* Mark if input set is set */ + uint32_t flow_count[I40E_FILTER_PCTYPE_MAX]; uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER]; }; diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index 20658816ee..6f73936091 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1607,13 +1607,13 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, } /* Check if the configuration is conflicted */ - if (pf->fdir.inset_flag[pctype] && + if (pf->fdir.flow_count[pctype] && memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t))) { PMD_DRV_LOG(ERR, "Conflict with the first rule's input set."); return -EINVAL; } - if (pf->fdir.inset_flag[pctype] && + if (pf->fdir.flow_count[pctype] && !memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t))) return 0; @@ -1666,7 +1666,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, I40E_WRITE_FLUSH(hw); pf->fdir.input_set[pctype] = input_set; - pf->fdir.inset_flag[pctype] = 1; return 0; } @@ -1890,11 +1889,13 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, } if (add) { + fdir_info->flow_count[pctype]++; fdir_info->fdir_actual_cnt++; if (fdir_info->fdir_invalprio == 1 && fdir_info->fdir_guarantee_free_space > 0) fdir_info->fdir_guarantee_free_space--; } else { + fdir_info->flow_count[pctype]--; fdir_info->fdir_actual_cnt--; if (fdir_info->fdir_invalprio == 1 && fdir_info->fdir_guarantee_free_space < diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 2cc9ad9ef7..ff8441b378 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4940,7 +4940,7 @@ 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; + pf->fdir.flow_count[pctype] = 0; pf->fdir.flex_mask_flag[pctype] = 0; } -- 2.26.2