[ndctl,22/37] cxl/list: Move enabled memdevs underneath their endpoint

Message ID	164298562531.3021641.10620937879296964476.stgit@dwillia2-desk3.amr.corp.intel.com
State	New, archived
Headers	show Return-Path: <linux-cxl-owner@kernel.org> Subject: [ndctl PATCH 22/37] cxl/list: Move enabled memdevs underneath their endpoint From: Dan Williams <dan.j.williams@intel.com> To: linux-cxl@vger.kernel.org Cc: vishal.l.verma@intel.com Date: Sun, 23 Jan 2022 16:53:45 -0800 Message-ID: <164298562531.3021641.10620937879296964476.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <164298550885.3021641.11210386002804544864.stgit@dwillia2-desk3.amr.corp.intel.com> References: <164298550885.3021641.11210386002804544864.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-3-g996c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	cxl: Full topology enumeration \| expand [ndctl,00/37] cxl: Full topology enumeration [ndctl,01/37] test: Add 'suite' identifiers to tests [ndctl,02/37] ndctl: Rename util_filter to ndctl_filter [ndctl,03/37] build: Add tags [ndctl,04/37] json: Add support for json_object_new_uint64() [ndctl,05/37] cxl/json: Cleanup object leak false positive [ndctl,06/37] cxl/list: Support multiple memdev device name filter arguments [ndctl,07/37] cxl/list: Support comma separated lists [ndctl,08/37] cxl/list: Introduce cxl_filter_walk() [ndctl,09/37] cxl/list: Emit device serial numbers [ndctl,10/37] cxl/list: Add filter by serial support [ndctl,11/37] cxl/lib: Rename nvdimm bridge to pmem [ndctl,12/37] cxl/list: Cleanup options definitions [ndctl,13/37] Documentation: Enhance libcxl memdev API documentation [ndctl,14/37] cxl/list: Add bus objects [ndctl,15/37] util/json: Warn on stderr about empty list results [ndctl,16/37] util/sysfs: Uplevel modalias lookup helper to util/ [ndctl,17/37] cxl/list: Add port enumeration [ndctl,18/37] cxl/list: Add --debug option [ndctl,19/37] cxl/list: Add endpoints [ndctl,20/37] cxl/list: Add 'host' entries for port-like objects [ndctl,21/37] cxl/list: Add 'host' entries for memdevs [ndctl,22/37] cxl/list: Move enabled memdevs underneath their endpoint [ndctl,23/37] cxl/list: Filter memdev by ancestry [ndctl,24/37] cxl/memdev: Use a local logger for debug [ndctl,25/37] cxl/memdev: Cleanup memdev filter [ndctl,26/37] cxl/memdev: Add serial support for memdev-related commands [ndctl,27/37] cxl/list: Add 'numa_node' to memdev listings [ndctl,28/37] util: Implement common bind/unbind helpers [ndctl,29/37] cxl/memdev: Enable / disable support [ndctl,30/37] cxl/list: Add decoder support [ndctl,31/37] cxl/list: Extend decoder objects with target information [ndctl,32/37] cxl/list: Use 'physical_node' for root port attachment detection [ndctl,33/37] cxl/list: Reuse the --target option for ports [ndctl,34/37] cxl/list: Support filtering memdevs by decoders [ndctl,35/37] cxl/list: Support filtering memdevs by ports [ndctl,36/37] cxl/port: Add {disable,enable}-port command [ndctl,37/37] cxl/list: Filter dports and targets by memdevs

diff --git a/Documentation/cxl/cxl-list.txt b/Documentation/cxl/cxl-list.txt index 9c21ab7afd74..175186819312 100644 --- a/Documentation/cxl/cxl-list.txt +++ b/Documentation/cxl/cxl-list.txt @@ -19,7 +19,16 @@ Options can be specified to limit the output to specific objects. When a single object type is specified the return json object is an array of just those objects, when multiple objects types are specified the returned the returned object may be an array of arrays with the inner -array named for the given object type. +array named for the given object type. The top-level arrays are ellided +when the objects can nest under a higher object-type in the hierararchy. +The potential top-level array names and their nesting properties are: + +"anon memdevs":: (disabled memory devices) do not nest +"buses":: do not nest +"ports":: nest under buses +"endpoints":: nest under ports or buses (if ports are not emitted) +"memdevs":: nest under endpoints or ports (if endpoints are not + emitted) or buses (if endpoints and ports are not emitted) Filters can by specifed as either a single identidier, a space separated quoted string, or a comma separated list. When multiple filter diff --git a/Documentation/cxl/lib/libcxl.txt b/Documentation/cxl/lib/libcxl.txt index 91fd33e8b1ae..73b0fb9c2062 100644 --- a/Documentation/cxl/lib/libcxl.txt +++ b/Documentation/cxl/lib/libcxl.txt @@ -41,6 +41,7 @@ struct cxl_memdev *cxl_memdev_get_first(struct cxl_ctx *ctx); struct cxl_memdev *cxl_memdev_get_next(struct cxl_memdev *memdev); struct cxl_ctx *cxl_memdev_get_ctx(struct cxl_memdev *memdev); const char *cxl_memdev_get_host(struct cxl_memdev *memdev) +struct cxl_memdev *cxl_endpoint_get_memdev(struct cxl_endpoint *endpoint); #define cxl_memdev_foreach(ctx, memdev) \ for (memdev = cxl_memdev_get_first(ctx); \ @@ -231,6 +232,7 @@ struct cxl_ctx *cxl_endpoint_get_ctx(struct cxl_endpoint *endpoint); struct cxl_port *cxl_endpoint_get_parent(struct cxl_endpoint *endpoint); struct cxl_port *cxl_endpoint_get_port(struct cxl_endpoint *endpoint); const char *cxl_endpoint_get_host(struct cxl_endpoint *endpoint); +struct cxl_endpoint *cxl_memdev_get_endpoint(struct cxl_memdev *memdev); #define cxl_endpoint_foreach(port, endpoint) \ for (endpoint = cxl_endpoint_get_first(port); endpoint != NULL; \ diff --git a/cxl/filter.c b/cxl/filter.c index 5d80d1b3922a..2130816931e5 100644 --- a/cxl/filter.c +++ b/cxl/filter.c @@ -381,13 +381,16 @@ static struct json_object *pick_array(struct json_object *child, } static void walk_endpoints(struct cxl_port *port, struct cxl_filter_params *p, - struct json_object *jeps, unsigned long flags) + struct json_object *jeps, struct json_object *jdevs, + unsigned long flags) { struct cxl_endpoint *endpoint; cxl_endpoint_foreach(port, endpoint) { struct cxl_port *ep_port = cxl_endpoint_get_port(endpoint); - struct json_object *jendpoint; + const char *devname = cxl_endpoint_get_devname(endpoint); + struct json_object *jendpoint = NULL; + struct cxl_memdev *memdev; if (!util_cxl_endpoint_filter(endpoint, p->endpoint_filter)) continue; @@ -398,24 +401,54 @@ static void walk_endpoints(struct cxl_port *port, struct cxl_filter_params *p, continue; if (!p->idle && !cxl_endpoint_is_enabled(endpoint)) continue; - jendpoint = util_cxl_endpoint_to_json(endpoint, flags); - if (jendpoint) + if (p->endpoints) { + jendpoint = util_cxl_endpoint_to_json(endpoint, flags); + if (!jendpoint) { + err(p, "%s: failed to list\n", devname); + continue; + } json_object_array_add(jeps, jendpoint); + } + if (p->memdevs) { + struct json_object *jobj; + + memdev = cxl_endpoint_get_memdev(endpoint); + if (!memdev) + continue; + if (!util_cxl_memdev_filter(memdev, p->memdev_filter, + p->serial_filter)) + continue; + if (!p->idle && !cxl_memdev_is_enabled(memdev)) + continue; + jobj = util_cxl_memdev_to_json(memdev, flags); + if (!jobj) { + err(p, "failed to json serialize %s\n", + cxl_memdev_get_devname(memdev)); + continue; + } + if (p->endpoints) + json_object_object_add(jendpoint, "memdev", + jobj); + else + json_object_array_add(jdevs, jobj); + } } } static void walk_child_ports(struct cxl_port *parent_port, struct cxl_filter_params *p, struct json_object *jports, - struct json_object *jeps, unsigned long flags) + struct json_object *jeps, + struct json_object *jdevs, unsigned long flags) { struct cxl_port *port; cxl_port_foreach(parent_port, port) { const char *devname = cxl_port_get_devname(port); struct json_object *jport = NULL; + struct json_object *jchilddevs = NULL; struct json_object *jchildports = NULL; - struct json_object *jchildendpoints = NULL; + struct json_object *jchildeps = NULL; if (!util_cxl_port_filter(port, p->port_filter, pf_mode(p))) goto walk_children; @@ -436,28 +469,41 @@ static void walk_child_ports(struct cxl_port *parent_port, devname); continue; } - } - if (p->ports && p->endpoints) { - jchildendpoints = json_object_new_array(); - if (!jchildendpoints) { - err(p, - "%s: failed to enumerate child endpoints\n", - devname); - continue; + if (p->memdevs && !p->endpoints) { + jchilddevs = json_object_new_array(); + if (!jchilddevs) { + err(p, + "%s: failed to enumerate child memdevs\n", + devname); + continue; + } + } + + if (p->endpoints) { + jchildeps = json_object_new_array(); + if (!jchildeps) { + err(p, + "%s: failed to enumerate child endpoints\n", + devname); + continue; + } } } walk_children: - if (p->endpoints) - walk_endpoints(port, p, pick_array(jchildendpoints, jeps), - flags); + if (p->endpoints || p->memdevs) + walk_endpoints(port, p, pick_array(jchildeps, jeps), + pick_array(jchilddevs, jdevs), flags); walk_child_ports(port, p, pick_array(jchildports, jports), - pick_array(jchildendpoints, jeps), flags); + pick_array(jchildeps, jeps), + pick_array(jchilddevs, jdevs), flags); cond_add_put_array_suffix(jport, "ports", devname, jchildports); cond_add_put_array_suffix(jport, "endpoints", devname, - jchildendpoints); + jchildeps); + cond_add_put_array_suffix(jport, "memdevs", devname, + jchilddevs); } } @@ -466,6 +512,7 @@ int cxl_filter_walk(struct cxl_ctx *ctx, struct cxl_filter_params *p) struct json_object *jdevs = NULL, *jbuses = NULL, *jports = NULL; struct json_object *jplatform = json_object_new_array(); unsigned long flags = params_to_flags(p); + struct json_object *janondevs = NULL; struct json_object *jeps = NULL; struct cxl_memdev *memdev; int top_level_objs = 0; @@ -476,8 +523,8 @@ int cxl_filter_walk(struct cxl_ctx *ctx, struct cxl_filter_params *p) return -ENOMEM; } - jdevs = json_object_new_array(); - if (!jdevs) + janondevs = json_object_new_array(); + if (!janondevs) goto err; jbuses = json_object_new_array(); @@ -492,20 +539,28 @@ int cxl_filter_walk(struct cxl_ctx *ctx, struct cxl_filter_params *p) if (!jeps) goto err; + jdevs = json_object_new_array(); + if (!jdevs) + goto err; + dbg(p, "walk memdevs\n"); cxl_memdev_foreach(ctx, memdev) { - struct json_object *jdev; + struct json_object *janondev; if (!util_cxl_memdev_filter(memdev, p->memdev_filter, p->serial_filter)) continue; + if (cxl_memdev_is_enabled(memdev)) + continue; + if (!p->idle) + continue; if (p->memdevs) { - jdev = util_cxl_memdev_to_json(memdev, flags); - if (!jdev) { + janondev = util_cxl_memdev_to_json(memdev, flags); + if (!janondev) { dbg(p, "memdev object allocation failure\n"); continue; } - json_object_array_add(jdevs, jdev); + json_object_array_add(janondevs, janondev); } } @@ -513,6 +568,7 @@ int cxl_filter_walk(struct cxl_ctx *ctx, struct cxl_filter_params *p) cxl_bus_foreach(ctx, bus) { struct json_object *jbus = NULL; struct json_object *jchildports = NULL; + struct json_object *jchilddevs = NULL; struct json_object *jchildeps = NULL; struct cxl_port *port = cxl_bus_get_port(bus); const char *devname = cxl_bus_get_devname(bus); @@ -546,17 +602,29 @@ int cxl_filter_walk(struct cxl_ctx *ctx, struct cxl_filter_params *p) continue; } } + + if (p->memdevs && !p->ports && !p->endpoints) { + jchilddevs = json_object_new_array(); + if (!jchilddevs) { + err(p, + "%s: failed to enumerate child memdevs\n", + devname); + continue; + } + } } walk_children: dbg(p, "walk ports\n"); walk_child_ports(port, p, pick_array(jchildports, jports), - pick_array(jchildeps, jeps), flags); + pick_array(jchildeps, jeps), + pick_array(jchilddevs, jdevs), flags); cond_add_put_array_suffix(jbus, "ports", devname, jchildports); cond_add_put_array_suffix(jbus, "endpoints", devname, jchildeps); + cond_add_put_array_suffix(jbus, "memdevs", devname, jchilddevs); } - if (json_object_array_length(jdevs)) + if (json_object_array_length(janondevs)) top_level_objs++; if (json_object_array_length(jbuses)) top_level_objs++; @@ -564,20 +632,24 @@ walk_children: top_level_objs++; if (json_object_array_length(jeps)) top_level_objs++; + if (json_object_array_length(jdevs)) + top_level_objs++; - splice_array(p, jdevs, jplatform, "anon memdevs", top_level_objs > 1); + splice_array(p, janondevs, jplatform, "anon memdevs", top_level_objs > 1); splice_array(p, jbuses, jplatform, "buses", top_level_objs > 1); splice_array(p, jports, jplatform, "ports", top_level_objs > 1); splice_array(p, jeps, jplatform, "endpoints", top_level_objs > 1); + splice_array(p, jdevs, jplatform, "memdevs", top_level_objs > 1); util_display_json_array(stdout, jplatform, flags); return 0; err: - json_object_put(jdevs); + json_object_put(janondevs); json_object_put(jbuses); json_object_put(jports); json_object_put(jeps); + json_object_put(jdevs); json_object_put(jplatform); return -ENOMEM; } diff --git a/cxl/json.c b/cxl/json.c index 18686867e0c5..b809332b8d51 100644 --- a/cxl/json.c +++ b/cxl/json.c @@ -224,6 +224,12 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev, if (jobj) json_object_object_add(jdev, "host", jobj); + if (!cxl_memdev_is_enabled(memdev)) { + jobj = json_object_new_string("disabled"); + if (jobj) + json_object_object_add(jdev, "state", jobj); + } + return jdev; } diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c index c4ddc7d80cff..4523ca630d11 100644 --- a/cxl/lib/libcxl.c +++ b/cxl/lib/libcxl.c @@ -480,6 +480,60 @@ CXL_EXPORT const char *cxl_memdev_get_firmware_verison(struct cxl_memdev *memdev return memdev->firmware_version; } +static struct cxl_endpoint *cxl_port_find_endpoint(struct cxl_port *parent_port, + struct cxl_memdev *memdev) +{ + struct cxl_endpoint *endpoint; + struct cxl_port *port; + + cxl_port_foreach(parent_port, port) { + cxl_endpoint_foreach(port, endpoint) + if (strcmp(cxl_endpoint_get_host(endpoint), + cxl_memdev_get_devname(memdev)) == 0) + return endpoint; + endpoint = cxl_port_find_endpoint(port, memdev); + if (endpoint) + return endpoint; + } + + return NULL; +} + +CXL_EXPORT struct cxl_endpoint * +cxl_memdev_get_endpoint(struct cxl_memdev *memdev) +{ + struct cxl_ctx *ctx = cxl_memdev_get_ctx(memdev); + struct cxl_endpoint *endpoint = NULL; + struct cxl_bus *bus; + + if (memdev->endpoint) + return memdev->endpoint; + + if (!cxl_memdev_is_enabled(memdev)) + return NULL; + + cxl_bus_foreach (ctx, bus) { + struct cxl_port *port = cxl_bus_get_port(bus); + + endpoint = cxl_port_find_endpoint(port, memdev); + if (endpoint) + break; + } + + if (!endpoint) + return NULL; + + if (endpoint->memdev && endpoint->memdev != memdev) + err(ctx, "%s assigned to %s not %s\n", + cxl_endpoint_get_devname(endpoint), + cxl_memdev_get_devname(endpoint->memdev), + cxl_memdev_get_devname(memdev)); + memdev->endpoint = endpoint; + endpoint->memdev = memdev; + + return endpoint; +} + CXL_EXPORT size_t cxl_memdev_get_label_size(struct cxl_memdev *memdev) { return memdev->lsa_size; @@ -495,6 +549,21 @@ static int is_enabled(const char *drvpath) return 1; } +CXL_EXPORT int cxl_memdev_is_enabled(struct cxl_memdev *memdev) +{ + struct cxl_ctx *ctx = cxl_memdev_get_ctx(memdev); + char *path = memdev->dev_buf; + int len = memdev->buf_len; + + if (snprintf(path, len, "%s/driver", memdev->dev_path) >= len) { + err(ctx, "%s: buffer too small!\n", + cxl_memdev_get_devname(memdev)); + return 0; + } + + return is_enabled(path); +} + CXL_EXPORT int cxl_memdev_nvdimm_bridge_active(struct cxl_memdev *memdev) { struct cxl_ctx *ctx = cxl_memdev_get_ctx(memdev); @@ -660,6 +729,34 @@ CXL_EXPORT int cxl_endpoint_is_enabled(struct cxl_endpoint *endpoint) return cxl_port_is_enabled(&endpoint->port); } +CXL_EXPORT struct cxl_memdev * +cxl_endpoint_get_memdev(struct cxl_endpoint *endpoint) +{ + struct cxl_ctx *ctx = cxl_endpoint_get_ctx(endpoint); + struct cxl_memdev *memdev; + + if (endpoint->memdev) + return endpoint->memdev; + + if (!cxl_endpoint_is_enabled(endpoint)) + return NULL; + + cxl_memdev_foreach(ctx, memdev) + if (strcmp(cxl_memdev_get_devname(memdev), + cxl_endpoint_get_host(endpoint)) == 0) { + if (memdev->endpoint && memdev->endpoint != endpoint) + err(ctx, "%s assigned to %s not %s\n", + cxl_memdev_get_devname(memdev), + cxl_endpoint_get_devname(memdev->endpoint), + cxl_endpoint_get_devname(endpoint)); + endpoint->memdev = memdev; + memdev->endpoint = endpoint; + return memdev; + } + + return NULL; +} + static void *add_cxl_port(void *parent, int id, const char *cxlport_base) { const char *devname = devpath_to_devname(cxlport_base); diff --git a/cxl/lib/libcxl.sym b/cxl/lib/libcxl.sym index 8f0688a95f5d..321acac57e3e 100644 --- a/cxl/lib/libcxl.sym +++ b/cxl/lib/libcxl.sym @@ -106,4 +106,7 @@ global: cxl_endpoint_get_parent; cxl_endpoint_get_port; cxl_endpoint_get_host; + cxl_endpoint_get_memdev; + cxl_memdev_get_endpoint; + cxl_memdev_is_enabled; } LIBCXL_1; diff --git a/cxl/libcxl.h b/cxl/libcxl.h index 5487b55d2fc0..790ece86529d 100644 --- a/cxl/libcxl.h +++ b/cxl/libcxl.h @@ -46,6 +46,8 @@ unsigned long long cxl_memdev_get_pmem_size(struct cxl_memdev *memdev); unsigned long long cxl_memdev_get_ram_size(struct cxl_memdev *memdev); const char *cxl_memdev_get_firmware_verison(struct cxl_memdev *memdev); size_t cxl_memdev_get_label_size(struct cxl_memdev *memdev); +struct cxl_endpoint; +struct cxl_endpoint *cxl_memdev_get_endpoint(struct cxl_memdev *memdev); int cxl_memdev_nvdimm_bridge_active(struct cxl_memdev *memdev); int cxl_memdev_zero_label(struct cxl_memdev *memdev, size_t length, size_t offset); @@ -100,6 +102,8 @@ int cxl_endpoint_is_enabled(struct cxl_endpoint *endpoint); struct cxl_port *cxl_endpoint_get_parent(struct cxl_endpoint *endpoint); struct cxl_port *cxl_endpoint_get_port(struct cxl_endpoint *endpoint); const char *cxl_endpoint_get_host(struct cxl_endpoint *endpoint); +struct cxl_memdev *cxl_endpoint_get_memdev(struct cxl_endpoint *endpoint); +int cxl_memdev_is_enabled(struct cxl_memdev *memdev); #define cxl_endpoint_foreach(port, endpoint) \ for (endpoint = cxl_endpoint_get_first(port); endpoint != NULL; \

[ndctl,22/37] cxl/list: Move enabled memdevs underneath their endpoint

Commit Message

Patch