qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cindy Lu <lulu@redhat.com>, Gautam Dawar <gdawar@xilinx.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Laurent Vivier <lvivier@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	"Gonglei (Arei)" <arei.gonglei@huawei.com>,
	Zhu Lingshan <lingshan.zhu@intel.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Liuxiangdong <liuxiangdong5@huawei.com>,
	Jason Wang <jasowang@redhat.com>,
	Stefano Garzarella <sgarzare@redhat.com>,
	Eli Cohen <eli@mellanox.com>,
	Harpreet Singh Anand <hanand@xilinx.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Parav Pandit <parav@mellanox.com>
Subject: [PATCH v4 14/19] vdpa: Export vhost_vdpa_dma_map and unmap calls
Date: Mon, 18 Jul 2022 12:29:44 +0200	[thread overview]
Message-ID: <20220718102949.2868267-15-eperezma@redhat.com> (raw)
In-Reply-To: <20220718102949.2868267-1-eperezma@redhat.com>

Shadow CVQ will copy buffers on qemu VA, so we avoid TOCTOU attacks from
the guest that could set a different state in qemu device model and vdpa
device.

To do so, it needs to be able to map these new buffers to the device.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
 include/hw/virtio/vhost-vdpa.h | 4 ++++
 hw/virtio/vhost-vdpa.c         | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
index a29dbb3f53..7214eb47dc 100644
--- a/include/hw/virtio/vhost-vdpa.h
+++ b/include/hw/virtio/vhost-vdpa.h
@@ -39,4 +39,8 @@ typedef struct vhost_vdpa {
     VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX];
 } VhostVDPA;
 
+int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
+                       void *vaddr, bool readonly);
+int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova, hwaddr size);
+
 #endif
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 0b13e98471..96997210be 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -71,8 +71,8 @@ static bool vhost_vdpa_listener_skipped_section(MemoryRegionSection *section,
     return false;
 }
 
-static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
-                              void *vaddr, bool readonly)
+int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
+                       void *vaddr, bool readonly)
 {
     struct vhost_msg_v2 msg = {};
     int fd = v->device_fd;
@@ -97,8 +97,7 @@ static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
     return ret;
 }
 
-static int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova,
-                                hwaddr size)
+int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova, hwaddr size)
 {
     struct vhost_msg_v2 msg = {};
     int fd = v->device_fd;
-- 
2.31.1



  parent reply	other threads:[~2022-07-18 10:40 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-18 10:29 [PATCH v4 00/19] vdpa net devices Rx filter change notification with Shadow VQ Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 01/19] vhost: move descriptor translation to vhost_svq_vring_write_descs Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 02/19] virtio-net: Expose MAC_TABLE_ENTRIES Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 03/19] virtio-net: Expose ctrl virtqueue logic Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 04/19] vhost: Reorder vhost_svq_kick Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 05/19] vhost: Move vhost_svq_kick call to vhost_svq_add Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 06/19] vhost: Check for queue full at vhost_svq_add Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 07/19] vhost: Decouple vhost_svq_add from VirtQueueElement Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 08/19] vhost: Add SVQDescState Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 09/19] vhost: Track number of descs in SVQDescState Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 10/19] vhost: add vhost_svq_push_elem Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 11/19] vhost: Expose vhost_svq_add Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 12/19] vhost: add vhost_svq_poll Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 13/19] vhost: Add svq avail_handler callback Eugenio Pérez
2022-07-18 10:29 ` Eugenio Pérez [this message]
2022-07-18 10:29 ` [PATCH v4 15/19] vdpa: manual forward CVQ buffers Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 16/19] vdpa: Buffer CVQ support on shadow virtqueue Eugenio Pérez
2022-07-19  2:39   ` Jason Wang
2022-07-19  5:42     ` Eugenio Perez Martin
2022-07-19  6:45       ` Eugenio Perez Martin
2022-07-18 10:29 ` [PATCH v4 17/19] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs Eugenio Pérez
2022-07-18 10:29 ` [PATCH v4 18/19] vdpa: Add device migration blocker Eugenio Pérez
2022-07-19  2:36   ` Jason Wang
2022-07-18 10:29 ` [PATCH v4 19/19] vdpa: Add x-svq to NetdevVhostVDPAOptions Eugenio Pérez

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=20220718102949.2868267-15-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=armbru@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=eblake@redhat.com \
    --cc=eli@mellanox.com \
    --cc=gdawar@xilinx.com \
    --cc=hanand@xilinx.com \
    --cc=jasowang@redhat.com \
    --cc=lingshan.zhu@intel.com \
    --cc=liuxiangdong5@huawei.com \
    --cc=lulu@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=parav@mellanox.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.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).