[dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 824ebcd5cf0310553dcb85470f5ba804453e6c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma at redhat.com>
Date: Mon, 31 Aug 2020 09:59:22 +0200
Subject: [PATCH] vhost: fix IOTLB mempool single-consumer flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 46d3f57537059ef9ec497f97d98e57a1e5f2f417 ]

Control thread (which handles iotlb msg) and forwarding thread
both use iotlb to translate address. The former may modify the
same entry of mempool and may cause a loop in iotlb_pending_entries
list.

Bugzilla ID: 523
Fixes: d012d1f293f4 ("vhost: add IOTLB helper functions")

Signed-off-by: Eugenio Pérez <eperezma at redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/iotlb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index 07443a94bc..2e90a63bb1 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -321,8 +321,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
 			IOTLB_CACHE_SIZE, sizeof(struct vhost_iotlb_entry), 0,
 			0, 0, NULL, NULL, NULL, socket,
 			MEMPOOL_F_NO_CACHE_ALIGN |
-			MEMPOOL_F_SP_PUT |
-			MEMPOOL_F_SC_GET);
+			MEMPOOL_F_SP_PUT);
 	if (!vq->iotlb_pool) {
 		RTE_LOG(ERR, VHOST_CONFIG,
 				"Failed to create IOTLB cache pool (%s)\n",
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.343102393 +0000
+++ 0050-vhost-fix-IOTLB-mempool-single-consumer-flag.patch	2020-10-28 10:35:11.512830142 +0000
@@ -1,4 +1,4 @@
-From 46d3f57537059ef9ec497f97d98e57a1e5f2f417 Mon Sep 17 00:00:00 2001
+From 824ebcd5cf0310553dcb85470f5ba804453e6c73 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma at redhat.com>
 Date: Mon, 31 Aug 2020 09:59:22 +0200
 Subject: [PATCH] vhost: fix IOTLB mempool single-consumer flag
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 46d3f57537059ef9ec497f97d98e57a1e5f2f417 ]
+
 Control thread (which handles iotlb msg) and forwarding thread
 both use iotlb to translate address. The former may modify the
 same entry of mempool and may cause a loop in iotlb_pending_entries
@@ -13,7 +15,6 @@
 
 Bugzilla ID: 523
 Fixes: d012d1f293f4 ("vhost: add IOTLB helper functions")
-Cc: stable at dpdk.org
 
 Signed-off-by: Eugenio Pérez <eperezma at redhat.com>
 Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
@@ -23,7 +24,7 @@
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
-index 5b3a0c090c..e0b67721b6 100644
+index 07443a94bc..2e90a63bb1 100644
 --- a/lib/librte_vhost/iotlb.c
 +++ b/lib/librte_vhost/iotlb.c
 @@ -321,8 +321,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
@@ -34,7 +35,7 @@
 -			MEMPOOL_F_SC_GET);
 +			MEMPOOL_F_SP_PUT);
  	if (!vq->iotlb_pool) {
- 		VHOST_LOG_CONFIG(ERR,
+ 		RTE_LOG(ERR, VHOST_CONFIG,
  				"Failed to create IOTLB cache pool (%s)\n",
 -- 
 2.20.1