[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/13] vdpa: move backend_cap to vhost_vdpa_shared
From: |
Eugenio Pérez |
Subject: |
[PATCH v4 08/13] vdpa: move backend_cap to vhost_vdpa_shared |
Date: |
Thu, 21 Dec 2023 18:43:17 +0100 |
Next patches will register the vhost_vdpa memory listener while the VM
is migrating at the destination, so we can map the memory to the device
before stopping the VM at the source. The main goal is to reduce the
downtime.
However, the destination QEMU is unaware of which vhost_vdpa device will
register its memory_listener. If the source guest has CVQ enabled, it
will be the CVQ device. Otherwise, it will be the first one.
Move the backend_cap member to VhostVDPAShared so all vhost_vdpa can use
it, rather than always in the first / last vhost_vdpa.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
include/hw/virtio/vhost-vdpa.h | 3 +++
hw/virtio/vhost-vdpa.c | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
index 05219bbcf7..11ac14085a 100644
--- a/include/hw/virtio/vhost-vdpa.h
+++ b/include/hw/virtio/vhost-vdpa.h
@@ -38,6 +38,9 @@ typedef struct vhost_vdpa_shared {
/* IOVA mapping used by the Shadow Virtqueue */
VhostIOVATree *iova_tree;
+ /* Copy of backend features */
+ uint64_t backend_cap;
+
bool iotlb_batch_begin_sent;
/* Vdpa must send shadow addresses as IOTLB key for data queues, not GPA */
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 85b13e09f4..458e46befd 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -161,7 +161,7 @@ static void vhost_vdpa_listener_begin_batch(struct
vhost_vdpa *v)
static void vhost_vdpa_iotlb_batch_begin_once(struct vhost_vdpa *v)
{
- if (v->dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH) &&
+ if (v->shared->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH) &&
!v->shared->iotlb_batch_begin_sent) {
vhost_vdpa_listener_begin_batch(v);
}
@@ -172,11 +172,10 @@ static void vhost_vdpa_iotlb_batch_begin_once(struct
vhost_vdpa *v)
static void vhost_vdpa_listener_commit(MemoryListener *listener)
{
struct vhost_vdpa *v = container_of(listener, struct vhost_vdpa, listener);
- struct vhost_dev *dev = v->dev;
struct vhost_msg_v2 msg = {};
int fd = v->shared->device_fd;
- if (!(dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH))) {
+ if (!(v->shared->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH))) {
return;
}
@@ -834,6 +833,8 @@ static int vhost_vdpa_set_features(struct vhost_dev *dev,
static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev)
{
+ struct vhost_vdpa *v = dev->opaque;
+
uint64_t features;
uint64_t f = 0x1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2 |
0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH |
@@ -855,6 +856,7 @@ static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev)
}
dev->backend_cap = features;
+ v->shared->backend_cap = features;
return 0;
}
--
2.39.3
- [PATCH v4 00/13] Consolidate common vdpa members in VhostVDPAShared, Eugenio Pérez, 2023/12/21
- [PATCH v4 01/13] vdpa: add VhostVDPAShared, Eugenio Pérez, 2023/12/21
- [PATCH v4 02/13] vdpa: move iova tree to the shared struct, Eugenio Pérez, 2023/12/21
- [PATCH v4 03/13] vdpa: move iova_range to vhost_vdpa_shared, Eugenio Pérez, 2023/12/21
- [PATCH v4 04/13] vdpa: move shadow_data to vhost_vdpa_shared, Eugenio Pérez, 2023/12/21
- [PATCH v4 05/13] vdpa: use vdpa shared for tracing, Eugenio Pérez, 2023/12/21
- [PATCH v4 09/13] vdpa: remove msg type of vhost_vdpa, Eugenio Pérez, 2023/12/21
- [PATCH v4 08/13] vdpa: move backend_cap to vhost_vdpa_shared,
Eugenio Pérez <=
- [PATCH v4 06/13] vdpa: move file descriptor to vhost_vdpa_shared, Eugenio Pérez, 2023/12/21
- [PATCH v4 07/13] vdpa: move iotlb_batch_begin_sent to vhost_vdpa_shared, Eugenio Pérez, 2023/12/21
- [PATCH v4 11/13] vdpa: use VhostVDPAShared in vdpa_dma_map and unmap, Eugenio Pérez, 2023/12/21
- [PATCH v4 10/13] vdpa: move iommu_list to vhost_vdpa_shared, Eugenio Pérez, 2023/12/21
- [PATCH v4 12/13] vdpa: use dev_shared in vdpa_iommu, Eugenio Pérez, 2023/12/21
- [PATCH v4 13/13] vdpa: move memory listener to vhost_vdpa_shared, Eugenio Pérez, 2023/12/21