[dpdk-stable] patch 'net/virtio: unmap device on initialization error' has been queued to LTS release 18.11.3

[Kevin Traynor]

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/eeabe2d6693ded6af89d6dc3499b2abcb9f88b61

Thanks.

Kevin Traynor

---
>From eeabe2d6693ded6af89d6dc3499b2abcb9f88b61 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Wed, 5 Jun 2019 17:43:40 +0800
Subject: [PATCH] net/virtio: unmap device on initialization error

[ upstream commit 3484c8d859b48f41c8958614736cc64f0e203f4c ]

We should unmap the device when we failed to initialize the device.

Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")

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 | 12 +++++++++---
 drivers/net/virtio/virtio_pci.c    |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index d8724566a..74076b9a9 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1698,5 +1698,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 		ret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
 		if (ret)
-			goto out;
+			goto err_vtpci_init;
 	}
 
@@ -1704,9 +1704,15 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 	ret = virtio_init_device(eth_dev, VIRTIO_PMD_DEFAULT_GUEST_FEATURES);
 	if (ret < 0)
-		goto out;
+		goto err_virtio_init;
 
 	return 0;
 
-out:
+err_virtio_init:
+	if (!hw->virtio_user_dev) {
+		rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
+		if (!hw->modern)
+			rte_pci_ioport_unmap(VTPCI_IO(hw));
+	}
+err_vtpci_init:
 	rte_free(eth_dev->data->mac_addrs);
 	eth_dev->data->mac_addrs = NULL;
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index c8883c32e..6e984ea94 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -679,4 +679,5 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)
 	PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
 	if (rte_pci_ioport_map(dev, 0, VTPCI_IO(hw)) < 0) {
+		rte_pci_unmap_device(dev);
 		if (dev->kdrv == RTE_KDRV_UNKNOWN &&
 		    (!dev->device.devargs ||
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:57.810995943 +0100
+++ 0053-net-virtio-unmap-device-on-initialization-error.patch	2019-06-24 16:18:55.125429005 +0100
@@ -1 +1 @@
-From 3484c8d859b48f41c8958614736cc64f0e203f4c Mon Sep 17 00:00:00 2001
+From eeabe2d6693ded6af89d6dc3499b2abcb9f88b61 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3484c8d859b48f41c8958614736cc64f0e203f4c ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index a2cedcc87..46d2e4ac6 100644
+index d8724566a..74076b9a9 100644
@@ -22 +23 @@
-@@ -1858,5 +1858,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1698,5 +1698,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
@@ -29 +30 @@
-@@ -1864,9 +1864,15 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1704,9 +1704,15 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
@@ -48 +49 @@
-index adc02f96a..4468e89cb 100644
+index c8883c32e..6e984ea94 100644