diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2014-01-17 11:12:56 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2014-01-17 11:12:56 -0700 |
| commit | 8d7b5a1da0e06aa7addd7f084d9ec9d433c4bafb (patch) | |
| tree | d428ed210b9f0211ef757524bd33c06b5c1ba817 /hw/misc | |
| parent | 47c16ed56aa6bc4037bdb7b61f049097993cd244 (diff) | |
| download | qemu-8d7b5a1da0e06aa7addd7f084d9ec9d433c4bafb.tar.gz | |
vfio: fix mapping of MSIX bar
VFIO virtualizes MSIX table for the guest but not mapping the part of
a BAR which contains an MSIX table. Since vfio_mmap_bar() mmaps chunks
before and after the MSIX table, they have to be aligned to the host
page size which may be TARGET_PAGE_MASK (4K) or 64K in case of PPC64.
This fixes boundaries calculations to use the real host page size.
Without the patch, the chunk before MSIX table may overlap with the MSIX
table and mmap will fail in the host kernel. The result will be serious
slowdown as the whole BAR will be emulated by QEMU.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/vfio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 432547ce16..8a1f1a124d 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2544,7 +2544,7 @@ static void vfio_map_bar(VFIODevice *vdev, int nr) * potentially insert a direct-mapped subregion before and after it. */ if (vdev->msix && vdev->msix->table_bar == nr) { - size = vdev->msix->table_offset & TARGET_PAGE_MASK; + size = vdev->msix->table_offset & qemu_host_page_mask; } strncat(name, " mmap", sizeof(name) - strlen(name) - 1); @@ -2556,8 +2556,8 @@ static void vfio_map_bar(VFIODevice *vdev, int nr) if (vdev->msix && vdev->msix->table_bar == nr) { unsigned start; - start = TARGET_PAGE_ALIGN(vdev->msix->table_offset + - (vdev->msix->entries * PCI_MSIX_ENTRY_SIZE)); + start = HOST_PAGE_ALIGN(vdev->msix->table_offset + + (vdev->msix->entries * PCI_MSIX_ENTRY_SIZE)); size = start < bar->size ? bar->size - start : 0; strncat(name, " msix-hi", sizeof(name) - strlen(name) - 1); |