From nobody Tue Sep 9 19:08:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747122429734147.37350769355498; Tue, 13 May 2025 00:47:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 05EB31280; Tue, 13 May 2025 03:47:08 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 41CDF168B; Tue, 13 May 2025 03:44:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3F27C12B7; Tue, 13 May 2025 03:44:36 -0400 (EDT) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3A3E5124E for ; Tue, 13 May 2025 03:44:08 -0400 (EDT) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54D0K6ts005134; Tue, 13 May 2025 07:44:07 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46kuephk1g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 May 2025 07:44:07 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54D3XCoR011591; Tue, 13 May 2025 07:44:06 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 46jku29n28-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 May 2025 07:44:06 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54D7i5hC56361228 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 May 2025 07:44:05 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0692320067; Tue, 13 May 2025 07:44:04 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF1A42006E; Tue, 13 May 2025 07:44:02 +0000 (GMT) Received: from ltcblue8v9-lp1.aus.stglabs.ibm.com (unknown [9.40.192.91]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 13 May 2025 07:44:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=l2rNx989zJ2H3YPA9 ZSXfnEog0xa0EjFDc7ON5sq/iU=; b=hOwDgeSXHaA5lwMnQ2/6Sd7gfOwugpfkR TXI6joXFXAD8f5guUEjCE0rpMSg+cmuXUmVA7gEj1MEZsPX2L1wCE/caKbS+jIgZ 2/QSKSZrhLpasghV9yG1Ojb7+t/pV1xDX2P2hEcbvniEkqmvJq4G8L94tMdolWvL pjXOeCKLiWpA/kIgNeOccn25np2+8amHTezwW/SIhIzuWxFJfyEug0nrCaAgNir+ cvScw8ORp+VmxgeHt6929bCqS6/4BcT08c5NzbEsXgWajccu6KeVcTbK552y7med dXATMlIU634F9+JqWFzE5cZ0GcIB8y/SyHTj/JvqaJYObfLv2AKbw== From: Narayana Murty N To: devel@lists.libvirt.org Subject: [PATCH v5 5/5] cpu_ppc64: Add POWER11 host-model support Date: Tue, 13 May 2025 03:43:26 -0400 Message-ID: <20250513074326.311636-6-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250513074326.311636-1-nnmlinux@linux.ibm.com> References: <20250513074326.311636-1-nnmlinux@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 9CFDs07B3lGhNOOS-t-otiNFqa0Xsn0M X-Authority-Analysis: v=2.4 cv=e4gGSbp/ c=1 sm=1 tr=0 ts=6822f847 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=oFyARWZBCDj8tT_Gf3AA:9 X-Proofpoint-ORIG-GUID: 9CFDs07B3lGhNOOS-t-otiNFqa0Xsn0M X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTEzMDA3MSBTYWx0ZWRfX0zg7a7v4uaz7 RGvH6rJPhYh/zWWS//PDyojMEXJAjDzwY9KUaOXrtVVTtNcrQ557t8kJ/4/dIVyt+x76ZstYoot iPU9N3r20AXT+56+PNzgcH0F8HlwzEziV7LiB6x+EOAPFD7cN2/omnrTNz5sa2OObww53EADfAA 1riywgBK2Ue1TkY1QntrfX/ypQBpS8dJ7+0hR2YfGWyamV4jfqSFo4HpR0CleUTVC+nTbEt9MJ2 rSpAjZyxdOwKgjG4bttB66C63j3AHxC5VgqQGmpJA5YkbrWHUJqWdWXvBInum+sO/47t3Txno31 2Ta69HhyIvSjVS0kwJ/r1adBhbxlnpxWik8KgaHQmO6OoFqZSRA+eC9lBalxNtP9KpaXEkxEbWo mPxm/flE3b3lyDxUMKAmoQQrTHNbdMsZyqxwykS/kKO2KEODUxc/L3tcmWTTY+uw8PeIv0yd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-12_07,2025-05-09_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 spamscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 mlxlogscore=999 adultscore=0 malwarescore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505130071 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XC5KQC4273YR2L4FPA6TGB4X63AQYHVI X-Message-ID-Hash: XC5KQC4273YR2L4FPA6TGB4X63AQYHVI X-MailFrom: nnmlinux@linux.ibm.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: pkrempa@redhat.com, dbarboza@ventanamicro.com, abologna@redhat.com, jdenemar@redhat.com, dgibson@redhat.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747122431530019000 Content-Type: text/plain; charset="utf-8" This patch adds POWER11 CPU host-model support in libvirt's ppc64 CPU driver. With this addition, guests using CPU mode 'host-model' can specify POWER11 as the CPU model and have libvirt handle it correctly. With this change, libvirt can generate correct QEMU command line using `-machine ... max-cpu-compat=3Dpower11` when a POWER11 host-model guest is defined. This aligns with the QEMU support for POWER11 compatibility mode starting from version 10.0.0. Test coverage includes: - XML validation tests for POWER11 host model - Negative test for invalid compatibility on POWER10 hosts - Command line generation tests for POWER11 guests Signed-off-by: Narayana Murty N Reviewed-By: Shivaprasad G Bhat Tested-By: Shivaprasad G Bhat --- src/cpu/cpu_ppc64.c | 8 ++--- ...eries-cpu-compat-power11.ppc64-latest.args | 31 +++++++++++++++++++ ...series-cpu-compat-power11.ppc64-latest.err | 1 + ...series-cpu-compat-power11.ppc64-latest.xml | 29 +++++++++++++++++ .../pseries-cpu-compat-power11.xml | 19 ++++++++++++ tests/qemuxmlconftest.c | 4 +++ tests/testutilshostcpus.h | 11 +++++++ tests/testutilsqemu.c | 4 +++ tests/testutilsqemu.h | 1 + 9 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-= latest.args create mode 100644 tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-= latest.err create mode 100644 tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-= latest.xml create mode 100644 tests/qemuxmlconfdata/pseries-cpu-compat-power11.xml diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 13f5fc9c2c..8673d4f759 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -93,22 +93,22 @@ ppc64CheckCompatibilityMode(const char *host_model, if (!compat_mode) return VIR_CPU_COMPARE_IDENTICAL; =20 - /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9, POWER10 */ + /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9, POWER10, POWER11 */ if (!STRPREFIX(host_model, "POWER") || !(tmp =3D (char *) host_model + strlen("POWER")) || virStrToLong_i(tmp, NULL, 10, &host) < 0 || - host < 6 || host > 10) { + host < 6 || host > 11) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Host CPU does not support compatibility modes")); return VIR_CPU_COMPARE_ERROR; } =20 - /* Valid compatibility modes: power6, power7, power8, power9, power10 = */ + /* Valid compatibility modes: power6, power7, power8, power9, power10,= power11 */ if (!STRPREFIX(compat_mode, "power") || !(tmp =3D (char *) compat_mode + strlen("power")) || virStrToLong_i(tmp, NULL, 10, &compat) < 0 || - compat < 6 || compat > 10) { + compat < 6 || compat > 11) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown compatibility mode %1$s"), compat_mode); diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.= args b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args new file mode 100644 index 0000000000..a800f81905 --- /dev/null +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-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,max-cpu-compat=3Dpower11 \ +-accel kvm \ +-cpu host \ +-m size=3D262144k \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.= err b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.err new file mode 100644 index 0000000000..f2322ccea5 --- /dev/null +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.err @@ -0,0 +1 @@ +the CPU is incompatible with host CPU diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.= xml b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.xml new file mode 100644 index 0000000000..75c2b625c2 --- /dev/null +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.xml @@ -0,0 +1,29 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 4 + + hvm + + + + power11 + + + destroy + restart + destroy + + /usr/bin/qemu-system-ppc64 + + + + + + + diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.xml b/tests/q= emuxmlconfdata/pseries-cpu-compat-power11.xml new file mode 100644 index 0000000000..2dcdc651ef --- /dev/null +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.xml @@ -0,0 +1,19 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 4 + + hvm + + + power11 + + + + /usr/bin/qemu-system-ppc64 + + + + diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 3f916e5228..ee95733919 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2379,6 +2379,10 @@ mymain(void) QEMU_CPU_DEF_POWER9); DO_TEST_CAPS_LATEST_PPC64_HOSTCPU("pseries-cpu-compat-power10", QEMU_CPU_DEF_POWER10); + DO_TEST_CAPS_LATEST_PPC64_HOSTCPU_FAILURE("pseries-cpu-compat-power11", + QEMU_CPU_DEF_POWER10); + DO_TEST_CAPS_LATEST_PPC64_HOSTCPU("pseries-cpu-compat-power11", + QEMU_CPU_DEF_POWER11); =20 qemuTestSetHostArch(&driver, VIR_ARCH_NONE); =20 diff --git a/tests/testutilshostcpus.h b/tests/testutilshostcpus.h index 79c37baed4..36118d6acb 100644 --- a/tests/testutilshostcpus.h +++ b/tests/testutilshostcpus.h @@ -123,6 +123,15 @@ static virCPUDef cpuPower10Data =3D { .threads =3D 1, }; =20 +static virCPUDef cpuPower11Data =3D { + .type =3D VIR_CPU_TYPE_HOST, + .arch =3D VIR_ARCH_PPC64, + .model =3D (char *) "POWER11", + .sockets =3D 1, + .cores =3D 16, + .threads =3D 1, +}; + static virCPUDef cpuAarch64Data =3D { .type =3D VIR_CPU_TYPE_HOST, .arch =3D VIR_ARCH_AARCH64, @@ -197,6 +206,8 @@ testUtilsHostCpusGetDefForModel(const char *model) return virCPUDefCopy(&cpuPower9Data); else if (STREQ(model, "POWER10")) return virCPUDefCopy(&cpuPower10Data); + else if (STREQ(model, "POWER11")) + return virCPUDefCopy(&cpuPower11Data); =20 return NULL; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index ecd761dff0..9038a37869 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -24,6 +24,7 @@ static virCPUDef *cpuHaswell; static virCPUDef *cpuPower8; static virCPUDef *cpuPower9; static virCPUDef *cpuPower10; +static virCPUDef *cpuPower11; =20 char * virFindFileInPath(const char *file) @@ -166,6 +167,7 @@ qemuTestGetCPUDef(qemuTestCPUDef d) case QEMU_CPU_DEF_POWER8: return cpuPower8; case QEMU_CPU_DEF_POWER9: return cpuPower9; case QEMU_CPU_DEF_POWER10: return cpuPower10; + case QEMU_CPU_DEF_POWER11: return cpuPower11; } =20 return NULL; @@ -251,6 +253,7 @@ void qemuTestDriverFree(virQEMUDriver *driver) virCPUDefFree(cpuPower8); virCPUDefFree(cpuPower9); virCPUDefFree(cpuPower10); + virCPUDefFree(cpuPower11); } =20 =20 @@ -303,6 +306,7 @@ int qemuTestDriverInit(virQEMUDriver *driver) cpuPower8 =3D virCPUDefCopy(&cpuPower8Data); cpuPower9 =3D virCPUDefCopy(&cpuPower9Data); cpuPower10 =3D virCPUDefCopy(&cpuPower10Data); + cpuPower11 =3D virCPUDefCopy(&cpuPower11Data); =20 if (virMutexInit(&driver->lock) < 0) return -1; diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 20135b8390..62943bb2d8 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -78,6 +78,7 @@ typedef enum { QEMU_CPU_DEF_POWER8, QEMU_CPU_DEF_POWER9, QEMU_CPU_DEF_POWER10, + QEMU_CPU_DEF_POWER11, } qemuTestCPUDef; =20 struct testQemuArgs { --=20 2.48.1