vhost: fix vq dirty bitmap syncing when vIOMMU is enabled
PATCH v2 1/1 vhost: fix vq dirty bitmap syncing when vIOMMU is enabled
When vIOMMU is enabled, the vq->used_phys is actually the IOVA not GPA. So we need to translate it to GPA before the syncing otherwise we may hit the following crash since IOVA could be out of the scope of the GPA log size. This could be noted when using virtio-IOMMU with vhost using 1G memory.
---
Changes since V1:
- Fix the address calculation when used ring is not page aligned
- Fix the length for each round of dirty bitmap syncing
- Use LOG_GUEST_ERROR to log wrong used adddress
- Various other tweaks
--- hw/virtio/vhost.c | 76 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 20 deletions(-)
hw/virtio/vhost.c +56 -20
@@ -20,6 +20,7 @@#include "qemu/range.h" #include "qemu/error-report.h" #include "qemu/memfd.h" +#include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h"
@@ -106,6 +107,24 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, } } +static bool vhost_dev_has_iommu (struct vhost_dev *dev) +{ +VirtIODevice *vdev = dev->vdev; + +/* +* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support +* incremental memory mapping API via IOTLB API. For platform that +* does not have IOMMU, there's no need to enable this feature +* which may cause unnecessary IOTLB miss/update transactions. +*/ +if (vdev) { +return virtio_bus_device_iommu_enabled (vdev) && +virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); + }else { +return false; + } +} + static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, MemoryRegionSection *section, hwaddr first,
@@ -137,8 +156,43 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,continue ; } -vhost_dev_sync_region (dev, section, start_addr, end_addr, vq->used_phys, -range_get_last (vq->used_phys, vq->used_size)); +if (vhost_dev_has_iommu (dev)) { +IOMMUTLBEntry iotlb; +hwaddr used_phys = vq->used_phys, used_size = vq->used_size; +hwaddr phys, s; + +while (used_size) { +rcu_read_lock (); + iotlb =address_space_get_iotlb_entry (dev->vdev->dma_as, + used_phys, + true,MEMTXATTRS_UNSPECIFIED ); +rcu_read_unlock (); + +if (!iotlb.target_as) { +qemu_log_mask (LOG_GUEST_ERROR ,"translation " +"failure for used_phys %" PRIx64"\n" , used_phys); +return -EINVAL ; + } + + phys = iotlb.translated_addr + (used_phys & iotlb.addr_mask); + +/* Distance from start of used ring until last byte of +IOMMU page */ + s = iotlb.addr_mask - (used_phys & iotlb.addr_mask); +/* Size of used ring, or of the part of it until end +of IOMMU page */ + s =MIN (s, used_size -1 ) +1 ; + +vhost_dev_sync_region (dev, section, start_addr, end_addr, phys, +range_get_last (phys, s)); + used_size -= s; + used_phys += s; + } + }else { +vhost_dev_sync_region (dev, section, start_addr, + end_addr, vq->used_phys, +range_get_last (vq->used_phys, vq->used_size)); + } }return 0 ; }
@@ -306,24 +360,6 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static bool vhost_dev_has_iommu (struct vhost_dev *dev) -{ -VirtIODevice *vdev = dev->vdev; - -/* -* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support -* incremental memory mapping API via IOTLB API. For platform that -* does not have IOMMU, there's no need to enable this feature -* which may cause unnecessary IOTLB miss/update transactions. -*/ -if (vdev) { -return virtio_bus_device_iommu_enabled (vdev) && -virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); - }else { -return false; - } -} -static void *vhost_memory_map (struct vhost_dev *dev,hwaddr addr,hwaddr *plen,bool is_write) {
Signature · 1 line
2.25.1
Hi Jason,
Quoted 69 lines · Jason Wang
When vIOMMU is enabled, the
vq->used_physis actually the IOVA not GPA. So we need to translate it to GPA before the syncing otherwise we may hit the following crash since IOVA could be out of the scope of the GPA log size. This could be noted when using virtio-IOMMU with vhost using 1G memory.Fixes c471ad0e9bd46 ("vhost_net: device IOTLB support")Tested-by Lei Yang <[email protected]>Reported-by Yalan Zhang <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes since V1:
- Fix the address calculation when used ring is not page aligned
- Fix the length for each round of dirty bitmap syncing
- UseLOG_GUEST_ERRORto log wrong used adddress
- Various other tweaks--- hw/virtio/vhost.c | 76 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 20 deletions(-)hw/virtio/vhost.c +24
-2@@ -20,6 +20,7 @@#include "qemu/range.h" #include "qemu/error-report.h" #include "qemu/memfd.h" +#include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" @@ -106,6 +107,24 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, } } +static bool vhost_dev_has_iommu (struct vhost_dev *dev) +{ +VirtIODevice *vdev = dev->vdev; + +/* +* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support +* incremental memory mapping API via IOTLB API. For platform that +* does not have IOMMU, there's no need to enable this feature +* which may cause unnecessary IOTLB miss/update transactions. +*/ +if (vdev) { +return virtio_bus_device_iommu_enabled (vdev) && +virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); + }else { +return false; + } +} + static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, MemoryRegionSection *section, hwaddr first,@@ -137,8 +156,43 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,continue ; } -vhost_dev_sync_region (dev, section, start_addr, end_addr, vq->used_phys, -range_get_last (vq->used_phys, vq->used_size)); +if (vhost_dev_has_iommu (dev)) { +IOMMUTLBEntry iotlb; +hwaddr used_phys = vq->used_phys, used_size = vq->used_size; +hwaddr phys, s; +
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 173
Quoted 10 lines
hw/virtio/vhost.c +10
-0+while (used_size) { +rcu_read_lock (); + iotlb =address_space_get_iotlb_entry (dev->vdev->dma_as, + used_phys, + true,MEMTXATTRS_UNSPECIFIED ); +rcu_read_unlock (); + +if (!iotlb.target_as) { +qemu_log_mask (LOG_GUEST_ERROR ,"translation " +"failure for used_phys %" PRIx64"\n" , used_phys);
looks weird to see translation of "used_phys" whereas it is an iova. At least I would reword the msg
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 177
Quoted 4 lines
hw/virtio/vhost.c +4
-0+return -EINVAL ; + } + + phys = iotlb.translated_addr + (used_phys & iotlb.addr_mask);
you may use a local variable storing this offset =
used_phys & iotlb.addr_mask
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 180
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ +/* Distance from start of used ring until last byte of +IOMMU page */
you can avoid checkpatch warnings here
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 183
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ s = iotlb.addr_mask - (used_phys & iotlb.addr_mask); +/* Size of used ring, or of the part of it until end +of IOMMU page */
and here
I would suggest to rewrite this into
s =iotlb.addr_mask - (used_phys & iotlb.addr_mask) + 1 s = MIN(s, used_size);
Quoted 30 lines
hw/virtio/vhost.c +12
-11+ s =MIN (s, used_size -1 ) +1 ; + +vhost_dev_sync_region (dev, section, start_addr, end_addr, phys, +range_get_last (phys, s)); + used_size -= s; + used_phys += s; + } + }else { +vhost_dev_sync_region (dev, section, start_addr, + end_addr, vq->used_phys, +range_get_last (vq->used_phys, vq->used_size)); + } }return 0 ; }@@ -306,24 +360,6 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static bool vhost_dev_has_iommu (struct vhost_dev *dev) -{ -VirtIODevice *vdev = dev->vdev; - -/* -* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support -* incremental memory mapping API via IOTLB API. For platform that -* does not have IOMMU, there's no need to enable this feature -* which may cause unnecessary IOTLB miss/update transactions. -*/ -if (vdev) {
hw/virtio/vhost.c static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) · line 365
Quoted 10 lines
hw/virtio/vhost.c +0
-7-return virtio_bus_device_iommu_enabled (vdev) && -virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); - }else { -return false; - } -} -static void *vhost_memory_map (struct vhost_dev *dev,hwaddr addr,hwaddr *plen,bool is_write) {
Besides,
Eric
Quoted 96 lines · Eric Auger
Hi Jason,
Quoted 69 lines · Jason Wang
When vIOMMU is enabled, the
vq->used_physis actually the IOVA not GPA. So we need to translate it to GPA before the syncing otherwise we may hit the following crash since IOVA could be out of the scope of the GPA log size. This could be noted when using virtio-IOMMU with vhost using 1G memory.Fixes c471ad0e9bd46 ("vhost_net: device IOTLB support")Tested-by Lei Yang <[email protected]>Reported-by Yalan Zhang <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes since V1:
- Fix the address calculation when used ring is not page aligned
- Fix the length for each round of dirty bitmap syncing
- UseLOG_GUEST_ERRORto log wrong used adddress
- Various other tweaks--- hw/virtio/vhost.c | 76 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 20 deletions(-)hw/virtio/vhost.c +24
-2@@ -20,6 +20,7 @@#include "qemu/range.h" #include "qemu/error-report.h" #include "qemu/memfd.h" +#include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" @@ -106,6 +107,24 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, } } +static bool vhost_dev_has_iommu (struct vhost_dev *dev) +{ +VirtIODevice *vdev = dev->vdev; + +/* +* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support +* incremental memory mapping API via IOTLB API. For platform that +* does not have IOMMU, there's no need to enable this feature +* which may cause unnecessary IOTLB miss/update transactions. +*/ +if (vdev) { +return virtio_bus_device_iommu_enabled (vdev) && +virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); + }else { +return false; + } +} + static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, MemoryRegionSection *section, hwaddr first,@@ -137,8 +156,43 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,continue ; } -vhost_dev_sync_region (dev, section, start_addr, end_addr, vq->used_phys, -range_get_last (vq->used_phys, vq->used_size)); +if (vhost_dev_has_iommu (dev)) { +IOMMUTLBEntry iotlb; +hwaddr used_phys = vq->used_phys, used_size = vq->used_size; +hwaddr phys, s; +hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 173
Quoted 10 lines
hw/virtio/vhost.c +10
-0+while (used_size) { +rcu_read_lock (); + iotlb =address_space_get_iotlb_entry (dev->vdev->dma_as, + used_phys, + true,MEMTXATTRS_UNSPECIFIED ); +rcu_read_unlock (); + +if (!iotlb.target_as) { +qemu_log_mask (LOG_GUEST_ERROR ,"translation " +"failure for used_phys %" PRIx64"\n" , used_phys);looks weird to see translation of "
used_phys" whereas it is an iova. At least I would reword the msghw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 177
Quoted 4 lines
hw/virtio/vhost.c +4
-0+return -EINVAL ; + } + + phys = iotlb.translated_addr + (used_phys & iotlb.addr_mask);you may use a local variable storing this offset =
used_phys& iotlb.addr_maskhw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 180
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ +/* Distance from start of used ring until last byte of +IOMMU page */ you can avoid checkpatch warnings here
Quoted 8 lines
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 183
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ s = iotlb.addr_mask - (used_phys & iotlb.addr_mask); +/* Size of used ring, or of the part of it until end +of IOMMU page */ and here
I would suggest to rewrite this into
s =iotlb.addr_mask - (used_phys& iotlb.addr_mask) + 1 s =MIN(s, used_size);
This does not work - if iotlb.addr_mask - (used_phys & iotlb.addr_mask) is all-ones then + 1 gives you 0 and MIN gives you 0. Theoretical but worth being safe here IMHO.
Quoted 45 lines
Quoted 30 lines
hw/virtio/vhost.c +12
-11+ s =MIN (s, used_size -1 ) +1 ; + +vhost_dev_sync_region (dev, section, start_addr, end_addr, phys, +range_get_last (phys, s)); + used_size -= s; + used_phys += s; + } + }else { +vhost_dev_sync_region (dev, section, start_addr, + end_addr, vq->used_phys, +range_get_last (vq->used_phys, vq->used_size)); + } }return 0 ; }@@ -306,24 +360,6 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static bool vhost_dev_has_iommu (struct vhost_dev *dev) -{ -VirtIODevice *vdev = dev->vdev; - -/* -* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support -* incremental memory mapping API via IOTLB API. For platform that -* does not have IOMMU, there's no need to enable this feature -* which may cause unnecessary IOTLB miss/update transactions. -*/ -if (vdev) {hw/virtio/vhost.c static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) · line 365
Quoted 10 lines
hw/virtio/vhost.c +0
-7-return virtio_bus_device_iommu_enabled (vdev) && -virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); - }else { -return false; - } -} -static void *vhost_memory_map (struct vhost_dev *dev,hwaddr addr,hwaddr *plen,bool is_write) {Besides,
Tested-by Eric Auger <[email protected]>Eric
Hi Michael,
Quoted 100 lines · Michael S. Tsirkin
Quoted 99 lines · Eric Auger
Hi Jason,
Quoted 69 lines · Jason Wang
When vIOMMU is enabled, the
vq->used_physis actually the IOVA not GPA. So we need to translate it to GPA before the syncing otherwise we may hit the following crash since IOVA could be out of the scope of the GPA log size. This could be noted when using virtio-IOMMU with vhost using 1G memory.Fixes c471ad0e9bd46 ("vhost_net: device IOTLB support")Tested-by Lei Yang <[email protected]>Reported-by Yalan Zhang <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes since V1:
- Fix the address calculation when used ring is not page aligned
- Fix the length for each round of dirty bitmap syncing
- UseLOG_GUEST_ERRORto log wrong used adddress
- Various other tweaks--- hw/virtio/vhost.c | 76 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 20 deletions(-)hw/virtio/vhost.c +24
-2@@ -20,6 +20,7 @@#include "qemu/range.h" #include "qemu/error-report.h" #include "qemu/memfd.h" +#include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" @@ -106,6 +107,24 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, } } +static bool vhost_dev_has_iommu (struct vhost_dev *dev) +{ +VirtIODevice *vdev = dev->vdev; + +/* +* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support +* incremental memory mapping API via IOTLB API. For platform that +* does not have IOMMU, there's no need to enable this feature +* which may cause unnecessary IOTLB miss/update transactions. +*/ +if (vdev) { +return virtio_bus_device_iommu_enabled (vdev) && +virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); + }else { +return false; + } +} + static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, MemoryRegionSection *section, hwaddr first,@@ -137,8 +156,43 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,continue ; } -vhost_dev_sync_region (dev, section, start_addr, end_addr, vq->used_phys, -range_get_last (vq->used_phys, vq->used_size)); +if (vhost_dev_has_iommu (dev)) { +IOMMUTLBEntry iotlb; +hwaddr used_phys = vq->used_phys, used_size = vq->used_size; +hwaddr phys, s; +hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 173
Quoted 10 lines
hw/virtio/vhost.c +10
-0+while (used_size) { +rcu_read_lock (); + iotlb =address_space_get_iotlb_entry (dev->vdev->dma_as, + used_phys, + true,MEMTXATTRS_UNSPECIFIED ); +rcu_read_unlock (); + +if (!iotlb.target_as) { +qemu_log_mask (LOG_GUEST_ERROR ,"translation " +"failure for used_phys %" PRIx64"\n" , used_phys);looks weird to see translation of "
used_phys" whereas it is an iova. At least I would reword the msghw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 177
Quoted 4 lines
hw/virtio/vhost.c +4
-0+return -EINVAL ; + } + + phys = iotlb.translated_addr + (used_phys & iotlb.addr_mask);you may use a local variable storing this offset =
used_phys& iotlb.addr_maskhw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 180
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ +/* Distance from start of used ring until last byte of +IOMMU page */ you can avoid checkpatch warnings here
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ s = iotlb.addr_mask - (used_phys & iotlb.addr_mask); +/* Size of used ring, or of the part of it until end +of IOMMU page */
Quoted 8 lines
Quoted 5 lines
and here
I would suggest to rewrite this into
s =iotlb.addr_mask - (used_phys& iotlb.addr_mask) + 1 s =MIN(s, used_size);This does not work - if iotlb.addr_mask - (
used_phys& iotlb.addr_mask) is all-ones then + 1 gives you 0 and MIN gives you 0. Theoretical but worth being safe here IMHO.
Ah OK, I should have read your previous discussion more thoroughly ... Maybe just add a short comment then to justify the gym below and avoid tempting sbdy else to rewrite it in a more common but wrong way.
Thanks
Eric
Quoted 47 lines
Quoted 47 lines
Quoted 32 lines
hw/virtio/vhost.c +12
-11+ s =MIN (s, used_size -1 ) +1 ; + +vhost_dev_sync_region (dev, section, start_addr, end_addr, phys, +range_get_last (phys, s)); + used_size -= s; + used_phys += s; + } + }else { +vhost_dev_sync_region (dev, section, start_addr, + end_addr, vq->used_phys, +range_get_last (vq->used_phys, vq->used_size)); + } }return 0 ; }@@ -306,24 +360,6 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static bool vhost_dev_has_iommu (struct vhost_dev *dev) -{ -VirtIODevice *vdev = dev->vdev; - -/* -* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support -* incremental memory mapping API via IOTLB API. For platform that -* does not have IOMMU, there's no need to enable this feature -* which may cause unnecessary IOTLB miss/update transactions. -*/ -if (vdev) {hw/virtio/vhost.c static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) · line 365
Quoted 10 lines
hw/virtio/vhost.c +0
-7-return virtio_bus_device_iommu_enabled (vdev) && -virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); - }else { -return false; - } -} -static void *vhost_memory_map (struct vhost_dev *dev,hwaddr addr,hwaddr *plen,bool is_write) {Besides,
Tested-by Eric Auger <[email protected]>Eric
Quoted 89 lines · Eric Auger
Hi Michael,
Quoted 85 lines · Michael S. Tsirkin
Quoted 84 lines · Eric Auger
Hi Jason,
Quoted 69 lines · Jason Wang
When vIOMMU is enabled, the
vq->used_physis actually the IOVA not GPA. So we need to translate it to GPA before the syncing otherwise we may hit the following crash since IOVA could be out of the scope of the GPA log size. This could be noted when using virtio-IOMMU with vhost using 1G memory.Fixes c471ad0e9bd46 ("vhost_net: device IOTLB support")Tested-by Lei Yang <[email protected]>Reported-by Yalan Zhang <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes since V1:
- Fix the address calculation when used ring is not page aligned
- Fix the length for each round of dirty bitmap syncing
- UseLOG_GUEST_ERRORto log wrong used adddress
- Various other tweaks--- hw/virtio/vhost.c | 76 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 20 deletions(-)hw/virtio/vhost.c +24
-2@@ -20,6 +20,7 @@#include "qemu/range.h" #include "qemu/error-report.h" #include "qemu/memfd.h" +#include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" @@ -106,6 +107,24 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, } } +static bool vhost_dev_has_iommu (struct vhost_dev *dev) +{ +VirtIODevice *vdev = dev->vdev; + +/* +* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support +* incremental memory mapping API via IOTLB API. For platform that +* does not have IOMMU, there's no need to enable this feature +* which may cause unnecessary IOTLB miss/update transactions. +*/ +if (vdev) { +return virtio_bus_device_iommu_enabled (vdev) && +virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); + }else { +return false; + } +} + static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, MemoryRegionSection *section, hwaddr first,@@ -137,8 +156,43 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,continue ; } -vhost_dev_sync_region (dev, section, start_addr, end_addr, vq->used_phys, -range_get_last (vq->used_phys, vq->used_size)); +if (vhost_dev_has_iommu (dev)) { +IOMMUTLBEntry iotlb; +hwaddr used_phys = vq->used_phys, used_size = vq->used_size; +hwaddr phys, s; +hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 173
Quoted 10 lines
hw/virtio/vhost.c +10
-0+while (used_size) { +rcu_read_lock (); + iotlb =address_space_get_iotlb_entry (dev->vdev->dma_as, + used_phys, + true,MEMTXATTRS_UNSPECIFIED ); +rcu_read_unlock (); + +if (!iotlb.target_as) { +qemu_log_mask (LOG_GUEST_ERROR ,"translation " +"failure for used_phys %" PRIx64"\n" , used_phys);looks weird to see translation of "
used_phys" whereas it is an iova. At least I would reword the msg
Let me tweak this in the next version.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 177
Quoted 4 lines
hw/virtio/vhost.c +4
-0+return -EINVAL ; + } + + phys = iotlb.translated_addr + (used_phys & iotlb.addr_mask);you may use a local variable storing this offset =
used_phys& iotlb.addr_mask
Ok.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 180
Quoted 4 lines
hw/virtio/vhost.c +3
-0+ +/* Distance from start of used ring until last byte of +IOMMU page */ you can avoid checkpatch warnings here
hw/virtio/vhost.c static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, · line 183
Quoted 3 lines
hw/virtio/vhost.c +3
-0+ s = iotlb.addr_mask - (used_phys & iotlb.addr_mask); +/* Size of used ring, or of the part of it until end +of IOMMU page */ and here
Will fix.
Quoted 10 lines
Quoted 7 lines
Quoted 4 lines
I would suggest to rewrite this into
s =iotlb.addr_mask - (used_phys& iotlb.addr_mask) + 1 s =MIN(s, used_size);This does not work - if iotlb.addr_mask - (
used_phys& iotlb.addr_mask) is all-ones then + 1 gives you 0 and MIN gives you 0. Theoretical but worth being safe here IMHO.Ah OK, I should have read your previous discussion more thoroughly ... Maybe just add a short comment then to justify the gym below and avoid tempting sbdy else to rewrite it in a more common but wrong way.
That's fine.
Thanks
Quoted 52 lines
Thanks
Eric
Quoted 47 lines
Quoted 47 lines
Quoted 32 lines
hw/virtio/vhost.c +12
-11+ s =MIN (s, used_size -1 ) +1 ; + +vhost_dev_sync_region (dev, section, start_addr, end_addr, phys, +range_get_last (phys, s)); + used_size -= s; + used_phys += s; + } + }else { +vhost_dev_sync_region (dev, section, start_addr, + end_addr, vq->used_phys, +range_get_last (vq->used_phys, vq->used_size)); + } }return 0 ; }@@ -306,24 +360,6 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static bool vhost_dev_has_iommu (struct vhost_dev *dev) -{ -VirtIODevice *vdev = dev->vdev; - -/* -* For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support -* incremental memory mapping API via IOTLB API. For platform that -* does not have IOMMU, there's no need to enable this feature -* which may cause unnecessary IOTLB miss/update transactions. -*/ -if (vdev) {hw/virtio/vhost.c static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) · line 365
Quoted 10 lines
hw/virtio/vhost.c +0
-7-return virtio_bus_device_iommu_enabled (vdev) && -virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM ); - }else { -return false; - } -} -static void *vhost_memory_map (struct vhost_dev *dev,hwaddr addr,hwaddr *plen,bool is_write) {Besides,
Tested-by Eric Auger <[email protected]>Eric