[dpdk-stable] patch 'vhost: fix virtqueue not accessible' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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

Thanks.

Luca Boccassi

---
>From f1c2db80a906572df5dc40cd7d5eccfa94226103 Mon Sep 17 00:00:00 2001
From: Marvin Liu <yong.liu at intel.com>
Date: Mon, 4 Nov 2019 18:13:22 +0800
Subject: [PATCH] vhost: fix virtqueue not accessible

[ upstream commit bc42ca1787233617e5ce8a848e268784884a8d07 ]

Log feature is disabled in vhost user, so that log address was invalid
when checking. Check whether log address is valid can work around it.
Log address should also be translated in packed ring virtqueue.

Fixes: fbda9f145927 ("vhost: translate incoming log address to GPA")

Signed-off-by: Marvin Liu <yong.liu at intel.com>
Reviewed-by: Adrian Moreno <amorenoz at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/vhost_user.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index f039ce8706..7bb2868011 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -502,6 +502,17 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
 	struct vhost_vring_addr *addr = &vq->ring_addrs;
 	uint64_t len;
 
+	if (addr->flags & (1 << VHOST_VRING_F_LOG)) {
+		vq->log_guest_addr =
+			translate_log_addr(dev, vq, addr->log_guest_addr);
+		if (vq->log_guest_addr == 0) {
+			RTE_LOG(DEBUG, VHOST_CONFIG,
+				"(%d) failed to map log_guest_addr.\n",
+				dev->vid);
+			return dev;
+		}
+	}
+
 	/* The addresses are converted from QEMU virtual to Vhost virtual. */
 	if (vq->desc && vq->avail && vq->used)
 		return dev;
@@ -553,14 +564,6 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
 		vq->last_avail_idx = vq->used->idx;
 	}
 
-	vq->log_guest_addr =
-		translate_log_addr(dev, vq, addr->log_guest_addr);
-	if (vq->log_guest_addr == 0) {
-		RTE_LOG(DEBUG, VHOST_CONFIG,
-			"(%d) failed to map log_guest_addr .\n",
-			dev->vid);
-		return dev;
-	}
 	vq->access_ok = 1;
 
 	LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:30.861378103 +0000
+++ 0114-vhost-fix-virtqueue-not-accessible.patch	2019-12-19 14:32:26.289301474 +0000
@@ -1,29 +1,30 @@
-From bc42ca1787233617e5ce8a848e268784884a8d07 Mon Sep 17 00:00:00 2001
+From f1c2db80a906572df5dc40cd7d5eccfa94226103 Mon Sep 17 00:00:00 2001
 From: Marvin Liu <yong.liu at intel.com>
 Date: Mon, 4 Nov 2019 18:13:22 +0800
 Subject: [PATCH] vhost: fix virtqueue not accessible
 
+[ upstream commit bc42ca1787233617e5ce8a848e268784884a8d07 ]
+
 Log feature is disabled in vhost user, so that log address was invalid
 when checking. Check whether log address is valid can work around it.
 Log address should also be translated in packed ring virtqueue.
 
 Fixes: fbda9f145927 ("vhost: translate incoming log address to GPA")
-Cc: stable at dpdk.org
 
 Signed-off-by: Marvin Liu <yong.liu at intel.com>
 Reviewed-by: Adrian Moreno <amorenoz at redhat.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 ---
- lib/librte_vhost/vhost_user.c | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
+ lib/librte_vhost/vhost_user.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
 
 diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
-index 3f649c802c..cc660e03a8 100644
+index f039ce8706..7bb2868011 100644
 --- a/lib/librte_vhost/vhost_user.c
 +++ b/lib/librte_vhost/vhost_user.c
-@@ -653,11 +653,21 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
+@@ -502,6 +502,17 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
  	struct vhost_vring_addr *addr = &vq->ring_addrs;
- 	uint64_t len, expected_len;
+ 	uint64_t len;
  
 +	if (addr->flags & (1 << VHOST_VRING_F_LOG)) {
 +		vq->log_guest_addr =
@@ -36,15 +37,10 @@
 +		}
 +	}
 +
- 	if (vq_is_packed(dev)) {
- 		len = sizeof(struct vring_packed_desc) * vq->size;
- 		vq->desc_packed = (struct vring_packed_desc *)(uintptr_t)
- 			ring_addr_to_vva(dev, vq, addr->desc_user_addr, &len);
--		vq->log_guest_addr = 0;
- 		if (vq->desc_packed == NULL ||
- 				len != sizeof(struct vring_packed_desc) *
- 				vq->size) {
-@@ -753,14 +763,6 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
+ 	/* The addresses are converted from QEMU virtual to Vhost virtual. */
+ 	if (vq->desc && vq->avail && vq->used)
+ 		return dev;
+@@ -553,14 +564,6 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
  		vq->last_avail_idx = vq->used->idx;
  	}
  
@@ -58,7 +54,7 @@
 -	}
  	vq->access_ok = 1;
  
- 	VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
+ 	LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
 -- 
 2.20.1