From: Junfeng Guo <junfeng.guo@intel.com>
To: qi.z.zhang@intel.com, jingjing.wu@intel.com,
ferruh.yigit@amd.com, beilei.xing@intel.com
Cc: dev@dpdk.org, xiaoyun.li@intel.com, jeroendb@google.com,
rushilg@google.com, jrkim@google.com,
Junfeng Guo <junfeng.guo@intel.com>
Subject: [PATCH] net/gve: support queue release
Date: Fri, 11 Nov 2022 17:58:24 +0800 [thread overview]
Message-ID: <20221111095824.71778-1-junfeng.guo@intel.com> (raw)
Add support for queue operations:
- rx_queue_release
- tx_queue_release
Previous gve_tx_queue_release and gve_rx_queue_release functions are
only used internally to release Rx/Tx queue related resources. But
when the queues or ports are required to re-config, both of the dev
ops tx_queue_release and ops rx_queue_release will be checked and
then called. Without these two dev ops, the Rx/Tx queue struct will
be set as NULL directly.
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
---
drivers/net/gve/gve_ethdev.c | 16 ++++++----------
drivers/net/gve/gve_ethdev.h | 4 ++--
drivers/net/gve/gve_rx.c | 6 +++---
drivers/net/gve/gve_tx.c | 6 +++---
4 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index 0086162f63..274a183250 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -244,8 +244,6 @@ static int
gve_dev_close(struct rte_eth_dev *dev)
{
struct gve_priv *priv = dev->data->dev_private;
- struct gve_tx_queue *txq;
- struct gve_rx_queue *rxq;
int err = 0;
uint16_t i;
@@ -255,15 +253,11 @@ gve_dev_close(struct rte_eth_dev *dev)
PMD_DRV_LOG(ERR, "Failed to stop dev.");
}
- for (i = 0; i < dev->data->nb_tx_queues; i++) {
- txq = dev->data->tx_queues[i];
- gve_tx_queue_release(txq);
- }
+ for (i = 0; i < dev->data->nb_tx_queues; i++)
+ gve_tx_queue_release(dev, i);
- for (i = 0; i < dev->data->nb_rx_queues; i++) {
- rxq = dev->data->rx_queues[i];
- gve_rx_queue_release(rxq);
- }
+ for (i = 0; i < dev->data->nb_rx_queues; i++)
+ gve_rx_queue_release(dev, i);
gve_free_qpls(priv);
rte_free(priv->adminq);
@@ -362,6 +356,8 @@ static const struct eth_dev_ops gve_eth_dev_ops = {
.dev_infos_get = gve_dev_info_get,
.rx_queue_setup = gve_rx_queue_setup,
.tx_queue_setup = gve_tx_queue_setup,
+ .rx_queue_release = gve_rx_queue_release,
+ .tx_queue_release = gve_tx_queue_release,
.link_update = gve_link_update,
.mtu_set = gve_dev_mtu_set,
};
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index f6cac3ff2b..235e55899e 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -291,10 +291,10 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
unsigned int socket_id, const struct rte_eth_txconf *conf);
void
-gve_tx_queue_release(void *txq);
+gve_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void
-gve_rx_queue_release(void *rxq);
+gve_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void
gve_stop_tx_queues(struct rte_eth_dev *dev);
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 4c5b8c517d..518c9d109c 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -192,9 +192,9 @@ gve_release_rxq_mbufs(struct gve_rx_queue *rxq)
}
void
-gve_rx_queue_release(void *rxq)
+gve_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
{
- struct gve_rx_queue *q = rxq;
+ struct gve_rx_queue *q = dev->data->rx_queues[qid];
if (!q)
return;
@@ -232,7 +232,7 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
/* Free memory if needed. */
if (dev->data->rx_queues[queue_id]) {
- gve_rx_queue_release(dev->data->rx_queues[queue_id]);
+ gve_rx_queue_release(dev, queue_id);
dev->data->rx_queues[queue_id] = NULL;
}
diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c
index 4420a17192..bf4e8fea2c 100644
--- a/drivers/net/gve/gve_tx.c
+++ b/drivers/net/gve/gve_tx.c
@@ -514,9 +514,9 @@ gve_release_txq_mbufs(struct gve_tx_queue *txq)
}
void
-gve_tx_queue_release(void *txq)
+gve_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
{
- struct gve_tx_queue *q = txq;
+ struct gve_tx_queue *q = dev->data->tx_queues[qid];
if (!q)
return;
@@ -553,7 +553,7 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
/* Free memory if needed. */
if (dev->data->tx_queues[queue_id]) {
- gve_tx_queue_release(dev->data->tx_queues[queue_id]);
+ gve_tx_queue_release(dev, queue_id);
dev->data->tx_queues[queue_id] = NULL;
}
--
2.34.1
next reply other threads:[~2022-11-11 10:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 9:58 Junfeng Guo [this message]
2022-11-11 14:50 ` 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=20221111095824.71778-1-junfeng.guo@intel.com \
--to=junfeng.guo@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=jeroendb@google.com \
--cc=jingjing.wu@intel.com \
--cc=jrkim@google.com \
--cc=qi.z.zhang@intel.com \
--cc=rushilg@google.com \
--cc=xiaoyun.li@intel.com \
/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).