From nobody Tue Sep 9 19:10:18 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 header.i=@fujitsu.com; 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=aa.jp.fujitsu.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1749712685557972.2058938514926; Thu, 12 Jun 2025 00:18:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7D05E938; Thu, 12 Jun 2025 03:18:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6AA461211; Thu, 12 Jun 2025 03:16:29 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B54B310A2; Thu, 12 Jun 2025 03:16:22 -0400 (EDT) Received: from esa11.hc1455-7.c3s2.iphmx.com (esa11.hc1455-7.c3s2.iphmx.com [207.54.90.137]) (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 37B53108A for ; Thu, 12 Jun 2025 03:15:49 -0400 (EDT) Received: from unknown (HELO yto-r4.gw.nic.fujitsu.com) ([218.44.52.220]) by esa11.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2025 16:14:41 +0900 Received: from yto-m3.gw.nic.fujitsu.com (yto-nat-yto-m3.gw.nic.fujitsu.com [192.168.83.66]) by yto-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 437E8D5004 for ; Thu, 12 Jun 2025 16:14:38 +0900 (JST) Received: from yto-om3.fujitsu.com (yto-om3.o.css.fujitsu.com [10.128.89.164]) by yto-m3.gw.nic.fujitsu.com (Postfix) with ESMTP id 0E4751559A for ; Thu, 12 Jun 2025 16:14:38 +0900 (JST) Received: from sm-x86-amd03.ssoft.mng.com (sm-x86-stp01.soft.fujitsu.com [10.124.178.20]) by yto-om3.fujitsu.com (Postfix) with ESMTP id DB5CC400584F0; Thu, 12 Jun 2025 16:14:37 +0900 (JST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 X-Greylist: delayed 63 seconds by postgrey-1.37 at lists.libvirt.org; Thu, 12 Jun 2025 03:15:49 EDT DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1749712550; x=1781248550; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NYGsKcvVJWoJ78Bkbps6w4U4pnC2PphIF7WsHybRcGg=; b=Y6yr8HfSUQJbz6lmNdOPsohuscm98s4OtYNyQxD0S2/BnWIEBABXUh2Z rRoc39arZV+ACf7dVVBHM6SjmjFJqLQMS0KEyLWC1LCmD7Z+AQY8NK6i1 JtPqFyyB4WSKvSb0JtgjvILYd6TQYKFA06k48Vl/aRvOrOgxpDZieKxxV DbeuDVSgOgeMRMTN+SaC0bcUvyodNAoQrR2NaJDUtxEbrsG/knF4OEFqi eip4kEhtgPt2Wj5twXp2nivKl4P+NsOkQcetYFljOKE4BVxeIPjrE92La oV+u/i+fKSEQX2akb5n2f6ISMh/v0Ns9Jh7zaxrhxcK+ipWoMSZkb3MPM A==; X-CSE-ConnectionGUID: xEfxHd9FRjyTQ0v181/6wg== X-CSE-MsgGUID: k/GzXAhWQsGlVX6KW2PNBw== X-IronPort-AV: E=McAfee;i="6800,10657,11461"; a="181987838" X-IronPort-AV: E=Sophos;i="6.16,230,1744038000"; d="scan'208";a="181987838" From: Kazuhiro Abe To: devel@lists.libvirt.org Subject: [RFC PATCH v4 2/4] src: Add ARM CCA support in domain capabilities command Date: Thu, 12 Jun 2025 16:12:05 +0900 Message-ID: <20250612071418.2926384-3-fj1078ii@aa.jp.fujitsu.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250612071418.2926384-1-fj1078ii@aa.jp.fujitsu.com> References: <20250612071418.2926384-1-fj1078ii@aa.jp.fujitsu.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P5QMKJE3AOUYUE5ZKGBBUYBMYBDH5FUT X-Message-ID-Hash: P5QMKJE3AOUYUE5ZKGBBUYBMYBDH5FUT X-MailFrom: fj1078ii@aa.jp.fujitsu.com 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: taketani.ryo@fujitsu.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: 1749712687011116600 Content-Type: text/plain; charset="utf-8" From: Akio Kakuno - Add ARM CCA support in domain capabilies XML schema. [Capability example] - Execution results of 'virsh domcapability" on qemu ... ... sha256 sha512 ... Signed-off-by: Kazuhiro Abe --- docs/formatdomaincaps.rst | 27 +++++++++- src/conf/domain_capabilities.c | 48 +++++++++++++++++ src/conf/domain_capabilities.h | 6 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 28 ++++++++++ src/qemu/qemu_monitor.c | 10 ++++ src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 98 ++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 4 ++ 9 files changed, 224 insertions(+), 1 deletion(-) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index ed95af4fee..fbf7db12e6 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -734,6 +734,12 @@ capabilities. All features occur as children of the ma= in ``features`` element.
+ + + sha256 + sha512 + + relaxed @@ -861,6 +867,24 @@ document store. In order to use SGX with libvirt have = a look at `SGX in domain X ``sections`` The sections of the SGX enclave page cache (called EPC). =20 +CCA capabilities +^^^^^^^^^^^^^^^^ + +Arm Confidential Compute Architecture (CCA) capabilities are exposed under= the +``cca`` element. + +Arm CCA is a system solution comprised of hardware and software components= that +maximizes the security of data on devices and in the cloud. +CCA enhances the virtualization capabilities of the platform by separating= the +management of resources from access to those resources. + +For more details on the CCA feature, please follow resources in the CCA de= veloper's +document store. In order to use CCA with libvirt have a look at `CCA in do= main +XML `__ + +``measurement-algo`` + Options for the ``measurement-algo`` used to describe blob hashes. + =20 Hyper-V Enlightenments ^^^^^^^^^^^^^^^^^^^^^^ @@ -882,4 +906,5 @@ The ``sectype`` enum corresponds to ``type`` attribute = of ```` element as documented in `Launch Security `__. :since:`(Since 10.5.0)` For addit= ional information on individual types, see sections above: `s390-pv capability`_= for -S390 PV, `SEV capabilities`_ for AMD SEV and/or AMD SEV-SNP. +S390 PV, `SEV capabilities`_ for AMD SEV and/or AMD SEV-SNP, `CCA capabili= ties`_ +for Arm CCA. diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 27551f6102..0d7b132c5e 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -91,6 +91,25 @@ virSGXCapabilitiesFree(virSGXCapability *cap) } =20 =20 +void +virCCACapabilitiesFree(virCCACapability *cap) +{ + size_t i; + + if (!cap) + return; + + if (cap->nCcaMeasurementAlgo) + for (i =3D 0; i < cap->nCcaMeasurementAlgo; i++) + g_free(cap->ccaMeasurementAlgo[i]); + + if (cap->ccaMeasurementAlgo) + g_free(cap->ccaMeasurementAlgo); + + g_free(cap); +} + + static void virDomainCapsDispose(void *obj) { @@ -104,6 +123,7 @@ virDomainCapsDispose(void *obj) virCPUDefFree(caps->cpu.hostModel); virSEVCapabilitiesFree(caps->sev); virSGXCapabilitiesFree(caps->sgx); + virCCACapabilitiesFree(caps->cca); g_free(caps->hyperv); =20 values =3D &caps->os.loader.values; @@ -775,6 +795,33 @@ virDomainCapsFeatureSGXFormat(virBuffer *buf, virBufferAddLit(buf, "\n"); } =20 +static void +virDomainCapsFeatureCCAFormat(virBuffer *buf, + const virCCACapability *cca) +{ + size_t i; + + if (!cca) { + virBufferAddLit(buf, "\n"); + return; + } + + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + for (i =3D 0; i < cca->nCcaMeasurementAlgo; i++) { + virBufferAsprintf(buf, "%s\n", + cca->ccaMeasurementAlgo[i]); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); +} + static void virDomainCapsFeatureHypervFormat(virBuffer *buf, const virDomainCapsFeatureHyperv *hyperv) @@ -822,6 +869,7 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps, =20 virDomainCapsFeatureSEVFormat(&childBuf, caps->sev); virDomainCapsFeatureSGXFormat(&childBuf, caps->sgx); + virDomainCapsFeatureCCAFormat(&childBuf, caps->cca); virDomainCapsFeatureHypervFormat(&childBuf, caps->hyperv); virDomainCapsLaunchSecurityFormat(&childBuf, &caps->launchSecurity); =20 diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 93e2cc2931..b55f860e7b 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -315,6 +315,7 @@ struct _virDomainCaps { virDomainCapsFeatureGIC gic; virSEVCapability *sev; virSGXCapability *sgx; + virCCACapability *cca; virDomainCapsFeatureHyperv *hyperv; virDomainCapsLaunchSecurity launchSecurity; /* add new domain features here */ @@ -375,3 +376,8 @@ void virSGXCapabilitiesFree(virSGXCapability *capabilities); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSGXCapability, virSGXCapabilitiesFree); + +void +virCCACapabilitiesFree(virCCACapability *capabilities); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCCACapability, virCCACapabilitiesFree); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a8ebf9efd8..42954dc395 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -208,6 +208,7 @@ virDomainAuditVcpu; =20 =20 # conf/domain_capabilities.h +virCCACapabilitiesFree; virDomainCapsCPUModelsAdd; virDomainCapsCPUModelsCopy; virDomainCapsCPUModelsGet; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bd8de6d854..8bac140944 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3655,6 +3655,32 @@ virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qemu= Caps, } =20 =20 +static int +virQEMUCapsProbeQMPCCACapabilities(virQEMUCaps *qemuCaps, + qemuMonitor *mon) +{ + int rc =3D -1; + virCCACapability *caps =3D NULL; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCA_GUEST)) + return 0; + + if ((rc =3D qemuMonitorGetCCACapabilities(mon, &caps)) < 0) + return -1; + + /* CCA isn't actually supported */ + if (rc =3D=3D 0) { + virQEMUCapsClear(qemuCaps, QEMU_CAPS_CCA_GUEST); + return 0; + } + + virCCACapabilitiesFree(qemuCaps->ccaCapabilities); + qemuCaps->ccaCapabilities =3D caps; + return 0; +} + + + /* * Filter for features which should never be passed to QEMU. Either because * QEMU never supported them or they were dropped as they never did anythi= ng @@ -5752,6 +5778,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, return -1; if (virQEMUCapsProbeQMPSGXCapabilities(qemuCaps, mon) < 0) return -1; + if (virQEMUCapsProbeQMPCCACapabilities(qemuCaps, mon) < 0) + return -1; =20 virQEMUCapsInitProcessCaps(qemuCaps); =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 981975cdd2..8852e697e0 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3504,6 +3504,16 @@ qemuMonitorGetSGXCapabilities(qemuMonitor *mon, } =20 =20 +int +qemuMonitorGetCCACapabilities(qemuMonitor *mon, + virCCACapability **capabilities) +{ + QEMU_CHECK_MONITOR(mon); + + return qemuMonitorJSONGetCCACapabilities(mon, capabilities); +} + + int qemuMonitorNBDServerStart(qemuMonitor *mon, const virStorageNetHostDef *server, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 8d49ada114..e9b1b5a356 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -856,6 +856,9 @@ int qemuMonitorGetSEVCapabilities(qemuMonitor *mon, int qemuMonitorGetSGXCapabilities(qemuMonitor *mon, virSGXCapability **capabilities); =20 +int qemuMonitorGetCCACapabilities(qemuMonitor *mon, + virCCACapability **capabilities); + typedef enum { QEMU_MONITOR_MIGRATE_RESUME =3D 1 << 0, /* resume failed post-= copy migration */ QEMU_MONITOR_MIGRATION_FLAGS_LAST diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dc2eaace96..ce009dff69 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6299,6 +6299,104 @@ qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon, } =20 =20 +static int +qemuMonitorJSONGetCCAMeasurementAlgo(qemuMonitor *mon, + size_t *numalgo, + char ***malgo) +{ + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; + virJSONValue *caps; + virJSONValue *malgolist =3D NULL; + g_auto(GStrv) list =3D NULL; + size_t i; + size_t n =3D 0; + + if (!(cmd =3D qemuMonitorJSONMakeCommand("query-cca-capabilities", + NULL))) + return -1; + + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + return -1; + + /* If the 'query-cca-capabilities' QMP command was not available + * we simply successfully return zero capabilities. + * This is the current QEMU (=3D9.1.91) and all non-ARM architectures = */ + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) + return 0; + + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + return -1; + + caps =3D virJSONValueObjectGetObject(reply, "return"); + + if (!(caps =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_OBJEC= T))) + return -1; + + if ((malgolist =3D virJSONValueObjectGetArray(caps, "sections"))) { + n =3D virJSONValueArraySize(malgolist); + + /* If the received array is empty, an error is returned. */ + if (n =3D=3D 0) + return -1; + + list =3D g_new0(char *, n + 1); + + for (i =3D 0; i < n; i++) { + virJSONValue *cap =3D virJSONValueArrayGet(malgolist, i); + const char *measurement_algo =3D NULL; + + if (!cap || virJSONValueGetType(cap) !=3D VIR_JSON_TYPE_OBJECT= ) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing entry in CCA capabilities list")= ); + return -1; + } + + if (!(measurement_algo =3D virJSONValueObjectGetString(cap, "m= easurement-algo"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-cca-capabilities reply was missing 'me= asurement-algo' field")); + return -1; + } + + list[i] =3D g_strdup(measurement_algo); + } + } + + *numalgo =3D n; + *malgo =3D g_steal_pointer(&list); + return 1; +} + + +/** + * qemuMonitorJSONGetCCACapabilities: + * @mon: qemu monitor object + * @capabilities: pointer to pointer to a CCA capability structure to be f= illed + * + * Returns -1 on error, 0 if CCA is not supported, and 1 if CCA is support= ed on + * the platform. + */ +int +qemuMonitorJSONGetCCACapabilities(qemuMonitor *mon, + virCCACapability **capabilities) +{ + g_autoptr(virCCACapability) capability =3D NULL; + int ret =3D 0; + + *capabilities =3D NULL; + capability =3D g_new0(virCCACapability, 1); + + ret =3D qemuMonitorJSONGetCCAMeasurementAlgo(mon, + &capability->nCcaMeasuremen= tAlgo, + &capability->ccaMeasurement= Algo); + + if (ret > 0) + *capabilities =3D g_steal_pointer(&capability); + + return ret; +} + + static virJSONValue * qemuMonitorJSONBuildInetSocketAddress(const char *host, const char *port) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index cec4fb387e..fa263b923f 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -168,6 +168,10 @@ int qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon, virSEVCapability **capabilities); =20 +int +qemuMonitorJSONGetCCACapabilities(qemuMonitor *mon, + virCCACapability **capabilities); + int qemuMonitorJSONMigrate(qemuMonitor *mon, unsigned int flags, --=20 2.43.5