| Message ID | 1504603957-5389-6-git-send-email-yi.y.sun@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 05, 2017 at 05:32:27PM +0800, Yi Sun wrote: > This patch implements get HW info flow for MBA including its callback > function and sysctl interface. > > Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com> > --- > v3: > - replace 'PSR_VAL_TYPE_MBA' to 'PSR_TYPE_MBA_THRTL'. > (suggested by Roger Pau Monné) > v2: > - use 'XEN_SYSCTL_PSR_MBA_LINEAR' to set MBA feature HW info. > (suggested by Chao Peng) > v1: > - sort 'PSR_INFO_IDX_' macros as feature. > (suggested by Chao Peng) > - rename 'PSR_INFO_IDX_MBA_LINEAR' to 'PSR_INFO_IDX_MBA_FLAG'. > - rename 'linear' in 'struct mba_info' to 'flags' for future extension. > (suggested by Chao Peng) > --- > xen/arch/x86/psr.c | 17 ++++++++++++++++- > xen/arch/x86/sysctl.c | 19 +++++++++++++++++++ > xen/include/asm-x86/psr.h | 2 ++ > xen/include/public/sysctl.h | 8 ++++++++ > 4 files changed, 45 insertions(+), 1 deletion(-) > > diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c > index 10776d2..0486d2d 100644 > --- a/xen/arch/x86/psr.c > +++ b/xen/arch/x86/psr.c > @@ -263,6 +263,10 @@ static enum psr_feat_type psr_type_to_feat_type(enum psr_type type) > feat_type = FEAT_TYPE_L2_CAT; > break; > > + case PSR_TYPE_MBA_THRTL: > + feat_type = FEAT_TYPE_MBA; > + break; > + > default: > ASSERT_UNREACHABLE(); > } > @@ -491,7 +495,18 @@ static const struct feat_props l2_cat_props = { > static bool mba_get_feat_info(const struct feat_node *feat, > uint32_t data[], unsigned int array_len) > { > - return false; > + if ( array_len != PSR_INFO_ARRAY_SIZE ) > + return false; > + > + data[PSR_INFO_IDX_COS_MAX] = feat->cos_max; > + data[PSR_INFO_IDX_MBA_THRTL_MAX] = feat->mba.thrtl_max; > + > + if ( feat->mba.linear ) > + data[PSR_INFO_IDX_MBA_FLAG] |= XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; > + else > + data[PSR_INFO_IDX_MBA_FLAG] &= ~XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; This branch of the if shouldn't be needed... > + > + return true; > } > > static void mba_write_msr(unsigned int cos, uint32_t val, > diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c > index 1d3dbd0..4634cad 100644 > --- a/xen/arch/x86/sysctl.c > +++ b/xen/arch/x86/sysctl.c > @@ -214,6 +214,25 @@ long arch_do_sysctl( > break; > } > > + case XEN_SYSCTL_PSR_ALLOC_get_mba_info: > + { > + ret = psr_get_info(sysctl->u.psr_alloc.target, > + PSR_TYPE_MBA_THRTL, data, ARRAY_SIZE(data)); ... because data should be initialized, ie: uint32_t data[PSR_INFO_ARRAY_SIZE] = { 0 }; So that we don't leak stack data in the sysctl. Thanks, Roger.
On 17-09-19 10:08:22, Roger Pau Monn� wrote: > On Tue, Sep 05, 2017 at 05:32:27PM +0800, Yi Sun wrote: > > diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c > > index 10776d2..0486d2d 100644 > > --- a/xen/arch/x86/psr.c > > +++ b/xen/arch/x86/psr.c > > @@ -491,7 +495,18 @@ static const struct feat_props l2_cat_props = { > > static bool mba_get_feat_info(const struct feat_node *feat, > > uint32_t data[], unsigned int array_len) > > { > > - return false; > > + if ( array_len != PSR_INFO_ARRAY_SIZE ) > > + return false; > > + > > + data[PSR_INFO_IDX_COS_MAX] = feat->cos_max; > > + data[PSR_INFO_IDX_MBA_THRTL_MAX] = feat->mba.thrtl_max; > > + > > + if ( feat->mba.linear ) > > + data[PSR_INFO_IDX_MBA_FLAG] |= XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; > > + else > > + data[PSR_INFO_IDX_MBA_FLAG] &= ~XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; > > This branch of the if shouldn't be needed... > > > + > > + return true; > > } > > > > static void mba_write_msr(unsigned int cos, uint32_t val, > > diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c > > index 1d3dbd0..4634cad 100644 > > --- a/xen/arch/x86/sysctl.c > > +++ b/xen/arch/x86/sysctl.c > > @@ -214,6 +214,25 @@ long arch_do_sysctl( > > break; > > } > > > > + case XEN_SYSCTL_PSR_ALLOC_get_mba_info: > > + { > > + ret = psr_get_info(sysctl->u.psr_alloc.target, > > + PSR_TYPE_MBA_THRTL, data, ARRAY_SIZE(data)); > > ... because data should be initialized, ie: > > uint32_t data[PSR_INFO_ARRAY_SIZE] = { 0 }; > > So that we don't leak stack data in the sysctl. > Ok, thanks! > Thanks, Roger.
diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 10776d2..0486d2d 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -263,6 +263,10 @@ static enum psr_feat_type psr_type_to_feat_type(enum psr_type type) feat_type = FEAT_TYPE_L2_CAT; break; + case PSR_TYPE_MBA_THRTL: + feat_type = FEAT_TYPE_MBA; + break; + default: ASSERT_UNREACHABLE(); } @@ -491,7 +495,18 @@ static const struct feat_props l2_cat_props = { static bool mba_get_feat_info(const struct feat_node *feat, uint32_t data[], unsigned int array_len) { - return false; + if ( array_len != PSR_INFO_ARRAY_SIZE ) + return false; + + data[PSR_INFO_IDX_COS_MAX] = feat->cos_max; + data[PSR_INFO_IDX_MBA_THRTL_MAX] = feat->mba.thrtl_max; + + if ( feat->mba.linear ) + data[PSR_INFO_IDX_MBA_FLAG] |= XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; + else + data[PSR_INFO_IDX_MBA_FLAG] &= ~XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; + + return true; } static void mba_write_msr(unsigned int cos, uint32_t val, diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 1d3dbd0..4634cad 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -214,6 +214,25 @@ long arch_do_sysctl( break; } + case XEN_SYSCTL_PSR_ALLOC_get_mba_info: + { + ret = psr_get_info(sysctl->u.psr_alloc.target, + PSR_TYPE_MBA_THRTL, data, ARRAY_SIZE(data)); + if ( ret ) + break; + + sysctl->u.psr_alloc.u.mba_info.cos_max = + data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_alloc.u.mba_info.thrtl_max = + data[PSR_INFO_IDX_MBA_THRTL_MAX]; + sysctl->u.psr_alloc.u.mba_info.flags = + data[PSR_INFO_IDX_MBA_FLAG]; + + if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) ) + ret = -EFAULT; + break; + } + default: ret = -EOPNOTSUPP; break; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 9d14264..084ae97 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -39,6 +39,8 @@ #define PSR_INFO_IDX_COS_MAX 0 #define PSR_INFO_IDX_CAT_CBM_LEN 1 #define PSR_INFO_IDX_CAT_FLAG 2 +#define PSR_INFO_IDX_MBA_THRTL_MAX 1 +#define PSR_INFO_IDX_MBA_FLAG 2 #define PSR_INFO_ARRAY_SIZE 3 struct psr_cmt_l3 { diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 4759b10..0cfe02d 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -745,6 +745,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_pcitopoinfo_t); #define XEN_SYSCTL_PSR_ALLOC_get_l3_info 0 #define XEN_SYSCTL_PSR_ALLOC_get_l2_info 1 +#define XEN_SYSCTL_PSR_ALLOC_get_mba_info 2 struct xen_sysctl_psr_alloc { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CAT_* */ uint32_t target; /* IN */ @@ -755,6 +756,13 @@ struct xen_sysctl_psr_alloc { #define XEN_SYSCTL_PSR_ALLOC_L3_CDP (1u << 0) uint32_t flags; /* OUT: CAT flags */ } cat_info; + + struct { + uint32_t thrtl_max; /* OUT: Maximum throttle */ + uint32_t cos_max; /* OUT: Maximum COS */ +#define XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR (1u << 0) + uint32_t flags; /* OUT: MBA flags */ + } mba_info; } u; }; typedef struct xen_sysctl_psr_alloc xen_sysctl_psr_alloc_t;
This patch implements get HW info flow for MBA including its callback function and sysctl interface. Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com> --- v3: - replace 'PSR_VAL_TYPE_MBA' to 'PSR_TYPE_MBA_THRTL'. (suggested by Roger Pau Monné) v2: - use 'XEN_SYSCTL_PSR_MBA_LINEAR' to set MBA feature HW info. (suggested by Chao Peng) v1: - sort 'PSR_INFO_IDX_' macros as feature. (suggested by Chao Peng) - rename 'PSR_INFO_IDX_MBA_LINEAR' to 'PSR_INFO_IDX_MBA_FLAG'. - rename 'linear' in 'struct mba_info' to 'flags' for future extension. (suggested by Chao Peng) --- xen/arch/x86/psr.c | 17 ++++++++++++++++- xen/arch/x86/sysctl.c | 19 +++++++++++++++++++ xen/include/asm-x86/psr.h | 2 ++ xen/include/public/sysctl.h | 8 ++++++++ 4 files changed, 45 insertions(+), 1 deletion(-)