[dpdk-stable] patch 'net/virtio: fix queue memory leak on error' has been queued to LTS release 18.11.3
Kevin Traynor
ktraynor at redhat.com
Mon Jun 24 17:25:15 CEST 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/27/19. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/5f34f2eebc67d394837366f6f6272668deb5a84d
Thanks.
Kevin Traynor
---
>From 5f34f2eebc67d394837366f6f6272668deb5a84d Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Wed, 5 Jun 2019 17:43:38 +0800
Subject: [PATCH] net/virtio: fix queue memory leak on error
[ upstream commit 2b38151f745a30ebe653a202563bf8539740633f ]
We should free queues when we failed to initialize the virtio device.
Fixes: 26b683b4f7d0 ("net/virtio: setup Rx queue interrupts")
Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
drivers/net/virtio/virtio_ethdev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index f938b7cef..e1c97a481 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1594,4 +1594,5 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
if (virtio_configure_intr(eth_dev) < 0) {
PMD_INIT_LOG(ERR, "failed to configure interrupt");
+ virtio_free_queues(hw);
return -1;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-06-24 16:18:57.710214666 +0100
+++ 0051-net-virtio-fix-queue-memory-leak-on-error.patch 2019-06-24 16:18:55.121429099 +0100
@@ -1 +1 @@
-From 2b38151f745a30ebe653a202563bf8539740633f Mon Sep 17 00:00:00 2001
+From 5f34f2eebc67d394837366f6f6272668deb5a84d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2b38151f745a30ebe653a202563bf8539740633f ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index c4570bbf8..df3a218a8 100644
+index f938b7cef..e1c97a481 100644
@@ -21 +22 @@
-@@ -1753,4 +1753,5 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
+@@ -1594,4 +1594,5 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
More information about the stable
mailing list