From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Parav Pandit <parav@mellanox.com>,
Juan Quintela <quintela@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
virtualization@lists.linux-foundation.org,
Harpreet Singh Anand <hanand@xilinx.com>,
Xiao W Wang <xiao.w.wang@intel.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Eli Cohen <eli@mellanox.com>, Eric Blake <eblake@redhat.com>,
Michael Lilja <ml@napatech.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [RFC PATCH v4 12/20] virtio: Add vhost_shadow_vq_get_vring_addr
Date: Fri, 1 Oct 2021 09:05:55 +0200 [thread overview]
Message-ID: <20211001070603.307037-13-eperezma@redhat.com> (raw)
In-Reply-To: <20211001070603.307037-1-eperezma@redhat.com>
It reports the shadow virtqueue address from qemu virtual address space
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 4 +++
hw/virtio/vhost-shadow-virtqueue.c | 50 ++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-virtqueue.h
index 237cfceb9c..2df3d117f5 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -16,6 +16,10 @@ typedef struct VhostShadowVirtqueue VhostShadowVirtqueue;
EventNotifier *vhost_svq_get_svq_call_notifier(VhostShadowVirtqueue *svq);
void vhost_svq_set_guest_call_notifier(VhostShadowVirtqueue *svq, int call_fd);
+void vhost_svq_get_vring_addr(const VhostShadowVirtqueue *svq,
+ struct vhost_vring_addr *addr);
+size_t vhost_svq_driver_area_size(const VhostShadowVirtqueue *svq);
+size_t vhost_svq_device_area_size(const VhostShadowVirtqueue *svq);
bool vhost_svq_start(struct vhost_dev *dev, unsigned idx,
VhostShadowVirtqueue *svq);
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
index 3fe129cf63..5c1899f6af 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -18,6 +18,9 @@
/* Shadow virtqueue to relay notifications */
typedef struct VhostShadowVirtqueue {
+ /* Shadow vring */
+ struct vring vring;
+
/* Shadow kick notifier, sent to vhost */
EventNotifier kick_notifier;
/* Shadow call notifier, sent to vhost */
@@ -38,6 +41,9 @@ typedef struct VhostShadowVirtqueue {
/* Virtio queue shadowing */
VirtQueue *vq;
+
+ /* Virtio device */
+ VirtIODevice *vdev;
} VhostShadowVirtqueue;
/* Forward guest notifications */
@@ -93,6 +99,35 @@ void vhost_svq_set_guest_call_notifier(VhostShadowVirtqueue *svq, int call_fd)
event_notifier_init_fd(&svq->guest_call_notifier, call_fd);
}
+/*
+ * Get the shadow vq vring address.
+ * @svq Shadow virtqueue
+ * @addr Destination to store address
+ */
+void vhost_svq_get_vring_addr(const VhostShadowVirtqueue *svq,
+ struct vhost_vring_addr *addr)
+{
+ addr->desc_user_addr = (uint64_t)svq->vring.desc;
+ addr->avail_user_addr = (uint64_t)svq->vring.avail;
+ addr->used_user_addr = (uint64_t)svq->vring.used;
+}
+
+size_t vhost_svq_driver_area_size(const VhostShadowVirtqueue *svq)
+{
+ uint16_t vq_idx = virtio_get_queue_index(svq->vq);
+ size_t desc_size = virtio_queue_get_desc_size(svq->vdev, vq_idx);
+ size_t avail_size = virtio_queue_get_avail_size(svq->vdev, vq_idx);
+
+ return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size);
+}
+
+size_t vhost_svq_device_area_size(const VhostShadowVirtqueue *svq)
+{
+ uint16_t vq_idx = virtio_get_queue_index(svq->vq);
+ size_t used_size = virtio_queue_get_used_size(svq->vdev, vq_idx);
+ return ROUND_UP(used_size, qemu_real_host_page_size);
+}
+
/*
* Restore the vhost guest to host notifier, i.e., disables svq effect.
*/
@@ -178,6 +213,10 @@ void vhost_svq_stop(struct vhost_dev *dev, unsigned idx,
VhostShadowVirtqueue *vhost_svq_new(struct vhost_dev *dev, int idx)
{
int vq_idx = dev->vq_index + idx;
+ unsigned num = virtio_queue_get_num(dev->vdev, vq_idx);
+ size_t desc_size = virtio_queue_get_desc_size(dev->vdev, vq_idx);
+ size_t driver_size;
+ size_t device_size;
g_autofree VhostShadowVirtqueue *svq = g_new0(VhostShadowVirtqueue, 1);
int r;
@@ -196,6 +235,15 @@ VhostShadowVirtqueue *vhost_svq_new(struct vhost_dev *dev, int idx)
}
svq->vq = virtio_get_queue(dev->vdev, vq_idx);
+ svq->vdev = dev->vdev;
+ driver_size = vhost_svq_driver_area_size(svq);
+ device_size = vhost_svq_device_area_size(svq);
+ svq->vring.num = num;
+ svq->vring.desc = qemu_memalign(qemu_real_host_page_size, driver_size);
+ svq->vring.avail = (void *)((char *)svq->vring.desc + desc_size);
+ memset(svq->vring.desc, 0, driver_size);
+ svq->vring.used = qemu_memalign(qemu_real_host_page_size, device_size);
+ memset(svq->vring.used, 0, device_size);
event_notifier_set_handler(&svq->call_notifier,
vhost_svq_handle_call);
return g_steal_pointer(&svq);
@@ -215,5 +263,7 @@ void vhost_svq_free(VhostShadowVirtqueue *vq)
event_notifier_cleanup(&vq->kick_notifier);
event_notifier_set_handler(&vq->call_notifier, NULL);
event_notifier_cleanup(&vq->call_notifier);
+ qemu_vfree(vq->vring.desc);
+ qemu_vfree(vq->vring.used);
g_free(vq);
}
--
2.27.0
next prev parent reply other threads:[~2021-10-01 7:17 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 7:05 [RFC PATCH v4 00/20] vDPA shadow virtqueue Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 01/20] virtio: Add VIRTIO_F_QUEUE_STATE Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 02/20] virtio-net: Honor VIRTIO_CONFIG_S_DEVICE_STOPPED Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 03/20] virtio: Add virtio_queue_is_host_notifier_enabled Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 04/20] vhost: Make vhost_virtqueue_{start,stop} public Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 05/20] vhost: Add x-vhost-enable-shadow-vq qmp Eugenio Pérez
2021-10-12 5:18 ` Markus Armbruster
2021-10-12 13:08 ` Eugenio Perez Martin
2021-10-12 13:45 ` Markus Armbruster
2021-10-14 12:01 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 06/20] vhost: Add VhostShadowVirtqueue Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 07/20] vdpa: Register vdpa devices in a list Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 08/20] vhost: Route guest->host notification through shadow virtqueue Eugenio Pérez
2021-10-12 5:19 ` Markus Armbruster
2021-10-12 13:09 ` Eugenio Perez Martin
2021-10-13 3:27 ` Jason Wang
2021-10-14 12:00 ` Eugenio Perez Martin
2021-10-15 3:45 ` Jason Wang
2021-10-15 9:08 ` Eugenio Perez Martin
2021-10-15 18:21 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 09/20] vdpa: Save call_fd in vhost-vdpa Eugenio Pérez
2021-10-13 3:43 ` Jason Wang
2021-10-14 12:11 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 10/20] vhost-vdpa: Take into account SVQ in vhost_vdpa_set_vring_call Eugenio Pérez
2021-10-13 3:43 ` Jason Wang
2021-10-14 12:18 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 11/20] vhost: Route host->guest notification through shadow virtqueue Eugenio Pérez
2021-10-13 3:47 ` Jason Wang
2021-10-14 16:39 ` Eugenio Perez Martin
2021-10-15 4:42 ` Jason Wang
2021-10-19 8:39 ` Eugenio Perez Martin
2021-10-20 2:01 ` Jason Wang
2021-10-20 6:36 ` Eugenio Perez Martin
2021-10-13 3:49 ` Jason Wang
2021-10-14 15:58 ` Eugenio Perez Martin
2021-10-15 4:24 ` Jason Wang
2021-10-01 7:05 ` Eugenio Pérez [this message]
2021-10-13 3:54 ` [RFC PATCH v4 12/20] virtio: Add vhost_shadow_vq_get_vring_addr Jason Wang
2021-10-14 14:39 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 13/20] vdpa: Save host and guest features Eugenio Pérez
2021-10-13 3:56 ` Jason Wang
2021-10-14 15:03 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 14/20] vhost: Add vhost_svq_valid_device_features to shadow vq Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 15/20] vhost: Shadow virtqueue buffers forwarding Eugenio Pérez
2021-10-12 5:21 ` Markus Armbruster
2021-10-12 13:28 ` Eugenio Perez Martin
2021-10-12 13:48 ` Markus Armbruster
2021-10-14 15:04 ` Eugenio Perez Martin
2021-10-13 4:31 ` Jason Wang
2021-10-14 17:56 ` Eugenio Perez Martin
2021-10-15 4:23 ` Jason Wang
2021-10-15 9:33 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 16/20] vhost: Check for device VRING_USED_F_NO_NOTIFY at shadow virtqueue kick Eugenio Pérez
2021-10-13 4:35 ` Jason Wang
2021-10-15 6:17 ` Eugenio Perez Martin
2021-10-01 7:06 ` [RFC PATCH v4 17/20] vhost: Use VRING_AVAIL_F_NO_INTERRUPT at device call on shadow virtqueue Eugenio Pérez
2021-10-13 4:36 ` Jason Wang
2021-10-15 6:22 ` Eugenio Perez Martin
2021-10-01 7:06 ` [RFC PATCH v4 18/20] vhost: Add VhostIOVATree Eugenio Pérez
2021-10-19 8:32 ` Jason Wang
2021-10-19 9:22 ` Jason Wang
2021-10-20 7:54 ` Eugenio Perez Martin
2021-10-20 9:01 ` Jason Wang
2021-10-20 12:06 ` Eugenio Perez Martin
2021-10-21 2:34 ` Jason Wang
2021-10-21 7:03 ` Eugenio Perez Martin
2021-10-21 8:12 ` Jason Wang
2021-10-21 14:33 ` Eugenio Perez Martin
2021-10-26 4:29 ` Jason Wang
2021-10-20 7:36 ` Eugenio Perez Martin
2021-10-01 7:06 ` [RFC PATCH v4 19/20] vhost: Use a tree to store memory mappings Eugenio Pérez
2021-10-01 7:06 ` [RFC PATCH v4 20/20] vdpa: Add custom IOTLB translations to SVQ Eugenio Pérez
2021-10-13 5:34 ` Jason Wang
2021-10-15 7:27 ` Eugenio Perez Martin
2021-10-15 7:37 ` Jason Wang
2021-10-15 8:20 ` Eugenio Perez Martin
2021-10-15 8:37 ` Jason Wang
2021-10-15 9:14 ` Eugenio Perez Martin
2021-10-19 9:24 ` Jason Wang
2021-10-19 10:28 ` Eugenio Perez Martin
2021-10-20 2:02 ` Jason Wang
2021-10-20 2:07 ` Jason Wang
2021-10-20 6:51 ` Eugenio Perez Martin
2021-10-20 9:03 ` Jason Wang
2021-10-20 11:56 ` Eugenio Perez Martin
2021-10-21 2:38 ` Jason Wang
2021-10-26 4:32 ` Jason Wang
2021-10-12 3:59 ` [RFC PATCH v4 00/20] vDPA shadow virtqueue Jason Wang
2021-10-12 4:06 ` Jason Wang
2021-10-12 9:09 ` Eugenio Perez Martin
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=20211001070603.307037-13-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=eli@mellanox.com \
--cc=hanand@xilinx.com \
--cc=jasowang@redhat.com \
--cc=ml@napatech.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xiao.w.wang@intel.com \
/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).