Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 17:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

nEPT: correctly check if remote tlb flush is needed for shadowed EPT tables

Browse Source 
need_remote_flush() assumes that shadow page is in PT64 format, but
with addition of nested EPT this is no longer always true. Fix it by
bits definitions that depend on host shadow page type.

Reported-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Reviewed-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Gleb Natapov 2013-08-05 11:07:14 +03:00 committed by Paolo Bonzini
parent 7a1638ce42
commit 53166229e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kvm/mmu.c
View File

@ -132,8 +132,8 @@ module_param(dbg, bool, 0644);
(PAGE_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \ (PAGE_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \
* PT32_LEVEL_BITS))) - 1)) * PT32_LEVEL_BITS))) - 1))
#define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | PT_USER_MASK \ #define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | shadow_user_mask \
| PT64_NX_MASK) | shadow_x_mask | shadow_nx_mask)
#define ACC_EXEC_MASK 1 #define ACC_EXEC_MASK 1
#define ACC_WRITE_MASK PT_WRITABLE_MASK #define ACC_WRITE_MASK PT_WRITABLE_MASK
@ -3879,8 +3879,8 @@ static bool need_remote_flush(u64 old, u64 new)
return true; return true;
if ((old ^ new) & PT64_BASE_ADDR_MASK) if ((old ^ new) & PT64_BASE_ADDR_MASK)
return true; return true;
old ^= PT64_NX_MASK; old ^= shadow_nx_mask;
new ^= PT64_NX_MASK; new ^= shadow_nx_mask;
return (old & ~new & PT64_PERM_MASK) != 0; return (old & ~new & PT64_PERM_MASK) != 0;
} }