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 98B66A04DB for ; Fri, 11 Dec 2020 10:03:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59668AC9C; Fri, 11 Dec 2020 10:03:48 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 6A27EAC9C for ; Fri, 11 Dec 2020 10:03:45 +0100 (CET) IronPort-SDR: Fq1fEK5STk8b4tfaRW6EOw9p8BP+gqEDfD9yJ3yGd0BPLQaMKJdhBWjlJoWlb4Rg2lpcsb9h69 +bPvJuK7vJNg== X-IronPort-AV: E=McAfee;i="6000,8403,9831"; a="259118455" X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="259118455" 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:43 -0800 IronPort-SDR: 2fX5gVNooHzyU2cPuFQcVWdmF8P1pyE0WesoMEx5ZBT4lPYE/QopDfsyIIL+gmzu4xN0lDntBf c98H9u0DpKHA== X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="321662493" 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:40 -0800 From: Steve Yang To: stable@dpdk.org Cc: beilei.xing@intel.com, jia.guo@intel.com, Bernard Iremonger Date: Fri, 11 Dec 2020 09:01:02 +0000 Message-Id: <20201211090105.28432-2-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 flow director initialisation 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: Bernard Iremonger [ upstream commit ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc ] Remove references to struct rte_fdir_conf which is deprecated, in i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and i40e_flow_add_del_fdir_filter(). Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup") Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow API") Cc: stable@dpdk.org Acked-by: Beilei Xing Signed-off-by: Bernard Iremonger --- drivers/net/i40e/i40e_fdir.c | 4 ++-- drivers/net/i40e/i40e_flow.c | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index 35be846fbd..314cb2ae5e 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1549,8 +1549,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, struct i40e_fdir_filter check_filter; /* Check if the filter exists */ int ret = 0; - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DRV_LOG(ERR, "FDIR is not enabled, please check the mode in fdir_conf."); + if (pf->fdir.fdir_vsi == NULL) { + PMD_DRV_LOG(ERR, "FDIR is not enabled"); return -ENOTSUP; } diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 2198473411..c04dfe79fc 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3191,8 +3191,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, cons_filter_type = RTE_ETH_FILTER_FDIR; - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT || - pf->fdir.fdir_vsi == NULL) { + if (pf->fdir.fdir_vsi == NULL) { /* Enable fdir when fdir flow is added at first time. */ ret = i40e_fdir_setup(pf); if (ret != I40E_SUCCESS) { @@ -3208,8 +3207,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, NULL, "Failed to configure fdir."); goto err; } - - dev->data->dev_conf.fdir_conf.mode = RTE_FDIR_MODE_PERFECT; } return 0; @@ -4771,12 +4768,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, case RTE_ETH_FILTER_FDIR: ret = i40e_flow_add_del_fdir_filter(dev, &((struct i40e_fdir_filter *)flow->rule)->fdir, 0); - - /* If the last flow is destroyed, disable fdir. */ - if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { - dev->data->dev_conf.fdir_conf.mode = - RTE_FDIR_MODE_NONE; - } break; case RTE_ETH_FILTER_HASH: ret = i40e_config_rss_filter_del(dev, -- 2.17.1