From nobody Sun Feb 8 19:39:58 2026 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com 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 1624022457603192.21780866850986; Fri, 18 Jun 2021 06:20:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-BbaNNpsDMA6odmOGJF_RnA-1; Fri, 18 Jun 2021 09:20:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ECE448017FF; Fri, 18 Jun 2021 13:20:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47E9019D9D; Fri, 18 Jun 2021 13:20:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D310146F82; Fri, 18 Jun 2021 13:20:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15IDKfhe003021 for ; Fri, 18 Jun 2021 09:20:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 967E01111A48; Fri, 18 Jun 2021 13:20:41 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 918931111A44 for ; Fri, 18 Jun 2021 13:20:38 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8A6F1857F29 for ; Fri, 18 Jun 2021 13:20:38 +0000 (UTC) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-51--5bXiAH-MSirGjDNmtBqYA-1; Fri, 18 Jun 2021 09:20:36 -0400 Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15ID3QWu066538; Fri, 18 Jun 2021 09:20:36 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 398u3atj6u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Jun 2021 09:20:35 -0400 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 15ID4r7H079047; Fri, 18 Jun 2021 09:20:35 -0400 Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 398u3atj6a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Jun 2021 09:20:35 -0400 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15IDDUY3019983; Fri, 18 Jun 2021 13:20:33 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma04fra.de.ibm.com with ESMTP id 394mj8sud9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Jun 2021 13:20:33 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15IDKU1Y23789972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Jun 2021 13:20:30 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E110752051; Fri, 18 Jun 2021 13:20:29 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.171.49]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 99B2552054; Fri, 18 Jun 2021 13:20:29 +0000 (GMT) X-MC-Unique: BbaNNpsDMA6odmOGJF_RnA-1 X-MC-Unique: -5bXiAH-MSirGjDNmtBqYA-1 From: Boris Fiuczynski To: libvir-list@redhat.com, danielhb413@gmail.com Subject: [PATCH v2 1/4] conf: refactor launch security to allow more types Date: Fri, 18 Jun 2021 15:20:24 +0200 Message-Id: <20210618132027.47230-2-fiuczy@linux.ibm.com> In-Reply-To: <20210618132027.47230-1-fiuczy@linux.ibm.com> References: <20210618132027.47230-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: YV5LJRxBLMIiig8rzQtcAMoZVoxvzj9Q X-Proofpoint-ORIG-GUID: 6mtWsGEuwbQh_09gwsGNtJPyZUYIjbnN X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-06-18_07:2021-06-18, 2021-06-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 clxscore=1015 bulkscore=0 spamscore=0 lowpriorityscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106180077 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: pasic@linux.ibm.com, bwalk@linux.ibm.com, phrdina@redhat.com, mhartmay@linux.ibm.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To allow other types of launch security the SEV type specific parameters like e.g. policy need to be optional and be separated from other new launch security types. A test is added to ensure the previously required and now optional launch security policy remains required when launch security type is SEV. Signed-off-by: Boris Fiuczynski Reviewed-by: Daniel Henrique Barboza --- docs/schemas/domaincommon.rng | 12 +- src/conf/domain_conf.c | 156 +++++++++++------- src/conf/domain_conf.h | 13 +- src/conf/virconftypes.h | 2 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 43 ++++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_firmware.c | 8 +- src/qemu/qemu_namespace.c | 20 ++- src/qemu/qemu_process.c | 35 +++- src/qemu/qemu_validate.c | 22 ++- src/security/security_dac.c | 4 +- ...urity-sev-missing-policy.x86_64-2.12.0.err | 1 + .../launch-security-sev-missing-policy.xml | 34 ++++ tests/qemuxml2argvtest.c | 1 + 15 files changed, 257 insertions(+), 100 deletions(-) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-poli= cy.x86_64-2.12.0.err create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-poli= cy.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5ea14b6dbf..8c1b6c3a09 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -483,7 +483,9 @@ - sev + + sev + @@ -496,9 +498,11 @@ - - - + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f65509d8ec..8c2f4fd227 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3490,8 +3490,7 @@ virDomainResctrlDefFree(virDomainResctrlDef *resctrl) } =20 =20 -static void -virDomainSEVDefFree(virDomainSEVDef *def) +void virDomainSEVDefFree(virDomainSEVDef *def) { if (!def) return; @@ -3502,6 +3501,17 @@ virDomainSEVDefFree(virDomainSEVDef *def) g_free(def); } =20 +void virDomainSecDefFree(virDomainSecDef *def) +{ + if (!def) + return; + + virDomainSEVDefFree(def->sev); + + g_free(def); +} + + static void virDomainOSDefClear(virDomainOSDef *os) { @@ -3703,7 +3713,7 @@ void virDomainDefFree(virDomainDef *def) if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); =20 - virDomainSEVDefFree(def->sev); + virDomainSecDefFree(def->sec); =20 xmlFreeNode(def->metadata); =20 @@ -14719,72 +14729,80 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, xmlXPathContextPtr ctxt) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - virDomainSEVDef *def; + g_autoptr(virDomainSEVDef) sev =3D g_new0(virDomainSEVDef, 1); unsigned long policy; - g_autofree char *type =3D NULL; int rc =3D -1; =20 - def =3D g_new0(virDomainSEVDef, 1); - ctxt->node =3D sevNode; =20 - if (!(type =3D virXMLPropString(sevNode, "type"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing launch security type")); - goto error; - } - - def->sectype =3D virDomainLaunchSecurityTypeFromString(type); - switch ((virDomainLaunchSecurity) def->sectype) { - case VIR_DOMAIN_LAUNCH_SECURITY_SEV: - break; - case VIR_DOMAIN_LAUNCH_SECURITY_NONE: - case VIR_DOMAIN_LAUNCH_SECURITY_LAST: - default: - virReportError(VIR_ERR_XML_ERROR, - _("unsupported launch security type '%s'"), - type); - goto error; - } - if (virXPathULongHex("string(./policy)", ctxt, &policy) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("failed to get launch security policy")); - goto error; + _("Failed to get launch security policy for " + "launch security type SEV")); + return NULL; } =20 /* the following attributes are platform dependent and if missing, we = can * autofill them from domain capabilities later */ - rc =3D virXPathUInt("string(./cbitpos)", ctxt, &def->cbitpos); + rc =3D virXPathUInt("string(./cbitpos)", ctxt, &sev->cbitpos); if (rc =3D=3D 0) { - def->haveCbitpos =3D true; + sev->haveCbitpos =3D true; } else if (rc =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Invalid format for launch security cbitpos")); - goto error; + return NULL; } =20 rc =3D virXPathUInt("string(./reducedPhysBits)", ctxt, - &def->reduced_phys_bits); + &sev->reduced_phys_bits); if (rc =3D=3D 0) { - def->haveReducedPhysBits =3D true; + sev->haveReducedPhysBits =3D true; } else if (rc =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Invalid format for launch security " "reduced-phys-bits")); - goto error; + return NULL; } =20 - def->policy =3D policy; - def->dh_cert =3D virXPathString("string(./dhCert)", ctxt); - def->session =3D virXPathString("string(./session)", ctxt); + sev->policy =3D policy; + sev->dh_cert =3D virXPathString("string(./dhCert)", ctxt); + sev->session =3D virXPathString("string(./session)", ctxt); =20 - return def; + return g_steal_pointer(&sev); +} =20 - error: - virDomainSEVDefFree(def); - return NULL; + +static virDomainSecDef * +virDomainSecDefParseXML(xmlNodePtr lsecNode, + xmlXPathContextPtr ctxt) +{ + g_autoptr(virDomainSecDef) sec =3D g_new0(virDomainSecDef, 1); + g_autofree char *type =3D NULL; + + if (!(type =3D virXMLPropString(lsecNode, "type"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing launch security type")); + return NULL; + } + + sec->sectype =3D virDomainLaunchSecurityTypeFromString(type); + switch ((virDomainLaunchSecurity) sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + sec->sev =3D virDomainSEVDefParseXML(lsecNode, ctxt); + if (!sec->sev) + return NULL; + break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + default: + virReportError(VIR_ERR_XML_ERROR, + _("unsupported launch security type '%s'"), + type); + return NULL; + } + + return g_steal_pointer(&sec); } =20 =20 @@ -20104,10 +20122,10 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt->node =3D node; VIR_FREE(nodes); =20 - /* Check for SEV feature */ + /* Check for launch security e.g. SEV feature */ if ((node =3D virXPathNode("./launchSecurity", ctxt)) !=3D NULL) { - def->sev =3D virDomainSEVDefParseXML(node, ctxt); - if (!def->sev) + def->sec =3D virDomainSecDefParseXML(node, ctxt); + if (!def->sec) goto error; } =20 @@ -26838,30 +26856,44 @@ virDomainKeyWrapDefFormat(virBuffer *buf, virDoma= inKeyWrapDef *keywrap) =20 =20 static void -virDomainSEVDefFormat(virBuffer *buf, virDomainSEVDef *sev) +virDomainSecDefFormat(virBuffer *buf, virDomainSecDef *sec) { - if (!sev) + if (!sec) return; =20 - virBufferAsprintf(buf, "\n", - virDomainLaunchSecurityTypeToString(sev->sectype)); - virBufferAdjustIndent(buf, 2); + switch ((virDomainLaunchSecurity) sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: { + virDomainSEVDef *sev =3D sec->sev; + if (!sev) + return; =20 - if (sev->haveCbitpos) - virBufferAsprintf(buf, "%d\n", sev->cbitpos); + virBufferAsprintf(buf, "\n", + virDomainLaunchSecurityTypeToString(sec->sectype= )); + virBufferAdjustIndent(buf, 2); =20 - if (sev->haveReducedPhysBits) - virBufferAsprintf(buf, "%d\n", - sev->reduced_phys_bits); - virBufferAsprintf(buf, "0x%04x\n", sev->policy); - if (sev->dh_cert) - virBufferEscapeString(buf, "%s\n", sev->dh_cert); + if (sev->haveCbitpos) + virBufferAsprintf(buf, "%d\n", sev->cbitpos= ); =20 - if (sev->session) - virBufferEscapeString(buf, "%s\n", sev->session= ); + if (sev->haveReducedPhysBits) + virBufferAsprintf(buf, "%d\= n", + sev->reduced_phys_bits); + virBufferAsprintf(buf, "0x%04x\n", sev->policy); + if (sev->dh_cert) + virBufferEscapeString(buf, "%s\n", sev->dh_ce= rt); + + if (sev->session) + virBufferEscapeString(buf, "%s\n", sev->ses= sion); + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + break; + } + + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + break; + } =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); } =20 =20 @@ -28270,7 +28302,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef = *def, if (def->keywrap) virDomainKeyWrapDefFormat(buf, def->keywrap); =20 - virDomainSEVDefFormat(buf, def->sev); + virDomainSecDefFormat(buf, def->sec); =20 if (def->namespaceData && def->ns.format) { if ((def->ns.format)(buf, def->namespaceData) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f706c498ff..fa7ab1895d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2651,7 +2651,6 @@ typedef enum { =20 =20 struct _virDomainSEVDef { - int sectype; /* enum virDomainLaunchSecurity */ char *dh_cert; char *session; unsigned int policy; @@ -2661,6 +2660,10 @@ struct _virDomainSEVDef { unsigned int reduced_phys_bits; }; =20 +struct _virDomainSecDef { + int sectype; /* enum virDomainLaunchSecurity */ + virDomainSEVDef *sev; +}; =20 typedef enum { VIR_DOMAIN_IOMMU_MODEL_INTEL, @@ -2871,8 +2874,8 @@ struct _virDomainDef { =20 virDomainKeyWrapDef *keywrap; =20 - /* SEV-specific domain */ - virDomainSEVDef *sev; + /* launch security e.g. SEV */ + virDomainSecDef *sec; =20 /* Application-specific custom metadata */ xmlNodePtr metadata; @@ -3285,6 +3288,10 @@ void virDomainRedirdevDefFree(virDomainRedirdevDef *= def); void virDomainRedirFilterDefFree(virDomainRedirFilterDef *def); void virDomainShmemDefFree(virDomainShmemDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainShmemDef, virDomainShmemDefFree); +void virDomainSEVDefFree(virDomainSEVDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSEVDef, virDomainSEVDefFree); +void virDomainSecDefFree(virDomainSecDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSecDef, virDomainSecDefFree); void virDomainDeviceDefFree(virDomainDeviceDef *def); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainDeviceDef, virDomainDeviceDefFree); diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h index b21068486e..21420ba8ea 100644 --- a/src/conf/virconftypes.h +++ b/src/conf/virconftypes.h @@ -202,6 +202,8 @@ typedef struct _virDomainResourceDef virDomainResourceD= ef; =20 typedef struct _virDomainSEVDef virDomainSEVDef; =20 +typedef struct _virDomainSecDef virDomainSecDef; + typedef struct _virDomainShmemDef virDomainShmemDef; =20 typedef struct _virDomainSmartcardDef virDomainSmartcardDef; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 038d6478b2..f2d99abcfa 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -856,7 +856,9 @@ qemuSetupDevicesCgroup(virDomainObj *vm) return -1; } =20 - if (vm->def->sev && qemuSetupSEVCgroup(vm) < 0) + if (vm->def->sec && + vm->def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_SEV && + qemuSetupSEVCgroup(vm) < 0) return -1; =20 return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea513693f7..6a1383f255 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6966,11 +6966,20 @@ qemuBuildMachineCommandLine(virCommand *cmd, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_LOADPARM)) qemuAppendLoadparmMachineParm(&buf, def); =20 - if (def->sev) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_S= UPPORT)) { - virBufferAddLit(&buf, ",confidential-guest-support=3Dsev0"); - } else { - virBufferAddLit(&buf, ",memory-encryption=3Dsev0"); + if (def->sec) { + switch ((virDomainLaunchSecurity) def->sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUE= ST_SUPPORT)) { + virBufferAddLit(&buf, ",confidential-guest-support=3Dsev0"= ); + } else { + virBufferAddLit(&buf, ",memory-encryption=3Dsev0"); + } + break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + break; + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + virReportEnumRangeError(virDomainLaunchSecurity, def->sec->sec= type); + return -1; } } =20 @@ -9860,6 +9869,28 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virCommand= *cmd, return 0; } =20 + +static int +qemuBuildSecCommandLine(virDomainObj *vm, virCommand *cmd, + virDomainSecDef *sec) +{ + if (!sec) + return 0; + + switch ((virDomainLaunchSecurity) sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + return qemuBuildSEVCommandLine(vm, cmd, sec->sev); + break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + break; + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + virReportEnumRangeError(virDomainLaunchSecurity, sec->sectype); + return -1; + } + + return 0; +} + static int qemuBuildVMCoreInfoCommandLine(virCommand *cmd, const virDomainDef *def) @@ -10559,7 +10590,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildVMCoreInfoCommandLine(cmd, def) < 0) return NULL; =20 - if (qemuBuildSEVCommandLine(vm, cmd, def->sev) < 0) + if (qemuBuildSecCommandLine(vm, cmd, def->sec) < 0) return NULL; =20 if (snapshot) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1ee0e7ebc0..d8be868cb4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19848,7 +19848,7 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, if (virDomainGetLaunchSecurityInfoEnsureACL(domain->conn, vm->def) < 0) goto cleanup; =20 - if (vm->def->sev) { + if (vm->def->sec && vm->def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SEC= URITY_SEV) { if (qemuDomainGetSEVMeasurement(driver, vm, params, nparams, flags= ) < 0) goto cleanup; } diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index e17b024b06..6e8e7b4ae5 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1053,15 +1053,15 @@ qemuFirmwareMatchDomain(const virDomainDef *def, return false; } =20 - if (def->sev && - def->sev->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_SEV) { + if (def->sec && + def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_SEV) { if (!supportsSEV) { VIR_DEBUG("Domain requires SEV, firmware '%s' doesn't support = it", path); return false; } - - if (def->sev->policy & VIR_QEMU_FIRMWARE_AMD_SEV_ES_POLICY && + if (def->sec->sev && + def->sec->sev->policy & VIR_QEMU_FIRMWARE_AMD_SEV_ES_POLICY && !supportsSEVES) { VIR_DEBUG("Domain requires SEV-ES, firmware '%s' doesn't suppo= rt it", path); diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 98495e8ef8..35c8eb83fd 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -594,16 +594,26 @@ static int qemuDomainSetupLaunchSecurity(virDomainObj *vm, GSList **paths) { - virDomainSEVDef *sev =3D vm->def->sev; + virDomainSecDef *sec =3D vm->def->sec; =20 - if (!sev || sev->sectype !=3D VIR_DOMAIN_LAUNCH_SECURITY_SEV) + if (!sec) return 0; =20 - VIR_DEBUG("Setting up launch security"); + switch ((virDomainLaunchSecurity) sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + VIR_DEBUG("Setting up launch security for SEV"); =20 - *paths =3D g_slist_prepend(*paths, g_strdup(QEMU_DEV_SEV)); + *paths =3D g_slist_prepend(*paths, g_strdup(QEMU_DEV_SEV)); + + VIR_DEBUG("Set up launch security for SEV"); + break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + break; + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + virReportEnumRangeError(virDomainLaunchSecurity, sec->sectype); + return -1; + } =20 - VIR_DEBUG("Set up launch security"); return 0; } =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2b03b0ab98..ee39ff27fe 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6480,7 +6480,7 @@ qemuProcessUpdateSEVInfo(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUCaps *qemuCaps =3D priv->qemuCaps; - virDomainSEVDef *sev =3D vm->def->sev; + virDomainSEVDef *sev =3D vm->def->sec->sev; virSEVCapability *sevCaps =3D NULL; =20 /* if platform specific info like 'cbitpos' and 'reducedPhysBits' have @@ -6636,7 +6636,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver, for (i =3D 0; i < vm->def->nshmems; i++) qemuDomainPrepareShmemChardev(vm->def->shmems[i]); =20 - if (vm->def->sev) { + if (vm->def->sec && vm->def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SEC= URITY_SEV) { VIR_DEBUG("Updating SEV platform info"); if (qemuProcessUpdateSEVInfo(vm) < 0) return -1; @@ -6672,12 +6672,13 @@ qemuProcessSEVCreateFile(virDomainObj *vm, =20 =20 static int -qemuProcessPrepareSEVGuestInput(virDomainObj *vm) +qemuProcessPrepareSEVGuestInput(virDomainObj *vm, + virDomainSecDef *sec) { - virDomainSEVDef *sev =3D vm->def->sev; + virDomainSEVDef *sev =3D sec->sev; =20 if (!sev) - return 0; + return -1; =20 VIR_DEBUG("Preparing SEV guest"); =20 @@ -6695,6 +6696,28 @@ qemuProcessPrepareSEVGuestInput(virDomainObj *vm) } =20 =20 +static int +qemuProcessPrepareLaunchSecurityGuestInput(virDomainObj *vm) +{ + virDomainSecDef *sec =3D vm->def->sec; + + if (!sec) + return 0; + + switch ((virDomainLaunchSecurity) sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + return qemuProcessPrepareSEVGuestInput(vm, sec); + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + break; + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + virReportEnumRangeError(virDomainLaunchSecurity, sec->sectype); + return -1; + } + + return 0; +} + + static int qemuProcessPrepareHostStorage(virQEMUDriver *driver, virDomainObj *vm, @@ -6874,7 +6897,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver, if (qemuExtDevicesPrepareHost(driver, vm) < 0) return -1; =20 - if (qemuProcessPrepareSEVGuestInput(vm) < 0) + if (qemuProcessPrepareLaunchSecurityGuestInput(vm) < 0) return -1; =20 return 0; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 382473d03b..957dbc906c 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1214,12 +1214,22 @@ qemuValidateDomainDef(const virDomainDef *def, if (qemuValidateDomainDefPanic(def, qemuCaps) < 0) return -1; =20 - if (def->sev && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("SEV launch security is not supported with " - "this QEMU binary")); - return -1; + if (def->sec) { + switch ((virDomainLaunchSecurity) def->sec->sectype) { + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("SEV launch security is not supported wit= h " + "this QEMU binary")); + return -1; + } + break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: + break; + case VIR_DOMAIN_LAUNCH_SECURITY_LAST: + virReportEnumRangeError(virDomainLaunchSecurity, def->sec->sec= type); + return -1; + } } =20 if (def->naudios > 1 && diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 76bfce7762..eb4b0f7529 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1982,7 +1982,7 @@ virSecurityDACRestoreAllLabel(virSecurityManager *mgr, rc =3D -1; } =20 - if (def->sev) { + if (def->sec && def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_SE= V) { if (virSecurityDACRestoreSEVLabel(mgr, def) < 0) rc =3D -1; } @@ -2189,7 +2189,7 @@ virSecurityDACSetAllLabel(virSecurityManager *mgr, return -1; } =20 - if (def->sev) { + if (def->sec && def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_SE= V) { if (virSecurityDACSetSEVLabel(mgr, def) < 0) return -1; } diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-policy.x86_= 64-2.12.0.err b/tests/qemuxml2argvdata/launch-security-sev-missing-policy.x= 86_64-2.12.0.err new file mode 100644 index 0000000000..63eaf64071 --- /dev/null +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-policy.x86_64-2.12= .0.err @@ -0,0 +1 @@ +XML error: Failed to get launch security policy for launch security type S= EV diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml = b/tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml new file mode 100644 index 0000000000..5461b06c9d --- /dev/null +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml @@ -0,0 +1,34 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + + + + + + + + + AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA + IHAVENOIDEABUTJUSTPROVIDINGASTRING + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7fed871c9e..04806ef0e9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3456,6 +3456,7 @@ mymain(void) DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev", "6.0.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"= ); + DO_TEST_CAPS_VER_PARSE_ERROR("launch-security-sev-missing-policy", "2.= 12.0"); =20 DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory"); DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages"); --=20 2.30.2