From nobody Mon Feb 9 19:06:14 2026 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=1652326288; cv=none; d=zohomail.com; s=zohoarc; b=hertYsRVkIpMAB19NJOeQgNG8yYLaleNySw99J8yob1zTDVgamNQHjkgCNIwC4PYCvHEorGWxiMSQOwUgfJL5M9oxbwOemg5IoirsOnVq9+Ld7pFda3TY6E/4FdkRUhxrTconIGD7L9fPGyyCMpkLvJZiVfyIFwwpW6qCekf1C0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652326288; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PiDsX2R8BcIcM1ZMxJeuGDXHm92iYmPKnGcym2cixII=; b=A4gPVp63dXnCIuti3J8UKco8xk+YRLTpfNwzc7r2KVz6bRzUt4P9YdbtcCkey096v37FBdIS8pJ+quFr0WtsKU+4w0JaU/jLRVfC6uS3fon4Mnasmc+aWuLMkEQift5aPDzlpaGJtwyvDQaJkVmk1ERdos0PlR2KLv1EpWRThtE= 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 1652326288293509.33381081172047; Wed, 11 May 2022 20:31:28 -0700 (PDT) Received: from localhost ([::1]:47874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nozXy-0006Y2-UD for importer@patchew.org; Wed, 11 May 2022 23:31:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nozLq-0002AD-9V for qemu-devel@nongnu.org; Wed, 11 May 2022 23:18:54 -0400 Received: from mga06b.intel.com ([134.134.136.31]:1444 helo=mga06.intel.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nozLo-0002pk-FE for qemu-devel@nongnu.org; Wed, 11 May 2022 23:18:54 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2022 20:18:47 -0700 Received: from lxy-dell.sh.intel.com ([10.239.159.55]) by orsmga008.jf.intel.com with ESMTP; 11 May 2022 20:18:43 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652325532; x=1683861532; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vMFsLQVnoupHQ2jYhvlJfEfSaCwlUmEtAofylDNcL9Q=; b=QySKh6fPH4tnRxa2qwIIbZfkx2iOgf98vSdNawRnhBOD+5AGN3Jg7AWp VpJzsW8f/At+9VEquU02WU68l++z+Y3FItDPj5fHg06v2iYaUtlNBUMe6 1T0uJEUtObqb9FBMycEURroJZOGSMXXXbLM/lg/vda44dy8QLxI3d4lnh ResDSpZ+z3bLj3yfjImRCyKLXyexI5s79BMCrY7dxf0Opkm1KjN9FPWU/ RU582Ufg9sWyjLOmO3Pu22jgdnNkOth5PR13uy4XnVdFCpZCy0b0IvQBk gNRkyaxiEzansyYt/aoeyoyQePZ7itpNgKsYGhYgj5NHHqc4+vfe159WD g==; X-IronPort-AV: E=McAfee;i="6400,9594,10344"; a="330478977" X-IronPort-AV: E=Sophos;i="5.91,218,1647327600"; d="scan'208";a="330478977" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,218,1647327600"; d="scan'208";a="594455557" From: Xiaoyao Li To: Paolo Bonzini , Isaku Yamahata , isaku.yamahata@intel.com, Gerd Hoffmann , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , "Michael S . Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Marcelo Tosatti , Laszlo Ersek , Eric Blake Cc: Connor Kuehl , erdemaktas@google.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, seanjc@google.com, xiaoyao.li@intel.com Subject: [RFC PATCH v4 08/36] i386/tdx: Adjust get_supported_cpuid() for TDX VM Date: Thu, 12 May 2022 11:17:35 +0800 Message-Id: <20220512031803.3315890-9-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220512031803.3315890-1-xiaoyao.li@intel.com> References: <20220512031803.3315890-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=134.134.136.31; envelope-from=xiaoyao.li@intel.com; helo=mga06.intel.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, RCVD_IN_DNSWL_MED=-2.3, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1652326288695100001 Content-Type: text/plain; charset="utf-8" For TDX, the allowable CPUID configuration differs from what KVM reports for KVM scope via KVM_GET_SUPPORTED_CPUID. - Some CPUID bits are not supported for TDX VM while KVM reports the support. Mask them off for TDX VM. e.g., CPUID_EXT_VMX, some PV features. - The supported XCR0 and XSS bits needs to be cap'ed by tdx_caps, because KVM uses them to setup XFAM of TD. Introduce tdx_get_supported_cpuid() to adjust the kvm_arch_get_supported_cpuid() for TDX VM. Signed-off-by: Xiaoyao Li --- target/i386/cpu.h | 5 +++++ target/i386/kvm/kvm.c | 4 ++++ target/i386/kvm/tdx.c | 44 +++++++++++++++++++++++++++++++++++++++++++ target/i386/kvm/tdx.h | 2 ++ 4 files changed, 55 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 9661f9fbd1c6..0c922e5a305a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -567,6 +567,11 @@ typedef enum X86Seg { #define ESA_FEATURE_XFD_MASK (1U << ESA_FEATURE_XFD_BIT) =20 =20 +#define XCR0_MASK (XSTATE_FP_MASK | XSTATE_SSE_MASK | XSTATE_YMM_MAS= K | \ + XSTATE_BNDREGS_MASK | XSTATE_BNDCSR_MASK | \ + XSTATE_OPMASK_MASK | XSTATE_ZMM_Hi256_MASK | \ + XSTATE_Hi16_ZMM_MASK | XSTATE_PKRU_MASK) + /* CPUID feature words */ typedef enum FeatureWord { FEAT_1_EDX, /* CPUID[1].EDX */ diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index f257ffda259d..0751e6e102cc 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -498,6 +498,10 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uin= t32_t function, ret |=3D 1U << KVM_HINTS_REALTIME; } =20 + if (is_tdx_vm()) { + tdx_get_supported_cpuid(function, index, reg, &ret); + } + return ret; } =20 diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 803154efdb91..6e3b15ba8a4a 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -14,11 +14,22 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qom/object_interfaces.h" +#include "standard-headers/asm-x86/kvm_para.h" #include "sysemu/kvm.h" =20 #include "hw/i386/x86.h" #include "tdx.h" =20 +#define TDX_SUPPORTED_KVM_FEATURES ((1ULL << KVM_FEATURE_NOP_IO_DELAY) | \ + (1ULL << KVM_FEATURE_STEAL_TIME) | \ + (1ULL << KVM_FEATURE_PV_EOI) | \ + (1ULL << KVM_FEATURE_PV_UNHALT) | \ + (1ULL << KVM_FEATURE_PV_TLB_FLUSH) | \ + (1ULL << KVM_FEATURE_PV_SEND_IPI) | \ + (1ULL << KVM_FEATURE_POLL_CONTROL) | \ + (1ULL << KVM_FEATURE_PV_SCHED_YIELD) = | \ + (1ULL << KVM_FEATURE_MSI_EXT_DEST_ID)) + static TdxGuest *tdx_guest; =20 /* It's valid after kvm_confidential_guest_init()->kvm_tdx_init() */ @@ -121,6 +132,39 @@ int tdx_kvm_init(MachineState *ms, Error **errp) return 0; } =20 +void tdx_get_supported_cpuid(uint32_t function, uint32_t index, int reg, + uint32_t *ret) +{ + switch (function) { + case 1: + if (reg =3D=3D R_ECX) { + *ret &=3D ~CPUID_EXT_VMX; + } + break; + case 0xd: + if (index =3D=3D 0) { + if (reg =3D=3D R_EAX) { + *ret &=3D (uint32_t)tdx_caps->xfam_fixed0 & XCR0_MASK; + *ret |=3D (uint32_t)tdx_caps->xfam_fixed1 & XCR0_MASK; + } else if (reg =3D=3D R_EDX) { + *ret &=3D (tdx_caps->xfam_fixed0 & XCR0_MASK) >> 32; + *ret |=3D (tdx_caps->xfam_fixed1 & XCR0_MASK) >> 32; + } + } else if (index =3D=3D 1) { + /* TODO: Adjust XSS when it's supported. */ + } + break; + case KVM_CPUID_FEATURES: + if (reg =3D=3D R_EAX) { + *ret &=3D TDX_SUPPORTED_KVM_FEATURES; + } + break; + default: + /* TODO: Use tdx_caps to adjust CPUID leafs. */ + break; + } +} + /* tdx guest */ OBJECT_DEFINE_TYPE_WITH_INTERFACES(TdxGuest, tdx_guest, diff --git a/target/i386/kvm/tdx.h b/target/i386/kvm/tdx.h index 4036ca2f3f99..06599b65b827 100644 --- a/target/i386/kvm/tdx.h +++ b/target/i386/kvm/tdx.h @@ -27,5 +27,7 @@ bool is_tdx_vm(void); #endif /* CONFIG_TDX */ =20 int tdx_kvm_init(MachineState *ms, Error **errp); +void tdx_get_supported_cpuid(uint32_t function, uint32_t index, int reg, + uint32_t *ret); =20 #endif /* QEMU_I386_TDX_H */ --=20 2.27.0