From nobody Sat Nov 23 22:53:02 2024 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=1730789207; cv=none; d=zohomail.com; s=zohoarc; b=JOeAFr+EPWllLj3bZ21viJ4BE6OjFAneyFMFIASvm08iXPunGHnDT83piqtp28wSfy+eIcdlK2jgFZTZL5QzL2TCyOrXTJpZnjgO9J+9A7gtIXFT6PweUFHPHjDqjGOA5KtoM4Mgx2NvUOHO724tpNmxpNj+ca2S5/o3YYHie8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730789207; 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=+tDJ5RTw0vtERmlSqo3Lcm+7bW8HEqg5oLrjBrjZtNU=; b=UyxYdvMfHXgco0TXiDkVOA3ag70ZL3nD/dynGh2zXxd5feQeZE1UmC2IyBxLOIlfO+jwcIS4FwTugDvTNiLK4vn1AJ3dacYgtBGmSyxnlJFEU8LOr2yLEbA9A2fmw4hcxD9P2jl+58KPaYOP7sB6yy886UFrrLSZVvwxewIdTbk= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730789207461713.0864035258245; Mon, 4 Nov 2024 22:46:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8DBN-0004SR-16; Tue, 05 Nov 2024 01:36:53 -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 ) id 1t8DBJ-0004Re-Rg for qemu-devel@nongnu.org; Tue, 05 Nov 2024 01:36:49 -0500 Received: from mgamail.intel.com ([198.175.65.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8DBH-0001pq-Pe for qemu-devel@nongnu.org; Tue, 05 Nov 2024 01:36:49 -0500 Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2024 22:36:47 -0800 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by fmviesa009.fm.intel.com with ESMTP; 04 Nov 2024 22:36:43 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730788608; x=1762324608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7SB8aGVRHq3cVcRCjG983qVZg5U5xF0U5N0nc3brUHY=; b=KsRWxI/WLyGEs/yj/KDHntMNQirVXImY1qMu525UFreznrWmE9sgvgsG Zh827NPHvc6NWBEfIqZRKTVWvE4NhM8EhMvgUUqN2orhskBOaORVg+H/2 rV6dS67fbwvUUoeTCcAXDjevFZNHKdI7KA4FEDWr5vq7dAOdNlGjQHPH5 Pkt63kmyQV1zepgZc5Lgf2bLUwL6IkuZSYIToW0sE8OaDyp7mskL6NkQb Eqi8wVVqNoI1U9ACXlXYpilxfQlKYYyb2iXswhCL+W8N5bUVICndvonOE /sbW+qoo3yyf2b3xbggbRLB2yt42c9iWK1bYKw9T2so/+jLE+vunkZL+v Q==; X-CSE-ConnectionGUID: xbSja+cSQmKtSdEXwAXiwQ== X-CSE-MsgGUID: AlrywSEwT6aTrnbtt8dzpA== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="30689288" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="30689288" X-CSE-ConnectionGUID: CGPXOm3fS/i5ivZLDU97xA== X-CSE-MsgGUID: d6NqJKe+RIiI+IpNuhCdLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,259,1725346800"; d="scan'208";a="83988631" From: Xiaoyao Li To: Paolo Bonzini , Riku Voipio , Richard Henderson , Zhao Liu , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Ani Sinha Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Cornelia Huck , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eric Blake , Markus Armbruster , Marcelo Tosatti , rick.p.edgecombe@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, xiaoyao.li@intel.com Subject: [PATCH v6 06/60] i386/tdx: Introduce is_tdx_vm() helper and cache tdx_guest object Date: Tue, 5 Nov 2024 01:23:14 -0500 Message-Id: <20241105062408.3533704-7-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105062408.3533704-1-xiaoyao.li@intel.com> References: <20241105062408.3533704-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.18; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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.781, 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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: 1730789208803116600 Content-Type: text/plain; charset="utf-8" It will need special handling for TDX VMs all around the QEMU. Introduce is_tdx_vm() helper to query if it's a TDX VM. Cache tdx_guest object thus no need to cast from ms->cgs every time. Signed-off-by: Xiaoyao Li Acked-by: Gerd Hoffmann Reviewed-by: Isaku Yamahata --- changes in v3: - replace object_dynamic_cast with TDX_GUEST(); --- target/i386/kvm/tdx.c | 15 ++++++++++++++- target/i386/kvm/tdx.h | 10 ++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 907044910fec..ff3ef9bd8657 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -20,8 +20,16 @@ #include "kvm_i386.h" #include "tdx.h" =20 +static TdxGuest *tdx_guest; + static struct kvm_tdx_capabilities *tdx_caps; =20 +/* Valid after kvm_arch_init()->confidential_guest_kvm_init()->tdx_kvm_ini= t() */ +bool is_tdx_vm(void) +{ + return !!tdx_guest; +} + enum tdx_ioctl_level { TDX_VM_IOCTL, TDX_VCPU_IOCTL, @@ -105,15 +113,20 @@ static int get_tdx_capabilities(Error **errp) =20 static int tdx_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) { + TdxGuest *tdx =3D TDX_GUEST(cgs); int r =3D 0; =20 kvm_mark_guest_state_protected(); =20 if (!tdx_caps) { r =3D get_tdx_capabilities(errp); + if (r) { + return r; + } } =20 - return r; + tdx_guest =3D tdx; + return 0; } =20 static int tdx_kvm_type(X86ConfidentialGuest *cg) diff --git a/target/i386/kvm/tdx.h b/target/i386/kvm/tdx.h index de687457cae6..bca19c833e18 100644 --- a/target/i386/kvm/tdx.h +++ b/target/i386/kvm/tdx.h @@ -1,6 +1,10 @@ #ifndef QEMU_I386_TDX_H #define QEMU_I386_TDX_H =20 +#ifndef CONFIG_USER_ONLY +#include CONFIG_DEVICES /* CONFIG_TDX */ +#endif + #include "confidential-guest.h" =20 #define TYPE_TDX_GUEST "tdx-guest" @@ -16,4 +20,10 @@ typedef struct TdxGuest { uint64_t attributes; /* TD attributes */ } TdxGuest; =20 +#ifdef CONFIG_TDX +bool is_tdx_vm(void); +#else +#define is_tdx_vm() 0 +#endif /* CONFIG_TDX */ + #endif /* QEMU_I386_TDX_H */ --=20 2.34.1