lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1

Browse Source 
- Check reserved bits only if CR4.PAE=1 or CR4.PSE=1 when guest #PF occurs
- Fix a typo in reset_rsvds_bits_mask()

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Xiao Guangrong
2010-03-19 17:58:53 +08:00
committed by Avi Kivity
parent 041b1359a2
commit f815bce894
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2297,13 +2297,19 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
/* no rsvd bits for 2 level 4K page table entries */ /* no rsvd bits for 2 level 4K page table entries */
context->rsvd_bits_mask[0][1] = 0; context->rsvd_bits_mask[0][1] = 0;
context->rsvd_bits_mask[0][0] = 0; context->rsvd_bits_mask[0][0] = 0;
context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[0][0];
if (!is_pse(vcpu)) {
context->rsvd_bits_mask[1][1] = 0;
break;
}
if (is_cpuid_PSE36()) if (is_cpuid_PSE36())
/* 36bits PSE 4MB page */ /* 36bits PSE 4MB page */
context->rsvd_bits_mask[1][1] = rsvd_bits(17, 21); context->rsvd_bits_mask[1][1] = rsvd_bits(17, 21);
else else
/* 32 bits PSE 4MB page */ /* 32 bits PSE 4MB page */
context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21); context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);
context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];
break; break;
case PT32E_ROOT_LEVEL: case PT32E_ROOT_LEVEL:
context->rsvd_bits_mask[0][2] = context->rsvd_bits_mask[0][2] =
@@ -2316,7 +2322,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
context->rsvd_bits_mask[1][1] = exb_bit_rsvd | context->rsvd_bits_mask[1][1] = exb_bit_rsvd |
rsvd_bits(maxphyaddr, 62) | rsvd_bits(maxphyaddr, 62) |
rsvd_bits(13, 20); /* large page */ rsvd_bits(13, 20); /* large page */
context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0]; context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[0][0];
break; break;
case PT64_ROOT_LEVEL: case PT64_ROOT_LEVEL:
context->rsvd_bits_mask[0][3] = exb_bit_rsvd | context->rsvd_bits_mask[0][3] = exb_bit_rsvd |
@@ -2334,7 +2340,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
context->rsvd_bits_mask[1][1] = exb_bit_rsvd | context->rsvd_bits_mask[1][1] = exb_bit_rsvd |
rsvd_bits(maxphyaddr, 51) | rsvd_bits(maxphyaddr, 51) |
rsvd_bits(13, 20); /* large page */ rsvd_bits(13, 20); /* large page */
context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0]; context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[0][0];
break; break;
} }
} }