@@ -81,6 +81,7 @@ ForEachMacros:
- 'cxl_bus_foreach'
- 'cxl_port_foreach'
- 'cxl_decoder_foreach'
+ - 'cxl_decoder_foreach_reverse'
- 'cxl_target_foreach'
- 'cxl_dport_foreach'
- 'cxl_endpoint_foreach'
@@ -394,6 +394,7 @@ unsigned long long cxl_decoder_get_resource(struct cxl_decoder *decoder);
unsigned long long cxl_decoder_get_size(struct cxl_decoder *decoder);
unsigned long long cxl_decoder_get_dpa_resource(struct cxl_decoder *decoder);
unsigned long long cxl_decoder_get_dpa_size(struct cxl_decoder *decoder);
+int cxl_decoder_set_dpa_size(struct cxl_decoder *decoder, unsigned long long size);
const char *cxl_decoder_get_devname(struct cxl_decoder *decoder);
int cxl_decoder_get_id(struct cxl_decoder *decoder);
int cxl_decoder_get_nr_targets(struct cxl_decoder *decoder);
@@ -413,6 +414,7 @@ enum cxl_decoder_mode {
CXL_DECODER_MODE_RAM,
};
enum cxl_decoder_mode cxl_decoder_get_mode(struct cxl_decoder *decoder);
+int cxl_decoder_set_mode(struct cxl_decoder *decoder, enum cxl_decoder_mode mode);
bool cxl_decoder_is_pmem_capable(struct cxl_decoder *decoder);
bool cxl_decoder_is_volatile_capable(struct cxl_decoder *decoder);
@@ -12,6 +12,8 @@ int cmd_init_labels(int argc, const char **argv, struct cxl_ctx *ctx);
int cmd_check_labels(int argc, const char **argv, struct cxl_ctx *ctx);
int cmd_disable_memdev(int argc, const char **argv, struct cxl_ctx *ctx);
int cmd_enable_memdev(int argc, const char **argv, struct cxl_ctx *ctx);
+int cmd_reserve_dpa(int argc, const char **argv, struct cxl_ctx *ctx);
+int cmd_free_dpa(int argc, const char **argv, struct cxl_ctx *ctx);
int cmd_disable_port(int argc, const char **argv, struct cxl_ctx *ctx);
int cmd_enable_port(int argc, const char **argv, struct cxl_ctx *ctx);
int cmd_set_partition(int argc, const char **argv, struct cxl_ctx *ctx);
@@ -66,6 +66,8 @@ static struct cmd_struct commands[] = {
{ "write-labels", .c_fn = cmd_write_labels },
{ "disable-memdev", .c_fn = cmd_disable_memdev },
{ "enable-memdev", .c_fn = cmd_enable_memdev },
+ { "reserve-dpa", .c_fn = cmd_reserve_dpa },
+ { "free-dpa", .c_fn = cmd_free_dpa },
{ "disable-port", .c_fn = cmd_disable_port },
{ "enable-port", .c_fn = cmd_enable_port },
{ "set-partition", .c_fn = cmd_set_partition },
@@ -380,8 +380,8 @@ struct cxl_port *util_cxl_port_filter_by_memdev(struct cxl_port *port,
return NULL;
}
-static struct cxl_decoder *util_cxl_decoder_filter(struct cxl_decoder *decoder,
- const char *__ident)
+struct cxl_decoder *util_cxl_decoder_filter(struct cxl_decoder *decoder,
+ const char *__ident)
{
struct cxl_port *port = cxl_decoder_get_port(decoder);
int pid, did;
@@ -50,6 +50,8 @@ struct cxl_target *util_cxl_target_filter_by_memdev(struct cxl_target *target,
struct cxl_dport *util_cxl_dport_filter_by_memdev(struct cxl_dport *dport,
const char *ident,
const char *serial);
+struct cxl_decoder *util_cxl_decoder_filter(struct cxl_decoder *decoder,
+ const char *__ident);
int cxl_filter_walk(struct cxl_ctx *ctx, struct cxl_filter_params *param);
bool cxl_filter_has(const char *needle, const char *__filter);
#endif /* _CXL_UTIL_FILTER_H_ */
@@ -1120,6 +1120,20 @@ CXL_EXPORT struct cxl_decoder *cxl_decoder_get_next(struct cxl_decoder *decoder)
return list_next(&port->decoders, decoder, list);
}
+CXL_EXPORT struct cxl_decoder *cxl_decoder_get_last(struct cxl_port *port)
+{
+ cxl_decoders_init(port);
+
+ return list_tail(&port->decoders, struct cxl_decoder, list);
+}
+
+CXL_EXPORT struct cxl_decoder *cxl_decoder_get_prev(struct cxl_decoder *decoder)
+{
+ struct cxl_port *port = decoder->port;
+
+ return list_prev(&port->decoders, decoder, list);
+}
+
CXL_EXPORT struct cxl_ctx *cxl_decoder_get_ctx(struct cxl_decoder *decoder)
{
return decoder->ctx;
@@ -1175,6 +1189,78 @@ cxl_decoder_get_dpa_size(struct cxl_decoder *decoder)
return decoder->dpa_size;
}
+CXL_EXPORT int cxl_decoder_set_dpa_size(struct cxl_decoder *decoder,
+ unsigned long long size)
+{
+ struct cxl_port *port = cxl_decoder_get_port(decoder);
+ struct cxl_ctx *ctx = cxl_decoder_get_ctx(decoder);
+ char *path = decoder->dev_buf;
+ int len = decoder->buf_len, rc;
+ char buf[SYSFS_ATTR_SIZE];
+
+ if (!cxl_port_is_endpoint(port)) {
+ err(ctx, "%s: not an endpoint decoder\n",
+ cxl_decoder_get_devname(decoder));
+ return -EINVAL;
+ }
+
+ if (snprintf(path, len, "%s/dpa_size", decoder->dev_path) >= len) {
+ err(ctx, "%s: buffer too small!\n",
+ cxl_decoder_get_devname(decoder));
+ return -ENOMEM;
+ }
+
+ sprintf(buf, "%#llx\n", size);
+ rc = sysfs_write_attr(ctx, path, buf);
+ if (rc < 0)
+ return rc;
+
+ decoder->dpa_size = size;
+ return 0;
+}
+
+CXL_EXPORT int cxl_decoder_set_mode(struct cxl_decoder *decoder,
+ enum cxl_decoder_mode mode)
+{
+ struct cxl_port *port = cxl_decoder_get_port(decoder);
+ struct cxl_ctx *ctx = cxl_decoder_get_ctx(decoder);
+ char *path = decoder->dev_buf;
+ int len = decoder->buf_len, rc;
+ char buf[SYSFS_ATTR_SIZE];
+
+ if (!cxl_port_is_endpoint(port)) {
+ err(ctx, "%s: not an endpoint decoder\n",
+ cxl_decoder_get_devname(decoder));
+ return -EINVAL;
+ }
+
+ switch (mode) {
+ case CXL_DECODER_MODE_PMEM:
+ sprintf(buf, "pmem");
+ break;
+ case CXL_DECODER_MODE_RAM:
+ sprintf(buf, "ram");
+ break;
+ default:
+ err(ctx, "%s: unsupported mode: %d\n",
+ cxl_decoder_get_devname(decoder), mode);
+ return -EINVAL;
+ }
+
+ if (snprintf(path, len, "%s/mode", decoder->dev_path) >= len) {
+ err(ctx, "%s: buffer too small!\n",
+ cxl_decoder_get_devname(decoder));
+ return -ENOMEM;
+ }
+
+ rc = sysfs_write_attr(ctx, path, buf);
+ if (rc < 0)
+ return rc;
+
+ decoder->mode = mode;
+ return 0;
+}
+
CXL_EXPORT enum cxl_decoder_mode
cxl_decoder_get_mode(struct cxl_decoder *decoder)
{
@@ -173,4 +173,8 @@ global:
cxl_decoder_get_dpa_resource;
cxl_decoder_get_dpa_size;
cxl_decoder_get_mode;
+ cxl_decoder_get_last;
+ cxl_decoder_get_prev;
+ cxl_decoder_set_dpa_size;
+ cxl_decoder_set_mode;
} LIBCXL_2;
@@ -139,6 +139,7 @@ enum cxl_decoder_mode {
CXL_DECODER_MODE_PMEM,
CXL_DECODER_MODE_RAM,
};
+
static inline const char *cxl_decoder_mode_name(enum cxl_decoder_mode mode)
{
static const char *names[] = {
@@ -154,6 +155,10 @@ static inline const char *cxl_decoder_mode_name(enum cxl_decoder_mode mode)
}
enum cxl_decoder_mode cxl_decoder_get_mode(struct cxl_decoder *decoder);
+int cxl_decoder_set_mode(struct cxl_decoder *decoder,
+ enum cxl_decoder_mode mode);
+int cxl_decoder_set_dpa_size(struct cxl_decoder *decoder,
+ unsigned long long size);
const char *cxl_decoder_get_devname(struct cxl_decoder *decoder);
struct cxl_target *cxl_decoder_get_target_by_memdev(struct cxl_decoder *decoder,
struct cxl_memdev *memdev);
@@ -182,6 +187,10 @@ bool cxl_decoder_is_locked(struct cxl_decoder *decoder);
for (decoder = cxl_decoder_get_first(port); decoder != NULL; \
decoder = cxl_decoder_get_next(decoder))
+#define cxl_decoder_foreach_reverse(port, decoder) \
+ for (decoder = cxl_decoder_get_last(port); decoder != NULL; \
+ decoder = cxl_decoder_get_prev(decoder))
+
struct cxl_target;
struct cxl_target *cxl_target_get_first(struct cxl_decoder *decoder);
struct cxl_target *cxl_target_get_next(struct cxl_target *target);
@@ -33,6 +33,7 @@ static struct parameters {
bool align;
const char *type;
const char *size;
+ const char *decoder_filter;
} param;
static struct log_ctx ml;
@@ -71,6 +72,19 @@ OPT_STRING('s', "size", ¶m.size, "size", \
OPT_BOOLEAN('a', "align", ¶m.align, \
"auto-align --size per device's requirement")
+#define RESERVE_DPA_OPTIONS() \
+OPT_STRING('s', "size", ¶m.size, "size", \
+ "size in bytes (Default: all available capacity)")
+
+#define DPA_OPTIONS() \
+OPT_STRING('d', "decoder", ¶m.decoder_filter, \
+ "decoder instance id", \
+ "override the automatic decoder selection"), \
+OPT_STRING('t', "type", ¶m.type, "type", \
+ "'pmem' or 'ram' (volatile) (Default: 'pmem')"), \
+OPT_BOOLEAN('f', "force", ¶m.force, \
+ "Attempt 'expected to fail' operations")
+
static const struct option read_options[] = {
BASE_OPTIONS(),
LABEL_OPTIONS(),
@@ -108,6 +122,238 @@ static const struct option set_partition_options[] = {
OPT_END(),
};
+static const struct option reserve_dpa_options[] = {
+ BASE_OPTIONS(),
+ RESERVE_DPA_OPTIONS(),
+ DPA_OPTIONS(),
+ OPT_END(),
+};
+
+static const struct option free_dpa_options[] = {
+ BASE_OPTIONS(),
+ DPA_OPTIONS(),
+ OPT_END(),
+};
+
+enum reserve_dpa_mode {
+ DPA_ALLOC,
+ DPA_FREE,
+};
+
+static int __reserve_dpa(struct cxl_memdev *memdev,
+ enum reserve_dpa_mode alloc_mode,
+ struct action_context *actx)
+{
+ struct cxl_decoder *decoder, *auto_target = NULL, *target = NULL;
+ struct cxl_endpoint *endpoint = cxl_memdev_get_endpoint(memdev);
+ const char *devname = cxl_memdev_get_devname(memdev);
+ unsigned long long avail_dpa, size;
+ enum cxl_decoder_mode mode;
+ struct cxl_port *port;
+ char buf[256];
+ int rc;
+
+ if (param.type) {
+ if (strcmp(param.type, "ram") == 0)
+ mode = CXL_DECODER_MODE_RAM;
+ else if (strcmp(param.type, "volatile") == 0)
+ mode = CXL_DECODER_MODE_RAM;
+ else if (strcmp(param.type, "ram") == 0)
+ mode = CXL_DECODER_MODE_RAM;
+ else if (strcmp(param.type, "pmem") == 0)
+ mode = CXL_DECODER_MODE_PMEM;
+ else {
+ log_err(&ml, "%s: unsupported type: %s\n", devname,
+ param.type);
+ return -EINVAL;
+ }
+ } else
+ mode = CXL_DECODER_MODE_RAM;
+
+ if (!endpoint) {
+ log_err(&ml, "%s: CXL operation disabled\n", devname);
+ return -ENXIO;
+ }
+
+ port = cxl_endpoint_get_port(endpoint);
+
+ if (mode == CXL_DECODER_MODE_RAM)
+ avail_dpa = cxl_memdev_get_ram_size(memdev);
+ else
+ avail_dpa = cxl_memdev_get_pmem_size(memdev);
+
+ cxl_decoder_foreach(port, decoder) {
+ size = cxl_decoder_get_dpa_size(decoder);
+ if (size == ULLONG_MAX)
+ continue;
+ if (cxl_decoder_get_mode(decoder) != mode)
+ continue;
+
+ if (size > avail_dpa) {
+ log_err(&ml, "%s: capacity accounting error\n", devname);
+ return -ENXIO;
+ }
+ avail_dpa -= size;
+ }
+
+ if (!param.size)
+ if (alloc_mode == DPA_ALLOC) {
+ size = avail_dpa;
+ if (!avail_dpa) {
+ log_err(&ml, "%s: no available capacity\n", devname);
+ return -ENOSPC;
+ }
+ } else
+ size = 0;
+ else {
+ size = parse_size64(param.size);
+ if (size == ULLONG_MAX) {
+ log_err(&ml, "%s: failed to parse size option '%s'\n",
+ devname, param.size);
+ return -EINVAL;
+ }
+ if (size > avail_dpa) {
+ log_err(&ml, "%s: '%s' exceeds available capacity\n",
+ devname, param.size);
+ if (!param.force)
+ return -ENOSPC;
+ }
+ }
+
+ /*
+ * Find next free decoder, assumes cxl_decoder_foreach() is in
+ * hardware instance-id order
+ */
+ if (alloc_mode == DPA_ALLOC)
+ cxl_decoder_foreach(port, decoder) {
+ /* first 0-dpa_size is our target */
+ if (cxl_decoder_get_dpa_size(decoder) == 0) {
+ auto_target = decoder;
+ break;
+ }
+ }
+ else
+ cxl_decoder_foreach_reverse(port, decoder) {
+ /* nothing to free? */
+ if (!cxl_decoder_get_dpa_size(decoder))
+ continue;
+ /*
+ * Active decoders can't be freed, and by definition all
+ * previous decoders must also be active
+ */
+ if (cxl_decoder_get_size(decoder))
+ break;
+ /* first dpa_size > 0 + disabled decoder is our target */
+ if (cxl_decoder_get_dpa_size(decoder) < ULLONG_MAX) {
+ auto_target = decoder;
+ break;
+ }
+ }
+
+ if (param.decoder_filter) {
+ unsigned long id;
+ char *end;
+
+ id = strtoul(param.decoder_filter, &end, 0);
+ /* allow for standalone ordinal decoder ids */
+ if (*end == '\0')
+ rc = snprintf(buf, sizeof(buf), "decoder%d.%ld",
+ cxl_port_get_id(port), id);
+ else
+ rc = snprintf(buf, sizeof(buf), "%s",
+ param.decoder_filter);
+
+ if (rc >= (int) sizeof(buf)) {
+ log_err(&ml, "%s: decoder filter '%s' too long\n",
+ devname, param.decoder_filter);
+ return -EINVAL;
+ }
+
+ if (alloc_mode == DPA_ALLOC)
+ cxl_decoder_foreach(port, decoder) {
+ target = util_cxl_decoder_filter(decoder, buf);
+ if (target)
+ break;
+ }
+ else
+ cxl_decoder_foreach_reverse(port, decoder) {
+ target = util_cxl_decoder_filter(decoder, buf);
+ if (target)
+ break;
+ }
+
+ if (!target) {
+ log_err(&ml, "%s: no match for decoder: '%s'\n",
+ devname, param.decoder_filter);
+ return -ENXIO;
+ }
+
+ if (target != auto_target) {
+ log_err(&ml, "%s: %s is out of sequence\n", devname,
+ cxl_decoder_get_devname(target));
+ if (!param.force)
+ return -EINVAL;
+ }
+ }
+
+ if (!target)
+ target = auto_target;
+
+ if (!target) {
+ log_err(&ml, "%s: no suitable decoder found\n", devname);
+ return -ENXIO;
+ }
+
+ if (cxl_decoder_get_mode(target) != mode) {
+ rc = cxl_decoder_set_dpa_size(target, 0);
+ if (rc) {
+ log_err(&ml,
+ "%s: %s: failed to clear allocation to set mode\n",
+ devname, cxl_decoder_get_devname(target));
+ return rc;
+ }
+ rc = cxl_decoder_set_mode(target, mode);
+ if (rc) {
+ log_err(&ml, "%s: %s: failed to set %s mode\n", devname,
+ cxl_decoder_get_devname(target),
+ mode == CXL_DECODER_MODE_PMEM ? "pmem" : "ram");
+ return rc;
+ }
+ }
+
+ rc = cxl_decoder_set_dpa_size(target, size);
+ if (rc)
+ log_err(&ml, "%s: %s: failed to set dpa allocation\n", devname,
+ cxl_decoder_get_devname(target));
+ else {
+ struct json_object *jdev, *jdecoder;
+ unsigned long flags = 0;
+
+ if (actx->f_out == stdout && isatty(1))
+ flags |= UTIL_JSON_HUMAN;
+ jdev = util_cxl_memdev_to_json(memdev, flags);
+ jdecoder = util_cxl_decoder_to_json(target, flags);
+ if (!jdev || !jdecoder) {
+ json_object_put(jdev);
+ json_object_put(jdecoder);
+ } else {
+ json_object_object_add(jdev, "decoder", jdecoder);
+ json_object_array_add(actx->jdevs, jdev);
+ }
+ }
+ return rc;
+}
+
+static int action_reserve_dpa(struct cxl_memdev *memdev, struct action_context *actx)
+{
+ return __reserve_dpa(memdev, DPA_ALLOC, actx);
+}
+
+static int action_free_dpa(struct cxl_memdev *memdev, struct action_context *actx)
+{
+ return __reserve_dpa(memdev, DPA_FREE, actx);
+}
+
static int action_disable(struct cxl_memdev *memdev, struct action_context *actx)
{
if (!cxl_memdev_is_enabled(memdev))
@@ -452,7 +698,8 @@ static int memdev_action(int argc, const char **argv, struct cxl_ctx *ctx,
err++;
}
- if (action == action_setpartition)
+ if (action == action_setpartition || action == action_reserve_dpa ||
+ action == action_free_dpa)
actx.jdevs = json_object_new_array();
if (err == argc) {
@@ -495,6 +742,8 @@ static int memdev_action(int argc, const char **argv, struct cxl_ctx *ctx,
count = 0;
for (i = 0; i < argc; i++) {
+ bool found = false;
+
cxl_memdev_foreach(ctx, memdev) {
const char *memdev_filter = NULL;
const char *serial_filter = NULL;
@@ -507,6 +756,7 @@ static int memdev_action(int argc, const char **argv, struct cxl_ctx *ctx,
if (!util_cxl_memdev_filter(memdev, memdev_filter,
serial_filter))
continue;
+ found = true;
if (action == action_write) {
single = memdev;
@@ -519,6 +769,8 @@ static int memdev_action(int argc, const char **argv, struct cxl_ctx *ctx,
else if (rc && !err)
err = rc;
}
+ if (!found)
+ log_info(&ml, "no memdev matches %s\n", argv[i]);
}
rc = err;
@@ -622,3 +874,25 @@ int cmd_set_partition(int argc, const char **argv, struct cxl_ctx *ctx)
return count >= 0 ? 0 : EXIT_FAILURE;
}
+
+int cmd_reserve_dpa(int argc, const char **argv, struct cxl_ctx *ctx)
+{
+ int count = memdev_action(
+ argc, argv, ctx, action_reserve_dpa, reserve_dpa_options,
+ "cxl reserve-dpa <mem0> [<mem1>..<memn>] [<options>]");
+ log_info(&ml, "reservation completed on %d mem device%s\n",
+ count >= 0 ? count : 0, count > 1 ? "s" : "");
+
+ return count >= 0 ? 0 : EXIT_FAILURE;
+}
+
+int cmd_free_dpa(int argc, const char **argv, struct cxl_ctx *ctx)
+{
+ int count = memdev_action(
+ argc, argv, ctx, action_free_dpa, free_dpa_options,
+ "cxl free-dpa <mem0> [<mem1>..<memn>] [<options>]");
+ log_info(&ml, "reservation release completed on %d mem device%s\n",
+ count >= 0 ? count : 0, count > 1 ? "s" : "");
+
+ return count >= 0 ? 0 : EXIT_FAILURE;
+}
Add helper commands for managing allocations of DPA (device physical address) capacity on a set of CXL memory devices. The main convenience this command affords is automatically picking the next decoder to allocate per-memdev. For example, to allocate 256MiB from all endpoints that are covered by a given root decoder, and collect those resulting endpoint-decoders into an array: readarray -t mem < <(cxl list -M -d $decoder | jq -r ".[].memdev") readarray -t endpoint < <(cxl reserve-dpa -t pmem ${mem[*]} -s $((256<<20)) | jq -r ".[] | .decoder.decoder") Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- .clang-format | 1 Documentation/cxl/lib/libcxl.txt | 2 cxl/builtin.h | 2 cxl/cxl.c | 2 cxl/filter.c | 4 - cxl/filter.h | 2 cxl/lib/libcxl.c | 86 ++++++++++++ cxl/lib/libcxl.sym | 4 + cxl/libcxl.h | 9 + cxl/memdev.c | 276 ++++++++++++++++++++++++++++++++++++++ 10 files changed, 385 insertions(+), 3 deletions(-)