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, Zijie Pan <zijie.pan@6wind.com>
Subject: [dpdk-stable] [PATCH v2 2/4] net/virtio: fix memory leak when reinitializing device
Date: Fri, 19 Jan 2018 16:55:54 +0100 [thread overview]
Message-ID: <20180119155556.32597-3-olivier.matz@6wind.com> (raw)
In-Reply-To: <20180119155556.32597-1-olivier.matz@6wind.com>
Free the previous queues and the attached mbufs before initializing new
ones.
The function virtio_dev_free_mbufs() is now called when reconfiguring the
device, so we also need to add a check to ensure that it won't crash for
uninitialized queues.
Cc: stable@dpdk.org
Fixes: 60e6f4707ef2 ("net/virtio: reinitialize device when configuring")
Signed-off-by: Zijie Pan <zijie.pan@6wind.com>
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
drivers/net/virtio/virtio_ethdev.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 2c7f902e7..a8adf0037 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1368,6 +1368,11 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
/* Reset the device although not necessary at startup */
vtpci_reset(hw);
+ if (hw->vqs) {
+ virtio_dev_free_mbufs(eth_dev);
+ virtio_free_queues(hw);
+ }
+
/* Tell the host we've noticed this device. */
vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_ACK);
@@ -1863,6 +1868,9 @@ static void virtio_dev_free_mbufs(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_rx_queues; i++) {
struct virtnet_rx *rxvq = dev->data->rx_queues[i];
+ if (rxvq == NULL || rxvq->vq == NULL)
+ continue;
+
PMD_INIT_LOG(DEBUG,
"Before freeing rxq[%d] used and unused buf", i);
VIRTQUEUE_DUMP(rxvq->vq);
@@ -1882,6 +1890,9 @@ static void virtio_dev_free_mbufs(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++) {
struct virtnet_tx *txvq = dev->data->tx_queues[i];
+ if (txvq == NULL || txvq->vq == NULL)
+ continue;
+
PMD_INIT_LOG(DEBUG,
"Before freeing txq[%d] used and unused bufs",
i);
--
2.11.0
next prev parent reply other threads:[~2018-01-19 15:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180118090733.12728-1-olivier.matz@6wind.com>
2018-01-18 9:07 ` [dpdk-stable] [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 ` [dpdk-stable] [PATCH 2/3] net/virtio: rationalize queue flushing Olivier Matz
2018-01-18 13:26 ` 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-stable] [PATCH 3/3] net/virtio: fix memory leak when reinitializing device Olivier Matz
[not found] ` <20180119155556.32597-1-olivier.matz@6wind.com>
2018-01-19 15:55 ` [dpdk-stable] [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 ` Olivier Matz [this message]
[not found] ` <20180123155443.8883-1-olivier.matz@6wind.com>
2018-01-23 15:54 ` [dpdk-stable] [PATCH v3 " Olivier Matz
2018-01-23 15:54 ` [dpdk-stable] [PATCH v3 2/4] net/virtio: fix memory leak when reinitializing device Olivier Matz
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=20180119155556.32597-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 \
--cc=zijie.pan@6wind.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).