github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 15:02:13 +00:00
Code Issues Projects Releases Wiki Activity

add vmx msr ops protection from guest OS

Browse Source 
1.it doesn't support VMX for guest OS
2.for MSR out of control, inject GP to guest OS.

Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Minggui Cao 2018-03-06 10:17:08 +08:00 committed by lijinxia
parent 7660187f9e
commit 9dbd30303b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/guest/vmsr.c
View File

@ -152,6 +152,11 @@ void init_msr_emulation(struct vcpu *vcpu)
i <= MSR_IA32_MTRR_FIX4K_F8000; i++) { i <= MSR_IA32_MTRR_FIX4K_F8000; i++) {
enable_msr_interception(msr_bitmap, i); enable_msr_interception(msr_bitmap, i);
} }
for (i = MSR_IA32_VMX_BASIC;
i <= MSR_IA32_VMX_TRUE_ENTRY_CTLS; i++) {
enable_msr_interception(msr_bitmap, i);
}
} }
/* Set up MSR bitmap - pg 2904 24.6.9 */ /* Set up MSR bitmap - pg 2904 24.6.9 */
@ -192,6 +197,7 @@ int rdmsr_handler(struct vcpu *vcpu)
case MSR_IA32_MTRR_DEF_TYPE: case MSR_IA32_MTRR_DEF_TYPE:
case MSR_IA32_MTRR_PHYSBASE_0 ... MSR_IA32_MTRR_PHYSMASK_9: case MSR_IA32_MTRR_PHYSBASE_0 ... MSR_IA32_MTRR_PHYSMASK_9:
case MSR_IA32_MTRR_FIX64K_00000 ... MSR_IA32_MTRR_FIX4K_F8000: case MSR_IA32_MTRR_FIX64K_00000 ... MSR_IA32_MTRR_FIX4K_F8000:
case MSR_IA32_VMX_BASIC ... MSR_IA32_VMX_TRUE_ENTRY_CTLS:
{ {
vcpu_inject_gp(vcpu); vcpu_inject_gp(vcpu);
break; break;
@ -232,6 +238,7 @@ int rdmsr_handler(struct vcpu *vcpu)
default: default:
{ {
pr_warn("rdmsr: %lx should not come here!", msr); pr_warn("rdmsr: %lx should not come here!", msr);
vcpu_inject_gp(vcpu);
v = 0; v = 0;
break; break;
} }
@ -280,6 +287,7 @@ int wrmsr_handler(struct vcpu *vcpu)
case MSR_IA32_MTRR_DEF_TYPE: case MSR_IA32_MTRR_DEF_TYPE:
case MSR_IA32_MTRR_PHYSBASE_0 ... MSR_IA32_MTRR_PHYSMASK_9: case MSR_IA32_MTRR_PHYSBASE_0 ... MSR_IA32_MTRR_PHYSMASK_9:
case MSR_IA32_MTRR_FIX64K_00000 ... MSR_IA32_MTRR_FIX4K_F8000: case MSR_IA32_MTRR_FIX64K_00000 ... MSR_IA32_MTRR_FIX4K_F8000:
case MSR_IA32_VMX_BASIC ... MSR_IA32_VMX_TRUE_ENTRY_CTLS:
{ {
vcpu_inject_gp(vcpu); vcpu_inject_gp(vcpu);
break; break;
@ -329,8 +337,8 @@ int wrmsr_handler(struct vcpu *vcpu)
} }
default: default:
{ {
ASSERT(0, "wrmsr: %lx should not come here!", msr); pr_warn(0, "wrmsr: %lx should not come here!", msr);
msr_write(msr, v); vcpu_inject_gp(vcpu);
break; break;
} }
} }