| Message ID | 1481688484-5093-7-git-send-email-yi.y.sun@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 14.12.16 at 05:07, <yi.y.sun@linux.intel.com> wrote: > --- a/xen/arch/x86/psr.c > +++ b/xen/arch/x86/psr.c > @@ -115,6 +115,9 @@ struct feat_ops { > struct psr_socket_info *info); > /* get_max_cos_max is used to get feature's cos_max. */ > unsigned int (*get_max_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, enum cbm_type type, > + uint32_t dat[], uint32_t array_len); data, value, or val would all seem okay, but dat suggests an acronym of other than data (which I think it is meant to be). > @@ -220,9 +223,24 @@ static unsigned int l3_cat_get_max_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, > + enum cbm_type type, > + uint32_t dat[], uint32_t array_len) array_len wants to be size_t or unsigned int. And more generally, please avoid fixed width types when you don't really mean such. > +int psr_get_info(unsigned int socket, enum cbm_type type, > + uint32_t dat[], uint32_t array_len) > +{ > + struct psr_socket_info *info = get_socket_info(socket); > + struct feat_node *feat_tmp; With the hook function taking a pointer to const I don#t see why this one can't be const, too. > + if ( IS_ERR(info) ) > + return PTR_ERR(info); > + > + list_for_each_entry(feat_tmp, &info->feat_list, list) > + if ( feat_tmp->ops.get_feat_info(feat_tmp, type, dat, array_len) ) Wouldn't the type check better be done here than inside each function? That would then also allow for terminating the loop earlier (when the type was found, instead of when a function returns success). > --- a/xen/include/asm-x86/psr.h > +++ b/xen/include/asm-x86/psr.h > @@ -33,6 +33,11 @@ > /* L3 CDP Enable bit*/ > #define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 > > +/* Used by psr_get_info() */ > +#define CBM_LEN 0 > +#define COS_MAX 1 > +#define CDP_FLAG 2 These needing putting in a header means that you want to prefix them, e.g. by PSR_. Also with the next value used e.g. as array dimension, I think you also want to name that value (currently 3) and use it instead of a plain number which would need to be adjusted everywhere once a value gets added here. Also - is CDP_FLAG really a suitable name for flags? Wouldn't PSR_FLAGS be better (as being more general)? Jan
On 17-01-10 06:46:03, Jan Beulich wrote: > >>> On 14.12.16 at 05:07, <yi.y.sun@linux.intel.com> wrote: > > --- a/xen/arch/x86/psr.c > > +++ b/xen/arch/x86/psr.c > > @@ -115,6 +115,9 @@ struct feat_ops { > > struct psr_socket_info *info); > > /* get_max_cos_max is used to get feature's cos_max. */ > > unsigned int (*get_max_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, enum cbm_type type, > > + uint32_t dat[], uint32_t array_len); > > data, value, or val would all seem okay, but dat suggests an acronym > of other than data (which I think it is meant to be). > Ok, will change it to data. > > @@ -220,9 +223,24 @@ static unsigned int l3_cat_get_max_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, > > + enum cbm_type type, > > + uint32_t dat[], uint32_t array_len) > > array_len wants to be size_t or unsigned int. And more generally, > please avoid fixed width types when you don't really mean such. > Got it, thank you! > > +int psr_get_info(unsigned int socket, enum cbm_type type, > > + uint32_t dat[], uint32_t array_len) > > +{ > > + struct psr_socket_info *info = get_socket_info(socket); > > + struct feat_node *feat_tmp; > > With the hook function taking a pointer to const I don#t see why > this one can't be const, too. > Do you mean feat_tmp? Thanks! > > + if ( IS_ERR(info) ) > > + return PTR_ERR(info); > > + > > + list_for_each_entry(feat_tmp, &info->feat_list, list) > > + if ( feat_tmp->ops.get_feat_info(feat_tmp, type, dat, array_len) ) > > Wouldn't the type check better be done here than inside each > function? That would then also allow for terminating the loop > earlier (when the type was found, instead of when a function > returns success). > Ok, thanks for the suggestion! > > --- a/xen/include/asm-x86/psr.h > > +++ b/xen/include/asm-x86/psr.h > > @@ -33,6 +33,11 @@ > > /* L3 CDP Enable bit*/ > > #define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 > > > > +/* Used by psr_get_info() */ > > +#define CBM_LEN 0 > > +#define COS_MAX 1 > > +#define CDP_FLAG 2 > > These needing putting in a header means that you want to prefix > them, e.g. by PSR_. Also with the next value used e.g. as array > dimension, I think you also want to name that value (currently 3) > and use it instead of a plain number which would need to be > adjusted everywhere once a value gets added here. > > Also - is CDP_FLAG really a suitable name for flags? Wouldn't > PSR_FLAGS be better (as being more general)? > Thanks for the suggestions! > Jan
>>> On 11.01.17 at 06:13, <yi.y.sun@linux.intel.com> wrote: > On 17-01-10 06:46:03, Jan Beulich wrote: >> >>> On 14.12.16 at 05:07, <yi.y.sun@linux.intel.com> wrote: >> > +int psr_get_info(unsigned int socket, enum cbm_type type, >> > + uint32_t dat[], uint32_t array_len) >> > +{ >> > + struct psr_socket_info *info = get_socket_info(socket); >> > + struct feat_node *feat_tmp; >> >> With the hook function taking a pointer to const I don#t see why >> this one can't be const, too. >> > Do you mean feat_tmp? Thanks! Not sure why you ask - yes, that's why I've placed the comment at precisely this line. Jan
On 17-01-11 06:53:30, Jan Beulich wrote: > >>> On 11.01.17 at 06:13, <yi.y.sun@linux.intel.com> wrote: > > On 17-01-10 06:46:03, Jan Beulich wrote: > >> >>> On 14.12.16 at 05:07, <yi.y.sun@linux.intel.com> wrote: > >> > +int psr_get_info(unsigned int socket, enum cbm_type type, > >> > + uint32_t dat[], uint32_t array_len) > >> > +{ > >> > + struct psr_socket_info *info = get_socket_info(socket); > >> > + struct feat_node *feat_tmp; > >> > >> With the hook function taking a pointer to const I don#t see why > >> this one can't be const, too. > >> > > Do you mean feat_tmp? Thanks! > > Not sure why you ask - yes, that's why I've placed the comment at > precisely this line. > Got it, thanks! > Jan
diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 746c90e..095b3a7 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -115,6 +115,9 @@ struct feat_ops { struct psr_socket_info *info); /* get_max_cos_max is used to get feature's cos_max. */ unsigned int (*get_max_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, enum cbm_type type, + uint32_t dat[], uint32_t array_len); }; @@ -220,9 +223,24 @@ static unsigned int l3_cat_get_max_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, + enum cbm_type type, + uint32_t dat[], uint32_t array_len) +{ + if ( !dat || 3 > array_len || type != PSR_CBM_TYPE_L3 ) + return false; + + dat[CBM_LEN] = feat->info.l3_cat_info.cbm_len; + dat[COS_MAX] = feat->info.l3_cat_info.cos_max; + dat[CDP_FLAG] = 0; + + return true; +} + struct feat_ops l3_cat_ops = { .init_feature = l3_cat_init_feature, .get_max_cos_max = l3_cat_get_max_cos_max, + .get_feat_info = l3_cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -426,10 +444,34 @@ 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(-ENOTSOCK); + + 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 dat[], uint32_t array_len) +{ + struct psr_socket_info *info = get_socket_info(socket); + struct feat_node *feat_tmp; + + if ( IS_ERR(info) ) + return PTR_ERR(info); + + list_for_each_entry(feat_tmp, &info->feat_list, list) + if ( feat_tmp->ops.get_feat_info(feat_tmp, type, dat, array_len) ) + return 0; + + 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 14e7dc7..168ed45 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 dat[3]; + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L3, dat, 3); + + sysctl->u.psr_cat_op.u.l3_info.cbm_len = dat[CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.cos_max = dat[COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.flags = dat[CDP_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..c872fff 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -33,6 +33,11 @@ /* L3 CDP Enable bit*/ #define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 +/* Used by psr_get_info() */ +#define CBM_LEN 0 +#define COS_MAX 1 +#define CDP_FLAG 2 + struct psr_cmt_l3 { unsigned int features; unsigned int upscaling_factor; @@ -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 dat[], uint32_t 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,
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> --- xen/arch/x86/psr.c | 48 ++++++++++++++++++++++++++++++++++++++++++++--- xen/arch/x86/sysctl.c | 14 +++++++++----- xen/include/asm-x86/psr.h | 9 +++++++-- 3 files changed, 61 insertions(+), 10 deletions(-)