patch 'net/tap: fix interrupt handler freeing' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.2

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/30/22. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/b839853e83ea8505b040aa1fd7c0456223f4451d

Thanks.

Kevin

---
>From b839853e83ea8505b040aa1fd7c0456223f4451d Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin at armitage.org.uk>
Date: Tue, 3 May 2022 16:27:32 +0100
Subject: [PATCH] net/tap: fix interrupt handler freeing

[ upstream commit 0809d870fc22916627ec5e177d4c138c12196321 ]

rte_pmd_tun/tap_probe() allocates pmd->intr_handle in eth_dev_tap_create()
and it should not be freed until rte_pmd_tap_remove() is called.

Inspection of tap_rx_intr_vec_set() shows that the call to
tap_tx_intr_vec_uninstall() was calling rte_intr_instance_free() but
tap_tx_intr_vec_install() can then be immediately called, and this then
uses pmd->intr_handle without it being reallocated.

Move rte_intr_instance_free() call from tap_tx_intr_vec_uninstall()
to rte_pmd_tap_remove().

Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")

Signed-off-by: Quentin Armitage <quentin at armitage.org.uk>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 drivers/net/tap/rte_eth_tap.c | 2 ++
 drivers/net/tap/tap_intr.c    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index b0c09956de..919968af44 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -1206,4 +1206,6 @@ tap_dev_close(struct rte_eth_dev *dev)
 		tuntap_types[internals->type], rte_socket_id());
 
+	rte_intr_instance_free(internals->intr_handle);
+
 	if (internals->ioctl_sock != -1) {
 		close(internals->ioctl_sock);
diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c
index 56c343acea..a9097def1a 100644
--- a/drivers/net/tap/tap_intr.c
+++ b/drivers/net/tap/tap_intr.c
@@ -35,6 +35,4 @@ tap_rx_intr_vec_uninstall(struct rte_eth_dev *dev)
 	rte_intr_vec_list_free(intr_handle);
 	rte_intr_nb_efd_set(intr_handle, 0);
-
-	rte_intr_instance_free(intr_handle);
 }
 
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:59.008877079 +0100
+++ 0017-net-tap-fix-interrupt-handler-freeing.patch	2022-05-25 17:26:58.553828311 +0100
@@ -1 +1 @@
-From 0809d870fc22916627ec5e177d4c138c12196321 Mon Sep 17 00:00:00 2001
+From b839853e83ea8505b040aa1fd7c0456223f4451d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0809d870fc22916627ec5e177d4c138c12196321 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index bc3d56a311..5495818be6 100644
+index b0c09956de..919968af44 100644
@@ -31 +32 @@
-@@ -1214,4 +1214,6 @@ tap_dev_close(struct rte_eth_dev *dev)
+@@ -1206,4 +1206,6 @@ tap_dev_close(struct rte_eth_dev *dev)