diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2017-09-12 12:53:07 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-09-15 10:29:48 +1000 |
| commit | e100161b69f8cf56dae866912dfffe7dcd7140af (patch) | |
| tree | 4c7e6e9d17fd50002c30aa47e9206c4c66f38194 /hw | |
| parent | 9ba255365e19db6cce8ad6d03bc02db96c429641 (diff) | |
| download | qemu-e100161b69f8cf56dae866912dfffe7dcd7140af.zip qemu-e100161b69f8cf56dae866912dfffe7dcd7140af.tar.gz qemu-e100161b69f8cf56dae866912dfffe7dcd7140af.tar.bz2 | |
vfio, spapr: Fix levels calculation
The existing tries to round up the number of pages but @pages is always
calculated as the rounded up value minus one which makes ctz64() always
return 0 and have create.levels always set 1.
This removes wrong "-1" and allows having more than 1 levels. This becomes
handy for >128GB guests with standard 64K pages as this requires blocks
with zone order 9 and the popular limit of CONFIG_FORCE_MAX_ZONEORDER=9
means that only blocks up to order 8 are allowed.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/vfio/spapr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 32fd6a9..259397c 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -163,7 +163,7 @@ int vfio_spapr_create_window(VFIOContainer *container, */ entries = create.window_size >> create.page_shift; pages = MAX((entries * sizeof(uint64_t)) / getpagesize(), 1); - pages = MAX(pow2ceil(pages) - 1, 1); /* Round up */ + pages = MAX(pow2ceil(pages), 1); /* Round up */ create.levels = ctz64(pages) / 6 + 1; ret = ioctl(container->fd, VFIO_IOMMU_SPAPR_TCE_CREATE, &create); |