Commit f5948942 authored by Alex Williamson's avatar Alex Williamson
Browse files

kvm: Use inhibit to prevent ballooning without synchronous mmu 



Remove KVM specific tests in balloon_page(), instead marking
ballooning as inhibited without KVM_CAP_SYNC_MMU support.

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 01ccbec7

accel/kvm/kvm-all.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "trace.h"

#include "hw/irq.h"

#include "sysemu/sev.h"

#include "sysemu/balloon.h"



#include "hw/boards.h"
@@ -1698,6 +1699,9 @@ static int kvm_init(MachineState *ms) 
    s->many_ioeventfds = kvm_check_many_ioeventfds();



    s->sync_mmu = !!kvm_vm_check_extension(kvm_state, KVM_CAP_SYNC_MMU);

    if (!s->sync_mmu) {

        qemu_balloon_inhibit(true);

    }



    return 0;

hw/virtio/virtio-balloon.c

+1 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "hw/mem/pc-dimm.h"

#include "sysemu/balloon.h"

#include "hw/virtio/virtio-balloon.h"

#include "sysemu/kvm.h"

#include "exec/address-spaces.h"

#include "qapi/error.h"

#include "qapi/qapi-events-misc.h"
@@ -36,8 +35,7 @@ 


static void balloon_page(void *addr, int deflate)

{

    if (!qemu_balloon_is_inhibited() && (!kvm_enabled() ||

                                         kvm_has_sync_mmu())) {

    if (!qemu_balloon_is_inhibited()) {

        qemu_madvise(addr, BALLOON_PAGE_SIZE,

                deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED);

    }