[libvirt][PATCH v8 3/5] conf: Introduce SGX EPC element into device memory xml
Huang, Haibin
haibin.huang at intel.com
Tue Dec 14 12:35:05 UTC 2021
Ok, I will fix it.
Thank you!
> -----Original Message-----
> From: Ani Sinha <ani at anisinha.ca>
> Sent: Tuesday, December 14, 2021 2:54 PM
> To: Huang, Haibin <haibin.huang at intel.com>
> Cc: libvir-list at redhat.com; Ding, Jian-feng <jian-feng.ding at intel.com>; Yang,
> Lin A <lin.a.yang at intel.com>; Lu, Lianhao <lianhao.lu at intel.com>; Zhong,
> Yang <yang.zhong at intel.com>
> Subject: Re: [libvirt][PATCH v8 3/5] conf: Introduce SGX EPC element into
> device memory xml
>
> SOB is missing ...
>
> On Tue, Dec 14, 2021 at 9:16 AM Haibin Huang <haibin.huang at intel.com>
> wrote:
> >
> > From: Lin Yang <lin.a.yang at intel.com>
> >
> > <devices>
> > ...
> > <memory model='sgx-epc'>
> > <target>
> > <size unit='KiB'>512</size>
> > </target>
> > </memory>
> > ...
> > </devices>
> > ---
> > docs/schemas/domaincommon.rng | 1 +
> > src/conf/domain_conf.c | 6 ++++++
> > src/conf/domain_conf.h | 1 +
> > src/conf/domain_validate.c | 1 +
> > src/qemu/qemu_alias.c | 3 +++
> > src/qemu/qemu_command.c | 1 +
> > src/qemu/qemu_domain.c | 2 ++
> > src/qemu/qemu_domain_address.c | 6 ++++++
> > src/qemu/qemu_driver.c | 1 +
> > src/qemu/qemu_process.c | 2 ++
> > src/qemu/qemu_validate.c | 8 ++++++++
> > src/security/security_apparmor.c | 1 +
> > src/security/security_dac.c | 2 ++
> > src/security/security_selinux.c | 2 ++
> > 14 files changed, 37 insertions(+)
> >
> > diff --git a/docs/schemas/domaincommon.rng
> > b/docs/schemas/domaincommon.rng index 26990c4d6d..39b02d1cb7
> 100644
> > --- a/docs/schemas/domaincommon.rng
> > +++ b/docs/schemas/domaincommon.rng
> > @@ -6616,6 +6616,7 @@
> > <value>nvdimm</value>
> > <value>virtio-pmem</value>
> > <value>virtio-mem</value>
> > + <value>sgx-epc</value>
> > </choice>
> > </attribute>
> > <optional>
> > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index
> > 6fcf86ba58..c892865da4 100644
> > --- a/src/conf/domain_conf.c
> > +++ b/src/conf/domain_conf.c
> > @@ -1399,6 +1399,7 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
> > "nvdimm",
> > "virtio-pmem",
> > "virtio-mem",
> > + "sgx-epc",
> > );
> >
> > VIR_ENUM_IMPL(virDomainShmemModel,
> > @@ -5508,6 +5509,7 @@
> virDomainMemoryDefPostParse(virDomainMemoryDef
> > *mem,
> >
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > @@ -14696,6 +14698,7 @@
> virDomainMemorySourceDefParseXML(xmlNodePtr node,
> > def->nvdimmPath = virXPathString("string(./path)", ctxt);
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > @@ -14764,6 +14767,7 @@
> virDomainMemoryTargetDefParseXML(xmlNodePtr node,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > }
> > @@ -16548,6 +16552,7 @@
> virDomainMemoryFindByDefInternal(virDomainDef *def,
> > continue;
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > @@ -25997,6 +26002,7 @@ virDomainMemorySourceDefFormat(virBuffer
> *buf,
> > virBufferEscapeString(&childBuf, "<path>%s</path>\n", def-
> >nvdimmPath);
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index
> > 1ac802feca..58b6ff8355 100644
> > --- a/src/conf/domain_conf.h
> > +++ b/src/conf/domain_conf.h
> > @@ -2482,6 +2482,7 @@ typedef enum {
> > VIR_DOMAIN_MEMORY_MODEL_NVDIMM, /* nvdimm memory device
> */
> > VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM, /* virtio-pmem
> memory device */
> > VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM, /* virtio-mem memory
> device
> > */
> > + VIR_DOMAIN_MEMORY_MODEL_SGX_EPC, /* SGX enclave page cache
> */
> >
> > VIR_DOMAIN_MEMORY_MODEL_LAST
> > } virDomainMemoryModel;
> > diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
> > index 80401cf8c7..982ecc60d0 100644
> > --- a/src/conf/domain_validate.c
> > +++ b/src/conf/domain_validate.c
> > @@ -2066,6 +2066,7 @@ virDomainMemoryDefValidate(const
> virDomainMemoryDef *mem,
> > break;
> >
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > break;
> >
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index
> > 276a03cb56..5795924754 100644
> > --- a/src/qemu/qemu_alias.c
> > +++ b/src/qemu/qemu_alias.c
> > @@ -538,6 +538,9 @@ qemuAssignDeviceMemoryAlias(virDomainDef
> *def,
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > prefix = "virtiomem";
> > break;
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > + prefix = "epc";
> > + break;
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > default:
> > diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index
> > dba877a740..36281a69e2 100644
> > --- a/src/qemu/qemu_command.c
> > +++ b/src/qemu/qemu_command.c
> > @@ -3768,6 +3768,7 @@ qemuBuildMemoryDeviceProps(const
> virDomainDef *def,
> > device = "virtio-mem-pci";
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > default:
> > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index
> > 1bd3730281..f156d073e5 100644
> > --- a/src/qemu/qemu_domain.c
> > +++ b/src/qemu/qemu_domain.c
> > @@ -8184,6 +8184,7 @@
> qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driver,
> > break;
> >
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > @@ -8858,6 +8859,7 @@
> qemuDomainDefValidateMemoryHotplugDevice(const
> virDomainMemoryDef *mem,
> > }
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > return -1;
> > diff --git a/src/qemu/qemu_domain_address.c
> > b/src/qemu/qemu_domain_address.c index c43ad23cf5..d9a5e12e8d
> 100644
> > --- a/src/qemu/qemu_domain_address.c
> > +++ b/src/qemu/qemu_domain_address.c
> > @@ -389,6 +389,7 @@
> qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > }
> > @@ -1025,6 +1026,7 @@
> qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > return 0;
> > }
> > @@ -2390,6 +2392,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef
> *def,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > }
> > @@ -3055,6 +3058,7 @@
> qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *driver,
> > return qemuDomainEnsurePCIAddress(vm, &dev, driver);
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > @@ -3081,6 +3085,7 @@
> qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm,
> > qemuDomainReleaseDeviceAddress(vm, &mem->info);
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > @@ -3115,6 +3120,7 @@ qemuDomainAssignMemorySlots(virDomainDef
> *def)
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > /* handled in qemuDomainAssignPCIAddresses() */
> > break;
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index
> > b9cc8f8379..601de3bf31 100644
> > --- a/src/qemu/qemu_driver.c
> > +++ b/src/qemu/qemu_driver.c
> > @@ -7062,6 +7062,7 @@
> qemuDomainChangeMemoryLiveValidateChange(const
> virDomainMemoryDef *oldDef,
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> > _("cannot modify memory of model '%s'"), diff
> > --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index
> > 6027b30405..b304839421 100644
> > --- a/src/qemu/qemu_process.c
> > +++ b/src/qemu/qemu_process.c
> > @@ -3884,6 +3884,7 @@
> qemuProcessDomainMemoryDefNeedHugepagesPath(const
> virDomainMemoryDef *mem,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > /* None of these can be backed by hugepages. */
> > return false;
> > @@ -3958,6 +3959,7 @@
> qemuProcessNeedMemoryBackingPath(virDomainDef *def,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > /* Backed by user provided path. Not stored in memory
> > * backing dir anyway. */ diff --git
> > a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index
> > 3045e4b64b..3c02b97a20 100644
> > --- a/src/qemu/qemu_validate.c
> > +++ b/src/qemu/qemu_validate.c
> > @@ -5019,6 +5019,14 @@
> qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
> > }
> > break;
> >
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) {
> > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> > + _("sgx epc isn't supported by this QEMU binary"));
> > + return -1;
> > + }
> > + break;
> > +
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > diff --git a/src/security/security_apparmor.c
> > b/src/security/security_apparmor.c
> > index 2cc15ba6af..f832e5afd2 100644
> > --- a/src/security/security_apparmor.c
> > +++ b/src/security/security_apparmor.c
> > @@ -694,6 +694,7 @@ AppArmorSetMemoryLabel(virSecurityManager
> *mgr,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > }
> > diff --git a/src/security/security_dac.c b/src/security/security_dac.c
> > index 1733d63410..9420dbd73c 100644
> > --- a/src/security/security_dac.c
> > +++ b/src/security/security_dac.c
> > @@ -1850,6 +1850,7 @@
> > virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,
> >
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > ret = 0;
> > @@ -2035,6 +2036,7 @@
> virSecurityDACSetMemoryLabel(virSecurityManager
> > *mgr,
> >
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > ret = 0;
> > diff --git a/src/security/security_selinux.c
> > b/src/security/security_selinux.c index 622a8f4c02..6e40303e1f 100644
> > --- a/src/security/security_selinux.c
> > +++ b/src/security/security_selinux.c
> > @@ -1583,6 +1583,7 @@
> virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr,
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > break;
> > }
> > @@ -1611,6 +1612,7 @@
> > virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr,
> >
> > case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> > case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> > + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> > case VIR_DOMAIN_MEMORY_MODEL_NONE:
> > case VIR_DOMAIN_MEMORY_MODEL_LAST:
> > ret = 0;
> > --
> > 2.17.1
> >
More information about the libvir-list
mailing list