79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
From e417afeb76f30fca6c16e57971521c5c9c25681c Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:46 +0200
|
|
Subject: [PATCH 040/115] i386/tdx: Wire CPU features up with attributes of TD
|
|
guest
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [40/115] ce59bfc2281e630283095aec8975d93ef455d599 (bonzini/rhel-qemu-kvm)
|
|
|
|
For QEMU VMs,
|
|
- PKS is configured via CPUID_7_0_ECX_PKS, e.g., -cpu xxx,+pks and
|
|
- PMU is configured by x86cpu->enable_pmu, e.g., -cpu xxx,pmu=on
|
|
|
|
While the bit 30 (PKS) and bit 63 (PERFMON) of TD's attributes are also
|
|
used to configure the PKS and PERFMON/PMU of TD, reuse the existing
|
|
configuration interfaces of 'cpu' for TD's attributes.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20250508150002.689633-12-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit bb3be394cf80d68251e5b89e823dddc679b6e644)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@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 2ed40b7614..1ab063f790 100644
|
|
--- a/target/i386/kvm/tdx.c
|
|
+++ b/target/i386/kvm/tdx.c
|
|
@@ -19,6 +19,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;
|
|
|
|
@@ -151,6 +153,15 @@ static int tdx_kvm_type(X86ConfidentialGuest *cg)
|
|
return KVM_X86_TDX_VM;
|
|
}
|
|
|
|
+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;
|
|
+}
|
|
+
|
|
static int setup_td_xfam(X86CPU *x86cpu, Error **errp)
|
|
{
|
|
CPUX86State *env = &x86cpu->env;
|
|
@@ -214,6 +225,8 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp)
|
|
init_vm = g_malloc0(sizeof(struct kvm_tdx_init_vm) +
|
|
sizeof(struct kvm_cpuid_entry2) * KVM_MAX_CPUID_ENTRIES);
|
|
|
|
+ setup_td_guest_attributes(x86cpu);
|
|
+
|
|
r = setup_td_xfam(x86cpu, errp);
|
|
if (r) {
|
|
return r;
|
|
--
|
|
2.50.1
|
|
|