x86: implement get hw info flow for MBA

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>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/Config.mk b/Config.mk
index 51adc27d83966317b8dc9297f7b0cf4bf97570cb..18f5c34f5bc25c932d4a420cadadf010d3d61463 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -260,17 +260,17 @@ QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG)
 endif
 
 ifeq ($(GIT_HTTP),y)
-OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git
-QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git
-QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git
-SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
-MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git
+OVMF_UPSTREAM_URL ?= http://vt-sync.sh.intel.com/git-http/ovmf.git
+QEMU_UPSTREAM_URL ?= http://vt-sync.sh.intel.com/git-http/qemu-xen.git
+QEMU_TRADITIONAL_URL ?= http://vt-sync.sh.intel.com/git-http/qemu-xen-traditional.git
+SEABIOS_UPSTREAM_URL ?= http://vt-sync.sh.intel.com/git-http/seabios.git
+MINIOS_UPSTREAM_URL ?= http://vt-sync.sh.intel.com/git-http/mini-os.git
 else
-OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
-QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git
-QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git
-SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
-MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
+OVMF_UPSTREAM_URL ?= git://vt-sync.sh.intel.com/ovmf.git
+QEMU_UPSTREAM_URL ?= git://vt-sync.sh.intel.com/qemu-xen.git
+QEMU_TRADITIONAL_URL ?= git://vt-sync.sh.intel.com/qemu-xen-traditional.git
+SEABIOS_UPSTREAM_URL ?= git://vt-sync.sh.intel.com/seabios.git
+MINIOS_UPSTREAM_URL ?= git://vt-sync.sh.intel.com/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 947f3737abf65fda63f3ffd97fddfa6986986868
 QEMU_UPSTREAM_REVISION ?= master

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index 872bade6a2a770febe936a010e67c48fa390c363..a4901d8f9893c1b5a1f81821c7ccd29fc3583a0f 100644 (file)
--- 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();
     }
@@ -481,7 +485,15 @@ 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;
+    ASSERT(array_len == PSR_INFO_ARRAY_SIZE);
+
+    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_FLAGS] |= 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 6d48cac4c56765883df611c33103c14eba564a58..4d372db12baf984a64dcebdb21d02ebe5d1092bf 100644 (file)
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -172,12 +172,12 @@ long arch_do_sysctl(
         break;
 
     case XEN_SYSCTL_psr_alloc:
+    {
+        uint32_t data[PSR_INFO_ARRAY_SIZE] = { };
+
         switch ( sysctl->u.psr_alloc.cmd )
         {
-            uint32_t data[PSR_INFO_ARRAY_SIZE];
-
         case XEN_SYSCTL_PSR_get_l3_info:
-        {
             ret = psr_get_info(sysctl->u.psr_alloc.target,
                                PSR_TYPE_L3_CBM, data, ARRAY_SIZE(data));
             if ( ret )
@@ -193,10 +193,8 @@ long arch_do_sysctl(
             if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) )
                 ret = -EFAULT;
             break;
-        }
 
         case XEN_SYSCTL_PSR_get_l2_info:
-        {
             ret = psr_get_info(sysctl->u.psr_alloc.target,
                                PSR_TYPE_L2_CBM, data, ARRAY_SIZE(data));
             if ( ret )
@@ -212,13 +210,30 @@ long arch_do_sysctl(
             if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) )
                 ret = -EFAULT;
             break;
-        }
+
+        case XEN_SYSCTL_PSR_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_FLAGS];
+
+            if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) )
+                ret = -EFAULT;
+            break;
 
         default:
             ret = -EOPNOTSUPP;
             break;
         }
         break;
+    }
 
     case XEN_SYSCTL_get_cpu_levelling_caps:
         sysctl->u.cpu_levelling_caps.caps = levelling_caps;

diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h
index 3cf544a5e070d00d1d2bef1c634f0af4fb7ce4ec..c2257da7fc7817fd4fdd2371784947e06a29c4e4 100644 (file)
--- 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_FLAGS          2
+#define PSR_INFO_IDX_MBA_THRTL_MAX      1
+#define PSR_INFO_IDX_MBA_FLAGS          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 a50e345bbec268a2a364aa4f051b0ef575e0dc56..f7f26c38e31877a8af4bac08cc476fc9bbba8ac3 100644 (file)
--- a/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h
@@ -698,6 +698,7 @@ struct xen_sysctl_pcitopoinfo {
 
 #define XEN_SYSCTL_PSR_get_l3_info               0
 #define XEN_SYSCTL_PSR_get_l2_info               1
+#define XEN_SYSCTL_PSR_get_mba_info              2
 struct xen_sysctl_psr_alloc {
     uint32_t cmd;       /* IN: XEN_SYSCTL_PSR_* */
     uint32_t target;    /* IN */
@@ -708,6 +709,13 @@ struct xen_sysctl_psr_alloc {
 #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;
 };