From: Zhao Liu <zhao1.liu@xxxxxxxxx>
In addition to adding new bits to the package thermal MSRs, HFI has also
introduced two new MSRs:
* MSR_IA32_HW_FEEDBACK_CONFIG: used to enable/disable HFI feature at
runtime.
Emulate this MSR by parsing the HFI enabling bit.
* MSR_IA32_HW_FEEDBACK_PTR: used to configure the HFI table's memory
address.
Emulate this MSR by storing the Guest HFI table's GPA, and writing
local virtual HFI table into this GPA when Guest's HFI table needs to
be updated.
Only when HFI is enabled (set by Guest in MSR_IA32_HW_FEEDBACK_CONFIG)
and Guest HFI table is valid (set the valid address by Guest in
MSR_IA32_HW_FEEDBACK_PTR), Guest can have the valid HFI table and its
HFI table can be updated.
Because the current virtual HFI table is maintained for each VM, not for
each virtual package, these 2 MSRs are also emulated at the VM level.
Tested-by: Yanting Jiang <yanting.jiang@xxxxxxxxx>
Co-developed-by: Zhuocheng Ding <zhuocheng.ding@xxxxxxxxx>
Signed-off-by: Zhuocheng Ding <zhuocheng.ding@xxxxxxxxx>
Signed-off-by: Zhao Liu <zhao1.liu@xxxxxxxxx>
---
arch/x86/kvm/svm/svm.c | 2 +
arch/x86/kvm/vmx/vmx.c | 112 +++++++++++++++++++++++++++++++++++++++++
arch/x86/kvm/vmx/vmx.h | 2 +
arch/x86/kvm/x86.c | 2 +
4 files changed, 118 insertions(+)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 7039ae48d8d0..980d93c70eb6 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -4293,6 +4293,8 @@ static bool svm_has_emulated_msr(struct kvm *kvm, u32 index)
case MSR_IA32_THERM_STATUS:
case MSR_IA32_PACKAGE_THERM_INTERRUPT:
case MSR_IA32_PACKAGE_THERM_STATUS:
+ case MSR_IA32_HW_FEEDBACK_CONFIG:
+ case MSR_IA32_HW_FEEDBACK_PTR:
return false;
case MSR_IA32_SMBASE:
if (!IS_ENABLED(CONFIG_KVM_SMM))
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 92dded89ae3c..9c28d4ea0b2d 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -2424,6 +2424,18 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
msr_info->data = kvm_vmx->pkg_therm.msr_pkg_therm_status;
mutex_unlock(&kvm_vmx->pkg_therm.pkg_therm_lock);
break;
+ case MSR_IA32_HW_FEEDBACK_CONFIG:
+ if (!msr_info->host_initiated &&
+ !guest_cpuid_has(vcpu, X86_FEATURE_HFI))
+ return 1;
+ msr_info->data = kvm_vmx->pkg_therm.msr_ia32_hfi_cfg;
+ break;
+ case MSR_IA32_HW_FEEDBACK_PTR:
+ if (!msr_info->host_initiated &&
+ !guest_cpuid_has(vcpu, X86_FEATURE_HFI))
+ return 1;
+ msr_info->data = kvm_vmx->pkg_therm.msr_ia32_hfi_ptr;
+ break;
default:
find_uret_msr:
msr = vmx_find_uret_msr(vmx, msr_info->index);
@@ -2557,6 +2569,77 @@ static int vmx_set_pkg_therm_status_msr(struct kvm_vcpu *vcpu,
return 0;
}
+static int vmx_set_hfi_cfg_msr(struct kvm_vcpu *vcpu,
+ struct msr_data *msr_info)
+{
+ struct kvm_vmx *kvm_vmx = to_kvm_vmx(vcpu->kvm);
+ struct hfi_desc *kvm_vmx_hfi = &kvm_vmx->pkg_therm.hfi_desc;
+ u64 data = msr_info->data;
+ bool hfi_enabled, hfi_changed;
+
+ /*
+ * When the HFI enable bit changes (either from 0 to 1 or 1 to
+ * 0), HFI status bit is set and an interrupt is generated if
+ * enabled.
+ */
+ hfi_enabled = data & HW_FEEDBACK_CONFIG_HFI_ENABLE;
+ hfi_changed = kvm_vmx_hfi->hfi_enabled != hfi_enabled;
+
+ kvm_vmx->pkg_therm.msr_ia32_hfi_cfg = data;
+ kvm_vmx_hfi->hfi_enabled = hfi_enabled;
+
+ if (!hfi_changed)
+ return 0;
+
+ if (!hfi_enabled) {
+ /*
+ * SDM: hardware sets the IA32_PACKAGE_THERM_STATUS[bit 26]
+ * to 1 to acknowledge disabling of the interface.
+ */
+ kvm_vmx_hfi->hfi_update_status = true;
+ if (vmx_hfi_int_enabled(kvm_vmx))
+ vmx_inject_therm_interrupt(vcpu);
+ } else {
+ /*
+ * Here we don't care pending updates, because the enabed
+ * feature change may cause the HFI table update range to
+ * change.
+ */
+ vmx_update_hfi_table(vcpu->kvm, true);
+ vmx_hfi_notifier_register(vcpu->kvm);
+ }
+
+ return 0;
+}
+
+static int vmx_set_hfi_ptr_msr(struct kvm_vcpu *vcpu,
+ struct msr_data *msr_info)
+{
+ struct kvm_vmx *kvm_vmx = to_kvm_vmx(vcpu->kvm);
+ struct hfi_desc *kvm_vmx_hfi = &kvm_vmx->pkg_therm.hfi_desc;
+ u64 data = msr_info->data;
+
+ if (kvm_vmx->pkg_therm.msr_ia32_hfi_ptr == data)
+ return 0;
+
+ kvm_vmx->pkg_therm.msr_ia32_hfi_ptr = data;
+ kvm_vmx_hfi->table_ptr_valid = data & HW_FEEDBACK_PTR_VALID;
+ /*
+ * Currently we don't really support MSR handling for package
+ * scope, so when Guest writes, it is not possible to distinguish
+ * between writes from different packages or repeated writes from
+ * the same package. To simplify the process, we just assume that
+ * multiple writes are duplicate writes of the same package and
+ * overwrite the old.
+ */
+ kvm_vmx_hfi->table_base = data & ~HW_FEEDBACK_PTR_VALID;
+
+ vmx_update_hfi_table(vcpu->kvm, true);
+ vmx_hfi_notifier_register(vcpu->kvm);
+
+ return 0;
+}
+
/*
* Writes msr value into the appropriate "register".
* Returns 0 on success, non-0 otherwise.
@@ -2919,6 +3002,35 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
ret = vmx_set_pkg_therm_status_msr(vcpu, msr_info);
mutex_unlock(&kvm_vmx->pkg_therm.pkg_therm_lock);
break;
+ case MSR_IA32_HW_FEEDBACK_CONFIG:
+ if (!msr_info->host_initiated &&
+ !guest_cpuid_has(vcpu, X86_FEATURE_HFI))
+ return 1;
+ /*
+ * Unsupported and reserved bits. ITD is not supported
+ * (CPUID.06H:EAX[19]) yet.
+ */
+ if (!msr_info->host_initiated &&
+ data & ~(HW_FEEDBACK_CONFIG_HFI_ENABLE))
+ return 1;
+
+ mutex_lock(&kvm_vmx->pkg_therm.pkg_therm_lock);
+ ret = vmx_set_hfi_cfg_msr(vcpu, msr_info);
+ mutex_unlock(&kvm_vmx->pkg_therm.pkg_therm_lock);
+ break;
+ case MSR_IA32_HW_FEEDBACK_PTR:
+ if (!msr_info->host_initiated &&
+ !guest_cpuid_has(vcpu, X86_FEATURE_HFI))
+ return 1;
+ /* Reserved bits: generate the exception. */
+ if (!msr_info->host_initiated &&
+ data & HW_FEEDBACK_PTR_RESERVED_MASK)
+ return 1;
+
+ mutex_lock(&kvm_vmx->pkg_therm.pkg_therm_lock);
+ ret = vmx_set_hfi_ptr_msr(vcpu, msr_info);
+ mutex_unlock(&kvm_vmx->pkg_therm.pkg_therm_lock);
+ break;
default:
find_uret_msr:
msr = vmx_find_uret_msr(vmx, msr_index);
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index ff205bc0e99a..d9db8bf3726f 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -422,6 +422,8 @@ struct hfi_desc {
struct pkg_therm_desc {
u64 msr_pkg_therm_int;
u64 msr_pkg_therm_status;
+ u64 msr_ia32_hfi_cfg;
+ u64 msr_ia32_hfi_ptr;
/* Currently HFI is only supported at package level. */
struct hfi_desc hfi_desc;
/* All members before "struct mutex pkg_therm_lock" are protected by the lock. */
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index bea3def6a4b1..27bec359907c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1550,6 +1550,8 @@ static const u32 emulated_msrs_all[] = {
MSR_IA32_THERM_STATUS,
MSR_IA32_PACKAGE_THERM_INTERRUPT,
MSR_IA32_PACKAGE_THERM_STATUS,
+ MSR_IA32_HW_FEEDBACK_CONFIG,
+ MSR_IA32_HW_FEEDBACK_PTR,
/*
* KVM always supports the "true" VMX control MSRs, even if the host
--
2.34.1
