| From 89a67e0ce3e4c7b9f9b2d4cfb9fc5eeebc5643ac Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com> |
| Date: Tue, 23 Aug 2022 20:20:08 +0200 |
| Subject: [PATCH 10/23] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Eugenio Pérez <eperezma@redhat.com> |
| RH-MergeRequest: 116: vdpa: Restore device state on destination |
| RH-Bugzilla: 2114060 |
| RH-Acked-by: Cindy Lu <lulu@redhat.com> |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| RH-Commit: [9/21] 4420134d7be60fa8b04dc9a56566524bf8daddd4 (eperezmartin/qemu-kvm) |
| Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114060 |
| Upstream status: git@github.com:jasowang/qemu.git net-next |
| |
| Reduce code duplication. |
| |
| Signed-off-by: Eugenio Pérez <eperezma@redhat.com> |
| Acked-by: Jason Wang <jasowang@redhat.com> |
| Signed-off-by: Jason Wang <jasowang@redhat.com> |
| (cherry picked from commit 5a92452da95b2edfbffdd42ddc2612a7d09a5db0) |
| |
| hw/virtio/vhost-vdpa.c | 17 ++++++++--------- |
| 1 file changed, 8 insertions(+), 9 deletions(-) |
| |
| diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c |
| index 8eddf39f2a..0bea1e1eb9 100644 |
| |
| |
| @@ -882,10 +882,12 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev *dev, |
| /** |
| * Unmap a SVQ area in the device |
| */ |
| -static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, |
| - const DMAMap *needle) |
| +static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, hwaddr addr) |
| { |
| - const DMAMap *result = vhost_iova_tree_find_iova(v->iova_tree, needle); |
| + const DMAMap needle = { |
| + .translated_addr = addr, |
| + }; |
| + const DMAMap *result = vhost_iova_tree_find_iova(v->iova_tree, &needle); |
| hwaddr size; |
| int r; |
| |
| @@ -907,17 +909,14 @@ static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, |
| static void vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev, |
| const VhostShadowVirtqueue *svq) |
| { |
| - DMAMap needle = {}; |
| struct vhost_vdpa *v = dev->opaque; |
| struct vhost_vring_addr svq_addr; |
| |
| vhost_svq_get_vring_addr(svq, &svq_addr); |
| |
| - needle.translated_addr = svq_addr.desc_user_addr; |
| - vhost_vdpa_svq_unmap_ring(v, &needle); |
| + vhost_vdpa_svq_unmap_ring(v, svq_addr.desc_user_addr); |
| |
| - needle.translated_addr = svq_addr.used_user_addr; |
| - vhost_vdpa_svq_unmap_ring(v, &needle); |
| + vhost_vdpa_svq_unmap_ring(v, svq_addr.used_user_addr); |
| } |
| |
| /** |
| @@ -995,7 +994,7 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *dev, |
| ok = vhost_vdpa_svq_map_ring(v, &device_region, errp); |
| if (unlikely(!ok)) { |
| error_prepend(errp, "Cannot create vq device region: "); |
| - vhost_vdpa_svq_unmap_ring(v, &driver_region); |
| + vhost_vdpa_svq_unmap_ring(v, driver_region.translated_addr); |
| } |
| addr->used_user_addr = device_region.iova; |
| |
| -- |
| 2.31.1 |
| |