* [PATCH v3] KVM MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1
@ 2010-03-19 9:58 Xiao Guangrong
2010-03-23 15:32 ` Marcelo Tosatti
2010-03-24 9:25 ` Avi Kivity
0 siblings, 2 replies; 3+ messages in thread
From: Xiao Guangrong @ 2010-03-19 9:58 UTC (permalink / raw)
To: Avi Kivity; +Cc: Marcelo Tosatti, Sheng Yang, LKML, KVM list
- 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>
---
arch/x86/kvm/mmu.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index b137515..d6c1f03 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2293,13 +2293,19 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
/* no rsvd bits for 2 level 4K page table entries */
context->rsvd_bits_mask[0][1] = 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())
/* 36bits PSE 4MB page */
context->rsvd_bits_mask[1][1] = rsvd_bits(17, 21);
else
/* 32 bits PSE 4MB page */
context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);
- context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];
break;
case PT32E_ROOT_LEVEL:
context->rsvd_bits_mask[0][2] =
@@ -2312,7 +2318,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
context->rsvd_bits_mask[1][1] = exb_bit_rsvd |
rsvd_bits(maxphyaddr, 62) |
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;
case PT64_ROOT_LEVEL:
context->rsvd_bits_mask[0][3] = exb_bit_rsvd |
@@ -2330,7 +2336,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
context->rsvd_bits_mask[1][1] = exb_bit_rsvd |
rsvd_bits(maxphyaddr, 51) |
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;
}
}
--
1.6.6.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3] KVM MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1
2010-03-19 9:58 [PATCH v3] KVM MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1 Xiao Guangrong
@ 2010-03-23 15:32 ` Marcelo Tosatti
2010-03-24 9:25 ` Avi Kivity
1 sibling, 0 replies; 3+ messages in thread
From: Marcelo Tosatti @ 2010-03-23 15:32 UTC (permalink / raw)
To: Xiao Guangrong; +Cc: Avi Kivity, Sheng Yang, LKML, KVM list
On Fri, Mar 19, 2010 at 05:58:53PM +0800, Xiao Guangrong wrote:
> - 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>
> ---
> arch/x86/kvm/mmu.c | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
> index b137515..d6c1f03 100644
> --- a/arch/x86/kvm/mmu.c
> +++ b/arch/x86/kvm/mmu.c
> @@ -2293,13 +2293,19 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
> /* no rsvd bits for 2 level 4K page table entries */
> context->rsvd_bits_mask[0][1] = 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())
> /* 36bits PSE 4MB page */
> context->rsvd_bits_mask[1][1] = rsvd_bits(17, 21);
> else
> /* 32 bits PSE 4MB page */
> context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);
> - context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];
> break;
> case PT32E_ROOT_LEVEL:
> context->rsvd_bits_mask[0][2] =
> @@ -2312,7 +2318,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
> context->rsvd_bits_mask[1][1] = exb_bit_rsvd |
> rsvd_bits(maxphyaddr, 62) |
> 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;
> case PT64_ROOT_LEVEL:
> context->rsvd_bits_mask[0][3] = exb_bit_rsvd |
> @@ -2330,7 +2336,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level)
> context->rsvd_bits_mask[1][1] = exb_bit_rsvd |
> rsvd_bits(maxphyaddr, 51) |
> 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;
> }
> }
> --
> 1.6.6.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v3] KVM MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1
2010-03-19 9:58 [PATCH v3] KVM MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1 Xiao Guangrong
2010-03-23 15:32 ` Marcelo Tosatti
@ 2010-03-24 9:25 ` Avi Kivity
1 sibling, 0 replies; 3+ messages in thread
From: Avi Kivity @ 2010-03-24 9:25 UTC (permalink / raw)
To: Xiao Guangrong; +Cc: Marcelo Tosatti, Sheng Yang, LKML, KVM list
On 03/19/2010 11:58 AM, Xiao Guangrong wrote:
> - Check reserved bits only if CR4.PAE=1 or CR4.PSE=1 when guest #PF occurs
> - Fix a typo in reset_rsvds_bits_mask()
>
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-24 9:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 9:58 [PATCH v3] KVM MMU: check reserved bits only if CR4.PSE=1 or CR4.PAE=1 Xiao Guangrong
2010-03-23 15:32 ` Marcelo Tosatti
2010-03-24 9:25 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox