[dpdk-stable] patch 'vhost: translate incoming log address to GPA' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 12/16/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.

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/124653b939870843c02ff11ef39ea84547a7cab3

Thanks.

Kevin.

---
>From 124653b939870843c02ff11ef39ea84547a7cab3 Mon Sep 17 00:00:00 2001
From: Adrian Moreno <amorenoz at redhat.com>
Date: Wed, 9 Oct 2019 13:54:30 +0200
Subject: [PATCH] vhost: translate incoming log address to GPA

[ upstream commit fbda9f1459271435df3ea2575ca5845d04733466 ]

When IOMMU is enabled the incoming log address is in IOVA space. In that
case, look in IOTLB table and translate the resulting HVA to GPA.

If IOMMU is not enabled, the incoming log address is already a GPA so no
transformation is needed.

Fixes: 69c90e98f483 ("vhost: enable IOMMU support")

Signed-off-by: Adrian Moreno <amorenoz at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/vhost.c      |  1 +
 lib/librte_vhost/vhost.h      | 20 +++++++++++++++++
 lib/librte_vhost/vhost_user.c | 42 ++++++++++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index f7d132cd4..5dc82197b 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -219,4 +219,5 @@ vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq)
 	vq->avail = NULL;
 	vq->used = NULL;
+	vq->log_guest_addr = 0;
 
 	if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index bb9cff9f7..daccf5c65 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -605,4 +605,24 @@ gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size)
 }
 
+static __rte_always_inline uint64_t
+hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len)
+{
+	struct rte_vhost_mem_region *r;
+	uint32_t i;
+
+	if (unlikely(!dev || !dev->mem))
+		return 0;
+
+	for (i = 0; i < dev->mem->nregions; i++) {
+		r = &dev->mem->regions[i];
+
+		if (vva >= r->host_user_addr &&
+		    vva + len <  r->host_user_addr + r->size) {
+			return r->guest_phys_addr + vva - r->host_user_addr;
+		}
+	}
+	return 0;
+}
+
 static __rte_always_inline struct virtio_net *
 get_device(int vid)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 0d318cd93..6cc842447 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -631,4 +631,37 @@ ring_addr_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
 }
 
+/*
+ * Converts vring log address to GPA
+ * If IOMMU is enabled, the log address is IOVA
+ * If IOMMU not enabled, the log address is already GPA
+ */
+static uint64_t
+translate_log_addr(struct virtio_net *dev, struct vhost_virtqueue *vq,
+		uint64_t log_addr)
+{
+	if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) {
+		const uint64_t exp_size = sizeof(struct vring_used) +
+			sizeof(struct vring_used_elem) * vq->size;
+		uint64_t hva, gpa;
+		uint64_t size = exp_size;
+
+		hva = vhost_iova_to_vva(dev, vq, log_addr,
+					&size, VHOST_ACCESS_RW);
+		if (size != exp_size)
+			return 0;
+
+		gpa = hva_to_gpa(dev, hva, exp_size);
+		if (!gpa) {
+			RTE_LOG(ERR, VHOST_CONFIG,
+				"VQ: Failed to find GPA for log_addr: 0x%" PRIx64 " hva: 0x%" PRIx64 "\n",
+				log_addr, hva);
+			return 0;
+		}
+		return gpa;
+
+	} else
+		return log_addr;
+}
+
 static struct virtio_net *
 translate_ring_addresses(struct virtio_net *dev, int vq_index)
@@ -738,5 +771,12 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
 	}
 
-	vq->log_guest_addr = addr->log_guest_addr;
+	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;
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:39.309102335 +0000
+++ 0003-vhost-translate-incoming-log-address-to-GPA.patch	2019-12-10 14:49:38.983459054 +0000
@@ -1 +1 @@
-From fbda9f1459271435df3ea2575ca5845d04733466 Mon Sep 17 00:00:00 2001
+From 124653b939870843c02ff11ef39ea84547a7cab3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fbda9f1459271435df3ea2575ca5845d04733466 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index cea44df8c..76e753475 100644
+index f7d132cd4..5dc82197b 100644
@@ -27 +28 @@
-@@ -383,4 +383,5 @@ vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq)
+@@ -219,4 +219,5 @@ vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq)
@@ -34 +35 @@
-index 099a0d3f6..7a314717d 100644
+index bb9cff9f7..daccf5c65 100644
@@ -37 +38 @@
-@@ -448,4 +448,24 @@ gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size)
+@@ -605,4 +605,24 @@ gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size)
@@ -63 +64 @@
-index ce4e9fb32..5ae561e55 100644
+index 0d318cd93..6cc842447 100644
@@ -66 +67 @@
-@@ -576,4 +576,37 @@ ring_addr_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
+@@ -631,4 +631,37 @@ ring_addr_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
@@ -104 +105 @@
-@@ -683,5 +716,12 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
+@@ -738,5 +771,12 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)