diff mbox

[RFC,v2,08/12] tools: create general interfaces to support psr allocation features.

Message ID 1500540553-29199-9-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 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>
---
 tools/libxl/libxl.h         | 34 +++++++++++++++++++++++++++++++++-
 tools/libxl/libxl_psr.c     | 24 ++++++++++++++++++++++++
 tools/libxl/libxl_types.idl | 22 ++++++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)

Comments

Wei Liu July 31, 2017, 2:30 p.m. UTC | #1
On Thu, Jul 20, 2017 at 04:49:09PM +0800, Yi Sun wrote:
[...]
> +
> +#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, uint32_t target,

There is no need for target to be uint32_t right? Unsigned int should
work too?

> +                      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,
> +                          int *nr, libxl_psr_feat_type type, int lvl);
> +void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, int nr);

nr should be unsigned int.

> +#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..8319301 100644
> --- a/tools/libxl/libxl_psr.c
> +++ b/tools/libxl/libxl_psr.c
> @@ -425,6 +425,30 @@ 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 EXIT_FAILURE;

ERROR_FAIL here.

> +
> +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),
> +                               ])),
> +          ]))

If this is output only please mark it as dir=DIR_OUT.

> +    ])
> -- 
> 1.9.1
>
Yi Sun Aug. 1, 2017, 12:56 a.m. UTC | #2
On 17-07-31 15:30:08, Wei Liu wrote:
> On Thu, Jul 20, 2017 at 04:49:09PM +0800, Yi Sun wrote:
> [...]
> > +
> > +#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, uint32_t target,
> 
> There is no need for target to be uint32_t right? Unsigned int should
> work too?
> 
> > +                      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,
> > +                          int *nr, libxl_psr_feat_type type, int lvl);
> > +void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, int nr);
> 
> nr should be unsigned int.
> 
> > +#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..8319301 100644
> > --- a/tools/libxl/libxl_psr.c
> > +++ b/tools/libxl/libxl_psr.c
> > @@ -425,6 +425,30 @@ 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 EXIT_FAILURE;
> 
> ERROR_FAIL here.
> 
Thanks! Will fix above points.

> > +
> > +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),
> > +                               ])),
> > +          ]))
> 
> If this is output only please mark it as dir=DIR_OUT.
> 
Sorry, I do not understand this clearly. DYM if these values are all output
values for xl application?

BRs,
Sun Yi
Wei Liu Aug. 1, 2017, 9:05 a.m. UTC | #3
On Tue, Aug 01, 2017 at 08:56:19AM +0800, Yi Sun wrote:
> > > +
> > > +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),
> > > +                               ])),
> > > +          ]))
> > 
> > If this is output only please mark it as dir=DIR_OUT.
> > 
> Sorry, I do not understand this clearly. DYM if these values are all output
> values for xl application?

This is part of the idl, which means the structure is for output only.

Search for DIR_OUT in libxl_types.idl
diff mbox

Patch

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 229e289..05b9cfb 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,32 @@  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, uint32_t 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,
+                          int *nr, libxl_psr_feat_type type, int lvl);
+void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, 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..8319301 100644
--- a/tools/libxl/libxl_psr.c
+++ b/tools/libxl/libxl_psr.c
@@ -425,6 +425,30 @@  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 EXIT_FAILURE;
+}
+
+int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid,
+                      libxl_psr_cbm_type type, uint32_t target,
+                      uint64_t *val)
+{
+    return EXIT_FAILURE;
+}
+
+int libxl_psr_get_hw_info(libxl_ctx *ctx, libxl_psr_hw_info **info,
+                          int *nr, libxl_psr_feat_type type, int lvl)
+{
+    return EXIT_FAILURE;
+}
+
+void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, int nr)
+{
+}
+
 /*
  * Local variables:
  * mode: C
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 6e80d36..6e6c6e0 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),
+                               ])),
+          ]))
+    ])