[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 27/65] i386/tdx: Wire CPU features up with attributes of TD gu
From: |
Xiaoyao Li |
Subject: |
[PATCH v5 27/65] i386/tdx: Wire CPU features up with attributes of TD guest |
Date: |
Thu, 29 Feb 2024 01:36:48 -0500 |
For QEMU VMs, PKS is configured via CPUID_7_0_ECX_PKS and PMU is
configured by x86cpu->enable_pmu. Reuse the existing configuration
interface for TDX VMs.
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
target/i386/kvm/tdx.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
index b6295a644566..262e86fd2c67 100644
--- a/target/i386/kvm/tdx.c
+++ b/target/i386/kvm/tdx.c
@@ -33,6 +33,8 @@
(1U << KVM_FEATURE_MSI_EXT_DEST_ID))
#define TDX_TD_ATTRIBUTES_SEPT_VE_DISABLE BIT_ULL(28)
+#define TDX_TD_ATTRIBUTES_PKS BIT_ULL(30)
+#define TDX_TD_ATTRIBUTES_PERFMON BIT_ULL(63)
#define TDX_ATTRIBUTES_MAX_BITS 64
@@ -477,6 +479,15 @@ static int tdx_kvm_init(ConfidentialGuestSupport *cgs,
Error **errp)
return 0;
}
+static void setup_td_guest_attributes(X86CPU *x86cpu)
+{
+ CPUX86State *env = &x86cpu->env;
+
+ tdx_guest->attributes |= (env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_PKS)
?
+ TDX_TD_ATTRIBUTES_PKS : 0;
+ tdx_guest->attributes |= x86cpu->enable_pmu ? TDX_TD_ATTRIBUTES_PERFMON :
0;
+}
+
int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)
{
MachineState *ms = MACHINE(qdev_get_machine());
@@ -499,6 +510,8 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)
return r;
}
+ setup_td_guest_attributes(x86cpu);
+
init_vm->cpuid.nent = kvm_x86_arch_cpuid(env, init_vm->cpuid.entries, 0);
init_vm->attributes = tdx_guest->attributes;
--
2.34.1
- [PATCH v5 20/65] i386/tdx: Integrate tdx_caps->xfam_fixed0/1 into tdx_cpuid_lookup, (continued)
- [PATCH v5 20/65] i386/tdx: Integrate tdx_caps->xfam_fixed0/1 into tdx_cpuid_lookup, Xiaoyao Li, 2024/02/29
- [PATCH v5 24/65] i386/tdx: Initialize TDX before creating TD vcpus, Xiaoyao Li, 2024/02/29
- [PATCH v5 25/65] i386/tdx: Add property sept-ve-disable for tdx-guest object, Xiaoyao Li, 2024/02/29
- [PATCH v5 22/65] i386/kvm: Move architectural CPUID leaf generation to separate helper, Xiaoyao Li, 2024/02/29
- [PATCH v5 23/65] kvm: Introduce kvm_arch_pre_create_vcpu(), Xiaoyao Li, 2024/02/29
- [PATCH v5 32/65] i386/tdx: Set kvm_readonly_mem_enabled to false for TDX VM, Xiaoyao Li, 2024/02/29
- [PATCH v5 31/65] i386/tdx: Implement user specified tsc frequency, Xiaoyao Li, 2024/02/29
- [PATCH v5 30/65] i386/tdx: Support user configurable mrconfigid/mrowner/mrownerconfig, Xiaoyao Li, 2024/02/29
- [PATCH v5 26/65] i386/tdx: Make sept_ve_disable set by default, Xiaoyao Li, 2024/02/29
- [PATCH v5 33/65] kvm/tdx: Don't complain when converting vMMIO region to shared, Xiaoyao Li, 2024/02/29
- [PATCH v5 27/65] i386/tdx: Wire CPU features up with attributes of TD guest,
Xiaoyao Li <=
- [PATCH v5 34/65] kvm/tdx: Ignore memory conversion to shared of unassigned region, Xiaoyao Li, 2024/02/29
- [PATCH v5 35/65] memory: Introduce memory_region_init_ram_guest_memfd(), Xiaoyao Li, 2024/02/29
- [PATCH v5 29/65] i386/tdx: Validate TD attributes, Xiaoyao Li, 2024/02/29
- [PATCH v5 28/65] i386/tdx: Disable pmu for TD guest, Xiaoyao Li, 2024/02/29
- [PATCH v5 37/65] i386/tdvf: Introduce function to parse TDVF metadata, Xiaoyao Li, 2024/02/29
- [PATCH v5 39/65] i386/tdx: Skip BIOS shadowing setup, Xiaoyao Li, 2024/02/29
- [PATCH v5 36/65] i386/tdx: load TDVF for TD guest, Xiaoyao Li, 2024/02/29
- [PATCH v5 38/65] i386/tdx: Parse TDVF metadata for TDX VM, Xiaoyao Li, 2024/02/29
- [PATCH v5 40/65] i386/tdx: Don't initialize pc.rom for TDX VMs, Xiaoyao Li, 2024/02/29
- [PATCH v5 41/65] i386/tdx: Track mem_ptr for each firmware entry of TDVF, Xiaoyao Li, 2024/02/29