Add the 'cxl-inject-protocol-error' command. This command provides CXL protocol error injection for CXL VH root ports and CXL RCH downstream ports.
Add util_cxl_dport_filter() to find downstream ports by device name. Signed-off-by: Ben Cheatham <[email protected]> --- cxl/builtin.h | 1 + cxl/cxl.c | 1 + cxl/filter.c | 26 +++++++++ cxl/filter.h | 2 + cxl/inject-error.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ cxl/meson.build | 1 + 6 files changed, 174 insertions(+) create mode 100644 cxl/inject-error.c diff --git a/cxl/builtin.h b/cxl/builtin.h index c483f30..ca2e4d1 100644 --- a/cxl/builtin.h +++ b/cxl/builtin.h @@ -25,6 +25,7 @@ int cmd_create_region(int argc, const char **argv, struct cxl_ctx *ctx); int cmd_enable_region(int argc, const char **argv, struct cxl_ctx *ctx); int cmd_disable_region(int argc, const char **argv, struct cxl_ctx *ctx); int cmd_destroy_region(int argc, const char **argv, struct cxl_ctx *ctx); +int cmd_inject_protocol_error(int argc, const char **argv, struct cxl_ctx *ctx); #ifdef ENABLE_LIBTRACEFS int cmd_monitor(int argc, const char **argv, struct cxl_ctx *ctx); #else diff --git a/cxl/cxl.c b/cxl/cxl.c index 1643667..00ecda0 100644 --- a/cxl/cxl.c +++ b/cxl/cxl.c @@ -80,6 +80,7 @@ static struct cmd_struct commands[] = { { "disable-region", .c_fn = cmd_disable_region }, { "destroy-region", .c_fn = cmd_destroy_region }, { "monitor", .c_fn = cmd_monitor }, + { "inject-protocol-error", .c_fn = cmd_inject_protocol_error }, }; int main(int argc, const char **argv) diff --git a/cxl/filter.c b/cxl/filter.c index b135c04..8c7dc6e 100644 --- a/cxl/filter.c +++ b/cxl/filter.c @@ -171,6 +171,32 @@ util_cxl_endpoint_filter_by_port(struct cxl_endpoint *endpoint, return NULL; } +struct cxl_dport *util_cxl_dport_filter(struct cxl_dport *dport, + const char *__ident) +{ + + char *ident, *save; + const char *arg; + + if (!__ident) + return dport; + + ident = strdup(__ident); + if (!ident) + return NULL; + + for (arg = strtok_r(ident, which_sep(__ident), &save); arg; + arg = strtok_r(NULL, which_sep(__ident), &save)) { + if (strcmp(arg, cxl_dport_get_devname(dport)) == 0) + break; + } + + free(ident); + if (arg) + return dport; + return NULL; +} + static struct cxl_decoder * util_cxl_decoder_filter_by_port(struct cxl_decoder *decoder, const char *ident, enum cxl_port_filter_mode mode) diff --git a/cxl/filter.h b/cxl/filter.h index 956a46e..70463c4 100644 --- a/cxl/filter.h +++ b/cxl/filter.h @@ -55,6 +55,8 @@ enum cxl_port_filter_mode { struct cxl_port *util_cxl_port_filter(struct cxl_port *port, const char *ident, enum cxl_port_filter_mode mode); +struct cxl_dport *util_cxl_dport_filter(struct cxl_dport *dport, + const char *__ident); struct cxl_bus *util_cxl_bus_filter(struct cxl_bus *bus, const char *__ident); struct cxl_endpoint *util_cxl_endpoint_filter(struct cxl_endpoint *endpoint, const char *__ident); diff --git a/cxl/inject-error.c b/cxl/inject-error.c new file mode 100644 index 0000000..ed6fb36 --- /dev/null +++ b/cxl/inject-error.c @@ -0,0 +1,143 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2025 AMD. All rights reserved. */ +#include <util/parse-options.h> +#include <cxl/libcxl.h> +#include <cxl/filter.h> +#include <util/log.h> +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <limits.h> + +static bool debug; + +static struct proto_inject_params { + const char *proto; + const char *severity; +} proto_inj_param; + +static const struct option proto_inject_options[] = { + OPT_STRING('p', "protocol", &proto_inj_param.proto, "mem/cache", + "Which CXL protocol error to inject into <dport>"), + OPT_STRING('s', "severity", &proto_inj_param.severity, + "correctable/uncorrectable/fatal", + "Severity of CXL protocol to inject into <dport>"), +#ifdef ENABLE_DEBUG + OPT_BOOLEAN(0, "debug", &debug, "turn on debug output"), +#endif + OPT_END(), +}; + +static struct log_ctx iel; + +static struct cxl_protocol_error *find_cxl_proto_err(struct cxl_ctx *ctx, + const char *type, + const char *severity) +{ + struct cxl_protocol_error *pe; + char perror[256] = { 0 }; + size_t len; + + len = snprintf(perror, sizeof(perror), "%s-%s", type, + severity); + if (len >= sizeof(perror)) { + log_err(&iel, "Buffer too small\n"); + return NULL; + } + + cxl_protocol_error_foreach(ctx, pe) { + if (strcmp(perror, cxl_protocol_error_get_str(pe)) == 0) + return pe; + } + + log_err(&iel, "Invalid CXL protocol error type: %s\n", perror); + return NULL; +} + +static struct cxl_dport *find_cxl_dport(struct cxl_ctx *ctx, const char *devname) +{ + struct cxl_dport *dport; + struct cxl_port *port; + struct cxl_bus *bus; + + cxl_bus_foreach(ctx, bus) + cxl_port_foreach_all(cxl_bus_get_port(bus), port) + cxl_dport_foreach(port, dport) + if (util_cxl_dport_filter(dport, devname)) + return dport; + + log_err(&iel, "Downstream port \"%s\" not found\n", devname); + return NULL; +} + +static int inject_proto_err(struct cxl_ctx *ctx, const char *devname, + struct cxl_protocol_error *perror) +{ + struct cxl_dport *dport; + int rc; + + if (!devname) { + log_err(&iel, "No downstream port specified for injection\n"); + return -EINVAL; + } + + dport = find_cxl_dport(ctx, devname); + if (!dport) + return -ENODEV; + + rc = cxl_dport_protocol_error_inject(dport, + cxl_protocol_error_get_num(perror)); + if (rc) + return rc; + + log_info(&iel, "injected %s protocol error.\n", + cxl_protocol_error_get_str(perror)); + return 0; +} + +static int inject_protocol_action(int argc, const char **argv, + struct cxl_ctx *ctx, + const struct option *options, + const char *usage) +{ + struct cxl_protocol_error *perr; + const char * const u[] = { + usage, + NULL + }; + int rc = -EINVAL; + + log_init(&iel, "cxl inject-protocol-error", "CXL_INJECT_LOG"); + argc = parse_options(argc, argv, options, u, 0); + + if (debug) { + cxl_set_log_priority(ctx, LOG_DEBUG); + iel.log_priority = LOG_DEBUG; + } else { + iel.log_priority = LOG_INFO; + } + + if (argc != 1 || proto_inj_param.proto == NULL || + proto_inj_param.severity == NULL) { + usage_with_options(u, options); + return rc; + } + + perr = find_cxl_proto_err(ctx, proto_inj_param.proto, + proto_inj_param.severity); + if (perr) { + rc = inject_proto_err(ctx, argv[0], perr); + if (rc) + log_err(&iel, "Failed to inject error: %d\n", rc); + } + + return rc; +} + +int cmd_inject_protocol_error(int argc, const char **argv, struct cxl_ctx *ctx) +{ + int rc = inject_protocol_action(argc, argv, ctx, proto_inject_options, + "inject-protocol-error <dport> -p <protocol> -s <severity> [<options>]"); + + return rc ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/cxl/meson.build b/cxl/meson.build index b9924ae..92031b5 100644 --- a/cxl/meson.build +++ b/cxl/meson.build @@ -7,6 +7,7 @@ cxl_src = [ 'memdev.c', 'json.c', 'filter.c', + 'inject-error.c', '../daxctl/json.c', '../daxctl/filter.c', ] -- 2.52.0
