SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/virtio/vhost-vdpa: Use target-agnostic qemu_target_page_mask()

Browse Source 
Similarly to commit e414ed2c47 ("virtio-iommu: Use
target-agnostic qemu_target_page_mask"), Replace the
target-specific TARGET_PAGE_SIZE and TARGET_PAGE_MASK
definitions by a call to the runtime qemu_target_page_size()
helper which is target agnostic.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230710094931.84402-5-philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-07-10 11:49:29 +02:00 committed by Michael S. Tsirkin
parent 1dca36fb3d
commit 33f21860b7
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/virtio/vhost-vdpa.c
View File

@ -14,6 +14,7 @@
#include <linux/vfio.h> #include <linux/vfio.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "exec/target_page.h"
#include "hw/virtio/vhost.h" #include "hw/virtio/vhost.h"
#include "hw/virtio/vhost-backend.h" #include "hw/virtio/vhost-backend.h"
#include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-net.h"
@ -23,7 +24,6 @@
#include "migration/blocker.h" #include "migration/blocker.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "cpu.h"
#include "trace.h" #include "trace.h"
#include "qapi/error.h" #include "qapi/error.h"
@ -313,9 +313,11 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
Int128 llend, llsize; Int128 llend, llsize;
void *vaddr; void *vaddr;
int ret; int ret;
int page_size = qemu_target_page_size();
int page_mask = -page_size;
if (vhost_vdpa_listener_skipped_section(section, v->iova_range.first, if (vhost_vdpa_listener_skipped_section(section, v->iova_range.first,
v->iova_range.last, TARGET_PAGE_MASK)) { v->iova_range.last, page_mask)) {
return; return;
} }
if (memory_region_is_iommu(section->mr)) { if (memory_region_is_iommu(section->mr)) {
@ -323,16 +325,16 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
return; return;
} }
if (unlikely((section->offset_within_address_space & ~TARGET_PAGE_MASK) != if (unlikely((section->offset_within_address_space & ~page_mask) !=
(section->offset_within_region & ~TARGET_PAGE_MASK))) { (section->offset_within_region & ~page_mask))) {
trace_vhost_vdpa_listener_region_add_unaligned(v, section->mr->name, trace_vhost_vdpa_listener_region_add_unaligned(v, section->mr->name,
section->offset_within_address_space & ~TARGET_PAGE_MASK, section->offset_within_address_space & ~page_mask,
section->offset_within_region & ~TARGET_PAGE_MASK); section->offset_within_region & ~page_mask);
return; return;
} }
iova = ROUND_UP(section->offset_within_address_space, TARGET_PAGE_SIZE); iova = ROUND_UP(section->offset_within_address_space, page_size);
llend = vhost_vdpa_section_end(section, TARGET_PAGE_MASK); llend = vhost_vdpa_section_end(section, page_mask);
if (int128_ge(int128_make64(iova), llend)) { if (int128_ge(int128_make64(iova), llend)) {
return; return;
} }
@ -398,25 +400,27 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
hwaddr iova; hwaddr iova;
Int128 llend, llsize; Int128 llend, llsize;
int ret; int ret;
int page_size = qemu_target_page_size();
int page_mask = -page_size;
if (vhost_vdpa_listener_skipped_section(section, v->iova_range.first, if (vhost_vdpa_listener_skipped_section(section, v->iova_range.first,
v->iova_range.last, TARGET_PAGE_MASK)) { v->iova_range.last, page_mask)) {
return; return;
} }
if (memory_region_is_iommu(section->mr)) { if (memory_region_is_iommu(section->mr)) {
vhost_vdpa_iommu_region_del(listener, section); vhost_vdpa_iommu_region_del(listener, section);
} }
if (unlikely((section->offset_within_address_space & ~TARGET_PAGE_MASK) != if (unlikely((section->offset_within_address_space & ~page_mask) !=
(section->offset_within_region & ~TARGET_PAGE_MASK))) { (section->offset_within_region & ~page_mask))) {
trace_vhost_vdpa_listener_region_del_unaligned(v, section->mr->name, trace_vhost_vdpa_listener_region_del_unaligned(v, section->mr->name,
section->offset_within_address_space & ~TARGET_PAGE_MASK, section->offset_within_address_space & ~page_mask,
section->offset_within_region & ~TARGET_PAGE_MASK); section->offset_within_region & ~page_mask);
return; return;
} }
iova = ROUND_UP(section->offset_within_address_space, TARGET_PAGE_SIZE); iova = ROUND_UP(section->offset_within_address_space, page_size);
llend = vhost_vdpa_section_end(section, TARGET_PAGE_MASK); llend = vhost_vdpa_section_end(section, page_mask);
trace_vhost_vdpa_listener_region_del(v, iova, trace_vhost_vdpa_listener_region_del(v, iova,
int128_get64(int128_sub(llend, int128_one()))); int128_get64(int128_sub(llend, int128_one())));