From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XszLf-0001eC-2I for qemu-devel@nongnu.org; Mon, 24 Nov 2014 14:31:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XszLY-0001Op-Gy for qemu-devel@nongnu.org; Mon, 24 Nov 2014 14:30:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XszLY-0001Ol-AB for qemu-devel@nongnu.org; Mon, 24 Nov 2014 14:30:52 -0500 Date: Mon, 24 Nov 2014 21:30:39 +0200 From: "Michael S. Tsirkin" Message-ID: <1416855830-31740-3-git-send-email-mst@redhat.com> References: <1416855830-31740-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1416855830-31740-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 02/15] pc: kvm: check if KVM has free memory slots to avoid abort() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, Anthony Liguori , Igor Mammedov , Paolo Bonzini , Richard Henderson From: Igor Mammedov When more memory devices are used than available KVM memory slots, QEMU crashes with: kvm_alloc_slot: no free slot available Aborted (core dumped) Fix this by checking that KVM has a free slot before attempting to map memory in guest address space. Signed-off-by: Igor Mammedov Acked-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/sysemu/kvm.h | 1 + hw/i386/pc.c | 5 +++++ kvm-all.c | 18 +++++++++++++++++- kvm-stub.c | 5 +++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index b0cd657..22e42ef 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -163,6 +163,7 @@ extern KVMState *kvm_state; /* external API */ +bool kvm_has_free_slot(MachineState *ms); int kvm_has_sync_mmu(void); int kvm_has_vcpu_events(void); int kvm_has_robust_singlestep(void); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1205db8..ce7b752 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1598,6 +1598,11 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, goto out; } + if (kvm_enabled() && !kvm_has_free_slot(machine)) { + error_setg(&local_err, "hypervisor has no free memory slots left"); + goto out; + } + memory_region_add_subregion(&pcms->hotplug_memory, addr - pcms->hotplug_memory_base, mr); vmstate_register_ram(mr, dev); diff --git a/kvm-all.c b/kvm-all.c index 596e7ce..937bc9d 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -132,7 +132,7 @@ static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_LAST_INFO }; -static KVMSlot *kvm_alloc_slot(KVMState *s) +static KVMSlot *kvm_get_free_slot(KVMState *s) { int i; @@ -142,6 +142,22 @@ static KVMSlot *kvm_alloc_slot(KVMState *s) } } + return NULL; +} + +bool kvm_has_free_slot(MachineState *ms) +{ + return kvm_get_free_slot(KVM_STATE(ms->accelerator)); +} + +static KVMSlot *kvm_alloc_slot(KVMState *s) +{ + KVMSlot *slot = kvm_get_free_slot(s); + + if (slot) { + return slot; + } + fprintf(stderr, "%s: no free slot available\n", __func__); abort(); } diff --git a/kvm-stub.c b/kvm-stub.c index 43fc0dd..7ba90c5 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -147,4 +147,9 @@ int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq) { return -ENOSYS; } + +bool kvm_has_free_slot(MachineState *ms) +{ + return false; +} #endif -- MST