From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqZT3-0002CJ-Gp for qemu-devel@nongnu.org; Fri, 17 Aug 2018 03:46:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqZT0-0005pf-AY for qemu-devel@nongnu.org; Fri, 17 Aug 2018 03:46:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46478 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 1fqZT0-0005oE-3B for qemu-devel@nongnu.org; Fri, 17 Aug 2018 03:46:42 -0400 References: <20180807193125.30378-1-alex.williamson@redhat.com> <20180807193125.30378-3-alex.williamson@redhat.com> <20180816121501.3cf8781a@t450s.home> From: Paolo Bonzini Message-ID: <5f9add58-ad08-513a-10bf-c63707f42d62@redhat.com> Date: Fri, 17 Aug 2018 09:46:28 +0200 MIME-Version: 1.0 In-Reply-To: <20180816121501.3cf8781a@t450s.home> Content-Type: text/plain; charset=utf-8 Content-Language: en-US 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 , qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: peterx@redhat.com, Cornelia Huck , kvm@vger.kernel.org, david@redhat.com On 16/08/2018 20:15, Alex Williamson wrote: > 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); >> } > Acked-by: Paolo Bonzini Thanks, Paolo