qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Xiaoyao Li <xiaoyao.li@intel.com>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Isaku Yamahata" <isaku.yamahata@gmail.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Michael S . Tsirkin" <mst@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Marcelo Tosatti" <mtosatti@redhat.com>,
	"Laszlo Ersek" <lersek@redhat.com>,
	"Eric Blake" <eblake@redhat.com>
Cc: Connor Kuehl <ckuehl@redhat.com>,
	erdemaktas@google.com, kvm@vger.kernel.org,
	qemu-devel@nongnu.org, seanjc@google.com, xiaoyao.li@intel.com
Subject: [PATCH v1 03/40] target/i386: Implement mc->kvm_type() to get VM type
Date: Tue,  2 Aug 2022 15:47:13 +0800	[thread overview]
Message-ID: <20220802074750.2581308-4-xiaoyao.li@intel.com> (raw)
In-Reply-To: <20220802074750.2581308-1-xiaoyao.li@intel.com>

TDX VM requires VM type KVM_X86_TDX_VM to be passed to
kvm_ioctl(KVM_CREATE_VM). Hence implement mc->kvm_type() for i386
architecture.

If tdx-guest object is specified to confidential-guest-support, like,

  qemu -machine ...,confidential-guest-support=tdx0 \
       -object tdx-guest,id=tdx0,...

it parses VM type as KVM_X86_TDX_VM. Otherwise, it's KVM_X86_DEFAULT_VM.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/x86.c              |  6 ++++++
 target/i386/kvm/kvm.c      | 30 ++++++++++++++++++++++++++++++
 target/i386/kvm/kvm_i386.h |  1 +
 3 files changed, 37 insertions(+)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 050eedc0c8e2..a15fadeb0e68 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1379,6 +1379,11 @@ static void machine_set_sgx_epc(Object *obj, Visitor *v, const char *name,
     qapi_free_SgxEPCList(list);
 }
 
+static int x86_kvm_type(MachineState *ms, const char *vm_type)
+{
+    return kvm_get_vm_type(ms, vm_type);
+}
+
 static void x86_machine_initfn(Object *obj)
 {
     X86MachineState *x86ms = X86_MACHINE(obj);
@@ -1403,6 +1408,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data)
     mc->cpu_index_to_instance_props = x86_cpu_index_to_props;
     mc->get_default_cpu_node_id = x86_get_default_cpu_node_id;
     mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
+    mc->kvm_type = x86_kvm_type;
     x86mc->save_tsc_khz = true;
     x86mc->fwcfg_dma_enabled = true;
     nc->nmi_monitor_handler = x86_nmi;
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index f148a6d52fa4..33e0d2948f77 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -30,6 +30,7 @@
 #include "sysemu/runstate.h"
 #include "kvm_i386.h"
 #include "sev.h"
+#include "tdx.h"
 #include "hyperv.h"
 #include "hyperv-proto.h"
 
@@ -143,6 +144,35 @@ static struct kvm_msr_list *kvm_feature_msrs;
 static RateLimit bus_lock_ratelimit_ctrl;
 static int kvm_get_one_msr(X86CPU *cpu, int index, uint64_t *value);
 
+static const char* vm_type_name[] = {
+    [KVM_X86_DEFAULT_VM] = "X86_DEFAULT_VM",
+    [KVM_X86_TDX_VM] = "X86_TDX_VM",
+};
+
+int kvm_get_vm_type(MachineState *ms, const char *vm_type)
+{
+    int kvm_type = KVM_X86_DEFAULT_VM;
+
+    if (ms->cgs && object_dynamic_cast(OBJECT(ms->cgs), TYPE_TDX_GUEST)) {
+        kvm_type = KVM_X86_TDX_VM;
+    }
+
+    /*
+     * old KVM doesn't support KVM_CAP_VM_TYPES and KVM_X86_DEFAULT_VM
+     * is always supported
+     */
+    if (kvm_type == KVM_X86_DEFAULT_VM) {
+        return kvm_type;
+    }
+
+    if (!(kvm_check_extension(KVM_STATE(ms->accelerator), KVM_CAP_VM_TYPES) & BIT(kvm_type))) {
+        error_report("vm-type %s not supported by KVM", vm_type_name[kvm_type]);
+        exit(1);
+    }
+
+    return kvm_type;
+}
+
 int kvm_has_pit_state2(void)
 {
     return has_pit_state2;
diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index 4124912c202e..b434feaa6b1d 100644
--- a/target/i386/kvm/kvm_i386.h
+++ b/target/i386/kvm/kvm_i386.h
@@ -37,6 +37,7 @@ bool kvm_has_adjust_clock(void);
 bool kvm_has_adjust_clock_stable(void);
 bool kvm_has_exception_payload(void);
 void kvm_synchronize_all_tsc(void);
+int kvm_get_vm_type(MachineState *ms, const char *vm_type);
 void kvm_arch_reset_vcpu(X86CPU *cs);
 void kvm_arch_do_init_vcpu(X86CPU *cs);
 
-- 
2.27.0



  parent reply	other threads:[~2022-08-02  7:53 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-02  7:47 [PATCH v1 00/40] TDX QEMU support Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 01/40] *** HACK *** linux-headers: Update headers to pull in TDX API changes Xiaoyao Li
2022-08-02  9:47   ` Daniel P. Berrangé
2022-08-02 10:38     ` Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 02/40] i386: Introduce tdx-guest object Xiaoyao Li
2022-08-02  7:47 ` Xiaoyao Li [this message]
2022-08-02  7:47 ` [PATCH v1 04/40] target/i386: Introduce kvm_confidential_guest_init() Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 05/40] i386/tdx: Implement tdx_kvm_init() to initialize TDX VM context Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 06/40] i386/tdx: Get tdx_capabilities via KVM_TDX_CAPABILITIES Xiaoyao Li
2022-08-25 10:12   ` Gerd Hoffmann
2022-08-25 15:35     ` Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 07/40] i386/tdx: Introduce is_tdx_vm() helper and cache tdx_guest object Xiaoyao Li
2022-08-25 10:16   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 08/40] i386/tdx: Adjust the supported CPUID based on TDX restrictions Xiaoyao Li
2022-08-03  7:33   ` Chenyi Qiang
2022-08-04  0:55     ` Xiaoyao Li
2022-08-26  4:00     ` Xiaoyao Li
2022-08-25 11:26   ` Gerd Hoffmann
2022-08-25 12:44     ` Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 09/40] i386/tdx: Update tdx_fixed0/1 bits by tdx_caps.cpuid_config[] Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 10/40] i386/tdx: Integrate tdx_caps->xfam_fixed0/1 into tdx_cpuid_lookup Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 11/40] i386/tdx: Integrate tdx_caps->attrs_fixed0/1 to tdx_cpuid_lookup Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 12/40] i386/kvm: Move architectural CPUID leaf generation to separate helper Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 13/40] KVM: Introduce kvm_arch_pre_create_vcpu() Xiaoyao Li
2022-08-25 11:28   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 14/40] i386/tdx: Initialize TDX before creating TD vcpus Xiaoyao Li
2022-08-25 11:29   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 15/40] i386/tdx: Add property sept-ve-disable for tdx-guest object Xiaoyao Li
2022-08-25 11:36   ` Gerd Hoffmann
2022-08-25 14:42     ` Xiaoyao Li
2022-08-26  5:57       ` Gerd Hoffmann
2022-09-02  2:33         ` Xiaoyao Li
2022-09-02  2:52           ` Sean Christopherson
2022-09-02  5:46             ` Gerd Hoffmann
2022-09-02 15:26               ` Sean Christopherson
2022-09-02 16:52                 ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 16/40] i386/tdx: Wire CPU features up with attributes of TD guest Xiaoyao Li
2022-08-25 11:38   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 17/40] i386/tdx: Validate TD attributes Xiaoyao Li
2022-08-25 11:39   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 18/40] i386/tdx: Implement user specified tsc frequency Xiaoyao Li
2022-08-25 11:41   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 19/40] i386/tdx: Set kvm_readonly_mem_enabled to false for TDX VM Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 20/40] i386/tdvf: Introduce function to parse TDVF metadata Xiaoyao Li
2022-08-26  9:12   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 21/40] i386/tdx: Parse TDVF metadata for TDX VM Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 22/40] i386/tdx: Skip BIOS shadowing setup Xiaoyao Li
2022-08-26  9:13   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 23/40] i386/tdx: Don't initialize pc.rom for TDX VMs Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 24/40] i386/tdx: Track mem_ptr for each firmware entry of TDVF Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 25/40] i386/tdx: Track RAM entries for TDX VM Xiaoyao Li
2022-08-26  9:15   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 26/40] headers: Add definitions from UEFI spec for volumes, resources, etc Xiaoyao Li
2022-08-26  9:19   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 27/40] i386/tdx: Setup the TD HOB list Xiaoyao Li
2022-08-26 10:27   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 28/40] i386/tdx: Add TDVF memory via KVM_TDX_INIT_MEM_REGION Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 29/40] i386/tdx: Call KVM_TDX_INIT_VCPU to initialize TDX vcpu Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 30/40] i386/tdx: Finalize TDX VM Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 31/40] i386/tdx: Disable SMM for TDX VMs Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 32/40] i386/tdx: Disable PIC " Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 33/40] i386/tdx: Don't allow system reset " Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 34/40] hw/i386: add eoi_intercept_unsupported member to X86MachineState Xiaoyao Li
2022-08-26 10:32   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 35/40] hw/i386: add option to forcibly report edge trigger in acpi tables Xiaoyao Li
2022-08-26 10:32   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 36/40] i386/tdx: Don't synchronize guest tsc for TDs Xiaoyao Li
2022-08-26 10:33   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 37/40] i386/tdx: Only configure MSR_IA32_UCODE_REV in kvm_init_msrs() " Xiaoyao Li
2022-08-02  7:47 ` [PATCH v1 38/40] i386/tdx: Skip kvm_put_apicbase() " Xiaoyao Li
2022-08-26 10:34   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 39/40] i386/tdx: Don't get/put guest state for TDX VMs Xiaoyao Li
2022-08-26 10:35   ` Gerd Hoffmann
2022-08-02  7:47 ` [PATCH v1 40/40] docs: Add TDX documentation Xiaoyao Li
2022-08-26 10:36   ` Gerd Hoffmann
2022-08-02  9:49 ` [PATCH v1 00/40] TDX QEMU support Daniel P. Berrangé
2022-08-02 10:55   ` Xiaoyao Li
2022-08-03 17:44     ` Daniel P. Berrangé
2022-08-05  0:16       ` Xiaoyao Li
2022-09-05  0:58 ` 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=20220802074750.2581308-4-xiaoyao.li@intel.com \
    --to=xiaoyao.li@intel.com \
    --cc=berrange@redhat.com \
    --cc=ckuehl@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=eblake@redhat.com \
    --cc=erdemaktas@google.com \
    --cc=f4bug@amsat.org \
    --cc=isaku.yamahata@gmail.com \
    --cc=kraxel@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=lersek@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=seanjc@google.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).