david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-balloon: Rework ballon_page() interface

Browse Source 
This replaces the balloon_page() internal interface with
ballon_inflate_page(), with a slightly different interface.  The new
interface will make future alterations simpler.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20190214043916.22128-4-david@gibson.dropbear.id.au>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
David Gibson 2019-02-14 15:39:14 +11:00 committed by Michael S. Tsirkin
parent b218a70e6a
commit e9550234d7
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/virtio/virtio-balloon.c
View File

@ -33,11 +33,12 @@
#define BALLOON_PAGE_SIZE (1 << VIRTIO_BALLOON_PFN_SHIFT) #define BALLOON_PAGE_SIZE (1 << VIRTIO_BALLOON_PFN_SHIFT)
static void balloon_page(void *addr, int deflate) static void balloon_inflate_page(VirtIOBalloon *balloon,
MemoryRegion *mr, hwaddr offset)
{ {
if (!qemu_balloon_is_inhibited() && !deflate) { void *addr = memory_region_get_ram_ptr(mr) + offset;
qemu_madvise(addr, BALLOON_PAGE_SIZE, QEMU_MADV_DONTNEED); qemu_madvise(addr, BALLOON_PAGE_SIZE, QEMU_MADV_DONTNEED);
}
} }
static const char *balloon_stat_names[] = { static const char *balloon_stat_names[] = {
@ -222,7 +223,6 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
while (iov_to_buf(elem->out_sg, elem->out_num, offset, &pfn, 4) == 4) { while (iov_to_buf(elem->out_sg, elem->out_num, offset, &pfn, 4) == 4) {
hwaddr pa; hwaddr pa;
hwaddr addr;
int p = virtio_ldl_p(vdev, &pfn); int p = virtio_ldl_p(vdev, &pfn);
pa = (hwaddr) p << VIRTIO_BALLOON_PFN_SHIFT; pa = (hwaddr) p << VIRTIO_BALLOON_PFN_SHIFT;
@ -244,11 +244,9 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
trace_virtio_balloon_handle_output(memory_region_name(section.mr), trace_virtio_balloon_handle_output(memory_region_name(section.mr),
pa); pa);
/* Using memory_region_get_ram_ptr is bending the rules a bit, but if (!qemu_balloon_is_inhibited() && vq != s->dvq) {
should be OK because we only want a single page. */ balloon_inflate_page(s, section.mr, section.offset_within_region);
addr = section.offset_within_region; }
balloon_page(memory_region_get_ram_ptr(section.mr) + addr,
!!(vq == s->dvq));
memory_region_unref(section.mr); memory_region_unref(section.mr);
} }