From patchwork Tue Feb 25 13:14:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 66040 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 042CAA055A; Tue, 25 Feb 2020 14:10:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFEBF1BC24; Tue, 25 Feb 2020 14:10:55 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 8302E2C02; Tue, 25 Feb 2020 14:10:53 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Feb 2020 05:10:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,484,1574150400"; d="scan'208";a="231016307" Received: from dpdk51.sh.intel.com ([10.67.110.245]) by orsmga008.jf.intel.com with ESMTP; 25 Feb 2020 05:10:50 -0800 From: Qi Zhang To: beilei.xing@intel.com, yahui.cao@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Date: Tue, 25 Feb 2020 21:14:18 +0800 Message-Id: <20200225131418.5750-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH] net/ice: remove unnecessary variable 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" Remove unnecessary variable "meta" in ice_flow_create and ice_flow_validate, it should be defined when really be needed: its ice_parse_engine_create and ice_parse_engine_validate. The patch also move the meta's memory free from each filter engine->create to upper layer, the memory leakage when create a fdir rule is also be fixed. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") Cc: stable@dpdk.org Signed-off-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 28 ++++++++++++++-------------- drivers/net/ice/ice_hash.c | 2 -- drivers/net/ice/ice_switch_filter.c | 3 --- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 38ac799d8..f22538758 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1375,7 +1375,6 @@ typedef struct ice_flow_engine * (*parse_engine_t)(struct ice_adapter *ad, struct ice_parser_list *parser_list, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - void **meta, struct rte_flow_error *error); void @@ -1713,11 +1712,11 @@ ice_parse_engine_create(struct ice_adapter *ad, struct ice_parser_list *parser_list, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - void **meta, struct rte_flow_error *error) { struct ice_flow_engine *engine = NULL; struct ice_flow_parser_node *parser_node; + void *meta = NULL; void *temp; TAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) { @@ -1726,7 +1725,7 @@ ice_parse_engine_create(struct ice_adapter *ad, if (parser_node->parser->parse_pattern_action(ad, parser_node->parser->array, parser_node->parser->array_len, - pattern, actions, meta, error) < 0) + pattern, actions, &meta, error) < 0) continue; engine = parser_node->parser->engine; @@ -1737,7 +1736,9 @@ ice_parse_engine_create(struct ice_adapter *ad, continue; } - ret = engine->create(ad, flow, *meta, error); + ret = engine->create(ad, flow, meta, error); + if (meta) + rte_free(meta); if (ret == 0) return engine; else if (ret == -EEXIST) @@ -1752,23 +1753,25 @@ ice_parse_engine_validate(struct ice_adapter *ad, struct ice_parser_list *parser_list, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - void **meta, struct rte_flow_error *error) { struct ice_flow_engine *engine = NULL; struct ice_flow_parser_node *parser_node; + void *meta = NULL; void *temp; TAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) { if (parser_node->parser->parse_pattern_action(ad, parser_node->parser->array, parser_node->parser->array_len, - pattern, actions, meta, error) < 0) + pattern, actions, &meta, error) < 0) continue; engine = parser_node->parser->engine; break; } + if (meta) + rte_free(meta); return engine; } @@ -1779,7 +1782,6 @@ ice_flow_process_filter(struct rte_eth_dev *dev, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], struct ice_flow_engine **engine, - void **meta, parse_engine_t ice_parse_engine, struct rte_flow_error *error) { @@ -1814,7 +1816,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev, return ret; *engine = ice_parse_engine(ad, flow, &pf->rss_parser_list, - pattern, actions, meta, error); + pattern, actions, error); if (*engine != NULL) return 0; @@ -1822,11 +1824,11 @@ ice_flow_process_filter(struct rte_eth_dev *dev, case ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY: case ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR: *engine = ice_parse_engine(ad, flow, &pf->dist_parser_list, - pattern, actions, meta, error); + pattern, actions, error); break; case ICE_FLOW_CLASSIFY_STAGE_PERMISSION: *engine = ice_parse_engine(ad, flow, &pf->perm_parser_list, - pattern, actions, meta, error); + pattern, actions, error); break; default: return -EINVAL; @@ -1845,11 +1847,10 @@ ice_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_action actions[], struct rte_flow_error *error) { - void *meta; struct ice_flow_engine *engine; return ice_flow_process_filter(dev, NULL, attr, pattern, actions, - &engine, &meta, ice_parse_engine_validate, error); + &engine, ice_parse_engine_validate, error); } static struct rte_flow * @@ -1863,7 +1864,6 @@ ice_flow_create(struct rte_eth_dev *dev, struct rte_flow *flow = NULL; int ret; struct ice_flow_engine *engine = NULL; - void *meta; flow = rte_zmalloc("ice_flow", sizeof(struct rte_flow), 0); if (!flow) { @@ -1874,7 +1874,7 @@ ice_flow_create(struct rte_eth_dev *dev, } ret = ice_flow_process_filter(dev, flow, attr, pattern, actions, - &engine, &meta, ice_parse_engine_create, error); + &engine, ice_parse_engine_create, error); if (ret < 0) goto free_flow; flow->engine = engine; diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index d891538bd..fc3f33ee1 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -503,12 +503,10 @@ ice_hash_create(struct ice_adapter *ad, out: flow->rule = filter_ptr; - rte_free(meta); return 0; error: rte_free(filter_ptr); - rte_free(meta); return -rte_errno; } diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 4a9356b31..314a9a096 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -249,13 +249,10 @@ ice_switch_create(struct ice_adapter *ad, } rte_free(list); - rte_free(meta); return 0; error: rte_free(list); - rte_free(meta); - return -rte_errno; }