From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 983572256863B for ; Thu, 8 Mar 2018 14:56:08 -0800 (PST) From: Ross Zwisler Subject: [PATCH v3 3/3] ndctl: add filtering based on numa node Date: Thu, 8 Mar 2018 16:02:18 -0700 Message-Id: <20180308230218.9609-1-ross.zwisler@linux.intel.com> In-Reply-To: <20180307185355.4425-1-ross.zwisler@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams , linux-nvdimm , "Verma, Vishal L" List-ID: Add support to 'ndctl list' so that we can filter DIMMs, regions and namespaces based on numa node. Signed-off-by: Ross Zwisler Reviewed-by: Dan Williams --- v3: Changed the command line option from "numa_node" to "numa-node". (Vishal) --- Documentation/ndctl/ndctl-list.txt | 4 ++++ ndctl/list.c | 2 ++ util/filter.c | 40 ++++++++++++++++++++++++++++++++++++-- util/filter.h | 1 + 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/Documentation/ndctl/ndctl-list.txt b/Documentation/ndctl/ndctl-list.txt index 02d4f04..c4b38f9 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..0ca5b6d 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", ¶m.type, "region-type", "filter by region-type"), + OPT_STRING('U', "numa-node", ¶m.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..291d7ed 100644 --- a/util/filter.c +++ b/util/filter.c @@ -20,6 +20,8 @@ #include #include +#define NUMA_NO_NODE (-1) + struct ndctl_bus *util_bus_filter(struct ndctl_bus *bus, const char *ident) { char *end = NULL; @@ -146,7 +148,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 +224,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 == NUMA_NO_NODE) + 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 +305,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 = NUMA_NO_NODE; + char *end = NULL; if (param->type && (strcmp(param->type, "pmem") != 0 && strcmp(param->type, "blk") != 0)) { @@ -305,6 +327,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 +356,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 +374,10 @@ int util_filter_walk(struct ndctl_ctx *ctx, struct util_filter_ctx *fctx, param->namespace)) continue; + if (numa_node != NUMA_NO_NODE && + 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; -- 2.14.3 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm