qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v1 01/40] *** HACK *** linux-headers: Update headers to pull in T


From: Xiaoyao Li
Subject: [PATCH v1 01/40] *** HACK *** linux-headers: Update headers to pull in TDX API changes
Date: Tue, 2 Aug 2022 15:47:11 +0800

Pull in recent TDX updates, which are not backwards compatible.

It's just to make this series runnable. It will be updated by script

        scripts/update-linux-headers.sh

once TDX support is upstreamed in linux kernel.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Co-developed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 linux-headers/asm-x86/kvm.h | 95 +++++++++++++++++++++++++++++++++++++
 linux-headers/linux/kvm.h   |  2 +
 2 files changed, 97 insertions(+)

diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h
index bf6e96011dfe..a5433cc71f79 100644
--- a/linux-headers/asm-x86/kvm.h
+++ b/linux-headers/asm-x86/kvm.h
@@ -525,4 +525,99 @@ struct kvm_pmu_event_filter {
 #define KVM_VCPU_TSC_CTRL 0 /* control group for the timestamp counter (TSC) */
 #define   KVM_VCPU_TSC_OFFSET 0 /* attribute for the TSC offset */
 
+#define KVM_X86_DEFAULT_VM     0
+#define KVM_X86_TDX_VM         1
+
+/* Trust Domain eXtension sub-ioctl() commands. */
+enum kvm_tdx_cmd_id {
+       KVM_TDX_CAPABILITIES = 0,
+       KVM_TDX_INIT_VM,
+       KVM_TDX_INIT_VCPU,
+       KVM_TDX_INIT_MEM_REGION,
+       KVM_TDX_FINALIZE_VM,
+
+       KVM_TDX_CMD_NR_MAX,
+};
+
+struct kvm_tdx_cmd {
+       /* enum kvm_tdx_cmd_id */
+       __u32 id;
+       /* flags for sub-commend. If sub-command doesn't use this, set zero. */
+       __u32 flags;
+       /*
+        * data for each sub-command. An immediate or a pointer to the actual
+        * data in process virtual address.  If sub-command doesn't use it,
+        * set zero.
+        */
+       __u64 data;
+       /*
+        * Auxiliary error code.  The sub-command may return TDX SEAMCALL
+        * status code in addition to -Exxx.
+        * Defined for consistency with struct kvm_sev_cmd.
+        */
+       __u64 error;
+       /* Reserved: Defined for consistency with struct kvm_sev_cmd. */
+       __u64 unused;
+};
+
+struct kvm_tdx_cpuid_config {
+       __u32 leaf;
+       __u32 sub_leaf;
+       __u32 eax;
+       __u32 ebx;
+       __u32 ecx;
+       __u32 edx;
+};
+
+struct kvm_tdx_capabilities {
+       __u64 attrs_fixed0;
+       __u64 attrs_fixed1;
+       __u64 xfam_fixed0;
+       __u64 xfam_fixed1;
+
+       __u32 nr_cpuid_configs;
+       __u32 padding;
+       struct kvm_tdx_cpuid_config cpuid_configs[0];
+};
+
+struct kvm_tdx_init_vm {
+       __u64 attributes;
+       __u32 max_vcpus;
+       __u32 padding;
+       __u64 mrconfigid[6];    /* sha384 digest */
+       __u64 mrowner[6];       /* sha384 digest */
+       __u64 mrownerconfig[6]; /* sha348 digest */
+       union {
+               /*
+                * KVM_TDX_INIT_VM is called before vcpu creation, thus before
+                * KVM_SET_CPUID2.  CPUID configurations needs to be passed.
+                *
+                * This configuration supersedes KVM_SET_CPUID{,2}.
+                * The user space VMM, e.g. qemu, should make them consistent
+                * with this values.
+                * sizeof(struct kvm_cpuid_entry2) * KVM_MAX_CPUID_ENTRIES(256)
+                * = 8KB.
+                */
+               struct {
+                       struct kvm_cpuid2 cpuid;
+                       /* 8KB with KVM_MAX_CPUID_ENTRIES. */
+                       struct kvm_cpuid_entry2 entries[];
+               };
+               /*
+                * For future extensibility.
+                * The size(struct kvm_tdx_init_vm) = 16KB.
+                * This should be enough given sizeof(TD_PARAMS) = 1024
+                */
+               __u64 reserved[2028];
+       };
+};
+
+#define KVM_TDX_MEASURE_MEMORY_REGION  (1UL << 0)
+
+struct kvm_tdx_init_mem_region {
+       __u64 source_addr;
+       __u64 gpa;
+       __u64 nr_pages;
+};
+
 #endif /* _ASM_X86_KVM_H */
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index f089349149a5..054cf89fa2d6 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -1151,6 +1151,8 @@ struct kvm_ppc_resize_hpt {
 /* #define KVM_CAP_VM_TSC_CONTROL 214 */
 #define KVM_CAP_SYSTEM_EVENT_DATA 215
 
+#define KVM_CAP_VM_TYPES 216
+
 #ifdef KVM_CAP_IRQ_ROUTING
 
 struct kvm_irq_routing_irqchip {
-- 
2.27.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]