diff options
| author | David Hildenbrand | 2020-10-08 10:30:25 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2020-11-03 13:19:26 +0100 |
| commit | 0aed28006114b17d64a8491071d382f4c8a83e41 (patch) | |
| tree | 4d53702a7269c9506b4fd3a52f5849cae3abe83e /hw/virtio | |
| parent | virtio-mem: Make sure "addr" is always multiples of the block size (diff) | |
| download | qemu-0aed28006114b17d64a8491071d382f4c8a83e41.tar.gz qemu-0aed28006114b17d64a8491071d382f4c8a83e41.tar.xz qemu-0aed28006114b17d64a8491071d382f4c8a83e41.zip | |
virtio-mem: Make sure "usable_region_size" is always multiples of the block size
The spec states:
"The device MUST set addr, region_size, usable_region_size, plugged_size,
requested_size to multiples of block_size."
With block sizes > 256MB, we currently wouldn't guarantee that for the
usable_region_size.
Note that we cannot exceed the region_size, as we already enforce the
alignment there properly.
Fixes: 910b25766b33 ("virtio-mem: Paravirtualized memory hot(un)plug")
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Wei Yang <richardw.yang@linux.intel.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20201008083029.9504-3-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/virtio-mem.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 70200b4eac..461ac68ee8 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -227,6 +227,9 @@ static void virtio_mem_resize_usable_region(VirtIOMEM *vmem, uint64_t newsize = MIN(memory_region_size(&vmem->memdev->mr), requested_size + VIRTIO_MEM_USABLE_EXTENT); + /* The usable region size always has to be multiples of the block size. */ + newsize = QEMU_ALIGN_UP(newsize, vmem->block_size); + if (!requested_size) { newsize = 0; } |