41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
From 7438519f5cfb0e07dd54f242901761da87f1156c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kunkun Jiang <jiangkunkun@huawei.com>
|
||
|
|
Date: Tue, 7 Sep 2021 15:14:12 +0800
|
||
|
|
Subject: [PATCH] vfio/common: Fix incorrect address alignment in
|
||
|
|
vfio_dma_map_ram_section
|
||
|
|
|
||
|
|
The 'iova' will be passed to host kernel for mapping with the
|
||
|
|
HPA. It is related to the host page size. So TARGET_PAGE_ALIGN
|
||
|
|
should be replaced by REAL_HOST_PAGE_ALIGN. In the case of
|
||
|
|
large granularity (64K), it may return early when map MMIO RAM
|
||
|
|
section. And because of the inconsistency with
|
||
|
|
vfio_dma_unmap_ram_section, it may cause 'assert(qrange)'
|
||
|
|
in vfio_dma_unmap.
|
||
|
|
|
||
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
||
|
|
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
|
||
|
|
---
|
||
|
|
hw/vfio/common.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
|
||
|
|
index fb7ca63748..de166dd5f9 100644
|
||
|
|
--- a/hw/vfio/common.c
|
||
|
|
+++ b/hw/vfio/common.c
|
||
|
|
@@ -846,10 +846,10 @@ static int vfio_dma_map_ram_section(VFIOContainer *container,
|
||
|
|
|
||
|
|
assert(memory_region_is_ram(section->mr));
|
||
|
|
|
||
|
|
- iova = TARGET_PAGE_ALIGN(section->offset_within_address_space);
|
||
|
|
+ iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
|
||
|
|
llend = int128_make64(section->offset_within_address_space);
|
||
|
|
llend = int128_add(llend, section->size);
|
||
|
|
- llend = int128_and(llend, int128_exts64(TARGET_PAGE_MASK));
|
||
|
|
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask));
|
||
|
|
end = int128_get64(int128_sub(llend, int128_one()));
|
||
|
|
|
||
|
|
vaddr = memory_region_get_ram_ptr(section->mr) +
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|