qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Xiaoyao Li <xiaoyao.li@intel.com>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Francesco Lavra" <francescolavra.fl@gmail.com>,
	"Marcelo Tosatti" <mtosatti@redhat.com>,
	kvm@vger.kernel.org, qemu-devel@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Zhao Liu" <zhao1.liu@intel.com>,
	"Rick Edgecombe" <rick.p.edgecombe@intel.com>,
	"Xiaoyao Li" <xiaoyao.li@intel.com>
Subject: [PATCH v9 50/55] i386/cgs: Introduce x86_confidential_guest_check_features()
Date: Thu,  8 May 2025 10:59:56 -0400	[thread overview]
Message-ID: <20250508150002.689633-51-xiaoyao.li@intel.com> (raw)
In-Reply-To: <20250508150002.689633-1-xiaoyao.li@intel.com>

To do cgs specific feature checking. Note the feature checking in
x86_cpu_filter_features() is valid for non-cgs VMs. For cgs VMs like
TDX, what features can be supported has more restrictions.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
---
 target/i386/confidential-guest.h | 13 +++++++++++++
 target/i386/kvm/kvm.c            |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/target/i386/confidential-guest.h b/target/i386/confidential-guest.h
index 777d43cc9688..48b88dbd3130 100644
--- a/target/i386/confidential-guest.h
+++ b/target/i386/confidential-guest.h
@@ -42,6 +42,7 @@ struct X86ConfidentialGuestClass {
     void (*cpu_instance_init)(X86ConfidentialGuest *cg, CPUState *cpu);
     uint32_t (*adjust_cpuid_features)(X86ConfidentialGuest *cg, uint32_t feature,
                                       uint32_t index, int reg, uint32_t value);
+    int (*check_features)(X86ConfidentialGuest *cg, CPUState *cs);
 };
 
 /**
@@ -91,4 +92,16 @@ static inline int x86_confidential_guest_adjust_cpuid_features(X86ConfidentialGu
     }
 }
 
+static inline int x86_confidential_guest_check_features(X86ConfidentialGuest *cg,
+                                                        CPUState *cs)
+{
+    X86ConfidentialGuestClass *klass = X86_CONFIDENTIAL_GUEST_GET_CLASS(cg);
+
+    if (klass->check_features) {
+        return klass->check_features(cg, cs);
+    }
+
+    return 0;
+}
+
 #endif
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 17d7bf6ae9aa..27b4a069d194 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -2092,6 +2092,14 @@ int kvm_arch_init_vcpu(CPUState *cs)
     int r;
     Error *local_err = NULL;
 
+    if (current_machine->cgs) {
+        r = x86_confidential_guest_check_features(
+                X86_CONFIDENTIAL_GUEST(current_machine->cgs), cs);
+        if (r < 0) {
+            return r;
+        }
+    }
+
     memset(&cpuid_data, 0, sizeof(cpuid_data));
 
     cpuid_i = 0;
-- 
2.43.0



  parent reply	other threads:[~2025-05-08 15:11 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-08 14:59 [PATCH v9 00/55] QEMU TDX support Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 01/55] *** HACK *** linux-headers: Update headers to pull in TDX API changes Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 02/55] i386: Introduce tdx-guest object Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 03/55] i386/tdx: Implement tdx_kvm_type() for TDX Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 04/55] i386/tdx: Implement tdx_kvm_init() to initialize TDX VM context Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 05/55] i386/tdx: Get tdx_capabilities via KVM_TDX_CAPABILITIES Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 06/55] i386/tdx: Introduce is_tdx_vm() helper and cache tdx_guest object Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 07/55] kvm: Introduce kvm_arch_pre_create_vcpu() Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 08/55] i386/tdx: Initialize TDX before creating TD vcpus Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 09/55] i386/tdx: Add property sept-ve-disable for tdx-guest object Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 10/55] i386/tdx: Make sept_ve_disable set by default Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 11/55] i386/tdx: Wire CPU features up with attributes of TD guest Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 12/55] i386/tdx: Validate TD attributes Xiaoyao Li
2025-05-08 15:50   ` Daniel P. Berrangé
2025-05-08 14:59 ` [PATCH v9 13/55] i386/tdx: Support user configurable mrconfigid/mrowner/mrownerconfig Xiaoyao Li
2025-05-08 15:55   ` Daniel P. Berrangé
2025-05-09  6:21     ` Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 14/55] i386/tdx: Set APIC bus rate to match with what TDX module enforces Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 15/55] i386/tdx: Implement user specified tsc frequency Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 16/55] i386/tdx: load TDVF for TD guest Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 17/55] i386/tdvf: Introduce function to parse TDVF metadata Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 18/55] i386/tdx: Parse TDVF metadata for TDX VM Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 19/55] i386/tdx: Don't initialize pc.rom for TDX VMs Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 20/55] i386/tdx: Track mem_ptr for each firmware entry of TDVF Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 21/55] i386/tdx: Track RAM entries for TDX VM Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 22/55] headers: Add definitions from UEFI spec for volumes, resources, etc Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 23/55] i386/tdx: Setup the TD HOB list Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 24/55] i386/tdx: Add TDVF memory via KVM_TDX_INIT_MEM_REGION Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 25/55] i386/tdx: Call KVM_TDX_INIT_VCPU to initialize TDX vcpu Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 26/55] i386/tdx: Finalize TDX VM Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 27/55] i386/tdx: Enable user exit on KVM_HC_MAP_GPA_RANGE Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 28/55] i386/tdx: Handle KVM_SYSTEM_EVENT_TDX_FATAL Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 29/55] i386/tdx: Wire TDX_REPORT_FATAL_ERROR with GuestPanic facility Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 30/55] kvm: Check KVM_CAP_MAX_VCPUS at vm level Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 31/55] i386/cpu: introduce x86_confidential_guest_cpu_instance_init() Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 32/55] i386/tdx: implement tdx_cpu_instance_init() Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 33/55] i386/cpu: Introduce enable_cpuid_0x1f to force exposing CPUID 0x1f Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 34/55] i386/tdx: Force " Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 35/55] i386/tdx: Set kvm_readonly_mem_enabled to false for TDX VM Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 36/55] i386/tdx: Disable SMM for TDX VMs Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 37/55] i386/tdx: Disable PIC " Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 38/55] i386/tdx: Set and check kernel_irqchip mode for TDX Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 39/55] i386/tdx: Don't synchronize guest tsc for TDs Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 40/55] i386/tdx: Only configure MSR_IA32_UCODE_REV in kvm_init_msrs() " Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 41/55] i386/apic: Skip kvm_apic_put() for TDX Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 42/55] cpu: Don't set vcpu_dirty when guest_state_protected Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 43/55] i386/cgs: Rename *mask_cpuid_features() to *adjust_cpuid_features() Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 44/55] i386/tdx: Implement adjust_cpuid_features() for TDX Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 45/55] i386/tdx: Add TDX fixed1 bits to supported CPUIDs Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 46/55] i386/tdx: Add supported CPUID bits related to TD Attributes Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 47/55] i386/tdx: Add supported CPUID bits relates to XFAM Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 48/55] i386/tdx: Add XFD to supported bit of TDX Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 49/55] i386/tdx: Define supported KVM features for TDX Xiaoyao Li
2025-05-08 14:59 ` Xiaoyao Li [this message]
2025-05-08 14:59 ` [PATCH v9 51/55] i386/tdx: Fetch and validate CPUID of TD guest Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 52/55] i386/tdx: Don't treat SYSCALL as unavailable Xiaoyao Li
2025-05-08 14:59 ` [PATCH v9 53/55] i386/tdx: Make invtsc default on Xiaoyao Li
2025-05-08 15:00 ` [PATCH v9 54/55] i386/tdx: Validate phys_bits against host value Xiaoyao Li
2025-05-08 15:00 ` [PATCH v9 55/55] docs: Add TDX documentation Xiaoyao Li
2025-05-26 16:12 ` [PATCH v9 00/55] QEMU TDX support Paolo Bonzini
2025-05-27  1:30   ` Xiaoyao Li
2025-05-27  4:27     ` Markus Armbruster
2025-05-27  7:46       ` Xiaoyao Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250508150002.689633-51-xiaoyao.li@intel.com \
    --to=xiaoyao.li@intel.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=francescolavra.fl@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rick.p.edgecombe@intel.com \
    --cc=zhao1.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).