DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, remy.horton@intel.com, tiwei.bie@intel.com,
	yliu@fridaylinux.org
Cc: mst@redhat.com, jfreiman@redhat.com, vkaplans@redhat.com,
	jasowang@redhat.com, Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v2 11/19] vhost: introduce guest IOVA to backend VA helper
Date: Sun, 24 Sep 2017 18:19:13 +0200	[thread overview]
Message-ID: <20170924161921.30010-12-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20170924161921.30010-1-maxime.coquelin@redhat.com>

This patch introduces vhost_iova_to_vva() function to translate
guest's IO virtual addresses to backend's virtual addresses.

When IOMMU is enabled, the IOTLB cache is queried to get the
translation. If missing from the IOTLB cache, an IOTLB_MISS request
is sent to Qemu, and IOTLB cache is queried again on IOTLB event
notification.

When IOMMU is disabled, the passed address is a guest's physical
address, so the legacy rte_vhost_gpa_to_vva() API is used.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost.c | 24 ++++++++++++++++++++++++
 lib/librte_vhost/vhost.h | 13 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 2493a7992..6f243534e 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -47,12 +47,36 @@
 #include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_vhost.h>
+#include <rte_rwlock.h>
 
 #include "iotlb.h"
 #include "vhost.h"
+#include "vhost_user.h"
 
 struct virtio_net *vhost_devices[MAX_VHOST_DEVICE];
 
+uint64_t __vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
+			uint64_t iova, uint64_t size, uint8_t perm)
+{
+	uint64_t vva, tmp_size;
+
+	if (unlikely(!size))
+		return 0;
+
+	tmp_size = size;
+
+	vva = vhost_user_iotlb_cache_find(vq, iova, &tmp_size, perm);
+	if (tmp_size == size)
+		return vva;
+
+	if (!vhost_user_iotlb_pending_miss(vq, iova + tmp_size, perm)) {
+		vhost_user_iotlb_pending_insert(vq, iova + tmp_size, perm);
+		vhost_user_iotlb_miss(dev, iova + tmp_size, perm);
+	}
+
+	return 0;
+}
+
 struct virtio_net *
 get_device(int vid)
 {
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 8131bef9c..79351c66f 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -375,4 +375,17 @@ struct vhost_device_ops const *vhost_driver_callback_get(const char *path);
  */
 void vhost_backend_cleanup(struct virtio_net *dev);
 
+uint64_t __vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
+			uint64_t iova, uint64_t size, uint8_t perm);
+
+static __rte_always_inline uint64_t
+vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
+			uint64_t iova, uint64_t size, uint8_t perm)
+{
+	if (!(dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))
+		return rte_vhost_gpa_to_vva(dev->mem, iova);
+
+	return __vhost_iova_to_vva(dev, vq, iova, size, perm);
+}
+
 #endif /* _VHOST_NET_CDEV_H_ */
-- 
2.13.5

  parent reply	other threads:[~2017-09-24 16:20 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-24 16:19 [dpdk-dev] [PATCH v2 00/19] Vhost-user: Implement device IOTLB support Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 01/19] Revert "vhost: workaround MQ fails to startup" Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 02/19] vhost: make error handling consistent in rx path Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 03/19] vhost: prepare send_vhost_message() to slave requests Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 04/19] vhost: add support to slave requests channel Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 05/19] vhost: declare missing IOMMU-related definitions for old kernels Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 06/19] vhost: add iotlb helper functions Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 07/19] vhost: iotlb: add pending miss request list and helpers Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 08/19] vhost-user: add support to IOTLB miss slave requests Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 09/19] vhost: initialize vrings IOTLB caches Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 10/19] vhost-user: handle IOTLB update and invalidate requests Maxime Coquelin
2017-09-24 16:19 ` Maxime Coquelin [this message]
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 12/19] vhost: use the guest IOVA to host VA helper Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 13/19] vhost: enable rings at the right time Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 14/19] vhost: don't dereference invalid dev pointer after its reallocation Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 15/19] vhost: postpone rings addresses translation Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 16/19] vhost-user: translate ring addresses when IOMMU enabled Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 17/19] vhost-user: iommu: postpone device creation until ring are mapped Maxime Coquelin
2017-09-29 12:34   ` Yuanhan Liu
2017-09-29 12:51     ` Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 18/19] vhost: iommu: Invalidate vring in case of matching IOTLB invalidate Maxime Coquelin
2017-09-24 16:19 ` [dpdk-dev] [PATCH v2 19/19] vhost: enable IOMMU support Maxime Coquelin
2017-09-29 12:36   ` Yuanhan Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170924161921.30010-12-maxime.coquelin@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=dev@dpdk.org \
    --cc=jasowang@redhat.com \
    --cc=jfreiman@redhat.com \
    --cc=mst@redhat.com \
    --cc=remy.horton@intel.com \
    --cc=tiwei.bie@intel.com \
    --cc=vkaplans@redhat.com \
    --cc=yliu@fridaylinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).