From nobody Sat May 18 04:46:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689258203; cv=none; d=zohomail.com; s=zohoarc; b=GpzGYR27YH/WpXn4DlGxgT/5pqQ30KlzABouOGUpYyvU9UUZuzn3mZtoXhTtLN/a9B+ViQwEV9swYgfrzt1SwYg47EdvLwcEV8+qyB73bGLZ1Kio2RJUlIktX4U48G01aEiGAYLVbcMQ3Cegmc5Yq0DDnlsrLYFAbZkL7Y4HeCY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689258203; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Oq2DVNwKUKkN6O4/uqVh1FsJQVxgBqtVgLZ8hz2fEDA=; b=FtPLZHNcOAbMSXbXP+hL5epFVn5PjScAhV90iCJbsKZwJ4n8dFkmws0x7StMpmuAf5hd4dper/xSXYDUILlwUS2+odMZiuVh3bH1c3kj4lDkgt+KdQVel8OM+dz+kkjb/1lN41etU4ZKEkrJ/1PLd7skdBCFJs5Cnxz+t/fm3I4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689258203540434.38379767385925; Thu, 13 Jul 2023 07:23:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-230-FiUE30WWOnCAITsF7hjzyg-1; Thu, 13 Jul 2023 10:22:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E5C8909995; Thu, 13 Jul 2023 14:15:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1D60111E3EA; Thu, 13 Jul 2023 14:15:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 90E8619465B7; Thu, 13 Jul 2023 14:15:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E94E81946589 for ; Thu, 13 Jul 2023 08:48:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B7DE62166B27; Thu, 13 Jul 2023 08:48:10 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EA702166B26 for ; Thu, 13 Jul 2023 08:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689258202; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Oq2DVNwKUKkN6O4/uqVh1FsJQVxgBqtVgLZ8hz2fEDA=; b=NweNt2FFYoigWYEe54U/YFvB4r0f3rwJlm7hQ/GbahWrteKO4xgLLT5QXeJRZL2B4Hax6s N5TYygSIviY7qWUt32Wxr9NFcbdHRqwb+rlRqn39l0IOAvUhDH2WRMFFZJlA54ORK3xMt3 mVDv6PEuBhjYyTx/JTzHreRruQofEzc= X-MC-Unique: FiUE30WWOnCAITsF7hjzyg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] qemu: Add NUMA node automatically for memory hotplug Date: Thu, 13 Jul 2023 10:48:09 +0200 Message-ID: <8220d78f7a0cc2c51197363a0bcd3828b8ece32c.1689238089.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689258204490100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Up until v2.11.0-rc2~19^2~3 QEMU used to require at least one NUMA node to be configured when memory hotplug was enabled. After that commit, QEMU automatically adds a NUMA node if none was specified on the cmd line. Reflect this in domain XML, i.e. explicitly add a NUMA node into our domain definition if needed. Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- src/qemu/qemu_domain.c | 53 ++++++++++++++++++- ...emory-hotplug-ppc64-nonuma-abi-update.args | 11 ++-- ...memory-hotplug-ppc64-nonuma-abi-update.xml | 7 ++- 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3700b3e711..a9ed5f5901 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4807,6 +4807,51 @@ qemuDomainDefTsegPostParse(virDomainDef *def, } =20 =20 +static int +qemuDomainDefNumaAutoAdd(virDomainDef *def, + unsigned int parseFlags) +{ + bool abiUpdate =3D !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + unsigned long long initialMem; + size_t i; + + if (!abiUpdate || + !virDomainDefHasMemoryHotplug(def) || + virDomainNumaGetNodeCount(def->numa) > 0) { + return 0; + } + + initialMem =3D virDomainDefGetMemoryInitial(def); + + if (!def->numa) + def->numa =3D virDomainNumaNew(); + + virDomainNumaSetNodeCount(def->numa, 1); + virDomainNumaSetNodeMemorySize(def->numa, 0, initialMem); + + for (i =3D 0; i < def->nmems; i++) { + virDomainMemoryDef *mem =3D def->mems[i]; + + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + if (mem->targetNode =3D=3D -1) + mem->targetNode =3D 0; + break; + + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } + } + + return 0; +} + + /** * qemuDomainDefNumaCPUsRectify: * @numa: pointer to numa definition @@ -4841,8 +4886,12 @@ qemuDomainDefNumaCPUsRectify(virDomainDef *def, =20 static int qemuDomainDefNumaCPUsPostParse(virDomainDef *def, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps, + unsigned int parseFlags) { + if (qemuDomainDefNumaAutoAdd(def, parseFlags) < 0) + return -1; + return qemuDomainDefNumaCPUsRectify(def, qemuCaps); } =20 @@ -4914,7 +4963,7 @@ qemuDomainDefPostParse(virDomainDef *def, if (qemuDomainDefTsegPostParse(def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps) < 0) + if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps, parseFlags) < 0) return -1; =20 return 0; diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.= args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args index 83bfb1123c..18ae15aa0b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args @@ -10,13 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu POWER9 \ --m size=3D1048576k,slots=3D16,maxmem=3D4194304k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":1073= 741824}' \ +-m size=3D1310720k,slots=3D16,maxmem=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":13421772= 80}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912= }' \ --device '{"driver":"pc-dimm","memdev":"memdimm0","id":"dimm0","slot":0}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0}' \ -object '{"qom-type":"memory-backend-ram","id":"memdimm1","size":536870912= }' \ --device '{"driver":"pc-dimm","memdev":"memdimm1","id":"dimm1","slot":1}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","sl= ot":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-updat= e.xml b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml index d0be98f140..c4677dc977 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml @@ -2,7 +2,7 @@ QEMUGuest1 49545eb3-75e1-2d0a-acdd-f0294406c99e 4194304 - 2097152 + 2098177 2097152 1 @@ -11,6 +11,9 @@ POWER9 + + + destroy @@ -29,12 +32,14 @@ 524288 + 0
524288 + 0
--=20 2.41.0