| Message ID | 1503537289-56036-6-git-send-email-yi.y.sun@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 24, 2017 at 09:14:39AM +0800, Yi Sun wrote: > diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c > index df54d38..cbab85a 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_MBA_get_info: > + { > + ret = psr_get_info(sysctl->u.psr_alloc_op.target, > + PSR_VAL_TYPE_MBA, data, ARRAY_SIZE(data)); > + if ( ret ) > + break; > + > + sysctl->u.psr_alloc_op.u.mba_info.cos_max = > + data[PSR_INFO_IDX_COS_MAX]; > + sysctl->u.psr_alloc_op.u.mba_info.thrtl_max = > + data[PSR_INFO_IDX_MBA_THRTL_MAX]; > + sysctl->u.psr_alloc_op.u.mba_info.flags = > + data[PSR_INFO_IDX_MBA_FLAG]; > + > + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc_op) ) > + ret = -EFAULT; The !ret is not needed here AFAICT. If psr_get_info sets ret to != 0 you will break, so you cannot get here with ret != 0. Roger.
On 17-08-29 16:01:00, Roger Pau Monn� wrote: > On Thu, Aug 24, 2017 at 09:14:39AM +0800, Yi Sun wrote: > > diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c > > index df54d38..cbab85a 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_MBA_get_info: > > + { > > + ret = psr_get_info(sysctl->u.psr_alloc_op.target, > > + PSR_VAL_TYPE_MBA, data, ARRAY_SIZE(data)); > > + if ( ret ) > > + break; > > + > > + sysctl->u.psr_alloc_op.u.mba_info.cos_max = > > + data[PSR_INFO_IDX_COS_MAX]; > > + sysctl->u.psr_alloc_op.u.mba_info.thrtl_max = > > + data[PSR_INFO_IDX_MBA_THRTL_MAX]; > > + sysctl->u.psr_alloc_op.u.mba_info.flags = > > + data[PSR_INFO_IDX_MBA_FLAG]; > > + > > + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc_op) ) > > + ret = -EFAULT; > > The !ret is not needed here AFAICT. If psr_get_info sets ret to != 0 > you will break, so you cannot get here with ret != 0. > You are right. Sorry for this. > Roger.
diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index f5e99ce..4a0c982 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -264,6 +264,10 @@ static enum psr_feat_type psr_val_type_to_feat_type(enum psr_val_type type) feat_type = FEAT_TYPE_L2_CAT; break; + case PSR_VAL_TYPE_MBA: + feat_type = FEAT_TYPE_MBA; + break; + default: ASSERT_UNREACHABLE(); } @@ -493,7 +497,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_info.thrtl_max; + + if ( feat->mba_info.linear ) + data[PSR_INFO_IDX_MBA_FLAG] |= XEN_SYSCTL_PSR_MBA_LINEAR; + else + data[PSR_INFO_IDX_MBA_FLAG] &= ~XEN_SYSCTL_PSR_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 df54d38..cbab85a 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_MBA_get_info: + { + ret = psr_get_info(sysctl->u.psr_alloc_op.target, + PSR_VAL_TYPE_MBA, data, ARRAY_SIZE(data)); + if ( ret ) + break; + + sysctl->u.psr_alloc_op.u.mba_info.cos_max = + data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_alloc_op.u.mba_info.thrtl_max = + data[PSR_INFO_IDX_MBA_THRTL_MAX]; + sysctl->u.psr_alloc_op.u.mba_info.flags = + data[PSR_INFO_IDX_MBA_FLAG]; + + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc_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 10043ac..a7fb625 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 fcebab1..169e7e6 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_CAT_get_l3_info 0 #define XEN_SYSCTL_PSR_CAT_get_l2_info 1 +#define XEN_SYSCTL_PSR_MBA_get_info 2 struct xen_sysctl_psr_alloc_op { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CAT_* */ uint32_t target; /* IN */ @@ -755,6 +756,13 @@ struct xen_sysctl_psr_alloc_op { #define XEN_SYSCTL_PSR_CAT_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_MBA_LINEAR (1u << 0) + uint32_t flags; /* OUT: MBA flags */ + } mba_info; } u; }; typedef struct xen_sysctl_psr_alloc_op xen_sysctl_psr_alloc_op_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> --- 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(-)