From: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx>
Add PVM virtual MSRs to emulated_msrs_all[], enabling the saving and
restoration of VM states.
Signed-off-by: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx>
Signed-off-by: Hou Wenlong <houwenlong.hwl@xxxxxxxxxxxx>
---
arch/x86/kvm/svm/svm.c | 4 ++++
arch/x86/kvm/vmx/vmx.c | 4 ++++
arch/x86/kvm/x86.c | 10 ++++++++++
3 files changed, 18 insertions(+)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index f3bb30b40876..91ab7cbbe813 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -31,6 +31,7 @@
#include <asm/apic.h>
#include <asm/perf_event.h>
+#include <asm/pvm_para.h>
#include <asm/tlbflush.h>
#include <asm/desc.h>
#include <asm/debugreg.h>
@@ -4281,6 +4282,9 @@ static bool svm_has_emulated_msr(struct kvm *kvm, u32 index)
case MSR_IA32_MCG_EXT_CTL:
case KVM_FIRST_EMULATED_VMX_MSR ... KVM_LAST_EMULATED_VMX_MSR:
return false;
+ case PVM_VIRTUAL_MSR_BASE ... PVM_VIRTUAL_MSR_MAX:
+ /* This is PVM only. */
+ return false;
case MSR_IA32_SMBASE:
if (!IS_ENABLED(CONFIG_KVM_SMM))
return false;
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index fca47304506e..e20a566f6d83 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -43,6 +43,7 @@
#include <asm/irq_remapping.h>
#include <asm/reboot.h>
#include <asm/perf_event.h>
+#include <asm/pvm_para.h>
#include <asm/mmu_context.h>
#include <asm/mshyperv.h>
#include <asm/mwait.h>
@@ -7004,6 +7005,9 @@ static bool vmx_has_emulated_msr(struct kvm *kvm, u32 index)
case MSR_AMD64_TSC_RATIO:
/* This is AMD only. */
return false;
+ case PVM_VIRTUAL_MSR_BASE ... PVM_VIRTUAL_MSR_MAX:
+ /* This is PVM only. */
+ return false;
default:
return true;
}
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8ec7a36cdf3e..be8fdae942d1 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -84,6 +84,7 @@
#include <asm/intel_pt.h>
#include <asm/emulate_prefix.h>
#include <asm/sgx.h>
+#include <asm/pvm_para.h>
#include <clocksource/hyperv_timer.h>
#define CREATE_TRACE_POINTS
@@ -1525,6 +1526,15 @@ static const u32 emulated_msrs_all[] = {
MSR_KVM_ASYNC_PF_EN, MSR_KVM_STEAL_TIME,
MSR_KVM_PV_EOI_EN, MSR_KVM_ASYNC_PF_INT, MSR_KVM_ASYNC_PF_ACK,
+ MSR_PVM_LINEAR_ADDRESS_RANGE,
+ MSR_PVM_VCPU_STRUCT,
+ MSR_PVM_SUPERVISOR_RSP,
+ MSR_PVM_SUPERVISOR_REDZONE,
+ MSR_PVM_EVENT_ENTRY,
+ MSR_PVM_RETU_RIP,
+ MSR_PVM_RETS_RIP,
+ MSR_PVM_SWITCH_CR3,
+
MSR_IA32_TSC_ADJUST,
MSR_IA32_TSC_DEADLINE,
MSR_IA32_ARCH_CAPABILITIES,
--
2.19.1.6.gb485710b
