public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
@ 2012-12-19 13:29 Marcelo Tosatti
       [not found] ` <CAEbWair0awmpB9QXFGXJmooSsHg3B6P3uZrmLcyzs=T70TS7VA@mail.gmail.com>
  2013-01-03 13:49 ` KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v2) Marcelo Tosatti
  0 siblings, 2 replies; 14+ messages in thread
From: Marcelo Tosatti @ 2012-12-19 13:29 UTC (permalink / raw)
  To: Gleb Natapov, Avi Kivity; +Cc: kvm



CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.

Using values other than those can cause failures on operations that check CPL.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a4ecf7c..3abe433 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu *vcpu, int seg)
 
 static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
 {
-	if (!is_protmode(vcpu))
-		return 0;
-
-	if (!is_long_mode(vcpu)
-	    && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
-		return 3;
-
 	return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
 }
 
@@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
 {
 	struct vcpu_vmx *vmx = to_vmx(vcpu);
 
+	if (!is_protmode(vcpu))
+		return 0;
+
+	if (!is_long_mode(vcpu)
+	    && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
+		return 3;
+
 	/*
 	 * If we enter real mode with cs.sel & 3 != 0, the normal CPL calculations
 	 * fail; use the cache instead.

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
       [not found] ` <CAEbWair0awmpB9QXFGXJmooSsHg3B6P3uZrmLcyzs=T70TS7VA@mail.gmail.com>
@ 2012-12-25 12:48   ` Gleb Natapov
  2012-12-25 21:37     ` Marcelo Tosatti
  2013-01-01 23:41   ` Marcelo Tosatti
  1 sibling, 1 reply; 14+ messages in thread
From: Gleb Natapov @ 2012-12-25 12:48 UTC (permalink / raw)
  To: Avi Kivity; +Cc: Marcelo Tosatti, kvm

On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> 
> >
> >
> > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> >
> > Using values other than those can cause failures on operations that check
> > CPL.
> >
> > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> >
> > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > index a4ecf7c..3abe433 100644
> > --- a/arch/x86/kvm/vmx.c
> > +++ b/arch/x86/kvm/vmx.c
> > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > *vcpu, int seg)
> >
> >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> >  {
> > -       if (!is_protmode(vcpu))
> > -               return 0;
> > -
> > -       if (!is_long_mode(vcpu)
> > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > */
> > -               return 3;
> > -
> >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> >  }
> >
> > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> >  {
> >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> >
> > +       if (!is_protmode(vcpu))
> > +               return 0;
> > +
> > +       if (!is_long_mode(vcpu)
> > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > */
> > +               return 3;
> > +
> >         /*
> >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > calculations
> >          * fail; use the cache instead.
> >
> 
> 
> This undoes the cache, now every vmx_get_cpl() in protected mode has to
> VMREAD(GUEST_RFLAGS).
True. Marcelo what failure do you see without the patch?

--
			Gleb.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2012-12-25 12:48   ` Gleb Natapov
@ 2012-12-25 21:37     ` Marcelo Tosatti
  2012-12-26  5:25       ` Gleb Natapov
  0 siblings, 1 reply; 14+ messages in thread
From: Marcelo Tosatti @ 2012-12-25 21:37 UTC (permalink / raw)
  To: Gleb Natapov; +Cc: Avi Kivity, kvm

On Tue, Dec 25, 2012 at 02:48:08PM +0200, Gleb Natapov wrote:
> On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> > On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> > 
> > >
> > >
> > > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> > >
> > > Using values other than those can cause failures on operations that check
> > > CPL.
> > >
> > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> > >
> > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > > index a4ecf7c..3abe433 100644
> > > --- a/arch/x86/kvm/vmx.c
> > > +++ b/arch/x86/kvm/vmx.c
> > > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > > *vcpu, int seg)
> > >
> > >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> > >  {
> > > -       if (!is_protmode(vcpu))
> > > -               return 0;
> > > -
> > > -       if (!is_long_mode(vcpu)
> > > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > */
> > > -               return 3;
> > > -
> > >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> > >  }
> > >
> > > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> > >  {
> > >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> > >
> > > +       if (!is_protmode(vcpu))
> > > +               return 0;
> > > +
> > > +       if (!is_long_mode(vcpu)
> > > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > */
> > > +               return 3;
> > > +
> > >         /*
> > >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > > calculations
> > >          * fail; use the cache instead.
> > >
> > 
> > 
> > This undoes the cache, now every vmx_get_cpl() in protected mode has to
> > VMREAD(GUEST_RFLAGS).
> True. Marcelo what failure do you see without the patch?
> 
> --
> 			Gleb.

On transition _to_ real mode, linearize fails due to CPL checks
(FreeBSD). I'll resend the patch with use of cache for
VMREAD(GUEST_RFLAGS), which is already implemented.


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2012-12-25 21:37     ` Marcelo Tosatti
@ 2012-12-26  5:25       ` Gleb Natapov
  2012-12-26 13:25         ` Marcelo Tosatti
  0 siblings, 1 reply; 14+ messages in thread
From: Gleb Natapov @ 2012-12-26  5:25 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Avi Kivity, kvm

On Tue, Dec 25, 2012 at 07:37:10PM -0200, Marcelo Tosatti wrote:
> On Tue, Dec 25, 2012 at 02:48:08PM +0200, Gleb Natapov wrote:
> > On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> > > On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> > > 
> > > >
> > > >
> > > > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> > > >
> > > > Using values other than those can cause failures on operations that check
> > > > CPL.
> > > >
> > > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> > > >
> > > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > > > index a4ecf7c..3abe433 100644
> > > > --- a/arch/x86/kvm/vmx.c
> > > > +++ b/arch/x86/kvm/vmx.c
> > > > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > > > *vcpu, int seg)
> > > >
> > > >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > >  {
> > > > -       if (!is_protmode(vcpu))
> > > > -               return 0;
> > > > -
> > > > -       if (!is_long_mode(vcpu)
> > > > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > */
> > > > -               return 3;
> > > > -
> > > >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> > > >  }
> > > >
> > > > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > >  {
> > > >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> > > >
> > > > +       if (!is_protmode(vcpu))
> > > > +               return 0;
> > > > +
> > > > +       if (!is_long_mode(vcpu)
> > > > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > */
> > > > +               return 3;
> > > > +
> > > >         /*
> > > >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > > > calculations
> > > >          * fail; use the cache instead.
> > > >
> > > 
> > > 
> > > This undoes the cache, now every vmx_get_cpl() in protected mode has to
> > > VMREAD(GUEST_RFLAGS).
> > True. Marcelo what failure do you see without the patch?
> > 
> > --
> > 			Gleb.
> 
> On transition _to_ real mode, linearize fails due to CPL checks
> (FreeBSD). I'll resend the patch with use of cache for
> VMREAD(GUEST_RFLAGS), which is already implemented.
I am curious does it still fails with all my vmx patches applied too?
The question is how does it happen that we enter real mode while cache
is set to 3. It should never be 3 during boot since boot process never
enters the userspace.

--
			Gleb.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2012-12-26  5:25       ` Gleb Natapov
@ 2012-12-26 13:25         ` Marcelo Tosatti
  2012-12-26 13:33           ` Gleb Natapov
  0 siblings, 1 reply; 14+ messages in thread
From: Marcelo Tosatti @ 2012-12-26 13:25 UTC (permalink / raw)
  To: Gleb Natapov; +Cc: Avi Kivity, kvm

On Wed, Dec 26, 2012 at 07:25:49AM +0200, Gleb Natapov wrote:
> On Tue, Dec 25, 2012 at 07:37:10PM -0200, Marcelo Tosatti wrote:
> > On Tue, Dec 25, 2012 at 02:48:08PM +0200, Gleb Natapov wrote:
> > > On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> > > > On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> > > > 
> > > > >
> > > > >
> > > > > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> > > > >
> > > > > Using values other than those can cause failures on operations that check
> > > > > CPL.
> > > > >
> > > > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> > > > >
> > > > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > > > > index a4ecf7c..3abe433 100644
> > > > > --- a/arch/x86/kvm/vmx.c
> > > > > +++ b/arch/x86/kvm/vmx.c
> > > > > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > > > > *vcpu, int seg)
> > > > >
> > > > >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > >  {
> > > > > -       if (!is_protmode(vcpu))
> > > > > -               return 0;
> > > > > -
> > > > > -       if (!is_long_mode(vcpu)
> > > > > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > */
> > > > > -               return 3;
> > > > > -
> > > > >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> > > > >  }
> > > > >
> > > > > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > >  {
> > > > >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> > > > >
> > > > > +       if (!is_protmode(vcpu))
> > > > > +               return 0;
> > > > > +
> > > > > +       if (!is_long_mode(vcpu)
> > > > > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > */
> > > > > +               return 3;
> > > > > +
> > > > >         /*
> > > > >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > > > > calculations
> > > > >          * fail; use the cache instead.
> > > > >
> > > > 
> > > > 
> > > > This undoes the cache, now every vmx_get_cpl() in protected mode has to
> > > > VMREAD(GUEST_RFLAGS).
> > > True. Marcelo what failure do you see without the patch?
> > > 
> > > --
> > > 			Gleb.
> > 
> > On transition _to_ real mode, linearize fails due to CPL checks
> > (FreeBSD). I'll resend the patch with use of cache for
> > VMREAD(GUEST_RFLAGS), which is already implemented.
> I am curious does it still fails with all my vmx patches applied too?

Yes.

> The question is how does it happen that we enter real mode while cache
> is set to 3. It should never be 3 during boot since boot process never
> enters the userspace.

Its transition _to_ real mode (from protected).

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2012-12-26 13:25         ` Marcelo Tosatti
@ 2012-12-26 13:33           ` Gleb Natapov
  2013-01-01 23:36             ` Marcelo Tosatti
  0 siblings, 1 reply; 14+ messages in thread
From: Gleb Natapov @ 2012-12-26 13:33 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Avi Kivity, kvm

On Wed, Dec 26, 2012 at 11:25:24AM -0200, Marcelo Tosatti wrote:
> On Wed, Dec 26, 2012 at 07:25:49AM +0200, Gleb Natapov wrote:
> > On Tue, Dec 25, 2012 at 07:37:10PM -0200, Marcelo Tosatti wrote:
> > > On Tue, Dec 25, 2012 at 02:48:08PM +0200, Gleb Natapov wrote:
> > > > On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> > > > > On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> > > > > 
> > > > > >
> > > > > >
> > > > > > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> > > > > >
> > > > > > Using values other than those can cause failures on operations that check
> > > > > > CPL.
> > > > > >
> > > > > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> > > > > >
> > > > > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > > > > > index a4ecf7c..3abe433 100644
> > > > > > --- a/arch/x86/kvm/vmx.c
> > > > > > +++ b/arch/x86/kvm/vmx.c
> > > > > > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > > > > > *vcpu, int seg)
> > > > > >
> > > > > >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > > >  {
> > > > > > -       if (!is_protmode(vcpu))
> > > > > > -               return 0;
> > > > > > -
> > > > > > -       if (!is_long_mode(vcpu)
> > > > > > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > > */
> > > > > > -               return 3;
> > > > > > -
> > > > > >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> > > > > >  }
> > > > > >
> > > > > > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > > >  {
> > > > > >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> > > > > >
> > > > > > +       if (!is_protmode(vcpu))
> > > > > > +               return 0;
> > > > > > +
> > > > > > +       if (!is_long_mode(vcpu)
> > > > > > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > > */
> > > > > > +               return 3;
> > > > > > +
> > > > > >         /*
> > > > > >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > > > > > calculations
> > > > > >          * fail; use the cache instead.
> > > > > >
> > > > > 
> > > > > 
> > > > > This undoes the cache, now every vmx_get_cpl() in protected mode has to
> > > > > VMREAD(GUEST_RFLAGS).
> > > > True. Marcelo what failure do you see without the patch?
> > > > 
> > > > --
> > > > 			Gleb.
> > > 
> > > On transition _to_ real mode, linearize fails due to CPL checks
> > > (FreeBSD). I'll resend the patch with use of cache for
> > > VMREAD(GUEST_RFLAGS), which is already implemented.
> > I am curious does it still fails with all my vmx patches applied too?
> 
> Yes.
> 
Which FreeBSD exactly? Cannot reproduce with FreeBSD 9 64 bits here.

> > The question is how does it happen that we enter real mode while cache
> > is set to 3. It should never be 3 during boot since boot process never
> > enters the userspace.
> 
> Its transition _to_ real mode (from protected).
But in protected mode CPL should be 0 during boot.

--
			Gleb.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2012-12-26 13:33           ` Gleb Natapov
@ 2013-01-01 23:36             ` Marcelo Tosatti
  2013-01-03  8:11               ` Gleb Natapov
  0 siblings, 1 reply; 14+ messages in thread
From: Marcelo Tosatti @ 2013-01-01 23:36 UTC (permalink / raw)
  To: Gleb Natapov; +Cc: Avi Kivity, kvm

On Wed, Dec 26, 2012 at 03:33:16PM +0200, Gleb Natapov wrote:
> On Wed, Dec 26, 2012 at 11:25:24AM -0200, Marcelo Tosatti wrote:
> > On Wed, Dec 26, 2012 at 07:25:49AM +0200, Gleb Natapov wrote:
> > > On Tue, Dec 25, 2012 at 07:37:10PM -0200, Marcelo Tosatti wrote:
> > > > On Tue, Dec 25, 2012 at 02:48:08PM +0200, Gleb Natapov wrote:
> > > > > On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> > > > > > On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> > > > > > 
> > > > > > >
> > > > > > >
> > > > > > > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> > > > > > >
> > > > > > > Using values other than those can cause failures on operations that check
> > > > > > > CPL.
> > > > > > >
> > > > > > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> > > > > > >
> > > > > > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > > > > > > index a4ecf7c..3abe433 100644
> > > > > > > --- a/arch/x86/kvm/vmx.c
> > > > > > > +++ b/arch/x86/kvm/vmx.c
> > > > > > > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > > > > > > *vcpu, int seg)
> > > > > > >
> > > > > > >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > > > >  {
> > > > > > > -       if (!is_protmode(vcpu))
> > > > > > > -               return 0;
> > > > > > > -
> > > > > > > -       if (!is_long_mode(vcpu)
> > > > > > > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > > > */
> > > > > > > -               return 3;
> > > > > > > -
> > > > > > >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> > > > > > >  }
> > > > > > >
> > > > > > > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > > > >  {
> > > > > > >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> > > > > > >
> > > > > > > +       if (!is_protmode(vcpu))
> > > > > > > +               return 0;
> > > > > > > +
> > > > > > > +       if (!is_long_mode(vcpu)
> > > > > > > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > > > */
> > > > > > > +               return 3;
> > > > > > > +
> > > > > > >         /*
> > > > > > >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > > > > > > calculations
> > > > > > >          * fail; use the cache instead.
> > > > > > >
> > > > > > 
> > > > > > 
> > > > > > This undoes the cache, now every vmx_get_cpl() in protected mode has to
> > > > > > VMREAD(GUEST_RFLAGS).
> > > > > True. Marcelo what failure do you see without the patch?
> > > > > 
> > > > > --
> > > > > 			Gleb.
> > > > 
> > > > On transition _to_ real mode, linearize fails due to CPL checks
> > > > (FreeBSD). I'll resend the patch with use of cache for
> > > > VMREAD(GUEST_RFLAGS), which is already implemented.
> > > I am curious does it still fails with all my vmx patches applied too?
> > 
> > Yes.
> > 
> Which FreeBSD exactly? Cannot reproduce with FreeBSD 9 64 bits here.

FreeBSD 9.1 with -smp 2.
> 
> > > The question is how does it happen that we enter real mode while cache
> > > is set to 3. It should never be 3 during boot since boot process never
> > > enters the userspace.
> > 
> > Its transition _to_ real mode (from protected).
> But in protected mode CPL should be 0 during boot.

BTX (FreeBSD's bootloader) does:

http://people.freebsd.org/~jhb/docs/loader.txt. 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
       [not found] ` <CAEbWair0awmpB9QXFGXJmooSsHg3B6P3uZrmLcyzs=T70TS7VA@mail.gmail.com>
  2012-12-25 12:48   ` Gleb Natapov
@ 2013-01-01 23:41   ` Marcelo Tosatti
  1 sibling, 0 replies; 14+ messages in thread
From: Marcelo Tosatti @ 2013-01-01 23:41 UTC (permalink / raw)
  To: Avi Kivity; +Cc: Gleb Natapov, kvm

On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> 
> >
> >
> > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> >
> > Using values other than those can cause failures on operations that check
> > CPL.
> >
> > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> >
> > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > index a4ecf7c..3abe433 100644
> > --- a/arch/x86/kvm/vmx.c
> > +++ b/arch/x86/kvm/vmx.c
> > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > *vcpu, int seg)
> >
> >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> >  {
> > -       if (!is_protmode(vcpu))
> > -               return 0;
> > -
> > -       if (!is_long_mode(vcpu)
> > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > */
> > -               return 3;
> > -
> >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> >  }
> >
> > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> >  {
> >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> >
> > +       if (!is_protmode(vcpu))
> > +               return 0;
> > +
> > +       if (!is_long_mode(vcpu)
> > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > */
> > +               return 3;
> > +
> >         /*
> >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > calculations
> >          * fail; use the cache instead.
> >
> 
> 
> This undoes the cache, now every vmx_get_cpl() in protected mode has to
> VMREAD(GUEST_RFLAGS).

Yes, but GUEST_RFLAGS reads are cached. So its read once per exit.



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2013-01-01 23:36             ` Marcelo Tosatti
@ 2013-01-03  8:11               ` Gleb Natapov
  2013-01-03 13:19                 ` Marcelo Tosatti
  0 siblings, 1 reply; 14+ messages in thread
From: Gleb Natapov @ 2013-01-03  8:11 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Avi Kivity, kvm

On Tue, Jan 01, 2013 at 09:36:38PM -0200, Marcelo Tosatti wrote:
> On Wed, Dec 26, 2012 at 03:33:16PM +0200, Gleb Natapov wrote:
> > On Wed, Dec 26, 2012 at 11:25:24AM -0200, Marcelo Tosatti wrote:
> > > On Wed, Dec 26, 2012 at 07:25:49AM +0200, Gleb Natapov wrote:
> > > > On Tue, Dec 25, 2012 at 07:37:10PM -0200, Marcelo Tosatti wrote:
> > > > > On Tue, Dec 25, 2012 at 02:48:08PM +0200, Gleb Natapov wrote:
> > > > > > On Sat, Dec 22, 2012 at 02:31:10PM +0200, Avi Kivity wrote:
> > > > > > > On Wed, Dec 19, 2012 at 3:29 PM, Marcelo Tosatti <mtosatti@redhat.com>wrote:
> > > > > > > 
> > > > > > > >
> > > > > > > >
> > > > > > > > CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> > > > > > > >
> > > > > > > > Using values other than those can cause failures on operations that check
> > > > > > > > CPL.
> > > > > > > >
> > > > > > > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> > > > > > > >
> > > > > > > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > > > > > > > index a4ecf7c..3abe433 100644
> > > > > > > > --- a/arch/x86/kvm/vmx.c
> > > > > > > > +++ b/arch/x86/kvm/vmx.c
> > > > > > > > @@ -3215,13 +3215,6 @@ static u64 vmx_get_segment_base(struct kvm_vcpu
> > > > > > > > *vcpu, int seg)
> > > > > > > >
> > > > > > > >  static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > > > > >  {
> > > > > > > > -       if (!is_protmode(vcpu))
> > > > > > > > -               return 0;
> > > > > > > > -
> > > > > > > > -       if (!is_long_mode(vcpu)
> > > > > > > > -           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > > > > */
> > > > > > > > -               return 3;
> > > > > > > > -
> > > > > > > >         return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> > > > > > > >  }
> > > > > > > >
> > > > > > > > @@ -3229,6 +3222,13 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> > > > > > > >  {
> > > > > > > >         struct vcpu_vmx *vmx = to_vmx(vcpu);
> > > > > > > >
> > > > > > > > +       if (!is_protmode(vcpu))
> > > > > > > > +               return 0;
> > > > > > > > +
> > > > > > > > +       if (!is_long_mode(vcpu)
> > > > > > > > +           && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086
> > > > > > > > */
> > > > > > > > +               return 3;
> > > > > > > > +
> > > > > > > >         /*
> > > > > > > >          * If we enter real mode with cs.sel & 3 != 0, the normal CPL
> > > > > > > > calculations
> > > > > > > >          * fail; use the cache instead.
> > > > > > > >
> > > > > > > 
> > > > > > > 
> > > > > > > This undoes the cache, now every vmx_get_cpl() in protected mode has to
> > > > > > > VMREAD(GUEST_RFLAGS).
> > > > > > True. Marcelo what failure do you see without the patch?
> > > > > > 
> > > > > > --
> > > > > > 			Gleb.
> > > > > 
> > > > > On transition _to_ real mode, linearize fails due to CPL checks
> > > > > (FreeBSD). I'll resend the patch with use of cache for
> > > > > VMREAD(GUEST_RFLAGS), which is already implemented.
> > > > I am curious does it still fails with all my vmx patches applied too?
> > > 
> > > Yes.
> > > 
> > Which FreeBSD exactly? Cannot reproduce with FreeBSD 9 64 bits here.
> 
> FreeBSD 9.1 with -smp 2.
I cannot reproduce. I do see boot failure on the next branch with 9.[01]
64 bit -smp 2 here, but it is caused but segment registers been all
incorrect on a secondary vcpu and this patch does not help. Applying
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/102593 fixes
it.

> > 
> > > > The question is how does it happen that we enter real mode while cache
> > > > is set to 3. It should never be 3 during boot since boot process never
> > > > enters the userspace.
> > > 
> > > Its transition _to_ real mode (from protected).
> > But in protected mode CPL should be 0 during boot.
> 
> BTX (FreeBSD's bootloader) does:
> 
> http://people.freebsd.org/~jhb/docs/loader.txt. 
Crazy. Regardless, I think your patch is correct and the current code
that uses cpl cache during emulation is wrong and it remains wrong even
after your patch. What if last time cpl cache was updated was while vcpu
ran in cpl 3? Commit message says that it tries to fix the case when
CS.selector&3 != 0 during transition to protected mode, but this can be
fixed by setting cpl cache to 0 in vmx_set_cr0() instead of clearing it.

Two things about the patch itself. Get rid of __vmx_get_cpl() and call
to vmx_read_guest_seg_selector() directly from vmx_get_cpl() and drop
__clear_bit(VCPU_EXREG_CPL) from vmx_set_rflags() and vmx_set_cr0()
since vmx->cpl no longer depends on rflags and cr0.

--
			Gleb.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2013-01-03  8:11               ` Gleb Natapov
@ 2013-01-03 13:19                 ` Marcelo Tosatti
  2013-01-04 11:16                   ` Gleb Natapov
  0 siblings, 1 reply; 14+ messages in thread
From: Marcelo Tosatti @ 2013-01-03 13:19 UTC (permalink / raw)
  To: Gleb Natapov; +Cc: Avi Kivity, kvm

On Thu, Jan 03, 2013 at 10:11:53AM +0200, Gleb Natapov wrote:
> > FreeBSD 9.1 with -smp 2.
> I cannot reproduce. I do see boot failure on the next branch with 9.[01]
> 64 bit -smp 2 here, but it is caused but segment registers been all
> incorrect on a secondary vcpu and this patch does not help. Applying
> http://comments.gmane.org/gmane.comp.emulators.kvm.devel/102593 fixes
> it.
> 
> > > 
> > > > > The question is how does it happen that we enter real mode while cache
> > > > > is set to 3. It should never be 3 during boot since boot process never
> > > > > enters the userspace.
> > > > 
> > > > Its transition _to_ real mode (from protected).
> > > But in protected mode CPL should be 0 during boot.
> > 
> > BTX (FreeBSD's bootloader) does:
> > 
> > http://people.freebsd.org/~jhb/docs/loader.txt. 
> Crazy. Regardless, I think your patch is correct and the current code
> that uses cpl cache during emulation is wrong and it remains wrong even
> after your patch. What if last time cpl cache was updated was while vcpu
> ran in cpl 3? Commit message says that it tries to fix the case when
> CS.selector&3 != 0 during transition to protected mode, but this can be
> fixed by setting cpl cache to 0 in vmx_set_cr0() instead of clearing it.

Yes, i suppose so, can be done by a separatch patch, though.

> Two things about the patch itself. Get rid of __vmx_get_cpl() and call
> to vmx_read_guest_seg_selector() directly from vmx_get_cpl() and drop
> __clear_bit(VCPU_EXREG_CPL) from vmx_set_rflags() and vmx_set_cr0()
> since vmx->cpl no longer depends on rflags and cr0.

You still want to invalidate vmx->cpl cache on cr0 writes:
think protected -> real -> protected transition.
And as for EFLAGS, agreed. Sending new patch.


^ permalink raw reply	[flat|nested] 14+ messages in thread

* KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v2)
  2012-12-19 13:29 KVM: VMX: fix incorrect cached cpl value with real/v8086 modes Marcelo Tosatti
       [not found] ` <CAEbWair0awmpB9QXFGXJmooSsHg3B6P3uZrmLcyzs=T70TS7VA@mail.gmail.com>
@ 2013-01-03 13:49 ` Marcelo Tosatti
  2013-01-07 21:27   ` KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v3) Marcelo Tosatti
  1 sibling, 1 reply; 14+ messages in thread
From: Marcelo Tosatti @ 2013-01-03 13:49 UTC (permalink / raw)
  To: Gleb Natapov, Avi Kivity; +Cc: kvm


CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.

Using values other than those can cause failures on operations that check CPL.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 55dfc37..849f5f2 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1696,7 +1696,6 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
 static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
 {
 	__set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
-	__clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
 	to_vmx(vcpu)->rflags = rflags;
 	if (to_vmx(vcpu)->rmode.vm86_active) {
 		to_vmx(vcpu)->rmode.save_rflags = rflags;
@@ -3220,8 +3219,10 @@ static u64 vmx_get_segment_base(struct kvm_vcpu *vcpu, int seg)
 	return vmx_read_guest_seg_base(to_vmx(vcpu), seg);
 }
 
-static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
+static int vmx_get_cpl(struct kvm_vcpu *vcpu)
 {
+	struct vcpu_vmx *vmx = to_vmx(vcpu);
+
 	if (!is_protmode(vcpu))
 		return 0;
 
@@ -3229,13 +3230,6 @@ static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
 	    && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
 		return 3;
 
-	return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
-}
-
-static int vmx_get_cpl(struct kvm_vcpu *vcpu)
-{
-	struct vcpu_vmx *vmx = to_vmx(vcpu);
-
 	/*
 	 * If we enter real mode with cs.sel & 3 != 0, the normal CPL calculations
 	 * fail; use the cache instead.
@@ -3246,7 +3240,7 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
 
 	if (!test_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail)) {
 		__set_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
-		vmx->cpl = __vmx_get_cpl(vcpu);
+		vmx->cpl = vmx_read_guest_seg_selector(vmx, VCPU_SREG_CS) & 3;
 	}
 
 	return vmx->cpl;

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes
  2013-01-03 13:19                 ` Marcelo Tosatti
@ 2013-01-04 11:16                   ` Gleb Natapov
  0 siblings, 0 replies; 14+ messages in thread
From: Gleb Natapov @ 2013-01-04 11:16 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Avi Kivity, kvm

On Thu, Jan 03, 2013 at 11:19:18AM -0200, Marcelo Tosatti wrote:
> On Thu, Jan 03, 2013 at 10:11:53AM +0200, Gleb Natapov wrote:
> > > FreeBSD 9.1 with -smp 2.
> > I cannot reproduce. I do see boot failure on the next branch with 9.[01]
> > 64 bit -smp 2 here, but it is caused but segment registers been all
> > incorrect on a secondary vcpu and this patch does not help. Applying
> > http://comments.gmane.org/gmane.comp.emulators.kvm.devel/102593 fixes
> > it.
> > 
> > > > 
> > > > > > The question is how does it happen that we enter real mode while cache
> > > > > > is set to 3. It should never be 3 during boot since boot process never
> > > > > > enters the userspace.
> > > > > 
> > > > > Its transition _to_ real mode (from protected).
> > > > But in protected mode CPL should be 0 during boot.
> > > 
> > > BTX (FreeBSD's bootloader) does:
> > > 
> > > http://people.freebsd.org/~jhb/docs/loader.txt. 
> > Crazy. Regardless, I think your patch is correct and the current code
> > that uses cpl cache during emulation is wrong and it remains wrong even
> > after your patch. What if last time cpl cache was updated was while vcpu
> > ran in cpl 3? Commit message says that it tries to fix the case when
> > CS.selector&3 != 0 during transition to protected mode, but this can be
> > fixed by setting cpl cache to 0 in vmx_set_cr0() instead of clearing it.
> 
> Yes, i suppose so, can be done by a separatch patch, though.
> 
Yes. I will send the patch.

> > Two things about the patch itself. Get rid of __vmx_get_cpl() and call
> > to vmx_read_guest_seg_selector() directly from vmx_get_cpl() and drop
> > __clear_bit(VCPU_EXREG_CPL) from vmx_set_rflags() and vmx_set_cr0()
> > since vmx->cpl no longer depends on rflags and cr0.
> 
> You still want to invalidate vmx->cpl cache on cr0 writes:
> think protected -> real -> protected transition.
If CS.selector didn't change during the transition vmx->cpl will be set
to the same value and if it changes cpl cache will be cleared either by
vmx_set_segment() or vmexit.

> And as for EFLAGS, agreed. Sending new patch.

--
			Gleb.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v3)
  2013-01-03 13:49 ` KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v2) Marcelo Tosatti
@ 2013-01-07 21:27   ` Marcelo Tosatti
  2013-01-08 10:56     ` Gleb Natapov
  0 siblings, 1 reply; 14+ messages in thread
From: Marcelo Tosatti @ 2013-01-07 21:27 UTC (permalink / raw)
  To: Gleb Natapov, Avi Kivity; +Cc: kvm


CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.

Using values other than those can cause failures on operations that
check CPL.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 55dfc37..dd2a85c 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1696,7 +1696,6 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
 static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
 {
 	__set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
-	__clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
 	to_vmx(vcpu)->rflags = rflags;
 	if (to_vmx(vcpu)->rmode.vm86_active) {
 		to_vmx(vcpu)->rmode.save_rflags = rflags;
@@ -3110,7 +3109,6 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 	vmcs_writel(CR0_READ_SHADOW, cr0);
 	vmcs_writel(GUEST_CR0, hw_cr0);
 	vcpu->arch.cr0 = cr0;
-	__clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
 }
 
 static u64 construct_eptp(unsigned long root_hpa)
@@ -3220,8 +3218,10 @@ static u64 vmx_get_segment_base(struct kvm_vcpu *vcpu, int seg)
 	return vmx_read_guest_seg_base(to_vmx(vcpu), seg);
 }
 
-static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
+static int vmx_get_cpl(struct kvm_vcpu *vcpu)
 {
+	struct vcpu_vmx *vmx = to_vmx(vcpu);
+
 	if (!is_protmode(vcpu))
 		return 0;
 
@@ -3229,13 +3229,6 @@ static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
 	    && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
 		return 3;
 
-	return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
-}
-
-static int vmx_get_cpl(struct kvm_vcpu *vcpu)
-{
-	struct vcpu_vmx *vmx = to_vmx(vcpu);
-
 	/*
 	 * If we enter real mode with cs.sel & 3 != 0, the normal CPL calculations
 	 * fail; use the cache instead.
@@ -3246,7 +3239,7 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
 
 	if (!test_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail)) {
 		__set_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
-		vmx->cpl = __vmx_get_cpl(vcpu);
+		vmx->cpl = vmx_read_guest_seg_selector(vmx, VCPU_SREG_CS) & 3;
 	}
 
 	return vmx->cpl;

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v3)
  2013-01-07 21:27   ` KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v3) Marcelo Tosatti
@ 2013-01-08 10:56     ` Gleb Natapov
  0 siblings, 0 replies; 14+ messages in thread
From: Gleb Natapov @ 2013-01-08 10:56 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Avi Kivity, kvm

On Mon, Jan 07, 2013 at 07:27:06PM -0200, Marcelo Tosatti wrote:
> 
> CPL is always 0 when in real mode, and always 3 when virtual 8086 mode.
> 
> Using values other than those can cause failures on operations that
> check CPL.
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> 
Reviewed-by: Gleb Natapov <gleb@redhat.com>

> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 55dfc37..dd2a85c 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -1696,7 +1696,6 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
>  static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
>  {
>  	__set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
> -	__clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
>  	to_vmx(vcpu)->rflags = rflags;
>  	if (to_vmx(vcpu)->rmode.vm86_active) {
>  		to_vmx(vcpu)->rmode.save_rflags = rflags;
> @@ -3110,7 +3109,6 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
>  	vmcs_writel(CR0_READ_SHADOW, cr0);
>  	vmcs_writel(GUEST_CR0, hw_cr0);
>  	vcpu->arch.cr0 = cr0;
> -	__clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
>  }
>  
>  static u64 construct_eptp(unsigned long root_hpa)
> @@ -3220,8 +3218,10 @@ static u64 vmx_get_segment_base(struct kvm_vcpu *vcpu, int seg)
>  	return vmx_read_guest_seg_base(to_vmx(vcpu), seg);
>  }
>  
> -static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
> +static int vmx_get_cpl(struct kvm_vcpu *vcpu)
>  {
> +	struct vcpu_vmx *vmx = to_vmx(vcpu);
> +
>  	if (!is_protmode(vcpu))
>  		return 0;
>  
> @@ -3229,13 +3229,6 @@ static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
>  	    && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
>  		return 3;
>  
> -	return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
> -}
> -
> -static int vmx_get_cpl(struct kvm_vcpu *vcpu)
> -{
> -	struct vcpu_vmx *vmx = to_vmx(vcpu);
> -
>  	/*
>  	 * If we enter real mode with cs.sel & 3 != 0, the normal CPL calculations
>  	 * fail; use the cache instead.
> @@ -3246,7 +3239,7 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
>  
>  	if (!test_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail)) {
>  		__set_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
> -		vmx->cpl = __vmx_get_cpl(vcpu);
> +		vmx->cpl = vmx_read_guest_seg_selector(vmx, VCPU_SREG_CS) & 3;
>  	}
>  
>  	return vmx->cpl;

--
			Gleb.

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2013-01-08 10:56 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-19 13:29 KVM: VMX: fix incorrect cached cpl value with real/v8086 modes Marcelo Tosatti
     [not found] ` <CAEbWair0awmpB9QXFGXJmooSsHg3B6P3uZrmLcyzs=T70TS7VA@mail.gmail.com>
2012-12-25 12:48   ` Gleb Natapov
2012-12-25 21:37     ` Marcelo Tosatti
2012-12-26  5:25       ` Gleb Natapov
2012-12-26 13:25         ` Marcelo Tosatti
2012-12-26 13:33           ` Gleb Natapov
2013-01-01 23:36             ` Marcelo Tosatti
2013-01-03  8:11               ` Gleb Natapov
2013-01-03 13:19                 ` Marcelo Tosatti
2013-01-04 11:16                   ` Gleb Natapov
2013-01-01 23:41   ` Marcelo Tosatti
2013-01-03 13:49 ` KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v2) Marcelo Tosatti
2013-01-07 21:27   ` KVM: VMX: fix incorrect cached cpl value with real/v8086 modes (v3) Marcelo Tosatti
2013-01-08 10:56     ` Gleb Natapov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox