[PATCH] xen: building with perfc=y was broken

[PATCH] xen: building with perfc=y was broken

[Dario Faggioli]

because of b38d426ad09 ("x86/viridian: flush remote tlbs
by hypercall") which was defining mshv_call_flush, but using
mshv_flush.

Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Paul Durrant <Paul.Durrant@citrix.com>
---
 xen/arch/x86/hvm/viridian.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c
index df6f26d..6bd844b 100644
--- a/xen/arch/x86/hvm/viridian.c
+++ b/xen/arch/x86/hvm/viridian.c
@@ -607,7 +607,7 @@ int viridian_hypercall(struct cpu_user_regs *regs)
          * See Microsoft Hypervisor Top Level Spec. sections 12.4.2
          * and 12.4.3.
          */
-        perfc_incr(mshv_flush);
+        perfc_incr(mshv_call_flush);
 
         /* These hypercalls should never use the fast-call convention. */
         status = HV_STATUS_INVALID_PARAMETER;

Re: [PATCH] xen: building with perfc=y was broken

[Andrew Cooper]

On 14/12/15 17:45, Dario Faggioli wrote:
> because of b38d426ad09 ("x86/viridian: flush remote tlbs
> by hypercall") which was defining mshv_call_flush, but using
> mshv_flush.
>
> Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Paul Durrant <Paul.Durrant@citrix.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

FYI, when the Kconfig series lands, I plan to port the Linux
IS_ENABLED() infrastructure to Xen, which will allow bugs like this to
be caught by the compiler even when the option is disabled.

~Andrew

Re: [PATCH] xen: building with perfc=y was broken

[Paul Durrant]

> -----Original Message-----
> From: Dario Faggioli [mailto:raistlin.df@gmail.com] On Behalf Of Dario Faggioli
> Sent: 14 December 2015 17:45
> To: xen-devel@lists.xenproject.org
> Cc: Andrew Cooper; Paul Durrant; Jan Beulich
> Subject: [PATCH] xen: building with perfc=y was broken
> 
> because of b38d426ad09 ("x86/viridian: flush remote tlbs
> by hypercall") which was defining mshv_call_flush, but using
> mshv_flush.

Oops. Sorry about that.

> 
> Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Paul Durrant <Paul.Durrant@citrix.com>

Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

> ---
>  xen/arch/x86/hvm/viridian.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c
> index df6f26d..6bd844b 100644
> --- a/xen/arch/x86/hvm/viridian.c
> +++ b/xen/arch/x86/hvm/viridian.c
> @@ -607,7 +607,7 @@ int viridian_hypercall(struct cpu_user_regs *regs)
>           * See Microsoft Hypervisor Top Level Spec. sections 12.4.2
>           * and 12.4.3.
>           */
> -        perfc_incr(mshv_flush);
> +        perfc_incr(mshv_call_flush);
> 
>          /* These hypercalls should never use the fast-call convention. */
>          status = HV_STATUS_INVALID_PARAMETER;