| Message ID | 1487148579-7243-7-git-send-email-yi.y.sun@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 15, 2017 at 04:49:21PM +0800, Yi Sun wrote: [...] > /* 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 ) I don't think this is documented, but this is the first time I see the constant on the left. Maybe considering swapping it to array_len < 3? Other than this: Reviewed-by: Wei Liu <wei.liu2@citrix.com>
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@linux.intel.com> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > --- > 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.
>>> On 15.02.17 at 09:49, <yi.y.sun@linux.intel.com> wrote: > --- 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, Any reason to use this value, instead of just the next sequential one? > @@ -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; > +} The comment ahead of the switch() doesn't seem to describe what's being done - there certainly is no check here whether anything is enabled or disabled. > @@ -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 ) I think the 3 here was picked upon already: This check does not guarantee there's no array overrun ... > + return false; > + > + data[CBM_LEN] = feat->info.l3_cat_info.cbm_len; > + data[COS_MAX] = feat->info.l3_cat_info.cos_max; > + data[PSR_FLAG] = 0; ... anywhere here. For that you'd need a *_MAX- or *_NUM-type constant (defined next to the array index constants). > --- 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]; > + ret = psr_get_info(sysctl->u.psr_cat_op.target, > + PSR_CBM_TYPE_L3, data, 3); > + > + sysctl->u.psr_cat_op.u.l3_info.cbm_len = data[CBM_LEN]; > + sysctl->u.psr_cat_op.u.l3_info.cos_max = data[COS_MAX]; > + sysctl->u.psr_cat_op.u.l3_info.flags = data[PSR_FLAG]; > > if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) > ret = -EFAULT; > break; > - > + } Please retain the blank line (after the } ). > --- a/xen/include/asm-x86/psr.h > +++ b/xen/include/asm-x86/psr.h > @@ -19,19 +19,24 @@ > #include <xen/types.h> > > /* CAT cpuid level */ > -#define PSR_CPUID_LEVEL_CAT 0x10 > +#define PSR_CPUID_LEVEL_CAT 0x10 > > /* Resource Type Enumeration */ > -#define PSR_RESOURCE_TYPE_L3 0x2 > +#define PSR_RESOURCE_TYPE_L3 0x2 > > /* L3 Monitoring Features */ > -#define PSR_CMT_L3_OCCUPANCY 0x1 > +#define PSR_CMT_L3_OCCUPANCY 0x1 > > /* CDP Capability */ > -#define PSR_CAT_CDP_CAPABILITY (1u << 2) > +#define PSR_CAT_CDP_CAPABILITY (1u << 2) > > /* L3 CDP Enable bit*/ > -#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 > +#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 Are all these adjustments really needed here? > +/* Used by psr_get_info() */ > +#define CBM_LEN 0 > +#define COS_MAX 1 > +#define PSR_FLAG 2 Neither comment nor names are helpful to understand the purpose of these constants. How about PSR_INFO_IDX_* or some such? Jan
On 17-03-08 08:15:33, Jan Beulich wrote: > >>> On 15.02.17 at 09:49, <yi.y.sun@linux.intel.com> wrote: > > --- 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, > > Any reason to use this value, instead of just the next sequential one? > This is an error value used below, in 'psr_cbm_type_to_feat_type'. To make it explicitly different, I assign a big value to it. > > @@ -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; > > +} > > The comment ahead of the switch() doesn't seem to describe what's > being done - there certainly is no check here whether anything is > enabled or disabled. > Sorry for that, will remove the comment. > > @@ -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 ) > > I think the 3 here was picked upon already: This check does not > guarantee there's no array overrun ... > Yes, Roger has suggested to change it to 'array_len != PSR_INFO_SIZE'. > > + return false; > > + > > + data[CBM_LEN] = feat->info.l3_cat_info.cbm_len; > > + data[COS_MAX] = feat->info.l3_cat_info.cos_max; > > + data[PSR_FLAG] = 0; > > ... anywhere here. For that you'd need a *_MAX- or *_NUM-type > constant (defined next to the array index constants). > This is defined in next version. [...] > > --- a/xen/include/asm-x86/psr.h > > +++ b/xen/include/asm-x86/psr.h > > @@ -19,19 +19,24 @@ > > #include <xen/types.h> > > > > /* CAT cpuid level */ > > -#define PSR_CPUID_LEVEL_CAT 0x10 > > +#define PSR_CPUID_LEVEL_CAT 0x10 > > > > /* Resource Type Enumeration */ > > -#define PSR_RESOURCE_TYPE_L3 0x2 > > +#define PSR_RESOURCE_TYPE_L3 0x2 > > > > /* L3 Monitoring Features */ > > -#define PSR_CMT_L3_OCCUPANCY 0x1 > > +#define PSR_CMT_L3_OCCUPANCY 0x1 > > > > /* CDP Capability */ > > -#define PSR_CAT_CDP_CAPABILITY (1u << 2) > > +#define PSR_CAT_CDP_CAPABILITY (1u << 2) > > > > /* L3 CDP Enable bit*/ > > -#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 > > +#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 > > Are all these adjustments really needed here? > Per Wei's suggestion to make codes neat. > > +/* Used by psr_get_info() */ > > +#define CBM_LEN 0 > > +#define COS_MAX 1 > > +#define PSR_FLAG 2 > > Neither comment nor names are helpful to understand the purpose of > these constants. How about PSR_INFO_IDX_* or some such? > Ok will do it in next version. > Jan
>>> On 10.03.17 at 02:43, <yi.y.sun@linux.intel.com> wrote: > On 17-03-08 08:15:33, Jan Beulich wrote: >> >>> On 15.02.17 at 09:49, <yi.y.sun@linux.intel.com> wrote: >> > --- 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, >> >> Any reason to use this value, instead of just the next sequential one? >> > This is an error value used below, in 'psr_cbm_type_to_feat_type'. To make it > explicitly different, I assign a big value to it. How does that "big value" help? Jan
On 17-03-10 01:57:57, Jan Beulich wrote: > >>> On 10.03.17 at 02:43, <yi.y.sun@linux.intel.com> wrote: > > On 17-03-08 08:15:33, Jan Beulich wrote: > >> >>> On 15.02.17 at 09:49, <yi.y.sun@linux.intel.com> wrote: > >> > --- 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, > >> > >> Any reason to use this value, instead of just the next sequential one? > >> > > This is an error value used below, in 'psr_cbm_type_to_feat_type'. To make it > > explicitly different, I assign a big value to it. > > How does that "big value" help? > It is just my habit. I will remove this assignment if you don't like it. > Jan
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 ) + return false; + + data[CBM_LEN] = feat->info.l3_cat_info.cbm_len; + data[COS_MAX] = feat->info.l3_cat_info.cos_max; + data[PSR_FLAG] = 0; + + return true; +} + static const struct feat_ops l3_cat_ops = { .get_cos_max = l3_cat_get_cos_max, + .get_feat_info = l3_cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -432,10 +468,43 @@ void psr_ctxt_switch_to(struct domain *d) } } -int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len, - uint32_t *cos_max, uint32_t *flags) +static struct psr_socket_info *get_socket_info(unsigned int socket) { - return 0; + if ( !socket_info ) + return ERR_PTR(-ENODEV); + + if ( socket >= nr_sockets ) + return ERR_PTR(-ERANGE); + + if ( !socket_info[socket].feat_mask ) + return ERR_PTR(-ENOENT); + + return socket_info + socket; +} + +int psr_get_info(unsigned int socket, enum cbm_type type, + uint32_t data[], unsigned int array_len) +{ + const struct psr_socket_info *info = get_socket_info(socket); + const struct feat_node *feat; + enum psr_feat_type feat_type; + + if ( IS_ERR(info) ) + return PTR_ERR(info); + + feat_type = psr_cbm_type_to_feat_type(type); + list_for_each_entry(feat, &info->feat_list, list) + { + if ( feat->feature != feat_type ) + continue; + + if ( feat->ops.get_feat_info(feat, data, array_len) ) + return 0; + else + return -EINVAL; + } + + return -ENOENT; } 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]; + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L3, data, 3); + + sysctl->u.psr_cat_op.u.l3_info.cbm_len = data[CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.cos_max = data[COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.flags = data[PSR_FLAG]; if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) ret = -EFAULT; break; - + } default: ret = -EOPNOTSUPP; break; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 57f47e9..0342a80 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -19,19 +19,24 @@ #include <xen/types.h> /* CAT cpuid level */ -#define PSR_CPUID_LEVEL_CAT 0x10 +#define PSR_CPUID_LEVEL_CAT 0x10 /* Resource Type Enumeration */ -#define PSR_RESOURCE_TYPE_L3 0x2 +#define PSR_RESOURCE_TYPE_L3 0x2 /* L3 Monitoring Features */ -#define PSR_CMT_L3_OCCUPANCY 0x1 +#define PSR_CMT_L3_OCCUPANCY 0x1 /* CDP Capability */ -#define PSR_CAT_CDP_CAPABILITY (1u << 2) +#define PSR_CAT_CDP_CAPABILITY (1u << 2) /* L3 CDP Enable bit*/ -#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 +#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 + +/* Used by psr_get_info() */ +#define CBM_LEN 0 +#define COS_MAX 1 +#define PSR_FLAG 2 struct psr_cmt_l3 { unsigned int features; @@ -63,8 +68,8 @@ int psr_alloc_rmid(struct domain *d); void psr_free_rmid(struct domain *d); void psr_ctxt_switch_to(struct domain *d); -int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len, - uint32_t *cos_max, uint32_t *flags); +int psr_get_info(unsigned int socket, enum cbm_type type, + uint32_t data[], unsigned int array_len); int psr_get_l3_cbm(struct domain *d, unsigned int socket, uint64_t *cbm, enum cbm_type type); int psr_set_l3_cbm(struct domain *d, unsigned int socket,