From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,
stable@dpdk.org, Long Wu <long.wu@corigine.com>,
Peng Zhang <peng.zhang@corigine.com>
Subject: [PATCH v2 5/8] net/nfp: fix resource leak for flower firmware
Date: Mon, 4 Dec 2023 09:57:15 +0800 [thread overview]
Message-ID: <20231204015718.780578-6-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20231204015718.780578-1-chaoyong.he@corigine.com>
Fix the resource leak problem in the logic of flower firmware
application.
Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework")
Cc: stable@dpdk.org
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
.../net/nfp/flower/nfp_flower_representor.c | 89 ++++++++++++++++++-
.../net/nfp/flower/nfp_flower_representor.h | 1 +
2 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index 0f0e63aae0..7212d9e024 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -291,6 +291,43 @@ nfp_flower_repr_tx_burst(void *tx_queue,
return sent;
}
+static int
+nfp_flower_repr_uninit(struct rte_eth_dev *eth_dev)
+{
+ struct nfp_flower_representor *repr;
+
+ repr = eth_dev->data->dev_private;
+ rte_ring_free(repr->ring);
+
+ return 0;
+}
+
+static int
+nfp_flower_pf_repr_uninit(__rte_unused struct rte_eth_dev *eth_dev)
+{
+ return 0;
+}
+
+static void
+nfp_flower_repr_free(struct nfp_flower_representor *repr,
+ enum nfp_repr_type repr_type)
+{
+ switch (repr_type) {
+ case NFP_REPR_TYPE_PHYS_PORT:
+ rte_eth_dev_destroy(repr->eth_dev, nfp_flower_repr_uninit);
+ break;
+ case NFP_REPR_TYPE_PF:
+ rte_eth_dev_destroy(repr->eth_dev, nfp_flower_pf_repr_uninit);
+ break;
+ case NFP_REPR_TYPE_VF:
+ rte_eth_dev_destroy(repr->eth_dev, nfp_flower_repr_uninit);
+ break;
+ default:
+ PMD_DRV_LOG(ERR, "Unsupported repr port type.");
+ break;
+ }
+}
+
static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = {
.dev_infos_get = nfp_flower_repr_dev_infos_get,
@@ -410,6 +447,7 @@ nfp_flower_pf_repr_init(struct rte_eth_dev *eth_dev,
repr->app_fw_flower->pf_repr = repr;
repr->app_fw_flower->pf_hw->eth_dev = eth_dev;
+ repr->eth_dev = eth_dev;
return 0;
}
@@ -501,6 +539,8 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
app_fw_flower->vf_reprs[index] = repr;
}
+ repr->eth_dev = eth_dev;
+
return 0;
mac_cleanup:
@@ -511,6 +551,35 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
return ret;
}
+static void
+nfp_flower_repr_free_all(struct nfp_app_fw_flower *app_fw_flower)
+{
+ uint32_t i;
+ struct nfp_flower_representor *repr;
+
+ for (i = 0; i < MAX_FLOWER_VFS; i++) {
+ repr = app_fw_flower->vf_reprs[i];
+ if (repr != NULL) {
+ nfp_flower_repr_free(repr, NFP_REPR_TYPE_VF);
+ app_fw_flower->vf_reprs[i] = NULL;
+ }
+ }
+
+ for (i = 0; i < NFP_MAX_PHYPORTS; i++) {
+ repr = app_fw_flower->phy_reprs[i];
+ if (repr != NULL) {
+ nfp_flower_repr_free(repr, NFP_REPR_TYPE_PHYS_PORT);
+ app_fw_flower->phy_reprs[i] = NULL;
+ }
+ }
+
+ repr = app_fw_flower->pf_repr;
+ if (repr != NULL) {
+ nfp_flower_repr_free(repr, NFP_REPR_TYPE_PF);
+ app_fw_flower->pf_repr = NULL;
+ }
+}
+
static int
nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower)
{
@@ -585,7 +654,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower)
}
if (i < app_fw_flower->num_phyport_reprs)
- return ret;
+ goto repr_free;
/*
* Now allocate eth_dev's for VF representors.
@@ -614,9 +683,14 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower)
}
if (i < app_fw_flower->num_vf_reprs)
- return ret;
+ goto repr_free;
return 0;
+
+repr_free:
+ nfp_flower_repr_free_all(app_fw_flower);
+
+ return ret;
}
int
@@ -635,7 +709,7 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower)
/* Allocate a switch domain for the flower app */
if (app_fw_flower->switch_domain_id == RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID &&
- rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id)) {
+ rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id) != 0) {
PMD_INIT_LOG(WARNING, "failed to allocate switch domain for device");
}
@@ -677,8 +751,15 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower)
ret = nfp_flower_repr_alloc(app_fw_flower);
if (ret != 0) {
PMD_INIT_LOG(ERR, "representors allocation failed");
- return -EINVAL;
+ ret = -EINVAL;
+ goto domain_free;
}
return 0;
+
+domain_free:
+ if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0)
+ PMD_INIT_LOG(WARNING, "failed to free switch domain for device");
+
+ return ret;
}
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.h b/drivers/net/nfp/flower/nfp_flower_representor.h
index bcb4c3cdb5..8053617562 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.h
+++ b/drivers/net/nfp/flower/nfp_flower_representor.h
@@ -20,6 +20,7 @@ struct nfp_flower_representor {
struct rte_ring *ring;
struct rte_eth_link link;
struct rte_eth_stats repr_stats;
+ struct rte_eth_dev *eth_dev;
};
int nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower);
--
2.39.1
next prev parent reply other threads:[~2023-12-04 1:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 8:52 [PATCH 0/7] fix resource leak problems Chaoyong He
2023-11-30 8:52 ` [PATCH 1/7] net/nfp: fix resource leak for device initialization Chaoyong He
2023-11-30 8:52 ` [PATCH 2/7] net/nfp: fix resource leak for CoreNIC firmware Chaoyong He
2023-11-30 8:52 ` [PATCH 3/7] net/nfp: fix resource leak for PF initialization Chaoyong He
2023-11-30 8:52 ` [PATCH 4/7] net/nfp: fix resource leak for flower firmware Chaoyong He
2023-11-30 8:52 ` [PATCH 5/7] net/nfp: fix resource leak for exit of CoreNIC firmware Chaoyong He
2023-11-30 11:00 ` Ferruh Yigit
2023-12-01 3:00 ` Chaoyong He
2023-12-01 9:41 ` Ferruh Yigit
2023-12-01 10:03 ` Chaoyong He
2023-11-30 8:52 ` [PATCH 6/7] net/nfp: fix resource leak for exit of flower firmware Chaoyong He
2023-11-30 8:52 ` [PATCH 7/7] net/nfp: fix resource leak for VF Chaoyong He
2023-12-04 1:57 ` [PATCH v2 0/8] fix resource leak problems Chaoyong He
2023-12-04 1:57 ` [PATCH v2 1/8] net/nfp: modify the process private data Chaoyong He
2023-12-04 1:57 ` [PATCH v2 2/8] net/nfp: fix resource leak for device initialization Chaoyong He
2023-12-04 1:57 ` [PATCH v2 3/8] net/nfp: fix resource leak for CoreNIC firmware Chaoyong He
2023-12-04 1:57 ` [PATCH v2 4/8] net/nfp: fix resource leak for PF initialization Chaoyong He
2023-12-04 1:57 ` Chaoyong He [this message]
2023-12-04 1:57 ` [PATCH v2 6/8] net/nfp: fix resource leak for exit of CoreNIC firmware Chaoyong He
2023-12-04 1:57 ` [PATCH v2 7/8] net/nfp: fix resource leak for exit of flower firmware Chaoyong He
2023-12-04 1:57 ` [PATCH v2 8/8] net/nfp: fix resource leak for VF Chaoyong He
2023-12-04 12:22 ` [PATCH v2 0/8] fix resource leak problems Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231204015718.780578-6-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=long.wu@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=peng.zhang@corigine.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).