From nobody Wed Mar 12 17:27:41 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 1741102960458538.9809466036518; Tue, 4 Mar 2025 07:42:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id CD23D15DE; Tue, 4 Mar 2025 10:42:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0A9341613; Tue, 4 Mar 2025 10:40:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E63F7153A; Tue, 4 Mar 2025 10:40:39 -0500 (EST) 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 2E7C6E1E for ; Tue, 4 Mar 2025 10:40:39 -0500 (EST) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5249t8C0018790 for ; Tue, 4 Mar 2025 15:40:38 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 455kmymqmu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 Mar 2025 15:40:38 +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 524EwLmL009015 for ; Tue, 4 Mar 2025 15:40:38 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 454cxye74e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 Mar 2025 15:40:37 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 524FeZHp47776152 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 4 Mar 2025 15:40:36 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E034D20043 for ; Tue, 4 Mar 2025 15:40:35 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F57A20040 for ; Tue, 4 Mar 2025 15:40:35 +0000 (GMT) Received: from ltcblue8v9-lp1.aus.stglabs.ibm.com (unknown [9.40.192.91]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP for ; Tue, 4 Mar 2025 15:40:35 +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_H2,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= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=GQVvjqR7IkiuvMvfN EtPn3hiSjapDMRELcr0N0CGwrU=; b=rznjNbdaLvLukG8obn0Vnb5I1+/SfbhjF XQr2WRzuSr8AUjA2sFEbTFWpeKYd1kB+kozvM5CvBnwL4DSA9hO9Wvw3/RXqzgT9 p2AOG20qDTiTf5Hy1/q4Yq1LQAyJqKZ5RCLPvkPD59S+Esc1jDTPTzLeHLUHcNp+ UJxf/CF7K+PPszTlQQkkmVJlknK9TPx0flHC2XJtMfYX3AQxJu+VHbjQ6vR9RtaK wS86YcdZxWfOjH4q1ei9w/NNTV2XW84PKu/hApMfOI7AHYooIfS75ylTAeiUaWZF plC33YJbDKCzkxj0ygsnk6Sd7yPsAczHXQafUhnsprcwD56DH6p0w== From: Narayana Murty N To: devel@lists.libvirt.org Subject: [PATCH v2 4/4] cpu_ppc64: Add POWER11 host-model support Date: Tue, 4 Mar 2025 10:40:24 -0500 Message-ID: <20250304154024.1946-5-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250304154024.1946-1-nnmlinux@linux.ibm.com> References: <20250304154024.1946-1-nnmlinux@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: CnDoUyjuwb3cGQ_F7QujH2Q24tlQjQ61 X-Proofpoint-GUID: CnDoUyjuwb3cGQ_F7QujH2Q24tlQjQ61 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-04_06,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 priorityscore=1501 bulkscore=0 impostorscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=0 clxscore=1015 phishscore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2503040122 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UX5EWL7TS7UEAZI3L4FAGT3QD3YUZYR4 X-Message-ID-Hash: UX5EWL7TS7UEAZI3L4FAGT3QD3YUZYR4 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 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: 1741102961947019000 Content-Type: text/plain; charset="utf-8" Adds POWER11 host-model support to libvirt. Signed-off-by: Narayana Murty N --- 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 f2e319e390..2396875c98 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2400,6 +2400,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 44011c2b36..81e1e3002f 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) @@ -160,6 +161,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; @@ -245,6 +247,7 @@ void qemuTestDriverFree(virQEMUDriver *driver) virCPUDefFree(cpuPower8); virCPUDefFree(cpuPower9); virCPUDefFree(cpuPower10); + virCPUDefFree(cpuPower11); } =20 =20 @@ -297,6 +300,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