github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-31 15:30:56 +00:00
Code Issues Projects Releases Wiki Activity

hv: guest: fix bug in get_vcpu_paging_mode

Browse Source 
Align the implementation to SDM Vol.3 4.1.1.
Also this patch fixed a bug that doesn't check paging status first
in some cpu mode.

Tracked-On: #4628
Signed-off-by: Binbin Wu <binbin.wu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Binbin Wu 2020-04-10 09:36:46 +00:00 committed by wenlingz
parent 3df6d71e08
commit 597f7658fc
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hypervisor/arch/x86/guest/guest_memory.c
View File

@ -33,24 +33,18 @@ struct page_walk_info {
enum vm_paging_mode get_vcpu_paging_mode(struct acrn_vcpu *vcpu)
{
enum vm_cpu_mode cpu_mode;
enum vm_paging_mode ret;
enum vm_paging_mode ret = PAGING_MODE_0_LEVEL; /* non-paging */
cpu_mode = get_vcpu_mode(vcpu);
if (cpu_mode == CPU_MODE_REAL) {
ret = PAGING_MODE_0_LEVEL;
} else if (cpu_mode == CPU_MODE_PROTECTED) {
if (is_paging_enabled(vcpu)) {
if (is_pae(vcpu)) {
ret = PAGING_MODE_3_LEVEL;
} else if (is_paging_enabled(vcpu)) {
ret = PAGING_MODE_2_LEVEL;
if (is_long_mode(vcpu)) {
ret = PAGING_MODE_4_LEVEL; /* 4-level paging */
} else {
ret = PAGING_MODE_3_LEVEL; /* PAE paging */
}
} else {
ret = PAGING_MODE_0_LEVEL;
ret = PAGING_MODE_2_LEVEL; /* 32-bit paging */
}
} else { /* compatibility or 64bit mode */
ret = PAGING_MODE_4_LEVEL;
}
return ret;