diff mbox

[3/3] ndctl: add filtering based on numa_node

Message ID 20180307180237.9289-3-ross.zwisler@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ross Zwisler March 7, 2018, 6:02 p.m. UTC 
Add support to 'ndctl list' so that we can filter DIMMs, regions and
namespaces based on numa node.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
---
 Documentation/ndctl/ndctl-list.txt |  4 ++++
 ndctl/list.c                       |  2 ++
 util/filter.c                      | 38 ++++++++++++++++++++++++++++++++++++--
 util/filter.h                      |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)

Comments

Dan Williams March 7, 2018, 6:36 p.m. UTC | #1 
On Wed, Mar 7, 2018 at 10:02 AM, Ross Zwisler
<ross.zwisler@linux.intel.com> wrote:
> Add support to 'ndctl list' so that we can filter DIMMs, regions and
> namespaces based on numa node.
>
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> ---
>  Documentation/ndctl/ndctl-list.txt |  4 ++++
>  ndctl/list.c                       |  2 ++
>  util/filter.c                      | 38 ++++++++++++++++++++++++++++++++++++--
>  util/filter.h                      |  1 +
>  4 files changed, 43 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/ndctl/ndctl-list.txt b/Documentation/ndctl/ndctl-list.txt
> index 02d4f04..c711c1f 100644
> --- a/Documentation/ndctl/ndctl-list.txt
> +++ b/Documentation/ndctl/ndctl-list.txt
> @@ -83,6 +83,10 @@ include::xable-region-options.txt[]
>         Filter listing by the mode ('raw', 'fsdax', 'sector' or 'devdax')
>         of the namespace(s).
>
> +-U::
> +--numa_node=::
> +       Filter listing by numa node
> +
>  -B::
>  --buses::
>         Include bus info in the listing
> diff --git a/ndctl/list.c b/ndctl/list.c
> index 4cb66de..e861f8b 100644
> --- a/ndctl/list.c
> +++ b/ndctl/list.c
> @@ -400,6 +400,8 @@ int cmd_list(int argc, const char **argv, void *ctx)
>                                 "filter by namespace mode"),
>                 OPT_STRING('t', "type", &param.type, "region-type",
>                                 "filter by region-type"),
> +               OPT_STRING('U', "numa_node", &param.numa_node, "numa node",
> +                               "filter by numa node"),
>                 OPT_BOOLEAN('B', "buses", &list.buses, "include bus info"),
>                 OPT_BOOLEAN('D', "dimms", &list.dimms, "include dimm info"),
>                 OPT_BOOLEAN('F', "firmware", &list.firmware, "include firmware info"),
> diff --git a/util/filter.c b/util/filter.c
> index b0b7fdf..85630ca 100644
> --- a/util/filter.c
> +++ b/util/filter.c
> @@ -146,7 +146,6 @@ struct ndctl_bus *util_bus_filter_by_region(struct ndctl_bus *bus,
>         return NULL;
>  }
>
> -
>  struct ndctl_bus *util_bus_filter_by_namespace(struct ndctl_bus *bus,
>                 const char *ident)
>  {
> @@ -223,6 +222,25 @@ struct ndctl_dimm *util_dimm_filter_by_namespace(struct ndctl_dimm *dimm,
>         return NULL;
>  }
>
> +struct ndctl_dimm *util_dimm_filter_by_numa_node(struct ndctl_dimm *dimm,
> +               int numa_node)
> +{
> +       struct ndctl_bus *bus = ndctl_dimm_get_bus(dimm);
> +       struct ndctl_region *region;
> +       struct ndctl_dimm *check;
> +
> +       if (numa_node == -1)
> +               return dimm;
> +
> +       ndctl_region_foreach(bus, region)
> +               ndctl_dimm_foreach_in_region(region, check)
> +                       if (check == dimm &&
> +                           ndctl_region_get_numa_node(region) == numa_node)
> +                               return dimm;
> +
> +       return NULL;
> +}

Awesome, thanks for remembering to include dimms in this filtering.

> +
>  struct ndctl_region *util_region_filter_by_namespace(struct ndctl_region *region,
>                 const char *ident)
>  {
> @@ -285,6 +303,8 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
>  {
>         struct ndctl_bus *bus;
>         unsigned int type = 0;
> +       int numa_node = -1;
> +       char *end = NULL;
>
>         if (param->type && (strcmp(param->type, "pmem") != 0
>                                 && strcmp(param->type, "blk") != 0)) {
> @@ -305,6 +325,14 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
>                 return -EINVAL;
>         }
>
> +       if (param->numa_node && strcmp(param->numa_node, "all") != 0) {
> +               numa_node = strtol(param->numa_node, &end, 0);
> +               if (end == param->numa_node || end[0]) {
> +                       error("invalid numa_node: '%s'\n", param->numa_node);
> +                       return -EINVAL;
> +               }
> +       }
> +
>         ndctl_bus_foreach(ctx, bus) {
>                 struct ndctl_region *region;
>                 struct ndctl_dimm *dimm;
> @@ -326,7 +354,9 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
>                                         || !util_dimm_filter_by_region(dimm,
>                                                 param->region)
>                                         || !util_dimm_filter_by_namespace(dimm,
> -                                               param->namespace))
> +                                               param->namespace)
> +                                       || !util_dimm_filter_by_numa_node(dimm,
> +                                               numa_node))
>                                 continue;
>
>                         fctx->filter_dimm(dimm, fctx);
> @@ -342,6 +372,10 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
>                                                 param->namespace))
>                                 continue;
>
> +                       if (numa_node != -1 &&
> +                           ndctl_region_get_numa_node(region) != numa_node)
> +                               continue;

Maybe "numa_node >= 0", or "#define NUMA_NO_NODE  (-1)" and use that?
Ross Zwisler March 7, 2018, 6:46 p.m. UTC | #2 
On Wed, Mar 07, 2018 at 10:36:47AM -0800, Dan Williams wrote:
> > @@ -342,6 +372,10 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
> >                                                 param->namespace))
> >                                 continue;
> >
> > +                       if (numa_node != -1 &&
> > +                           ndctl_region_get_numa_node(region) != numa_node)
> > +                               continue;
> 
> Maybe "numa_node >= 0", or "#define NUMA_NO_NODE  (-1)" and use that?

Yea, that does make it easier to read.  Thanks for the review.
diff mbox

Patch

diff --git a/Documentation/ndctl/ndctl-list.txt b/Documentation/ndctl/ndctl-list.txt
index 02d4f04..c711c1f 100644
--- a/Documentation/ndctl/ndctl-list.txt
+++ b/Documentation/ndctl/ndctl-list.txt
@@ -83,6 +83,10 @@  include::xable-region-options.txt[]
 	Filter listing by the mode ('raw', 'fsdax', 'sector' or 'devdax')
 	of the namespace(s).
 
+-U::
+--numa_node=::
+	Filter listing by numa node
+
 -B::
 --buses::
 	Include bus info in the listing
diff --git a/ndctl/list.c b/ndctl/list.c
index 4cb66de..e861f8b 100644
--- a/ndctl/list.c
+++ b/ndctl/list.c
@@ -400,6 +400,8 @@  int cmd_list(int argc, const char **argv, void *ctx)
 				"filter by namespace mode"),
 		OPT_STRING('t', "type", &param.type, "region-type",
 				"filter by region-type"),
+		OPT_STRING('U', "numa_node", &param.numa_node, "numa node",
+				"filter by numa node"),
 		OPT_BOOLEAN('B', "buses", &list.buses, "include bus info"),
 		OPT_BOOLEAN('D', "dimms", &list.dimms, "include dimm info"),
 		OPT_BOOLEAN('F', "firmware", &list.firmware, "include firmware info"),
diff --git a/util/filter.c b/util/filter.c
index b0b7fdf..85630ca 100644
--- a/util/filter.c
+++ b/util/filter.c
@@ -146,7 +146,6 @@  struct ndctl_bus *util_bus_filter_by_region(struct ndctl_bus *bus,
 	return NULL;
 }
 
-
 struct ndctl_bus *util_bus_filter_by_namespace(struct ndctl_bus *bus,
 		const char *ident)
 {
@@ -223,6 +222,25 @@  struct ndctl_dimm *util_dimm_filter_by_namespace(struct ndctl_dimm *dimm,
 	return NULL;
 }
 
+struct ndctl_dimm *util_dimm_filter_by_numa_node(struct ndctl_dimm *dimm,
+		int numa_node)
+{
+	struct ndctl_bus *bus = ndctl_dimm_get_bus(dimm);
+	struct ndctl_region *region;
+	struct ndctl_dimm *check;
+
+	if (numa_node == -1)
+		return dimm;
+
+	ndctl_region_foreach(bus, region)
+		ndctl_dimm_foreach_in_region(region, check)
+			if (check == dimm &&
+			    ndctl_region_get_numa_node(region) == numa_node)
+				return dimm;
+
+	return NULL;
+}
+
 struct ndctl_region *util_region_filter_by_namespace(struct ndctl_region *region,
 		const char *ident)
 {
@@ -285,6 +303,8 @@  int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
 {
 	struct ndctl_bus *bus;
 	unsigned int type = 0;
+	int numa_node = -1;
+	char *end = NULL;
 
 	if (param->type && (strcmp(param->type, "pmem") != 0
 				&& strcmp(param->type, "blk") != 0)) {
@@ -305,6 +325,14 @@  int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
 		return -EINVAL;
 	}
 
+	if (param->numa_node && strcmp(param->numa_node, "all") != 0) {
+		numa_node = strtol(param->numa_node, &end, 0);
+		if (end == param->numa_node || end[0]) {
+			error("invalid numa_node: '%s'\n", param->numa_node);
+			return -EINVAL;
+		}
+	}
+
 	ndctl_bus_foreach(ctx, bus) {
 		struct ndctl_region *region;
 		struct ndctl_dimm *dimm;
@@ -326,7 +354,9 @@  int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
 					|| !util_dimm_filter_by_region(dimm,
 						param->region)
 					|| !util_dimm_filter_by_namespace(dimm,
-						param->namespace))
+						param->namespace)
+					|| !util_dimm_filter_by_numa_node(dimm,
+						numa_node))
 				continue;
 
 			fctx->filter_dimm(dimm, fctx);
@@ -342,6 +372,10 @@  int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx,
 						param->namespace))
 				continue;
 
+			if (numa_node != -1 &&
+			    ndctl_region_get_numa_node(region) != numa_node)
+				continue;
+
 			if (type && ndctl_region_get_type(region) != type)
 				continue;
 
diff --git a/util/filter.h b/util/filter.h
index aea5a71..effda24 100644
--- a/util/filter.h
+++ b/util/filter.h
@@ -77,6 +77,7 @@  struct util_filter_params {
 	const char *dimm;
 	const char *mode;
 	const char *namespace;
+	const char *numa_node;
 };
 
 struct ndctl_ctx;