From nobody Thu Apr 10 09:13:02 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass header.i=@intel.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=intel.com
ARC-Seal: i=1; a=rsa-sha256; t=1737726127; cv=none;
d=zohomail.com; s=zohoarc;
b=O7/y7k6nK/Mq54FJDZiOO9FQY2JO0Q1hGFXMDqCfYZA1K56uiDb547iPY5Yxxv7h7AhHVlFFk2eIvDAsSSKqDzbW8VYWwWw8w9onaxmCOqs+CgHJvJJzczIzX/E41zB6C9oiivRxTja7MA9ZfsS4987ISImgerekq8ENWwbATSw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1737726127;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=5Hp1mlaLKZPhNlO+BLn7JNJwPSBhyESRcUgVQMeGOhs=;
b=LT2cSrmprgGpcPPgxGMe4ZFGiLd36kQ0itAUEv9GoEEHqcYVaNKptlSlHpA700WR2I2/VQsxWkFEPnLaP/B2XX/lN4FifFv1ee47FvWQgRe7M1hDq8Pm3R0baeZwtgFMHUfsLtm9izTj7ESlvEeQSoeVK+FWcrnPvq9zrHu+rJU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=@intel.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<xiaoyao.li@intel.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1737726127329639.6714237702377;
Fri, 24 Jan 2025 05:42:07 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tbJta-0006Th-3J; Fri, 24 Jan 2025 08:38:50 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <xiaoyao.li@intel.com>)
id 1tbJtT-00062I-OB
for qemu-devel@nongnu.org; Fri, 24 Jan 2025 08:38:44 -0500
Received: from mgamail.intel.com ([198.175.65.13])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <xiaoyao.li@intel.com>)
id 1tbJtR-00042W-Vg
for qemu-devel@nongnu.org; Fri, 24 Jan 2025 08:38:43 -0500
Received: from fmviesa003.fm.intel.com ([10.60.135.143])
by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
24 Jan 2025 05:38:30 -0800
Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52])
by fmviesa003.fm.intel.com with ESMTP; 24 Jan 2025 05:38:25 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1737725922; x=1769261922;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=yKX2C5oNRGllaV58Edxdk4KBInFvfS6cENAd6j8GQ0U=;
b=XYYwbZwYMaNGDGTgmF/RWAC+SpnOptg86kpElYvEYI36uEDh8uoT1xZZ
7wn+ze4Up+AdAXPG8YBXVp/mpVBWgpEsL52S1PTS1Ohs6NYnsAumkT9Cp
yvU/TNFQmmO4zHYjlIdNrvrHKZ3/cvjlQ2TcKjs3NIEr/kG4MulNk7slT
svvNDWcXqCTiE9mSms+YSdnfp2W7/+YtiH0RJrrhI9dSLHkG6rBOfvGLQ
b9rZcYRU36ViIPTPlb8N1wegzR87dmjXF8P/zFUBn2NthmVzhWQhODmFC
Ov1algIj8/JXrKTE/AmVmXhKMWbjJLs/XeoyIVUCUAvN3hAIIrhztHDSB w==;
X-CSE-ConnectionGUID: zWaU4wsJS/CkMT1cVtVvJA==
X-CSE-MsgGUID: DuExvDzLTouBTYnhdXhNng==
X-IronPort-AV: E=McAfee;i="6700,10204,11325"; a="49246413"
X-IronPort-AV: E=Sophos;i="6.13,231,1732608000"; d="scan'208";a="49246413"
X-CSE-ConnectionGUID: 1T8BMRnETISh+Xx12Ivtcg==
X-CSE-MsgGUID: 2xy4yLmjQpeP+jrArL8pZA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="111804310"
From: Xiaoyao Li <xiaoyao.li@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Igor Mammedov <imammedo@redhat.com>
Cc: Zhao Liu <zhao1.liu@intel.com>, "Michael S. Tsirkin" <mst@redhat.com>,
Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Marcelo Tosatti <mtosatti@redhat.com>, Huacai Chen <chenhuacai@kernel.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Francesco Lavra <francescolavra.fl@gmail.com>, xiaoyao.li@intel.com,
qemu-devel@nongnu.org, kvm@vger.kernel.org
Subject: [PATCH v7 23/52] i386/tdx: Add TDVF memory via
KVM_TDX_INIT_MEM_REGION
Date: Fri, 24 Jan 2025 08:20:19 -0500
Message-Id: <20250124132048.3229049-24-xiaoyao.li@intel.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250124132048.3229049-1-xiaoyao.li@intel.com>
References: <20250124132048.3229049-1-xiaoyao.li@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=198.175.65.13;
envelope-from=xiaoyao.li@intel.com;
helo=mgamail.intel.com
X-Spam_score_int: -63
X-Spam_score: -6.4
X-Spam_bar: ------
X-Spam_report: (-6.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.998, RCVD_IN_DNSWL_MED=-2.3,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @intel.com)
X-ZM-MESSAGEID: 1737726128875019100
Content-Type: text/plain; charset="utf-8"
From: Isaku Yamahata <isaku.yamahata@intel.com>
TDVF firmware (CODE and VARS) needs to be copied to TD's private
memory via KVM_TDX_INIT_MEM_REGION, as well as TD HOB and TEMP memory.
If the TDVF section has TDVF_SECTION_ATTRIBUTES_MR_EXTEND set in the
flag, calling KVM_TDX_EXTEND_MEMORY to extend the measurement.
After populating the TDVF memory, the original image located in shared
ramblock can be discarded.
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
Changes in v6:
- switch back to use KVM_TDX_INIT_MEM_REGION according to KVM's change;
---
target/i386/kvm/tdx.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
index cac073a6d291..08320b59b62a 100644
--- a/target/i386/kvm/tdx.c
+++ b/target/i386/kvm/tdx.c
@@ -17,6 +17,7 @@
#include "qom/object_interfaces.h"
#include "crypto/hash.h"
#include "system/system.h"
+#include "exec/ramblock.h"
=20
#include "hw/i386/e820_memory_layout.h"
#include "hw/i386/x86.h"
@@ -270,6 +271,9 @@ static void tdx_finalize_vm(Notifier *notifier, void *u=
nused)
{
TdxFirmware *tdvf =3D &tdx_guest->tdvf;
TdxFirmwareEntry *entry;
+ RAMBlock *ram_block;
+ Error *local_err =3D NULL;
+ int r;
=20
tdx_init_ram_entries();
=20
@@ -295,6 +299,44 @@ static void tdx_finalize_vm(Notifier *notifier, void *=
unused)
sizeof(TdxRamEntry), &tdx_ram_entry_compare);
=20
tdvf_hob_create(tdx_guest, tdx_get_hob_entry(tdx_guest));
+
+ for_each_tdx_fw_entry(tdvf, entry) {
+ struct kvm_tdx_init_mem_region region;
+ uint32_t flags;
+
+ region =3D (struct kvm_tdx_init_mem_region) {
+ .source_addr =3D (uint64_t)entry->mem_ptr,
+ .gpa =3D entry->address,
+ .nr_pages =3D entry->size >> 12,
+ };
+
+ flags =3D entry->attributes & TDVF_SECTION_ATTRIBUTES_MR_EXTEND ?
+ KVM_TDX_MEASURE_MEMORY_REGION : 0;
+
+ do {
+ error_free(local_err);
+ local_err =3D NULL;
+ r =3D tdx_vcpu_ioctl(first_cpu, KVM_TDX_INIT_MEM_REGION, flags,
+ ®ion, &local_err);
+ } while (r =3D=3D -EAGAIN || r =3D=3D -EINTR);
+ if (r < 0) {
+ error_report_err(local_err);
+ exit(1);
+ }
+
+ if (entry->type =3D=3D TDVF_SECTION_TYPE_TD_HOB ||
+ entry->type =3D=3D TDVF_SECTION_TYPE_TEMP_MEM) {
+ qemu_ram_munmap(-1, entry->mem_ptr, entry->size);
+ entry->mem_ptr =3D NULL;
+ }
+ }
+
+ /*
+ * TDVF image has been copied into private region above via
+ * KVM_MEMORY_MAPPING. It becomes useless.
+ */
+ ram_block =3D tdx_guest->tdvf_mr->ram_block;
+ ram_block_discard_range(ram_block, 0, ram_block->max_length);
}
=20
static Notifier tdx_machine_done_notify =3D {
--=20
2.34.1