{"id":1839904,"url":"http://patchwork.ozlabs.org/api/patches/1839904/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-5-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230926185738.277351-5-david@redhat.com>","list_archive_url":null,"date":"2023-09-26T18:57:24","name":"[v4,04/18] kvm: Return number of free memslots","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8fb49da68e1aee87ba78954ae08fb40524b2f3be","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-5-david@redhat.com/mbox/","series":[{"id":374991,"url":"http://patchwork.ozlabs.org/api/series/374991/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=374991","date":"2023-09-26T18:57:23","name":"virtio-mem: Expose device memory through multiple memslots","version":4,"mbox":"http://patchwork.ozlabs.org/series/374991/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1839904/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1839904/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=HZ/IJYu8;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4Rw8DL22fTz1ypM\n\tfor ; Wed, 27 Sep 2023 04:59:14 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1qlDGg-0006rl-5Y; Tue, 26 Sep 2023 14:58:46 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qlDGe-0006rV-Kt\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 14:58:44 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qlDGc-0002zW-Ew\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 14:58:44 -0400","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-92-PLCiT9W-MzSNlkc2dFf4TQ-1; Tue, 26 Sep 2023 14:58:38 -0400","from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF30F3813F2E;\n Tue, 26 Sep 2023 18:58:37 +0000 (UTC)","from t14s.fritz.box (unknown [10.39.192.33])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 7DB292026D76;\n Tue, 26 Sep 2023 18:58:28 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1695754721;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=iQv88OFvb8fJICC0aQ4EZvXR0U7eWR19gDzG5bZkaE4=;\n b=HZ/IJYu80tHGyka37IzS8HWGdjENTL7/RsI1UIWUIgZ3/tDLBsc6NXFxyuYbNhuhMxM/SO\n 8rBYQJ0vmuyGDRJcLtHVcFXNjnd78L1/Ls2ARgpquYDB+teiQ6bsZ8ZIBF1RwloRJ0QTEA\n HaypMFwNu+M3HD/UsqaW8c8TZRK3fac=","X-MC-Unique":"PLCiT9W-MzSNlkc2dFf4TQ-1","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Cc":"David Hildenbrand , Paolo Bonzini ,\n Igor Mammedov ,\n Xiao Guangrong ,\n \"Michael S. Tsirkin\" , Peter Xu ,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n Eduardo Habkost ,\n Marcel Apfelbaum ,\n Yanan Wang , Michal Privoznik ,\n\t=?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= ,\n Gavin Shan , Alex Williamson ,\n Stefan Hajnoczi ,\n \"Maciej S . Szmigiero\" , kvm@vger.kernel.org,\n \"Maciej S . Szmigiero\" ","Subject":"[PATCH v4 04/18] kvm: Return number of free memslots","Date":"Tue, 26 Sep 2023 20:57:24 +0200","Message-ID":"<20230926185738.277351-5-david@redhat.com>","In-Reply-To":"<20230926185738.277351-1-david@redhat.com>","References":"<20230926185738.277351-1-david@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.1 on 10.11.54.4","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=david@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"12","X-Spam_score":"1.2","X-Spam_bar":"+","X-Spam_report":"(1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Let's return the number of free slots instead of only checking if there\nis a free slot. While at it, check all address spaces, which will also\nconsider SMM under x86 correctly.\n\nThis is a preparation for memory devices that consume multiple memslots.\n\nReviewed-by: Philippe Mathieu-Daudé \nReviewed-by: Maciej S. Szmigiero \nSigned-off-by: David Hildenbrand \n---\n accel/kvm/kvm-all.c | 33 ++++++++++++++++++++-------------\n accel/stubs/kvm-stub.c | 4 ++--\n hw/mem/memory-device.c | 2 +-\n include/sysemu/kvm.h | 2 +-\n include/sysemu/kvm_int.h | 1 +\n 5 files changed, 25 insertions(+), 17 deletions(-)","diff":"diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c\nindex ff1578bb32..9d4c5a4c51 100644\n--- a/accel/kvm/kvm-all.c\n+++ b/accel/kvm/kvm-all.c\n@@ -181,6 +181,24 @@ int kvm_get_max_memslots(void)\n return s->nr_slots;\n }\n \n+unsigned int kvm_get_free_memslots(void)\n+{\n+ unsigned int used_slots = 0;\n+ KVMState *s = kvm_state;\n+ int i;\n+\n+ kvm_slots_lock();\n+ for (i = 0; i < s->nr_as; i++) {\n+ if (!s->as[i].ml) {\n+ continue;\n+ }\n+ used_slots = MAX(used_slots, s->as[i].ml->nr_used_slots);\n+ }\n+ kvm_slots_unlock();\n+\n+ return s->nr_slots - used_slots;\n+}\n+\n /* Called with KVMMemoryListener.slots_lock held */\n static KVMSlot *kvm_get_free_slot(KVMMemoryListener *kml)\n {\n@@ -196,19 +214,6 @@ static KVMSlot *kvm_get_free_slot(KVMMemoryListener *kml)\n return NULL;\n }\n \n-bool kvm_has_free_slot(MachineState *ms)\n-{\n- KVMState *s = KVM_STATE(ms->accelerator);\n- bool result;\n- KVMMemoryListener *kml = &s->memory_listener;\n-\n- kvm_slots_lock();\n- result = !!kvm_get_free_slot(kml);\n- kvm_slots_unlock();\n-\n- return result;\n-}\n-\n /* Called with KVMMemoryListener.slots_lock held */\n static KVMSlot *kvm_alloc_slot(KVMMemoryListener *kml)\n {\n@@ -1387,6 +1392,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,\n }\n start_addr += slot_size;\n size -= slot_size;\n+ kml->nr_used_slots--;\n } while (size);\n return;\n }\n@@ -1412,6 +1418,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,\n ram_start_offset += slot_size;\n ram += slot_size;\n size -= slot_size;\n+ kml->nr_used_slots++;\n } while (size);\n }\n \ndiff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c\nindex 235dc661bc..a5d4442d8f 100644\n--- a/accel/stubs/kvm-stub.c\n+++ b/accel/stubs/kvm-stub.c\n@@ -109,9 +109,9 @@ int kvm_irqchip_remove_irqfd_notifier_gsi(KVMState *s, EventNotifier *n,\n return -ENOSYS;\n }\n \n-bool kvm_has_free_slot(MachineState *ms)\n+unsigned int kvm_get_free_memslots(void)\n {\n- return false;\n+ return 0;\n }\n \n void kvm_init_cpu_signals(CPUState *cpu)\ndiff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c\nindex 667d56bd29..98e355c960 100644\n--- a/hw/mem/memory-device.c\n+++ b/hw/mem/memory-device.c\n@@ -59,7 +59,7 @@ static void memory_device_check_addable(MachineState *ms, MemoryRegion *mr,\n const uint64_t size = memory_region_size(mr);\n \n /* we will need a new memory slot for kvm and vhost */\n- if (kvm_enabled() && !kvm_has_free_slot(ms)) {\n+ if (kvm_enabled() && !kvm_get_free_memslots()) {\n error_setg(errp, \"hypervisor has no free memory slots left\");\n return;\n }\ndiff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h\nindex ee9025f8e9..c3d831baef 100644\n--- a/include/sysemu/kvm.h\n+++ b/include/sysemu/kvm.h\n@@ -215,7 +215,7 @@ typedef struct KVMRouteChange {\n \n /* external API */\n \n-bool kvm_has_free_slot(MachineState *ms);\n+unsigned int kvm_get_free_memslots(void);\n bool kvm_has_sync_mmu(void);\n int kvm_has_vcpu_events(void);\n int kvm_has_robust_singlestep(void);\ndiff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h\nindex a5b9122cb8..075939a3c4 100644\n--- a/include/sysemu/kvm_int.h\n+++ b/include/sysemu/kvm_int.h\n@@ -40,6 +40,7 @@ typedef struct KVMMemoryUpdate {\n typedef struct KVMMemoryListener {\n MemoryListener listener;\n KVMSlot *slots;\n+ unsigned int nr_used_slots;\n int as_id;\n QSIMPLEQ_HEAD(, KVMMemoryUpdate) transaction_add;\n QSIMPLEQ_HEAD(, KVMMemoryUpdate) transaction_del;\n","prefixes":["v4","04/18"]}