From nobody Mon Feb 9 19:05:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629440356061325.0511346574434; Thu, 19 Aug 2021 23:19:16 -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-153-P4BKmiWOP1ea9b8pvWyGtg-1; Fri, 20 Aug 2021 02:19:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D3F71008063; Fri, 20 Aug 2021 06:19:07 +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 6CC545C1BB; Fri, 20 Aug 2021 06:19:06 +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 B9B0C4BB7C; Fri, 20 Aug 2021 06:19:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17K6J1PC029364 for ; Fri, 20 Aug 2021 02:19:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BC1420A8C05; Fri, 20 Aug 2021 06:19:01 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46D2620A8C1A for ; Fri, 20 Aug 2021 06:19:01 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 2B784800182 for ; Fri, 20 Aug 2021 06:19:01 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-593-TAgCNm8PPIWrqc5MmnypCQ-3; Fri, 20 Aug 2021 02:18:58 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 23:17:54 -0700 Received: from nhsgx.sh.intel.com ([10.239.36.138]) by orsmga008.jf.intel.com with ESMTP; 19 Aug 2021 23:17:52 -0700 X-MC-Unique: P4BKmiWOP1ea9b8pvWyGtg-1 X-MC-Unique: TAgCNm8PPIWrqc5MmnypCQ-3 X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="277738313" X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="277738313" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="472173837" From: Haibin Huang To: libvir-list@redhat.com, haibin.huang@intel.com, jian-feng.ding@intel.com, lin.a.yang@intel.com, lianhao.lu@intel.com, pbonzini@redhat.com Subject: [libvirt][PATCH v6 2/6] qemu: Add command-line to generate SGX EPC memory backend Date: Fri, 20 Aug 2021 14:15:02 +0800 Message-Id: <20210820061506.6268-3-haibin.huang@intel.com> In-Reply-To: <20210820061506.6268-1-haibin.huang@intel.com> References: <20210820061506.6268-1-haibin.huang@intel.com> 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.4 X-loop: libvir-list@redhat.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.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com X-ZM-MESSAGEID: 1629440358006100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Lin Yang According to the result parsing from xml, add the argument of SGX EPC memory backend into QEMU command line: #qemu-system-x86_64 \ ...... \ -object memory-backend-epc,id=3Dmem1,size=3D64M,prealloc=3Don \ -object memory-backend-epc,id=3Dmem2,size=3D28M \ -M sgx-epc.0.memdev=3Dmem1,sgx-epc.1.memdev=3Dmem2 --- src/qemu/qemu_alias.c | 8 +++++--- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_domain.c | 8 +++++++- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 101ab5608f..d935ae6847 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -487,10 +487,12 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def, =20 if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_DIMM) prefix =3D "dimm"; - else + else if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) prefix =3D "nvdimm"; + else + prefix =3D "epc"; =20 - if (oldAlias) { + if (oldAlias || mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_SGX_EPC) { for (i =3D 0; i < def->nmems; i++) { if ((idx =3D qemuDomainDeviceAliasIndex(&def->mems[i]->info, p= refix)) >=3D maxidx) maxidx =3D idx + 1; @@ -674,7 +676,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) return -1; } for (i =3D 0; i < def->nmems; i++) { - if (qemuAssignDeviceMemoryAlias(NULL, def->mems[i], false) < 0) + if (qemuAssignDeviceMemoryAlias(def, def->mems[i], false) < 0) return -1; } if (def->vsock) { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4a1d0c3e9e..dba76d3f78 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3143,6 +3143,14 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backend= Props, =20 if (qemuBuildMemoryBackendPropsShare(props, memAccess) < 0) return -1; + } else if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_SGX_EPC) { + backendType =3D "memory-backend-epc"; + if (!priv->memPrealloc) + prealloc =3D true; + if (virJSONValueObjectAdd(props, + "B:prealloc", prealloc, + NULL) < 0) + return -1; } else { backendType =3D "memory-backend-ram"; } @@ -7477,6 +7485,8 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { size_t i; + g_auto(virBuffer) epcBuf =3D VIR_BUFFER_INITIALIZER; + int epcNum =3D 0; =20 /* memory hotplug requires NUMA to be enabled - we already checked * that memory devices are present only when NUMA is */ @@ -7490,12 +7500,35 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); =20 - if (!(dimmStr =3D qemuBuildMemoryDeviceStr(def->mems[i], priv))) - return -1; + switch ((virDomainMemoryModel) def->mems[i]->model) { + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + if (!(dimmStr =3D qemuBuildMemoryDeviceStr(def->mems[i], priv)= )) + return -1; + + virCommandAddArgList(cmd, "-device", dimmStr, NULL); + + VIR_FREE(dimmStr); + break; + + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + if (virBufferUse(&epcBuf) > 0) + virBufferAddChar(&epcBuf, ','); + + virBufferAsprintf(&epcBuf, "sgx-epc.%d.memdev=3D%s", epcNum++, + g_strdup_printf("mem%s", def->mems[i]->info.= alias)); + + break; =20 - virCommandAddArgList(cmd, "-device", dimmStr, NULL); + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } + } =20 - VIR_FREE(dimmStr); + if (virBufferUse(&epcBuf) > 0) { + virCommandAddArg(cmd, "-M"); + virCommandAddArgBuffer(cmd, &epcBuf); } =20 return 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 55c874da16..d9e2da5f70 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8430,7 +8430,7 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef= *def, virQEMUCapsPtr qemuCaps, const virDomainMemoryDef *mem) { - unsigned int nmems =3D def->nmems; + unsigned int nmems =3D 0; unsigned long long hotplugSpace; unsigned long long hotplugMemory =3D 0; bool needPCDimmCap =3D false; @@ -8439,6 +8439,12 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDe= f *def, =20 hotplugSpace =3D def->mem.max_memory - virDomainDefGetMemoryInitial(de= f); =20 + for (i =3D 0; i < def->nmems; i++) { + if (def->mems[i]->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_DIMM || + def->mems[i]->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) + nmems++; + } + if (mem) { nmems++; hotplugMemory =3D mem->size; --=20 2.17.1