[v4,14/24] x86: refactor psr: implement get hw info flow for CDP.

Commit Message

Yi Sun Dec. 14, 2016, 4:07 a.m. UTC

This patch implements get HW info flow for CDP including L3 CDP callback
function.

It also changes sysctl function to make it work for CDP.

With this patch, 'psr-hwinfo' can work for L3 CDP.

Signed-off-by: Yi Sun <[e-mail]>
---
 xen/arch/x86/psr.c    | 16 ++++++++++++++++
 xen/arch/x86/sysctl.c | 24 +++++++++++++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)

Patch

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index 09da12c..99add7a 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -548,9 +548,25 @@  static unsigned int l3_cdp_get_max_cos_max(const struct feat_node *feat)
     return feat->info.l3_cdp_info.cos_max;
 }
 
+static bool l3_cdp_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_DATA && type != PSR_CBM_TYPE_L3_CODE) )
+        return false;
+
+    dat[CBM_LEN] = feat->info.l3_cdp_info.cbm_len;
+    dat[COS_MAX] = feat->info.l3_cdp_info.cos_max;
+    dat[CDP_FLAG] |= XEN_SYSCTL_PSR_CAT_L3_CDP;
+
+    return true;
+}
+
 struct feat_ops l3_cdp_ops = {
     .init_feature = l3_cdp_init_feature,
     .get_max_cos_max = l3_cdp_get_max_cos_max,
+    .get_feat_info = l3_cdp_get_feat_info,
 };
 
 static void __init parse_psr_bool(char *s, char *value, char *feature,
diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c
index 168ed45..846eeaf 100644
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -181,9 +181,27 @@  long arch_do_sysctl(
             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 )
+            {
+                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];
+            } else {
+                /*
+                 * Check if CDP is enabled.
+                 *
+                 * Per spec, L3 CAT and CDP cannot co-exist. So, we need replace
+                 * output values to CDP's if it is enabled.
+                 */
+                ret = psr_get_info(sysctl->u.psr_cat_op.target,
+                               PSR_CBM_TYPE_L3_CODE, dat, 3);
+                if ( !ret )
+                {
+                    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;