| Message ID | 1491054836-30488-22-git-send-email-yi.y.sun@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 01.04.17 at 15:53, <yi.y.sun@linux.intel.com> wrote: > --- a/xen/arch/x86/domctl.c > +++ b/xen/arch/x86/domctl.c > @@ -1466,6 +1466,16 @@ long arch_do_domctl( > PSR_CBM_TYPE_L3_DATA); > break; > > + case XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM: > + if ( domctl->u.psr_cat_op.data != > + (uint32_t)domctl->u.psr_cat_op.data ) > + return -EINVAL; Considering this recurring pattern I'd like to suggest to do the check in a single place early in ... > + ret = psr_set_val(d, domctl->u.psr_cat_op.target, > + domctl->u.psr_cat_op.data, > + PSR_CBM_TYPE_L2); ... the function being called here. > --- a/xen/arch/x86/psr.c > +++ b/xen/arch/x86/psr.c > @@ -467,10 +467,21 @@ static struct feat_props l3_cdp_props = { > }; > > /* L2 CAT ops */ > +static void l2_cat_write_msr(unsigned int cos, uint32_t val, > + enum cbm_type type, struct feat_node *feat) > +{ > + if ( feat->cos_reg_val[cos] != val ) > + { > + feat->cos_reg_val[cos] = val; It's not the first time I see this pattern, so it looks like this again would be a candidate for further code movement into generic logic. Jan
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 59d472c..7eb5983 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1466,6 +1466,16 @@ long arch_do_domctl( PSR_CBM_TYPE_L3_DATA); break; + case XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM: + if ( domctl->u.psr_cat_op.data != + (uint32_t)domctl->u.psr_cat_op.data ) + return -EINVAL; + + ret = psr_set_val(d, domctl->u.psr_cat_op.target, + domctl->u.psr_cat_op.data, + PSR_CBM_TYPE_L2); + break; + case XEN_DOMCTL_PSR_CAT_OP_GET_L3_CBM: { uint32_t val; diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 426d725..a85ea99 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -467,10 +467,21 @@ static struct feat_props l3_cdp_props = { }; /* L2 CAT ops */ +static void l2_cat_write_msr(unsigned int cos, uint32_t val, + enum cbm_type type, struct feat_node *feat) +{ + if ( feat->cos_reg_val[cos] != val ) + { + feat->cos_reg_val[cos] = val; + wrmsrl(MSR_IA32_PSR_L2_MASK(cos), val); + } +} + static struct feat_props l2_cat_props = { .cos_num = 1, .get_feat_info = cat_get_feat_info, .get_val = cat_get_val, + .write_msr = l2_cat_write_msr, }; static void __init parse_psr_bool(char *s, char *value, char *feature, diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 8c183ba..523a2cd 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1138,6 +1138,7 @@ struct xen_domctl_psr_cat_op { #define XEN_DOMCTL_PSR_CAT_OP_SET_L3_DATA 3 #define XEN_DOMCTL_PSR_CAT_OP_GET_L3_CODE 4 #define XEN_DOMCTL_PSR_CAT_OP_GET_L3_DATA 5 +#define XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM 6 #define XEN_DOMCTL_PSR_CAT_OP_GET_L2_CBM 7 uint32_t cmd; /* IN: XEN_DOMCTL_PSR_CAT_OP_* */ uint32_t target; /* IN */
This patch implements L2 CAT set value related callback functions and domctl interface. Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com> --- v10: - check input data and remove cast in domctl. (suggested by Jan Beulich) - remove some hooks assignment due to previous patches changes. (suggested by Jan Beulich) - remove cast in 'l2_cat_write_msr'. (suggested by Jan Beulich) - remove 'return in 'l2_cat_write_msr'. (suggested by Jan Beulich) v9: - reuse some CAT common functions for L2 CAT to reduce redundant codes. (suggested by Roger Pau) - remove parameter 'found' from 'cat_compare_val' and modify the return values to let caller know if the id is found or not. These things are done in patch "x86: refactor psr: set value: implement cos finding flow." (suggested by Roger Pau and Dario Faggioli) - remove 'get_cos_num' related codes. (suggested by Jan Beulich) - modify 'l2_cat_write_msr' according to previous patch change. - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v8: - modify 'l2_cat_write_msr' to 'void'. v5: - remove type check in callback function. (suggested by Jan Beulich) - modify return value of callback functions because we do not need them to return number of entries the feature uses. In caller, we call 'get_cos_num' to get the number of entries the feature uses. (suggested by Jan Beulich) - remove 'l2_cat_get_cos_max_from_type'. (suggested by Jan Beulich) - rename 'l2_cat_exceeds_cos_max' to 'l2_cat_fits_cos_max'. (suggested by Jan Beulich) v4: - create this patch because of codes architecture change. (suggested by Jan Beulich) --- xen/arch/x86/domctl.c | 10 ++++++++++ xen/arch/x86/psr.c | 11 +++++++++++ xen/include/public/domctl.h | 1 + 3 files changed, 22 insertions(+)