All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt
@ 2013-07-03 16:05 Arthur Chunqi Li
  2013-07-03 16:09 ` Arthur Chunqi Li
  2013-07-04  5:22 ` Jan Kiszka
  0 siblings, 2 replies; 4+ messages in thread
From: Arthur Chunqi Li @ 2013-07-03 16:05 UTC (permalink / raw)
  To: kvm; +Cc: gleb, pbonzini, jan.kiszka, Arthur Chunqi Li

Set success rflags after emulating VMXON/VMXOFF in nested environment.

Re-arrange the code sequence of 3 functions,
nested_vmx_succeed()/failValid()/failInvalid(), to avoid double
declaration in the same file.

Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
---
 arch/x86/kvm/vmx.c |   85 ++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 260a919..423bc411 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -5551,8 +5551,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx)
 		free_loaded_vmcs(&vmx->vmcs01);
 }
 
+/*
+ * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
+ * set the success or error code of an emulated VMX instruction, as specified
+ * by Vol 2B, VMX Instruction Reference, "Conventions".
+ */
+static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
+{
+	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
+			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
+			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
+}
+
+static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
+{
+	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
+			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
+			    X86_EFLAGS_SF | X86_EFLAGS_OF))
+			| X86_EFLAGS_CF);
+}
+
 static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
-				 u32 vm_instruction_error);
+					u32 vm_instruction_error)
+{
+	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
+		/*
+		 * failValid writes the error number to the current VMCS, which
+		 * can't be done there isn't a current VMCS.
+		 */
+		nested_vmx_failInvalid(vcpu);
+		return;
+	}
+	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
+			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
+			    X86_EFLAGS_SF | X86_EFLAGS_OF))
+			| X86_EFLAGS_ZF);
+	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
+	/*
+	 * We don't need to force a shadow sync because
+	 * VM_INSTRUCTION_ERROR is not shadowed
+	 */
+}
 
 /*
  * Emulate the VMXON instruction.
@@ -5612,6 +5651,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
 	vmx->nested.vmxon = true;
 
 	skip_emulated_instruction(vcpu);
+	nested_vmx_succeed(vcpu);
 	return 1;
 }
 
@@ -5696,6 +5736,7 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
 		return 1;
 	free_nested(to_vmx(vcpu));
 	skip_emulated_instruction(vcpu);
+	nested_vmx_succeed(vcpu);
 	return 1;
 }
 
@@ -5752,48 +5793,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
 	return 0;
 }
 
-/*
- * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
- * set the success or error code of an emulated VMX instruction, as specified
- * by Vol 2B, VMX Instruction Reference, "Conventions".
- */
-static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
-{
-	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
-			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
-			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
-}
-
-static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
-{
-	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
-			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
-			    X86_EFLAGS_SF | X86_EFLAGS_OF))
-			| X86_EFLAGS_CF);
-}
-
-static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
-					u32 vm_instruction_error)
-{
-	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
-		/*
-		 * failValid writes the error number to the current VMCS, which
-		 * can't be done there isn't a current VMCS.
-		 */
-		nested_vmx_failInvalid(vcpu);
-		return;
-	}
-	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
-			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
-			    X86_EFLAGS_SF | X86_EFLAGS_OF))
-			| X86_EFLAGS_ZF);
-	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
-	/*
-	 * We don't need to force a shadow sync because
-	 * VM_INSTRUCTION_ERROR is not shadowed
-	 */
-}
-
 /* Emulate the VMCLEAR instruction */
 static int handle_vmclear(struct kvm_vcpu *vcpu)
 {
-- 
1.7.9.5


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

* Re: [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt
  2013-07-03 16:05 [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt Arthur Chunqi Li
@ 2013-07-03 16:09 ` Arthur Chunqi Li
  2013-07-04  6:06   ` Gleb Natapov
  2013-07-04  5:22 ` Jan Kiszka
  1 sibling, 1 reply; 4+ messages in thread
From: Arthur Chunqi Li @ 2013-07-03 16:09 UTC (permalink / raw)
  To: kvm; +Cc: Gleb Natapov, Paolo Bonzini, Jan Kiszka, Arthur Chunqi Li

Before moving the 3 functions ahead, they will be declared twice in
the same file before handle_vmon(). I don't know if this small change
can be committed together in one patch. If this change is needless or
should be committed in a separate patch, tell me and I will commit
another version.

Arthur

On Thu, Jul 4, 2013 at 12:05 AM, Arthur Chunqi Li <yzt356@gmail.com> wrote:
> Set success rflags after emulating VMXON/VMXOFF in nested environment.
>
> Re-arrange the code sequence of 3 functions,
> nested_vmx_succeed()/failValid()/failInvalid(), to avoid double
> declaration in the same file.
>
> Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
> ---
>  arch/x86/kvm/vmx.c |   85 ++++++++++++++++++++++++++--------------------------
>  1 file changed, 42 insertions(+), 43 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 260a919..423bc411 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -5551,8 +5551,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx)
>                 free_loaded_vmcs(&vmx->vmcs01);
>  }
>
> +/*
> + * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> + * set the success or error code of an emulated VMX instruction, as specified
> + * by Vol 2B, VMX Instruction Reference, "Conventions".
> + */
> +static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> +{
> +       vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> +                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> +                           X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> +}
> +
> +static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> +{
> +       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> +                       & ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> +                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> +                       | X86_EFLAGS_CF);
> +}
> +
>  static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> -                                u32 vm_instruction_error);
> +                                       u32 vm_instruction_error)
> +{
> +       if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> +               /*
> +                * failValid writes the error number to the current VMCS, which
> +                * can't be done there isn't a current VMCS.
> +                */
> +               nested_vmx_failInvalid(vcpu);
> +               return;
> +       }
> +       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> +                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> +                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> +                       | X86_EFLAGS_ZF);
> +       get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> +       /*
> +        * We don't need to force a shadow sync because
> +        * VM_INSTRUCTION_ERROR is not shadowed
> +        */
> +}
>
>  /*
>   * Emulate the VMXON instruction.
> @@ -5612,6 +5651,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
>         vmx->nested.vmxon = true;
>
>         skip_emulated_instruction(vcpu);
> +       nested_vmx_succeed(vcpu);
>         return 1;
>  }
>
> @@ -5696,6 +5736,7 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
>                 return 1;
>         free_nested(to_vmx(vcpu));
>         skip_emulated_instruction(vcpu);
> +       nested_vmx_succeed(vcpu);
>         return 1;
>  }
>
> @@ -5752,48 +5793,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
>         return 0;
>  }
>
> -/*
> - * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> - * set the success or error code of an emulated VMX instruction, as specified
> - * by Vol 2B, VMX Instruction Reference, "Conventions".
> - */
> -static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> -{
> -       vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> -                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> -                           X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> -}
> -
> -static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> -{
> -       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> -                       & ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> -                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> -                       | X86_EFLAGS_CF);
> -}
> -
> -static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> -                                       u32 vm_instruction_error)
> -{
> -       if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> -               /*
> -                * failValid writes the error number to the current VMCS, which
> -                * can't be done there isn't a current VMCS.
> -                */
> -               nested_vmx_failInvalid(vcpu);
> -               return;
> -       }
> -       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> -                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> -                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> -                       | X86_EFLAGS_ZF);
> -       get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> -       /*
> -        * We don't need to force a shadow sync because
> -        * VM_INSTRUCTION_ERROR is not shadowed
> -        */
> -}
> -
>  /* Emulate the VMCLEAR instruction */
>  static int handle_vmclear(struct kvm_vcpu *vcpu)
>  {
> --
> 1.7.9.5
>

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

* Re: [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt
  2013-07-03 16:05 [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt Arthur Chunqi Li
  2013-07-03 16:09 ` Arthur Chunqi Li
@ 2013-07-04  5:22 ` Jan Kiszka
  1 sibling, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2013-07-04  5:22 UTC (permalink / raw)
  To: Arthur Chunqi Li; +Cc: kvm, gleb, pbonzini

[-- Attachment #1: Type: text/plain, Size: 4595 bytes --]

On 2013-07-03 18:05, Arthur Chunqi Li wrote:
> Set success rflags after emulating VMXON/VMXOFF in nested environment.
> 
> Re-arrange the code sequence of 3 functions,
> nested_vmx_succeed()/failValid()/failInvalid(), to avoid double
> declaration in the same file.

Just don't forget to provide corresponding test cases. But you can
collect trivial checks like these and do a single VMX startup/shutdown
test case that consists of several smaller test steps.

Jan

> 
> Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
> ---
>  arch/x86/kvm/vmx.c |   85 ++++++++++++++++++++++++++--------------------------
>  1 file changed, 42 insertions(+), 43 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 260a919..423bc411 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -5551,8 +5551,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx)
>  		free_loaded_vmcs(&vmx->vmcs01);
>  }
>  
> +/*
> + * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> + * set the success or error code of an emulated VMX instruction, as specified
> + * by Vol 2B, VMX Instruction Reference, "Conventions".
> + */
> +static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> +{
> +	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> +			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> +			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> +}
> +
> +static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> +{
> +	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> +			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> +			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> +			| X86_EFLAGS_CF);
> +}
> +
>  static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> -				 u32 vm_instruction_error);
> +					u32 vm_instruction_error)
> +{
> +	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> +		/*
> +		 * failValid writes the error number to the current VMCS, which
> +		 * can't be done there isn't a current VMCS.
> +		 */
> +		nested_vmx_failInvalid(vcpu);
> +		return;
> +	}
> +	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> +			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> +			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> +			| X86_EFLAGS_ZF);
> +	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> +	/*
> +	 * We don't need to force a shadow sync because
> +	 * VM_INSTRUCTION_ERROR is not shadowed
> +	 */
> +}
>  
>  /*
>   * Emulate the VMXON instruction.
> @@ -5612,6 +5651,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
>  	vmx->nested.vmxon = true;
>  
>  	skip_emulated_instruction(vcpu);
> +	nested_vmx_succeed(vcpu);
>  	return 1;
>  }
>  
> @@ -5696,6 +5736,7 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
>  		return 1;
>  	free_nested(to_vmx(vcpu));
>  	skip_emulated_instruction(vcpu);
> +	nested_vmx_succeed(vcpu);
>  	return 1;
>  }
>  
> @@ -5752,48 +5793,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
>  	return 0;
>  }
>  
> -/*
> - * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> - * set the success or error code of an emulated VMX instruction, as specified
> - * by Vol 2B, VMX Instruction Reference, "Conventions".
> - */
> -static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> -{
> -	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> -			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> -			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> -}
> -
> -static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> -{
> -	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> -			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> -			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> -			| X86_EFLAGS_CF);
> -}
> -
> -static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> -					u32 vm_instruction_error)
> -{
> -	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> -		/*
> -		 * failValid writes the error number to the current VMCS, which
> -		 * can't be done there isn't a current VMCS.
> -		 */
> -		nested_vmx_failInvalid(vcpu);
> -		return;
> -	}
> -	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> -			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> -			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> -			| X86_EFLAGS_ZF);
> -	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> -	/*
> -	 * We don't need to force a shadow sync because
> -	 * VM_INSTRUCTION_ERROR is not shadowed
> -	 */
> -}
> -
>  /* Emulate the VMCLEAR instruction */
>  static int handle_vmclear(struct kvm_vcpu *vcpu)
>  {
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

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

* Re: [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt
  2013-07-03 16:09 ` Arthur Chunqi Li
@ 2013-07-04  6:06   ` Gleb Natapov
  0 siblings, 0 replies; 4+ messages in thread
From: Gleb Natapov @ 2013-07-04  6:06 UTC (permalink / raw)
  To: Arthur Chunqi Li; +Cc: kvm, Paolo Bonzini, Jan Kiszka

On Thu, Jul 04, 2013 at 12:09:32AM +0800, Arthur Chunqi Li wrote:
> Before moving the 3 functions ahead, they will be declared twice in
> the same file before handle_vmon(). I don't know if this small change
> can be committed together in one patch. If this change is needless or
> should be committed in a separate patch, tell me and I will commit
> another version.
> 
Yes please, move the code in a separate patch.

> Arthur
> 
> On Thu, Jul 4, 2013 at 12:05 AM, Arthur Chunqi Li <yzt356@gmail.com> wrote:
> > Set success rflags after emulating VMXON/VMXOFF in nested environment.
> >
> > Re-arrange the code sequence of 3 functions,
> > nested_vmx_succeed()/failValid()/failInvalid(), to avoid double
> > declaration in the same file.
> >
> > Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
> > ---
> >  arch/x86/kvm/vmx.c |   85 ++++++++++++++++++++++++++--------------------------
> >  1 file changed, 42 insertions(+), 43 deletions(-)
> >
> > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> > index 260a919..423bc411 100644
> > --- a/arch/x86/kvm/vmx.c
> > +++ b/arch/x86/kvm/vmx.c
> > @@ -5551,8 +5551,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx)
> >                 free_loaded_vmcs(&vmx->vmcs01);
> >  }
> >
> > +/*
> > + * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> > + * set the success or error code of an emulated VMX instruction, as specified
> > + * by Vol 2B, VMX Instruction Reference, "Conventions".
> > + */
> > +static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> > +{
> > +       vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> > +                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> > +                           X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> > +}
> > +
> > +static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> > +{
> > +       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> > +                       & ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> > +                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> > +                       | X86_EFLAGS_CF);
> > +}
> > +
> >  static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> > -                                u32 vm_instruction_error);
> > +                                       u32 vm_instruction_error)
> > +{
> > +       if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> > +               /*
> > +                * failValid writes the error number to the current VMCS, which
> > +                * can't be done there isn't a current VMCS.
> > +                */
> > +               nested_vmx_failInvalid(vcpu);
> > +               return;
> > +       }
> > +       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> > +                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> > +                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> > +                       | X86_EFLAGS_ZF);
> > +       get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> > +       /*
> > +        * We don't need to force a shadow sync because
> > +        * VM_INSTRUCTION_ERROR is not shadowed
> > +        */
> > +}
> >
> >  /*
> >   * Emulate the VMXON instruction.
> > @@ -5612,6 +5651,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
> >         vmx->nested.vmxon = true;
> >
> >         skip_emulated_instruction(vcpu);
> > +       nested_vmx_succeed(vcpu);
> >         return 1;
> >  }
> >
> > @@ -5696,6 +5736,7 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
> >                 return 1;
> >         free_nested(to_vmx(vcpu));
> >         skip_emulated_instruction(vcpu);
> > +       nested_vmx_succeed(vcpu);
> >         return 1;
> >  }
> >
> > @@ -5752,48 +5793,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
> >         return 0;
> >  }
> >
> > -/*
> > - * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> > - * set the success or error code of an emulated VMX instruction, as specified
> > - * by Vol 2B, VMX Instruction Reference, "Conventions".
> > - */
> > -static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> > -{
> > -       vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> > -                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> > -                           X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> > -}
> > -
> > -static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> > -{
> > -       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> > -                       & ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> > -                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> > -                       | X86_EFLAGS_CF);
> > -}
> > -
> > -static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> > -                                       u32 vm_instruction_error)
> > -{
> > -       if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> > -               /*
> > -                * failValid writes the error number to the current VMCS, which
> > -                * can't be done there isn't a current VMCS.
> > -                */
> > -               nested_vmx_failInvalid(vcpu);
> > -               return;
> > -       }
> > -       vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> > -                       & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> > -                           X86_EFLAGS_SF | X86_EFLAGS_OF))
> > -                       | X86_EFLAGS_ZF);
> > -       get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> > -       /*
> > -        * We don't need to force a shadow sync because
> > -        * VM_INSTRUCTION_ERROR is not shadowed
> > -        */
> > -}
> > -
> >  /* Emulate the VMCLEAR instruction */
> >  static int handle_vmclear(struct kvm_vcpu *vcpu)
> >  {
> > --
> > 1.7.9.5
> >

--
			Gleb.

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

end of thread, other threads:[~2013-07-04  6:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-03 16:05 [PATCH] KVM : Set success rflags when emulate VMXON/VMXOFF in nested virt Arthur Chunqi Li
2013-07-03 16:09 ` Arthur Chunqi Li
2013-07-04  6:06   ` Gleb Natapov
2013-07-04  5:22 ` Jan Kiszka

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.