[dpdk-stable] patch 'net/vhost: check creation failure' has been queued to LTS release 18.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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/13/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.

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/59e1f980a43d801e202dc5b03e1d14f6abcb7281

Thanks.

Kevin.

---
>From 59e1f980a43d801e202dc5b03e1d14f6abcb7281 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Tue, 7 Jan 2020 11:25:48 +0800
Subject: [PATCH] net/vhost: check creation failure

[ upstream commit f04513bc89d90c2ad425f1be1e4716bb3c790fb2 ]

The function eth_dev_vhost_create() could return errors,
the return value need to be checked.

Fixes: ee584e9710b9 ("vhost: add driver on top of the library")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 drivers/net/vhost/rte_eth_vhost.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index b70b9152f8..47d0102e0e 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1287,5 +1287,5 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
 
 	rte_eth_dev_probing_finish(eth_dev);
-	return data->port_id;
+	return 0;
 
 error:
@@ -1425,6 +1425,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
 		dev->device.numa_node = rte_socket_id();
 
-	eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
-		flags);
+	ret = eth_dev_vhost_create(dev, iface_name, queues,
+				   dev->device.numa_node, flags);
+	if (ret == -1)
+		VHOST_LOG(ERR, "Failed to create %s\n", name);
 
 out_free:
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:18.829379030 +0000
+++ 0025-net-vhost-check-creation-failure.patch	2020-02-07 15:08:17.543062564 +0000
@@ -1 +1 @@
-From f04513bc89d90c2ad425f1be1e4716bb3c790fb2 Mon Sep 17 00:00:00 2001
+From 59e1f980a43d801e202dc5b03e1d14f6abcb7281 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f04513bc89d90c2ad425f1be1e4716bb3c790fb2 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 46f01a7f46..a63588986f 100644
+index b70b9152f8..47d0102e0e 100644
@@ -22 +23 @@
-@@ -1303,5 +1303,5 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
+@@ -1287,5 +1287,5 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
@@ -29 +30 @@
-@@ -1456,6 +1456,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
+@@ -1425,6 +1425,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
@@ -33 +34 @@
--		flags, disable_flags);
+-		flags);
@@ -35 +36 @@
-+				   dev->device.numa_node, flags, disable_flags);
++				   dev->device.numa_node, flags);