Re: [PATCH v2 11/12] tools/libxc: add support of injecting MC# to specified CPUs

[Wei Liu <wei.liu2@citrix.com>]

On Fri, Mar 17, 2017 at 02:46:13PM +0800, Haozhong Zhang wrote:
> Though XEN_MC_inject_v2 allows injecting MC# to specified CPUs, the
> current xc_mca_op() does not use this feature and not provide an
> interface to callers. This commit add a new xc_mca_op_inject_v2() that
> receives a cpumap providing the set of target CPUs.
> 
> Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> 
> Changes in v2:
>  * Separate the libxc changes from v1 patch 19 to this one.
>  * Build the bounce buffer completely in one function.
> ---
>  tools/libxc/include/xenctrl.h |  2 ++
>  tools/libxc/xc_misc.c         | 52 ++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 53 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
> index a48981a..d7ecc02 100644
> --- a/tools/libxc/include/xenctrl.h
> +++ b/tools/libxc/include/xenctrl.h
> @@ -1773,6 +1773,8 @@ int xc_cpuid_apply_policy(xc_interface *xch,
>  void xc_cpuid_to_str(const unsigned int *regs,
>                       char **strs); /* some strs[] may be NULL if ENOMEM */
>  int xc_mca_op(xc_interface *xch, struct xen_mc *mc);
> +int xc_mca_op_inject_v2(xc_interface *xch, unsigned int flags,
> +                        xc_cpumap_t cpumap, unsigned int nr_cpus);
>  #endif
>  
>  struct xc_px_val {
> diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
> index 88084fd..52ff7b1 100644
> --- a/tools/libxc/xc_misc.c
> +++ b/tools/libxc/xc_misc.c
> @@ -341,7 +341,57 @@ int xc_mca_op(xc_interface *xch, struct xen_mc *mc)
>      xc_hypercall_bounce_post(xch, mc);
>      return ret;
>  }
> -#endif
> +
> +int xc_mca_op_inject_v2(xc_interface *xch, unsigned int flags,
> +                        xc_cpumap_t cpumap, unsigned int nr_bits)
> +{
> +    int ret = -1;
> +    struct xen_mc mc_buf, *mc = &mc_buf;
> +    struct xen_mc_inject_v2 *inject = &mc->u.mc_inject_v2;
> +
> +    DECLARE_HYPERCALL_BOUNCE(cpumap, 0, XC_HYPERCALL_BUFFER_BOUNCE_IN);
> +    DECLARE_HYPERCALL_BOUNCE(mc, sizeof(*mc), XC_HYPERCALL_BUFFER_BOUNCE_BOTH);
> +
> +    memset(mc, 0, sizeof(*mc));
> +
> +    if ( cpumap )
> +    {
> +        if ( !nr_bits )
> +        {
> +            errno = EINVAL;
> +            return -1;

Please use goto out here. I don't want to mix different error handling
styles.

> +        }
> +
> +        HYPERCALL_BOUNCE_SET_SIZE(cpumap, (nr_bits + 7) / 8);
> +        if ( xc_hypercall_bounce_pre(xch, cpumap) )
> +        {
> +            PERROR("Could not bounce cpumap memory buffer");
> +            return -1;

Ditto.

> +        }
> +        set_xen_guest_handle(inject->cpumap.bitmap, cpumap);
> +        inject->cpumap.nr_bits = nr_bits;
> +    }
> +
> +    inject->flags = flags;
> +    mc->cmd = XEN_MC_inject_v2;
> +    mc->interface_version = XEN_MCA_INTERFACE_VERSION;
> +
> +    if ( xc_hypercall_bounce_pre(xch, mc) )
> +    {
> +        PERROR("Could not bounce xen_mc memory buffer");
> +        goto out;
> +    }
> +
> +    ret = xencall1(xch->xcall, __HYPERVISOR_mca, HYPERCALL_BUFFER_AS_ARG(mc));
> +
> +    xc_hypercall_bounce_post(xch, mc);
> +out:
> +    if ( cpumap )
> +        xc_hypercall_bounce_post(xch, cpumap);
> +
> +    return ret;
> +}
> +#endif /* __i386__ || __x86_64__ */
>  
>  int xc_perfc_reset(xc_interface *xch)
>  {
> -- 
> 2.10.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel