[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 13/36] i386/tdx: Wire CPU features up with attributes of T
From: |
Xiaoyao Li |
Subject: |
[RFC PATCH v3 13/36] i386/tdx: Wire CPU features up with attributes of TD guest |
Date: |
Thu, 17 Mar 2022 21:58:50 +0800 |
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>
---
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 409526765304..de4146025995 100644
--- a/target/i386/kvm/tdx.c
+++ b/target/i386/kvm/tdx.c
@@ -22,6 +22,8 @@
#include "tdx.h"
#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)
static TdxGuest *tdx_guest;
@@ -152,6 +154,15 @@ void tdx_get_supported_cpuid(uint32_t function, uint32_t
index, int reg,
}
}
+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)
{
struct {
@@ -178,6 +189,8 @@ int tdx_pre_create_vcpu(CPUState *cpu)
goto out;
}
+ setup_td_guest_attributes(x86cpu);
+
memset(&cpuid_data, 0, sizeof(cpuid_data));
cpuid_data.cpuid.nent = kvm_x86_arch_cpuid(env, cpuid_data.entries, 0);
--
2.27.0
- [RFC PATCH v3 10/36] i386/kvm: Move architectural CPUID leaf generation to separate helper, (continued)
- [RFC PATCH v3 10/36] i386/kvm: Move architectural CPUID leaf generation to separate helper, Xiaoyao Li, 2022/03/17
- [RFC PATCH v3 11/36] i386/tdx: Initialize TDX before creating TD vcpus, Xiaoyao Li, 2022/03/17
- [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Xiaoyao Li, 2022/03/17
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Gerd Hoffmann, 2022/03/22
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Xiaoyao Li, 2022/03/24
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Gerd Hoffmann, 2022/03/24
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Xiaoyao Li, 2022/03/24
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Gerd Hoffmann, 2022/03/24
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Xiaoyao Li, 2022/03/24
- Re: [RFC PATCH v3 12/36] i386/tdx: Add property sept-ve-disable for tdx-guest object, Isaku Yamahata, 2022/03/24
[RFC PATCH v3 13/36] i386/tdx: Wire CPU features up with attributes of TD guest,
Xiaoyao Li <=
[RFC PATCH v3 14/36] i386/tdx: Validate TD attributes, Xiaoyao Li, 2022/03/17
[RFC PATCH v3 16/36] i386/tdx: Set kvm_readonly_mem_enabled to false for TDX VM, Xiaoyao Li, 2022/03/17
[RFC PATCH v3 15/36] i386/tdx: Implement user specified tsc frequency, Xiaoyao Li, 2022/03/17
[RFC PATCH v3 17/36] pflash_cfi01/tdx: Introduce ram_mode of pflash for TDVF, Xiaoyao Li, 2022/03/17