From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org, Yuanhan Liu <yliu@fridaylinux.org>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Tiwei Bie <tiwei.bie@intel.com>
Cc: stable@dpdk.org
Subject: [dpdk-dev] [PATCH 2/3] net/virtio: rationalize queue flushing
Date: Thu, 18 Jan 2018 10:07:32 +0100 [thread overview]
Message-ID: <20180118090733.12728-3-olivier.matz@6wind.com> (raw)
In-Reply-To: <20180118090733.12728-1-olivier.matz@6wind.com>
Rationalize the function virtio_dev_free_mbufs():
- skip NULL vqs instead of crashing: this is required for the
next commit
- use the same kind of loop than in virtio_free_queues()
- also flush mbufs from the control queue (this is useless yet)
- factorize common code between rxq, txq, cq
Cc: stable@dpdk.org
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
drivers/net/virtio/virtio_ethdev.c | 55 ++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index c7426951c..d8b3b8ed7 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1868,47 +1868,44 @@ virtio_dev_start(struct rte_eth_dev *dev)
static void virtio_dev_free_mbufs(struct rte_eth_dev *dev)
{
+ struct virtio_hw *hw = dev->data->dev_private;
+ uint16_t nr_vq = virtio_get_nr_vq(hw);
+ const char *type __rte_unused;
+ unsigned int i, mbuf_num = 0;
+ struct virtqueue *vq;
struct rte_mbuf *buf;
- int i, mbuf_num = 0;
-
- for (i = 0; i < dev->data->nb_rx_queues; i++) {
- struct virtnet_rx *rxvq = dev->data->rx_queues[i];
-
- PMD_INIT_LOG(DEBUG,
- "Before freeing rxq[%d] used and unused buf", i);
- VIRTQUEUE_DUMP(rxvq->vq);
-
- PMD_INIT_LOG(DEBUG, "rx_queues[%d]=%p", i, rxvq);
- while ((buf = virtqueue_detach_unused(rxvq->vq)) != NULL) {
- rte_pktmbuf_free(buf);
- mbuf_num++;
- }
+ int queue_type;
- PMD_INIT_LOG(DEBUG, "free %d mbufs", mbuf_num);
- PMD_INIT_LOG(DEBUG,
- "After freeing rxq[%d] used and unused buf", i);
- VIRTQUEUE_DUMP(rxvq->vq);
- }
+ for (i = 0; i < nr_vq; i++) {
+ vq = hw->vqs[i];
+ if (!vq)
+ continue;
- for (i = 0; i < dev->data->nb_tx_queues; i++) {
- struct virtnet_tx *txvq = dev->data->tx_queues[i];
+ queue_type = virtio_get_queue_type(hw, i);
+ if (queue_type == VTNET_RQ)
+ type = "rxq";
+ else if (queue_type == VTNET_TQ)
+ type = "txq";
+ else
+ type = "cq";
PMD_INIT_LOG(DEBUG,
- "Before freeing txq[%d] used and unused bufs",
- i);
- VIRTQUEUE_DUMP(txvq->vq);
+ "Before freeing %s[%d] used and unused buf",
+ type, i);
+ VIRTQUEUE_DUMP(vq);
- mbuf_num = 0;
- while ((buf = virtqueue_detach_unused(txvq->vq)) != NULL) {
+ while ((buf = virtqueue_detach_unused(vq)) != NULL) {
rte_pktmbuf_free(buf);
mbuf_num++;
}
- PMD_INIT_LOG(DEBUG, "free %d mbufs", mbuf_num);
PMD_INIT_LOG(DEBUG,
- "After freeing txq[%d] used and unused buf", i);
- VIRTQUEUE_DUMP(txvq->vq);
+ "After freeing %s[%d] used and unused buf",
+ type, i);
+ VIRTQUEUE_DUMP(vq);
}
+
+ PMD_INIT_LOG(DEBUG, "%d mbufs freed", mbuf_num);
}
/*
--
2.11.0
next prev parent reply other threads:[~2018-01-18 9:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 9:07 [dpdk-dev] [PATCH 0/3] net/virtio: fix memory leak when reinitializing device Olivier Matz
2018-01-18 9:07 ` [dpdk-dev] [PATCH 1/3] net/virtio: fix typo in function name Olivier Matz
2018-01-18 13:27 ` Yuanhan Liu
2018-01-18 13:45 ` Olivier Matz
2018-01-18 14:06 ` Yuanhan Liu
2018-01-18 9:07 ` Olivier Matz [this message]
2018-01-18 13:26 ` [dpdk-dev] [PATCH 2/3] net/virtio: rationalize queue flushing Yuanhan Liu
2018-01-18 13:55 ` Olivier Matz
2018-01-18 14:04 ` Yuanhan Liu
2018-01-18 14:05 ` Tiwei Bie
2018-01-18 14:55 ` Olivier Matz
2018-01-18 15:48 ` Tiwei Bie
2018-01-18 15:56 ` Olivier Matz
2018-01-18 9:07 ` [dpdk-dev] [PATCH 3/3] net/virtio: fix memory leak when reinitializing device Olivier Matz
2018-01-19 15:55 ` [dpdk-dev] [PATCH v2 0/4] " Olivier Matz
2018-01-19 15:55 ` [dpdk-dev] [PATCH v2 1/4] net/virtio: fix queue flushing with vector Rx enabled Olivier Matz
2018-01-22 2:56 ` Tiwei Bie
2018-01-22 10:38 ` Olivier Matz
2018-01-23 2:05 ` Tiwei Bie
2018-01-19 15:55 ` [dpdk-dev] [PATCH v2 2/4] net/virtio: fix memory leak when reinitializing device Olivier Matz
2018-01-19 15:55 ` [dpdk-dev] [PATCH v2 3/4] net/virtio: rationalize queue flushing Olivier Matz
2018-01-19 15:55 ` [dpdk-dev] [PATCH v2 4/4] net/virtio: fix typo in function name Olivier Matz
2018-01-23 15:54 ` [dpdk-dev] [PATCH v3 0/4] net/virtio: fix memory leak when reinitializing device Olivier Matz
2018-01-23 15:54 ` [dpdk-dev] [PATCH v3 1/4] net/virtio: fix queue flushing with vector Rx enabled Olivier Matz
2018-01-23 15:54 ` [dpdk-dev] [PATCH v3 2/4] net/virtio: fix memory leak when reinitializing device Olivier Matz
2018-01-23 15:54 ` [dpdk-dev] [PATCH v3 3/4] net/virtio: rationalize queue flushing Olivier Matz
2018-01-23 15:54 ` [dpdk-dev] [PATCH v3 4/4] net/virtio: fix typo in function name Olivier Matz
2018-01-26 15:34 ` [dpdk-dev] [PATCH v3 0/4] net/virtio: fix memory leak when reinitializing device Yuanhan Liu
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=20180118090733.12728-3-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@intel.com \
--cc=yliu@fridaylinux.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).