From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqMnl-0005zz-9Z for qemu-devel@nongnu.org; Thu, 16 Aug 2018 14:15:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqMnh-0002Th-Ar for qemu-devel@nongnu.org; Thu, 16 Aug 2018 14:15:17 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54918 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqMng-0002TF-DB for qemu-devel@nongnu.org; Thu, 16 Aug 2018 14:15:13 -0400 Date: Thu, 16 Aug 2018 12:15:01 -0600 From: Alex Williamson Message-ID: <20180816121501.3cf8781a@t450s.home> In-Reply-To: <20180807193125.30378-3-alex.williamson@redhat.com> References: <20180807193125.30378-1-alex.williamson@redhat.com> <20180807193125.30378-3-alex.williamson@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 2/4] kvm: Use inhibit to prevent ballooning without synchronous mmu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alex.williamson@redhat.com, qemu-devel@nongnu.org, "Michael S. Tsirkin" , Paolo Bonzini Cc: peterx@redhat.com, Cornelia Huck , kvm@vger.kernel.org, david@redhat.com On Tue, 7 Aug 2018 13:31:23 -0600 Alex Williamson wrote: > Remove KVM specific tests in balloon_page(), instead marking > ballooning as inhibited without KVM_CAP_SYNC_MMU support. > > Reviewed-by: David Hildenbrand > Reviewed-by: Peter Xu > Reviewed-by: Cornelia Huck > Signed-off-by: Alex Williamson > --- > accel/kvm/kvm-all.c | 4 ++++ > hw/virtio/virtio-balloon.c | 4 +--- > 2 files changed, 5 insertions(+), 3 deletions(-) Paolo and Michael, can I get an ack for this one? Otherwise I can drop it from the series and let this continue to be a special case. Thanks, Alex > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index eb7db92a5e3b..38f468d8e2b1 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -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; > > diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c > index 1f7a87f09429..b5425080c5fb 100644 > --- a/hw/virtio/virtio-balloon.c > +++ b/hw/virtio/virtio-balloon.c > @@ -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); > }