117 lines
5.0 KiB
Diff
117 lines
5.0 KiB
Diff
From fa35367ae78505390b5915c9bf96542ffed1787d Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:48 +0200
|
|
Subject: [PATCH 072/115] i386/cgs: Rename *mask_cpuid_features() to
|
|
*adjust_cpuid_features()
|
|
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: [72/115] 0633336351c17f73620bc7d13cee5ba53b100e13 (bonzini/rhel-qemu-kvm)
|
|
|
|
Because for TDX case, there are also fixed-1 bits that enforced by TDX
|
|
module.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.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-44-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 695bfaee7153153708228946aa26c6d879599c04)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/confidential-guest.h | 20 ++++++++++----------
|
|
target/i386/kvm/kvm.c | 2 +-
|
|
target/i386/sev.c | 4 ++--
|
|
3 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/target/i386/confidential-guest.h b/target/i386/confidential-guest.h
|
|
index 38169ed68e..8a5cc7ecff 100644
|
|
--- a/target/i386/confidential-guest.h
|
|
+++ b/target/i386/confidential-guest.h
|
|
@@ -40,8 +40,8 @@ struct X86ConfidentialGuestClass {
|
|
/* <public> */
|
|
int (*kvm_type)(X86ConfidentialGuest *cg);
|
|
void (*cpu_instance_init)(X86ConfidentialGuest *cg, CPUState *cpu);
|
|
- uint32_t (*mask_cpuid_features)(X86ConfidentialGuest *cg, uint32_t feature, uint32_t index,
|
|
- int reg, uint32_t value);
|
|
+ uint32_t (*adjust_cpuid_features)(X86ConfidentialGuest *cg, uint32_t feature,
|
|
+ uint32_t index, int reg, uint32_t value);
|
|
};
|
|
|
|
/**
|
|
@@ -71,21 +71,21 @@ static inline void x86_confidential_guest_cpu_instance_init(X86ConfidentialGuest
|
|
}
|
|
|
|
/**
|
|
- * x86_confidential_guest_mask_cpuid_features:
|
|
+ * x86_confidential_guest_adjust_cpuid_features:
|
|
*
|
|
- * Removes unsupported features from a confidential guest's CPUID values, returns
|
|
- * the value with the bits removed. The bits removed should be those that KVM
|
|
- * provides independent of host-supported CPUID features, but are not supported by
|
|
- * the confidential computing firmware.
|
|
+ * Adjust the supported features from a confidential guest's CPUID values,
|
|
+ * returns the adjusted value. There are bits being removed that are not
|
|
+ * supported by the confidential computing firmware or bits being added that
|
|
+ * are forcibly exposed to guest by the confidential computing firmware.
|
|
*/
|
|
-static inline int x86_confidential_guest_mask_cpuid_features(X86ConfidentialGuest *cg,
|
|
+static inline int x86_confidential_guest_adjust_cpuid_features(X86ConfidentialGuest *cg,
|
|
uint32_t feature, uint32_t index,
|
|
int reg, uint32_t value)
|
|
{
|
|
X86ConfidentialGuestClass *klass = X86_CONFIDENTIAL_GUEST_GET_CLASS(cg);
|
|
|
|
- if (klass->mask_cpuid_features) {
|
|
- return klass->mask_cpuid_features(cg, feature, index, reg, value);
|
|
+ if (klass->adjust_cpuid_features) {
|
|
+ return klass->adjust_cpuid_features(cg, feature, index, reg, value);
|
|
} else {
|
|
return value;
|
|
}
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index f3fe553151..5349ff4db7 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -565,7 +565,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
|
|
}
|
|
|
|
if (current_machine->cgs) {
|
|
- ret = x86_confidential_guest_mask_cpuid_features(
|
|
+ ret = x86_confidential_guest_adjust_cpuid_features(
|
|
X86_CONFIDENTIAL_GUEST(current_machine->cgs),
|
|
function, index, reg, ret);
|
|
}
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
|
index a0d271f898..24fcd078fc 100644
|
|
--- a/target/i386/sev.c
|
|
+++ b/target/i386/sev.c
|
|
@@ -946,7 +946,7 @@ out:
|
|
}
|
|
|
|
static uint32_t
|
|
-sev_snp_mask_cpuid_features(X86ConfidentialGuest *cg, uint32_t feature, uint32_t index,
|
|
+sev_snp_adjust_cpuid_features(X86ConfidentialGuest *cg, uint32_t feature, uint32_t index,
|
|
int reg, uint32_t value)
|
|
{
|
|
switch (feature) {
|
|
@@ -2404,7 +2404,7 @@ sev_snp_guest_class_init(ObjectClass *oc, void *data)
|
|
klass->launch_finish = sev_snp_launch_finish;
|
|
klass->launch_update_data = sev_snp_launch_update_data;
|
|
klass->kvm_init = sev_snp_kvm_init;
|
|
- x86_klass->mask_cpuid_features = sev_snp_mask_cpuid_features;
|
|
+ x86_klass->adjust_cpuid_features = sev_snp_adjust_cpuid_features;
|
|
x86_klass->kvm_type = sev_snp_kvm_type;
|
|
|
|
object_class_property_add(oc, "policy", "uint64",
|
|
--
|
|
2.50.1
|
|
|