[dpdk-stable] patch 'net/vhost: fix setup error path' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/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 a222f3ee7145254de7847e9c4c7d4cb3e2ea42ce Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Tue, 18 Feb 2020 18:22:39 +0100
Subject: [PATCH] net/vhost: fix setup error path

[ upstream commit 3e00307549ef7c90a9752f58f1d423542399267c ]

If for some reason vhost_driver_setup() fails, the list
element for the device may be freed without being removed
from the internal list of devices.

This patch fixes all the error paths, by unregistering the
device from Vhost library it has been registered, remove
the device from the list, reset device vring_state pointer
from the global table and only free vring state if it had
been allocated.

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

Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 drivers/net/vhost/rte_eth_vhost.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 307de2c682..c1b3dffeec 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -879,12 +879,12 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
 
 	list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
 	if (list == NULL)
-		goto error;
+		return -1;
 
 	vring_state = rte_zmalloc_socket(name, sizeof(*vring_state),
 					 0, numa_node);
 	if (vring_state == NULL)
-		goto error;
+		goto free_list;
 
 	list->eth_dev = eth_dev;
 	pthread_mutex_lock(&internal_list_lock);
@@ -895,30 +895,37 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
 	vring_states[eth_dev->data->port_id] = vring_state;
 
 	if (rte_vhost_driver_register(internal->iface_name, internal->flags))
-		goto error;
+		goto list_remove;
 
 	if (internal->disable_flags) {
 		if (rte_vhost_driver_disable_features(internal->iface_name,
 						      internal->disable_flags))
-			goto error;
+			goto drv_unreg;
 	}
 
 	if (rte_vhost_driver_callback_register(internal->iface_name,
 					       &vhost_ops) < 0) {
 		VHOST_LOG(ERR, "Can't register callbacks\n");
-		goto error;
+		goto drv_unreg;
 	}
 
 	if (rte_vhost_driver_start(internal->iface_name) < 0) {
 		VHOST_LOG(ERR, "Failed to start driver for %s\n",
 			  internal->iface_name);
-		goto error;
+		goto drv_unreg;
 	}
 
 	return 0;
 
-error:
+drv_unreg:
+	rte_vhost_driver_unregister(internal->iface_name);
+list_remove:
+	vring_states[eth_dev->data->port_id] = NULL;
+	pthread_mutex_lock(&internal_list_lock);
+	TAILQ_REMOVE(&internal_list, list, next);
+	pthread_mutex_unlock(&internal_list_lock);
 	rte_free(vring_state);
+free_list:
 	rte_free(list);
 
 	return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.244283332 +0000
+++ 0012-net-vhost-fix-setup-error-path.patch	2020-02-27 09:31:55.699945610 +0000
@@ -1,8 +1,10 @@
-From 3e00307549ef7c90a9752f58f1d423542399267c Mon Sep 17 00:00:00 2001
+From a222f3ee7145254de7847e9c4c7d4cb3e2ea42ce Mon Sep 17 00:00:00 2001
 From: Maxime Coquelin <maxime.coquelin at redhat.com>
 Date: Tue, 18 Feb 2020 18:22:39 +0100
 Subject: [PATCH] net/vhost: fix setup error path
 
+[ upstream commit 3e00307549ef7c90a9752f58f1d423542399267c ]
+
 If for some reason vhost_driver_setup() fails, the list
 element for the device may be freed without being removed
 from the internal list of devices.
@@ -14,7 +16,6 @@
 been allocated.
 
 Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
-Cc: stable at dpdk.org
 
 Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 Reviewed-by: David Marchand <david.marchand at redhat.com>
@@ -24,10 +25,10 @@
  1 file changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
-index 90263ae77c..4a7b1b608c 100644
+index 307de2c682..c1b3dffeec 100644
 --- a/drivers/net/vhost/rte_eth_vhost.c
 +++ b/drivers/net/vhost/rte_eth_vhost.c
-@@ -878,12 +878,12 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
+@@ -879,12 +879,12 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
  
  	list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
  	if (list == NULL)
@@ -42,7 +43,7 @@
  
  	list->eth_dev = eth_dev;
  	pthread_mutex_lock(&internal_list_lock);
-@@ -894,30 +894,37 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
+@@ -895,30 +895,37 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
  	vring_states[eth_dev->data->port_id] = vring_state;
  
  	if (rte_vhost_driver_register(internal->iface_name, internal->flags))