Re: [Xen-devel] [PATCH v8 06/24] x86: refactor psr: implement get hw info flow.

[Roger Pau Monné <roger.pau@xxxxxxxxxx>]

On Wed, Feb 15, 2017 at 04:49:21PM +0800, Yi Sun wrote:
> This patch implements get HW info flow including L3 CAT callback
> function.
> 
> It also changes sysctl interface to make it more general.
> 
> With this patch, 'psr-hwinfo' can work for L3 CAT.
> 
> Signed-off-by: Yi Sun <yi.y.sun@xxxxxxxxxxxxxxx>
> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> ---
>  xen/arch/x86/psr.c        | 75 
> +++++++++++++++++++++++++++++++++++++++++++++--
>  xen/arch/x86/sysctl.c     | 14 +++++----
>  xen/include/asm-x86/psr.h | 19 +++++++-----
>  3 files changed, 93 insertions(+), 15 deletions(-)
> 
> diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
> index 798c614..8af59d9 100644
> --- a/xen/arch/x86/psr.c
> +++ b/xen/arch/x86/psr.c
> @@ -84,6 +84,7 @@ enum psr_feat_type {
>      PSR_SOCKET_L3_CAT = 0,
>      PSR_SOCKET_L3_CDP,
>      PSR_SOCKET_L2_CAT,
> +    PSR_SOCKET_UNKNOWN = 0xFFFF,
>  };
>  
>  /* CAT/CDP HW info data structure. */
> @@ -112,6 +113,9 @@ struct feat_node;
>  struct feat_ops {
>      /* get_cos_max is used to get feature's cos_max. */
>      unsigned int (*get_cos_max)(const struct feat_node *feat);
> +    /* get_feat_info is used to get feature HW info. */
> +    bool (*get_feat_info)(const struct feat_node *feat,
> +                          uint32_t data[], unsigned int array_len);
>  };
>  
>  /*
> @@ -182,6 +186,24 @@ static void free_feature(struct psr_socket_info *info)
>      }
>  }
>  
> +static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type)
> +{
> +    enum psr_feat_type feat_type;
> +
> +    /* Judge if feature is enabled. */
> +    switch ( type )
> +    {
> +    case PSR_CBM_TYPE_L3:
> +        feat_type = PSR_SOCKET_L3_CAT;
> +        break;
> +    default:
> +        feat_type = PSR_SOCKET_UNKNOWN;
> +        break;
> +    }
> +
> +    return feat_type;
> +}
> +
>  /* L3 CAT functions implementation. */
>  static void l3_cat_init_feature(struct cpuid_leaf regs,
>                                  struct feat_node *feat,
> @@ -225,8 +247,22 @@ static unsigned int l3_cat_get_cos_max(const struct 
> feat_node *feat)
>      return feat->info.l3_cat_info.cos_max;
>  }
>  
> +static bool l3_cat_get_feat_info(const struct feat_node *feat,
> +                                 uint32_t data[], unsigned int array_len)
> +{
> +    if ( !data || 3 > array_len )

Shouldn't this be array_len != 3 and then I would rather prefer this to be set
in a define, it's used here and in XEN_SYSCTL_PSR_CAT_get_l3_info, maybe you
should add it's define below of the PSR_FLAG define?

#define CAT_L3_FEAT_SIZE 3

Or some better worded name.

[...]
>  int psr_get_l3_cbm(struct domain *d, unsigned int socket,
> diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c
> index b8c30d4..e340baa 100644
> --- a/xen/arch/x86/sysctl.c
> +++ b/xen/arch/x86/sysctl.c
> @@ -176,15 +176,19 @@ long arch_do_sysctl(
>          switch ( sysctl->u.psr_cat_op.cmd )
>          {
>          case XEN_SYSCTL_PSR_CAT_get_l3_info:
> -            ret = psr_get_cat_l3_info(sysctl->u.psr_cat_op.target,
> -                                      
> &sysctl->u.psr_cat_op.u.l3_info.cbm_len,
> -                                      
> &sysctl->u.psr_cat_op.u.l3_info.cos_max,
> -                                      &sysctl->u.psr_cat_op.u.l3_info.flags);
> +        {
> +            uint32_t data[3];

Space between variable declaration and code.

> +            ret = psr_get_info(sysctl->u.psr_cat_op.target,
> +                               PSR_CBM_TYPE_L3, data, 3);

Last parameter should be ARRAY_SIZE(data) IMHO.

Roger.

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