[dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/10/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/6be24aa7c852d8f31d28f119eefccdea30fa30a1

Thanks.

Kevin.

---
>From 6be24aa7c852d8f31d28f119eefccdea30fa30a1 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Fri, 11 Sep 2020 19:08:04 +0800
Subject: [PATCH] bus/pci: fix leak on VFIO mapping error

[ upstream commit 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 ]

Currently, only the 'vfio_dev_fd' is closed in failure path, so
some resources are not released(such as 'vfio_group_fd'). The
rte_vfio_release_device() should be used to avoid this problem.

Fixes: 33604c31354a ("vfio: refactor PCI BAR mapping")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 drivers/bus/pci/linux/pci_vfio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 44a7c764ce..0a4dc41cf3 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -810,5 +810,6 @@ err_vfio_res:
 	rte_free(vfio_res);
 err_vfio_dev_fd:
-	close(vfio_dev_fd);
+	rte_vfio_release_device(rte_pci_get_sysfs_path(),
+			pci_addr, vfio_dev_fd);
 	return -1;
 }
@@ -878,5 +879,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
 	return 0;
 err_vfio_dev_fd:
-	close(vfio_dev_fd);
+	rte_vfio_release_device(rte_pci_get_sysfs_path(),
+			pci_addr, vfio_dev_fd);
 	return -1;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.040781220 +0000
+++ 0041-bus-pci-fix-leak-on-VFIO-mapping-error.patch	2020-11-05 12:38:54.242896021 +0000
@@ -1 +1 @@
-From 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 Mon Sep 17 00:00:00 2001
+From 6be24aa7c852d8f31d28f119eefccdea30fa30a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 940ebc1e35..ef4f72017f 100644
+index 44a7c764ce..0a4dc41cf3 100644
@@ -23 +24 @@
-@@ -839,5 +839,6 @@ err_vfio_res:
+@@ -810,5 +810,6 @@ err_vfio_res:
@@ -31 +32 @@
-@@ -907,5 +908,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
+@@ -878,5 +879,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)