[dpdk-stable] patch 'net/vhost: fix potential memory leak on close' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/21/20. 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.

Thanks.

Luca Boccassi

---
>From 4f5f084c7fd99f2db1c8cb88c4e97f6bd248e107 Mon Sep 17 00:00:00 2001
From: Itsuro Oda <oda at valinux.co.jp>
Date: Thu, 5 Mar 2020 11:54:50 +0900
Subject: [PATCH] net/vhost: fix potential memory leak on close

[ upstream commit 770fabcd36ec11d64544e86ed7d2dda9f5c64daf ]

If a vhost device is closed before eth_dev_configure is done
to the device, internal resources allocated to the device
would not be freed. This patch fixes it.

Fixes: 3d01b759d267 ("net/vhost: delay driver setup")

Signed-off-by: Itsuro Oda <oda at valinux.co.jp>
Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/vhost/rte_eth_vhost.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index c5e3fa229a..85f91f0b9d 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1066,16 +1066,14 @@ eth_dev_close(struct rte_eth_dev *dev)
 
 	eth_dev_stop(dev);
 
-	rte_vhost_driver_unregister(internal->iface_name);
-
 	list = find_internal_resource(internal->iface_name);
-	if (!list)
-		return;
-
-	pthread_mutex_lock(&internal_list_lock);
-	TAILQ_REMOVE(&internal_list, list, next);
-	pthread_mutex_unlock(&internal_list_lock);
-	rte_free(list);
+	if (list) {
+		rte_vhost_driver_unregister(internal->iface_name);
+		pthread_mutex_lock(&internal_list_lock);
+		TAILQ_REMOVE(&internal_list, list, next);
+		pthread_mutex_unlock(&internal_list_lock);
+		rte_free(list);
+	}
 
 	if (dev->data->rx_queues)
 		for (i = 0; i < dev->data->nb_rx_queues; i++)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:47.332697142 +0100
+++ 0070-net-vhost-fix-potential-memory-leak-on-close.patch	2020-05-19 14:04:44.232648662 +0100
@@ -1,14 +1,15 @@
-From 770fabcd36ec11d64544e86ed7d2dda9f5c64daf Mon Sep 17 00:00:00 2001
+From 4f5f084c7fd99f2db1c8cb88c4e97f6bd248e107 Mon Sep 17 00:00:00 2001
 From: Itsuro Oda <oda at valinux.co.jp>
 Date: Thu, 5 Mar 2020 11:54:50 +0900
 Subject: [PATCH] net/vhost: fix potential memory leak on close
 
+[ upstream commit 770fabcd36ec11d64544e86ed7d2dda9f5c64daf ]
+
 If a vhost device is closed before eth_dev_configure is done
 to the device, internal resources allocated to the device
 would not be freed. This patch fixes it.
 
 Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
-Cc: stable at dpdk.org
 
 Signed-off-by: Itsuro Oda <oda at valinux.co.jp>
 Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
-index f44e6bbebe..808e670f13 100644
+index c5e3fa229a..85f91f0b9d 100644
 --- a/drivers/net/vhost/rte_eth_vhost.c
 +++ b/drivers/net/vhost/rte_eth_vhost.c
-@@ -1069,16 +1069,14 @@ eth_dev_close(struct rte_eth_dev *dev)
+@@ -1066,16 +1066,14 @@ eth_dev_close(struct rte_eth_dev *dev)
  
  	eth_dev_stop(dev);