From patchwork Thu Nov 7 02:22:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shougang Wang X-Patchwork-Id: 62634 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B15B7A034E; Thu, 7 Nov 2019 09:53:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D6201E968; Thu, 7 Nov 2019 09:53:48 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 09E171E95F; Thu, 7 Nov 2019 09:53:46 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2019 00:53:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,277,1569308400"; d="scan'208";a="212977108" Received: from intel.sh.intel.com ([10.239.255.146]) by fmsmga001.fm.intel.com with ESMTP; 07 Nov 2019 00:53:44 -0800 From: Wang ShougangX To: dev@dpdk.org Cc: qiming.yang@intel.com, beilei.xing@intel.com, Wang ShougangX , stable@dpdk.org Date: Thu, 7 Nov 2019 02:22:14 +0000 Message-Id: <20191107022217.41046-2-shougangx.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107022217.41046-1-shougangx.wang@intel.com> References: <20191105033806.2878-1-shougangx.wang@intel.com> <20191107022217.41046-1-shougangx.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 1/4] net/ice: fix memzone reserve and release in FDIR X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To avoid memzone reserve failure and memory leak, following resources management should be added. - Check if the FDIR Memzone already exists before reserving. - Free FDIR memzone when teardown and other failure scenarios. Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") Cc: stable@dpdk.org Signed-off-by: Wang ShougangX --- drivers/net/ice/ice_ethdev.h | 1 + drivers/net/ice/ice_fdir_filter.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index de67e5934..0a39ca6ff 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -325,6 +325,7 @@ struct ice_fdir_info { struct ice_rx_queue *rxq; void *prg_pkt; /* memory for fdir program packet */ uint64_t dma_addr; /* physic address of packet memory*/ + const struct rte_memzone *mz; struct ice_fdir_filter_conf conf; struct ice_fdir_filter_conf **hash_map; diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 736ccd54e..31705c164 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -140,6 +140,12 @@ static struct ice_flow_parser ice_fdir_parser_comms; static const struct rte_memzone * ice_memzone_reserve(const char *name, uint32_t len, int socket_id) { + const struct rte_memzone *mz; + + mz = rte_memzone_lookup(name); + if (mz) + return mz; + return rte_memzone_reserve_aligned(name, len, socket_id, RTE_MEMZONE_IOVA_CONTIG, ICE_RING_BASE_ALIGN); @@ -493,19 +499,23 @@ ice_fdir_setup(struct ice_pf *pf) } pf->fdir.prg_pkt = mz->addr; pf->fdir.dma_addr = mz->iova; + pf->fdir.mz = mz; err = ice_fdir_prof_alloc(hw); if (err) { PMD_DRV_LOG(ERR, "Cannot allocate memory for " "flow director profile."); err = -ENOMEM; - goto fail_mem; + goto fail_prof; } PMD_DRV_LOG(INFO, "FDIR setup successfully, with programming queue %u.", vsi->base_queue); return ICE_SUCCESS; +fail_prof: + rte_memzone_free(pf->fdir.mz); + pf->fdir.mz = NULL; fail_mem: ice_rx_queue_release(pf->fdir.rxq); pf->fdir.rxq = NULL; @@ -619,6 +629,13 @@ ice_fdir_teardown(struct ice_pf *pf) ice_fdir_prof_free(hw); ice_release_vsi(vsi); pf->fdir.fdir_vsi = NULL; + + if (pf->fdir.mz) { + err = rte_memzone_free(pf->fdir.mz); + pf->fdir.mz = NULL; + if (err) + PMD_DRV_LOG(ERR, "Failed to free memezone."); + } } static int From patchwork Thu Nov 7 02:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shougang Wang X-Patchwork-Id: 62635 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5B94DA034E; Thu, 7 Nov 2019 09:53:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E9431E95E; Thu, 7 Nov 2019 09:53:56 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 99B411E96E; Thu, 7 Nov 2019 09:53:54 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2019 00:53:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,277,1569308400"; d="scan'208";a="212977125" Received: from intel.sh.intel.com ([10.239.255.146]) by fmsmga001.fm.intel.com with ESMTP; 07 Nov 2019 00:53:51 -0800 From: Wang ShougangX To: dev@dpdk.org Cc: qiming.yang@intel.com, beilei.xing@intel.com, Wang ShougangX , stable@dpdk.org Date: Thu, 7 Nov 2019 02:22:15 +0000 Message-Id: <20191107022217.41046-3-shougangx.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107022217.41046-1-shougangx.wang@intel.com> References: <20191105033806.2878-1-shougangx.wang@intel.com> <20191107022217.41046-1-shougangx.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 2/4] net/ice: fix removal of FDIR profile X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The removal of FDIR profile should start from ICE_FLTR_PTYPE_NONF_IPV4_UDP. Fixes: 109e8e06249e ("net/ice: configure HW flow director rule") Cc: stable@dpdk.org Signed-off-by: Wang ShougangX --- drivers/net/ice/ice_fdir_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 31705c164..87634e4de 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -583,7 +583,7 @@ ice_fdir_prof_rm_all(struct ice_pf *pf) { enum ice_fltr_ptype ptype; - for (ptype = ICE_FLTR_PTYPE_NONF_NONE; + for (ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; ptype < ICE_FLTR_PTYPE_MAX; ptype++) { ice_fdir_prof_rm(pf, ptype, false); From patchwork Thu Nov 7 02:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shougang Wang X-Patchwork-Id: 62636 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 23165A034E; Thu, 7 Nov 2019 09:54:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E19F51E976; Thu, 7 Nov 2019 09:54:06 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7E8B21E964; Thu, 7 Nov 2019 09:54:04 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2019 00:54:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,277,1569308400"; d="scan'208";a="212977167" Received: from intel.sh.intel.com ([10.239.255.146]) by fmsmga001.fm.intel.com with ESMTP; 07 Nov 2019 00:54:00 -0800 From: Wang ShougangX To: dev@dpdk.org Cc: qiming.yang@intel.com, beilei.xing@intel.com, Wang ShougangX , stable@dpdk.org Date: Thu, 7 Nov 2019 02:22:16 +0000 Message-Id: <20191107022217.41046-4-shougangx.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107022217.41046-1-shougangx.wang@intel.com> References: <20191105033806.2878-1-shougangx.wang@intel.com> <20191107022217.41046-1-shougangx.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 3/4] net/ice: fix FDIR counter resource release X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" All the counter resources should be cleaned up when teardown. Fixes: 0f880c3df192 ("net/ice: add flow director counter resource init/release") Cc: stable@dpdk.org Signed-off-by: Wang ShougangX --- drivers/net/ice/ice_fdir_filter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 87634e4de..94a6e96df 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -265,6 +265,9 @@ ice_fdir_counter_release(struct ice_pf *pf) for (i = 0; i < container->index_free; i++) rte_free(container->pools[i]); + TAILQ_INIT(&container->pool_list); + container->index_free = 0; + return 0; } From patchwork Thu Nov 7 02:22:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shougang Wang X-Patchwork-Id: 62637 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C988DA034E; Thu, 7 Nov 2019 09:54:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A52E51E982; Thu, 7 Nov 2019 09:54:09 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E8B221E979; Thu, 7 Nov 2019 09:54:07 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2019 00:54:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,277,1569308400"; d="scan'208";a="212977182" Received: from intel.sh.intel.com ([10.239.255.146]) by fmsmga001.fm.intel.com with ESMTP; 07 Nov 2019 00:54:06 -0800 From: Wang ShougangX To: dev@dpdk.org Cc: qiming.yang@intel.com, beilei.xing@intel.com, Wang ShougangX , stable@dpdk.org Date: Thu, 7 Nov 2019 02:22:17 +0000 Message-Id: <20191107022217.41046-5-shougangx.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107022217.41046-1-shougangx.wang@intel.com> References: <20191105033806.2878-1-shougangx.wang@intel.com> <20191107022217.41046-1-shougangx.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 4/4] net/ice: fix wild pointer X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To avoid wild pointer, pointers should be set to NULL after free them. Fixes: 1a2fc1799f09 ("net/ice: reject duplicated flow for flow director") Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") Fixes: 0f880c3df192 ("net/ice: add flow director counter resource init/release") Cc: stable@dpdk.org Signed-off-by: Wang ShougangX --- drivers/net/ice/ice_fdir_filter.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 94a6e96df..e6e925b4e 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -165,6 +165,10 @@ ice_fdir_prof_alloc(struct ice_hw *hw) if (!hw->fdir_prof) return -ENOMEM; } + + /* To avoid wild pointer, unused field pointer should be NULL */ + hw->fdir_prof[ICE_FLTR_PTYPE_NONF_NONE] = NULL; + for (ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; ptype < ICE_FLTR_PTYPE_MAX; ptype++) { @@ -180,9 +184,13 @@ ice_fdir_prof_alloc(struct ice_hw *hw) fail_mem: for (fltr_ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; fltr_ptype < ptype; - fltr_ptype++) + fltr_ptype++) { rte_free(hw->fdir_prof[fltr_ptype]); + hw->fdir_prof[fltr_ptype] = NULL; + } + rte_free(hw->fdir_prof); + hw->fdir_prof = NULL; return -ENOMEM; } @@ -262,8 +270,10 @@ ice_fdir_counter_release(struct ice_pf *pf) &fdir_info->counter; uint8_t i; - for (i = 0; i < container->index_free; i++) + for (i = 0; i < container->index_free; i++) { rte_free(container->pools[i]); + container->pools[i] = NULL; + } TAILQ_INIT(&container->pool_list); container->index_free = 0; @@ -412,6 +422,9 @@ ice_fdir_release_filter_list(struct ice_pf *pf) rte_free(fdir_info->hash_map); if (fdir_info->hash_table) rte_hash_free(fdir_info->hash_table); + + fdir_info->hash_map = NULL; + fdir_info->hash_table = NULL; } /* @@ -538,10 +551,13 @@ ice_fdir_prof_free(struct ice_hw *hw) for (ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; ptype < ICE_FLTR_PTYPE_MAX; - ptype++) + ptype++) { rte_free(hw->fdir_prof[ptype]); + hw->fdir_prof[ptype] = NULL; + } rte_free(hw->fdir_prof); + hw->fdir_prof = NULL; } /* Remove a profile for some filter type */