From nobody Thu Dec 18 08:07:35 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 1744704956992199.58898242844248; Tue, 15 Apr 2025 01:15:56 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4FC6913A7; Tue, 15 Apr 2025 04:15:56 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C49DA13AA; Tue, 15 Apr 2025 04:13:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3D8AC187E; Tue, 15 Apr 2025 04:13:54 -0400 (EDT) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 8E89614FC for ; Tue, 15 Apr 2025 04:13:27 -0400 (EDT) Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53EKGliF027657; Tue, 15 Apr 2025 08:13:26 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46109f5fyx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Apr 2025 08:13:26 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 53F5Fjt6001258; Tue, 15 Apr 2025 08:13:25 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4602vytbtr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Apr 2025 08:13:25 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53F8DNVi54460674 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Apr 2025 08:13:23 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F1F32004B; Tue, 15 Apr 2025 08:13:23 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 66EF520043; Tue, 15 Apr 2025 08:13:22 +0000 (GMT) Received: from ltcblue8v9-lp1.aus.stglabs.ibm.com (unknown [9.40.192.91]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 15 Apr 2025 08:13:22 +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=kNDtyTM6H5CKWTczD HGhngocb4wFEBM9Q4FgvALn9oM=; b=IySAJNTPi1fSIj9l38EmMhRWm9rgZOEhi AuzVaaobJegjbMoFHqqh2mAsSGJtodRXEcwjOXaNWwIAyghM48Db3g2SnIpRelI5 /UkjKeL4qOewSBE1n5oXw9Pif00p7g1cFPyhtR1tyBQrwaDtMNCJSlY2Gvwh0GJ2 VkGnOOQlwDQPoYdUMwDs5UdDJKyKbYkcjmP+epQ+F02NymFxRvP2p58PvlbKHD0F U9kAR88Lm98l0EibTeEzv536uqyuMZCypXhiN9hADtIEql6lbISShAx4vAljBk/y RM3oc0jgYiiJ+g8JhCQYr1+QoJNypTVdfiKRE7TKmYPfkLPoDnlMw== From: Narayana Murty N To: devel@lists.libvirt.org Subject: [PATCH v4 5/5] cpu_ppc64: Add POWER11 hostmodel support and accept case insensitive Date: Tue, 15 Apr 2025 04:13:09 -0400 Message-ID: <20250415081309.11559-6-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250415081309.11559-1-nnmlinux@linux.ibm.com> References: <20250415081309.11559-1-nnmlinux@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: rNqKpUah15qUueFO7ivIIpXwXfUAjCln X-Proofpoint-ORIG-GUID: rNqKpUah15qUueFO7ivIIpXwXfUAjCln X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-15_03,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 bulkscore=0 adultscore=0 priorityscore=1501 mlxlogscore=999 malwarescore=0 clxscore=1015 spamscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504150054 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: J42FW2QK5P3BP3STLGCZYFDBGJ3MO4B6 X-Message-ID-Hash: J42FW2QK5P3BP3STLGCZYFDBGJ3MO4B6 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, jdenemar@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: 1744704958551019000 Content-Type: text/plain; charset="utf-8" QEMU has historically used uppercase CPU model names like "POWER8", "POWER9", etc. However, starting with commit c5354f54aa60 ("ppc: make cpu_model translation to type consistent"), QEMU began using lowercase CPU model names (e.g., "power8") for newer POWER generations. This shift in naming convention causes host-model compatibility checks to fail, as the logic in ppc64CheckCompatibilityMode was case-sensitive and expected only uppercase model names. This patch adds support for "power11" as a valid host-model. Also updates the compatibility logic to treat host-model names case-insensitivel= y, enabling recognition of both legacy uppercase and newer lowercase formats. To ensure compatibility checks work correctly across POWER CPU generations, avoiding false mismatches due to case differences. Signed-off-by: Narayana Murty N --- src/cpu/cpu_ppc64.c | 11 +++---- ...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, 105 insertions(+), 6 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..d1b9c52287 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -93,22 +93,21 @@ ppc64CheckCompatibilityMode(const char *host_model, if (!compat_mode) return VIR_CPU_COMPARE_IDENTICAL; =20 - /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9, POWER10 */ - if (!STRPREFIX(host_model, "POWER") || + /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9, POWER10, power11 */ + if (!STRCASEPREFIX(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; } - - /* 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..6fd69e54db 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