[dpdk-stable] patch 'vhost: make IOTLB cache name unique among processes' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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/03/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/15b8c1bb8f7bae668d3053eb76d81bf0ee0be458

Thanks.

Kevin.

---
>From 15b8c1bb8f7bae668d3053eb76d81bf0ee0be458 Mon Sep 17 00:00:00 2001
From: Itsuro Oda <oda at valinux.co.jp>
Date: Thu, 12 Mar 2020 08:19:18 +0900
Subject: [PATCH] vhost: make IOTLB cache name unique among processes

[ upstream commit 7470f845c17ac27ce08b22f3c024169e51ade990 ]

Currently, iotlb cache name is comprised of vid and virtqueue
index. For example, "iotlb_cache_0_0". Because vid is assigned
per process, iotlb cache name is not unique among multi processes.
For example a secondary process uses a vhost
(ex. eth_vhost0,iface=/tmp/sock0) and another secondary process
uses a vhost (ex. eth_vhost1,iface=/tmp/sock1), iotlb cache
name of both vhost ("iotlb_cache_0_0") are same and as a result
iotlb cache is broken.

This patch makes iotlb cache name unique among milti processes
by adding process id to the iotlb cache name.

The prefix of the name is shortened to "iotlb_" since the maximum
length of pool name is 25 bytes (RTE_MEMPOOL_NAMESIZE is 26).
Note that it is just 25 characters in maximum at the moment.
Here,
* pid_t == int: max 10 digits.
* vid < MAX_VHOST_DECICE(1024): max 4 digits.
* vq_index < VHOST_MAX_VRING(256): max 3 digits.

Fixes: d012d1f293f4 ("vhost: add IOTLB helper functions")

Signed-off-by: Itsuro Oda <oda at valinux.co.jp>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/iotlb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index c6354fef7e..3dfde94e80 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -337,6 +337,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
 	TAILQ_INIT(&vq->iotlb_pending_list);
 
-	snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%d_%d",
-			dev->vid, vq_index);
+	snprintf(pool_name, sizeof(pool_name), "iotlb_%u_%d_%d",
+			getpid(), dev->vid, vq_index);
+	RTE_LOG(DEBUG, VHOST_CONFIG, "IOTLB cache name: %s\n", pool_name);
 
 	/* If already created, free it and recreate */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:03.048819691 +0100
+++ 0076-vhost-make-IOTLB-cache-name-unique-among-processes.patch	2020-05-28 17:12:59.159555088 +0100
@@ -1 +1 @@
-From 7470f845c17ac27ce08b22f3c024169e51ade990 Mon Sep 17 00:00:00 2001
+From 15b8c1bb8f7bae668d3053eb76d81bf0ee0be458 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7470f845c17ac27ce08b22f3c024169e51ade990 ]
+
@@ -27 +28,0 @@
-Cc: stable at dpdk.org
@@ -36 +37 @@
-index bc17585288..5b3a0c090c 100644
+index c6354fef7e..3dfde94e80 100644
@@ -39 +40 @@
-@@ -309,6 +309,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
+@@ -337,6 +337,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
@@ -46 +47 @@
-+	VHOST_LOG_CONFIG(DEBUG, "IOTLB cache name: %s\n", pool_name);
++	RTE_LOG(DEBUG, VHOST_CONFIG, "IOTLB cache name: %s\n", pool_name);