diff mbox

[RFC,v2,05/12] x86: implement get hw info flow for MBA.

Message ID 1500540553-29199-6-git-send-email-yi.y.sun@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Yi Sun July 20, 2017, 8:49 a.m. UTC 
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>
---
 xen/arch/x86/psr.c          | 13 ++++++++++++-
 xen/arch/x86/sysctl.c       | 19 +++++++++++++++++++
 xen/include/asm-x86/psr.h   |  2 ++
 xen/include/public/sysctl.h |  8 ++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)

Comments

Chao Peng Aug. 9, 2017, 1:12 a.m. UTC | #1 
> diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h
> index 551ccf3..81da1c2 100644
> --- a/xen/include/asm-x86/psr.h
> +++ b/xen/include/asm-x86/psr.h
> @@ -38,7 +38,9 @@
>  /* Used by psr_get_info() */
>  #define PSR_INFO_IDX_COS_MAX            0
>  #define PSR_INFO_IDX_CAT_CBM_LEN        1
> +#define PSR_INFO_IDX_MBA_THRTL_MAX      1
>  #define PSR_INFO_IDX_CAT_FLAG           2
> +#define PSR_INFO_IDX_MBA_LINEAR         2

Sorting by feature instead of by index sounds more reasonable to me.

>  #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 44d64f5..457ce9c 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 linear;    /* OUT: Linear mode */

Just like CAT, rename to 'flags' so it can be extended easily in the
future?

Chao
diff mbox

Patch

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index d1ea5a4..c75755b 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -262,6 +262,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();
     }
@@ -470,7 +474,14 @@  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;
+    data[PSR_INFO_IDX_MBA_LINEAR] = feat->mba_info.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 b4fc1d5..22d7510 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.linear =
+                                      data[PSR_INFO_IDX_MBA_LINEAR];
+
+            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 551ccf3..81da1c2 100644
--- a/xen/include/asm-x86/psr.h
+++ b/xen/include/asm-x86/psr.h
@@ -38,7 +38,9 @@ 
 /* Used by psr_get_info() */
 #define PSR_INFO_IDX_COS_MAX            0
 #define PSR_INFO_IDX_CAT_CBM_LEN        1
+#define PSR_INFO_IDX_MBA_THRTL_MAX      1
 #define PSR_INFO_IDX_CAT_FLAG           2
+#define PSR_INFO_IDX_MBA_LINEAR         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 44d64f5..457ce9c 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 linear;    /* OUT: Linear mode */
+        } mba_info;
     } u;
 };
 typedef struct xen_sysctl_psr_alloc_op xen_sysctl_psr_alloc_op_t;