diff mbox

[v1,08/13] tools: create general interfaces to support psr allocation features

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

Commit Message

Yi Sun Aug. 9, 2017, 7:41 a.m. UTC
This patch creates general interfaces in libxl to support all psr
allocation features.

Add 'LIBXL_HAVE_PSR_MBA' to indicate interface change.

Please note, the functionality cannot work until later patches
are applied.

Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
---
v1:
    - change 'uint32_t target' to 'unsigned int target'.
      (suggested by Wei Liu)
    - change 'int nr' to 'unsigned int nr'.
      (suggested by Wei Liu)
    - change 'int lvl' to 'unsigned int lvl'.
    - change 'EXIT_FAILURE' to 'ERROR_FAIL'.
      (suggested by Wei Liu)
    - add 'dir=DIR_OUT' for 'libxl_psr_hw_info'.
      (suggested by Wei Liu)
---
 tools/libxl/libxl.h         | 35 ++++++++++++++++++++++++++++++++++-
 tools/libxl/libxl_psr.c     | 25 +++++++++++++++++++++++++
 tools/libxl/libxl_types.idl | 22 ++++++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)

Comments

Chao Peng Aug. 21, 2017, 10:12 a.m. UTC | #1
>   * mode: C
> diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
> index 6e80d36..10d317b 100644
> --- a/tools/libxl/libxl_types.idl
> +++ b/tools/libxl/libxl_types.idl
> @@ -977,6 +977,7 @@ libxl_psr_cbm_type = Enumeration("psr_cbm_type", [
>      (2, "L3_CBM_CODE"),
>      (3, "L3_CBM_DATA"),
>      (4, "L2_CBM"),
> +    (5, "MBA_THRTL"),

This is not quite appropriate as MBA_THRTL is actually not a 'cbm_type'.

>      ])
>  
>  libxl_psr_cat_info = Struct("psr_cat_info", [
> @@ -985,3 +986,24 @@ libxl_psr_cat_info = Struct("psr_cat_info", [
>      ("cbm_len", uint32),
>      ("cdp_enabled", bool),
>      ])
> +
> +libxl_psr_feat_type = Enumeration("psr_feat_type", [
> +    (1, "CAT_INFO"),
> +    (2, "MBA_INFO"),
> +    ])

'_INFO' can be removed so that it can be used for other purpose in the
future.

Chao
Yi Sun Aug. 22, 2017, 2:38 a.m. UTC | #2
On 17-08-21 18:12:18, Chao Peng wrote:
> 
> >   * mode: C
> > diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
> > index 6e80d36..10d317b 100644
> > --- a/tools/libxl/libxl_types.idl
> > +++ b/tools/libxl/libxl_types.idl
> > @@ -977,6 +977,7 @@ libxl_psr_cbm_type = Enumeration("psr_cbm_type", [
> >      (2, "L3_CBM_CODE"),
> >      (3, "L3_CBM_DATA"),
> >      (4, "L2_CBM"),
> > +    (5, "MBA_THRTL"),
> 
> This is not quite appropriate as MBA_THRTL is actually not a 'cbm_type'.
> 
MBA_THRTL is not 'cbm_type'. But I do not want to create a new generic
value type structure here. It looks redundant. So, I use the 'psr_cbm_type'
to include MBA too.

> >      ])
> >  
> >  libxl_psr_cat_info = Struct("psr_cat_info", [
> > @@ -985,3 +986,24 @@ libxl_psr_cat_info = Struct("psr_cat_info", [
> >      ("cbm_len", uint32),
> >      ("cdp_enabled", bool),
> >      ])
> > +
> > +libxl_psr_feat_type = Enumeration("psr_feat_type", [
> > +    (1, "CAT_INFO"),
> > +    (2, "MBA_INFO"),
> > +    ])
> 
> '_INFO' can be removed so that it can be used for other purpose in the
> future.
> 
Ok, will remove it.

> Chao
Chao Peng Aug. 22, 2017, 6:42 a.m. UTC | #3
On Tue, 2017-08-22 at 10:38 +0800, Yi Sun wrote:
> On 17-08-21 18:12:18, Chao Peng wrote:
> > 
> > 
> > > 
> > >   * mode: C
> > > diff --git a/tools/libxl/libxl_types.idl
> > > b/tools/libxl/libxl_types.idl
> > > index 6e80d36..10d317b 100644
> > > --- a/tools/libxl/libxl_types.idl
> > > +++ b/tools/libxl/libxl_types.idl
> > > @@ -977,6 +977,7 @@ libxl_psr_cbm_type =
> > > Enumeration("psr_cbm_type", [
> > >      (2, "L3_CBM_CODE"),
> > >      (3, "L3_CBM_DATA"),
> > >      (4, "L2_CBM"),
> > > +    (5, "MBA_THRTL"),
> > 
> > This is not quite appropriate as MBA_THRTL is actually not a
> > 'cbm_type'.
> > 
> MBA_THRTL is not 'cbm_type'. But I do not want to create a new generic
> value type structure here. It looks redundant. So, I use the
> 'psr_cbm_type'
> to include MBA too.

I don't strongly insist on it. If others don't object, I'm OK with it.

Chao
diff mbox

Patch

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 229e289..c1d804c 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -931,6 +931,13 @@  void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, const libxl_mac *src);
 #define LIBXL_HAVE_PSR_L2_CAT 1
 
 /*
+ * LIBXL_HAVE_PSR_MBA
+ *
+ * If this is defined, the Memory Bandwidth Allocation feature is supported.
+ */
+#define LIBXL_HAVE_PSR_MBA 1
+
+/*
  * LIBXL_HAVE_MCA_CAPS
  *
  * If this is defined, setting MCA capabilities for HVM domain is supported.
@@ -2219,7 +2226,33 @@  int libxl_psr_cat_get_info(libxl_ctx *ctx, libxl_psr_cat_info **info,
 int libxl_psr_cat_get_l3_info(libxl_ctx *ctx, libxl_psr_cat_info **info,
                               int *nr);
 void libxl_psr_cat_info_list_free(libxl_psr_cat_info *list, int nr);
-#endif
+
+#ifdef LIBXL_HAVE_PSR_MBA
+/*
+ * Function to set a domain's value. It operates on a single or multiple
+ * target(s) defined in 'target_map'. 'target_map' specifies all the sockets
+ * to be operated on.
+ */
+int libxl_psr_set_val(libxl_ctx *ctx, uint32_t domid,
+                      libxl_psr_cbm_type type, libxl_bitmap *target_map,
+                      uint64_t val);
+/*
+ * Function to get a domain's cbm. It operates on a single 'target'.
+ * 'target' specifies which socket to be operated on.
+ */
+int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid,
+                      libxl_psr_cbm_type type, unsigned int target,
+                      uint64_t *val);
+/*
+ * On success, the function returns an array of elements in 'info',
+ * and the length in 'nr'.
+ */
+int libxl_psr_get_hw_info(libxl_ctx *ctx, libxl_psr_hw_info **info,
+                          unsigned int *nr, libxl_psr_feat_type type,
+                          unsigned int lvl);
+void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, unsigned int nr);
+#endif /* LIBXL_HAVE_PSR_MBA */
+#endif /* LIBXL_HAVE_PSR_CAT */
 
 /* misc */
 
diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c
index f55ba1e..cf368ba 100644
--- a/tools/libxl/libxl_psr.c
+++ b/tools/libxl/libxl_psr.c
@@ -425,6 +425,31 @@  void libxl_psr_cat_info_list_free(libxl_psr_cat_info *list, int nr)
     free(list);
 }
 
+int libxl_psr_set_val(libxl_ctx *ctx, uint32_t domid,
+                      libxl_psr_cbm_type type, libxl_bitmap *target_map,
+                      uint64_t val)
+{
+    return ERROR_FAIL;
+}
+
+int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid,
+                      libxl_psr_cbm_type type, unsigned int target,
+                      uint64_t *val)
+{
+    return ERROR_FAIL;
+}
+
+int libxl_psr_get_hw_info(libxl_ctx *ctx, libxl_psr_hw_info **info,
+                          unsigned int *nr, libxl_psr_feat_type type,
+                          unsigned int lvl)
+{
+    return ERROR_FAIL;
+}
+
+void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, unsigned int nr)
+{
+}
+
 /*
  * Local variables:
  * mode: C
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 6e80d36..10d317b 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -977,6 +977,7 @@  libxl_psr_cbm_type = Enumeration("psr_cbm_type", [
     (2, "L3_CBM_CODE"),
     (3, "L3_CBM_DATA"),
     (4, "L2_CBM"),
+    (5, "MBA_THRTL"),
     ])
 
 libxl_psr_cat_info = Struct("psr_cat_info", [
@@ -985,3 +986,24 @@  libxl_psr_cat_info = Struct("psr_cat_info", [
     ("cbm_len", uint32),
     ("cdp_enabled", bool),
     ])
+
+libxl_psr_feat_type = Enumeration("psr_feat_type", [
+    (1, "CAT_INFO"),
+    (2, "MBA_INFO"),
+    ])
+
+libxl_psr_hw_info = Struct("psr_hw_info", [
+    ("id", uint32),
+    ("u", KeyedUnion(None, libxl_psr_feat_type, "type",
+          [("cat_info", Struct(None, [
+                                         ("cos_max",     uint32),
+                                         ("cbm_len",     uint32),
+                                         ("cdp_enabled", bool),
+                               ])),
+           ("mba_info", Struct(None, [
+                                         ("cos_max",     uint32),
+                                         ("thrtl_max",   uint32),
+                                         ("linear",      bool),
+                               ])),
+          ]))
+    ], dir=DIR_OUT)