Currently the code assumes that only nfit supports error injection, remove those assumptions before error injection support for PAPR is added. Add bus operations similar to that of DIMM operations with injection operations in it. Signed-off-by: Santosh Sivaraj <santosh(a)fossix.org&gt; --- This patch series is on top of Shiva's SMART test patches for PAPR[1]. [1]: https://lkml.kernel.org/r/161711738576.593.320964839920955692.stgit@9add6... ndctl/lib/inject.c | 96 ++++++++++++++++++++------------------------ ndctl/lib/libndctl.c | 11 +++-- ndctl/lib/nfit.c | 20 +++++++++ ndctl/lib/private.h | 12 ++++++ 4 files changed, 83 insertions(+), 56 deletions(-) diff --git a/ndctl/lib/inject.c b/ndctl/lib/inject.c index d61c02c..35fd11e 100644 --- a/ndctl/lib/inject.c +++ b/ndctl/lib/inject.c @@ -6,19 +6,15 @@ #include <util/size.h> #include <ndctl/libndctl.h> #include <ccan/list/list.h> -#include <ndctl/libndctl-nfit.h> #include <ccan/short_types/short_types.h> #include "private.h" NDCTL_EXPORT int ndctl_bus_has_error_injection(struct ndctl_bus *bus) { - /* Currently, only nfit buses have error injection */ - if (!bus || !ndctl_bus_has_nfit(bus)) + if (!bus) return 0; - if (ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_ARS_INJECT_SET) && - ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_ARS_INJECT_GET) && - ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_ARS_INJECT_CLEAR)) + if (bus->ops->err_inj_supported(bus)) return 1; return 0; @@ -151,7 +147,7 @@ static int ndctl_namespace_inject_one_error(struct ndctl_namespace *ndns, length = clear_unit; } - cmd = ndctl_bus_cmd_new_err_inj(bus); + cmd = bus->ops->new_err_inj(bus); if (!cmd) return -ENOMEM; @@ -185,8 +181,6 @@ NDCTL_EXPORT int ndctl_namespace_inject_error2(struct ndctl_namespace *ndns, if (!ndctl_bus_has_error_injection(bus)) return -EOPNOTSUPP; - if (!ndctl_bus_has_nfit(bus)) - return -EOPNOTSUPP; for (i = 0; i < count; i++) { rc = ndctl_namespace_inject_one_error(ndns, block + i, flags); @@ -231,7 +225,7 @@ static int ndctl_namespace_uninject_one_error(struct ndctl_namespace *ndns, length = clear_unit; } - cmd = ndctl_bus_cmd_new_err_inj_clr(bus); + cmd = bus->ops->new_err_inj_clr(bus); if (!cmd) return -ENOMEM; @@ -263,8 +257,6 @@ NDCTL_EXPORT int ndctl_namespace_uninject_error2(struct ndctl_namespace *ndns, if (!ndctl_bus_has_error_injection(bus)) return -EOPNOTSUPP; - if (!ndctl_bus_has_nfit(bus)) - return -EOPNOTSUPP; for (i = 0; i < count; i++) { rc = ndctl_namespace_uninject_one_error(ndns, block + i, @@ -445,51 +437,49 @@ NDCTL_EXPORT int ndctl_namespace_injection_status(struct ndctl_namespace *ndns) if (!ndctl_bus_has_error_injection(bus)) return -EOPNOTSUPP; - if (ndctl_bus_has_nfit(bus)) { - rc = ndctl_namespace_get_injection_bounds(ndns, &ns_offset, - &ns_size); - if (rc) - return rc; + rc = ndctl_namespace_get_injection_bounds(ndns, &ns_offset, + &ns_size); + if (rc) + return rc; - cmd = ndctl_bus_cmd_new_ars_cap(bus, ns_offset, ns_size); - if (!cmd) { - err(ctx, "%s: failed to create cmd\n", - ndctl_namespace_get_devname(ndns)); - return -ENOTTY; - } - rc = ndctl_cmd_submit(cmd); - if (rc < 0) { - dbg(ctx, "Error submitting ars_cap: %d\n", rc); - goto out; - } - buf_size = ndctl_cmd_ars_cap_get_size(cmd); - if (buf_size == 0) { - dbg(ctx, "Got an invalid max_ars_out from ars_cap\n"); - rc = -EINVAL; - goto out; - } - ndctl_cmd_unref(cmd); + cmd = ndctl_bus_cmd_new_ars_cap(bus, ns_offset, ns_size); + if (!cmd) { + err(ctx, "%s: failed to create cmd\n", + ndctl_namespace_get_devname(ndns)); + return -ENOTTY; + } + rc = ndctl_cmd_submit(cmd); + if (rc < 0) { + dbg(ctx, "Error submitting ars_cap: %d\n", rc); + goto out; + } + buf_size = ndctl_cmd_ars_cap_get_size(cmd); + if (buf_size == 0) { + dbg(ctx, "Got an invalid max_ars_out from ars_cap\n"); + rc = -EINVAL; + goto out; + } + ndctl_cmd_unref(cmd); - cmd = ndctl_bus_cmd_new_err_inj_stat(bus, buf_size); - if (!cmd) - return -ENOMEM; + cmd = bus->ops->new_err_inj_stat(bus, buf_size); + if (!cmd) + return -ENOMEM; - pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0]; - err_inj_stat = - (struct nd_cmd_ars_err_inj_stat *)&pkg->nd_payload[0]; + pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0]; + err_inj_stat = + (struct nd_cmd_ars_err_inj_stat *)&pkg->nd_payload[0]; - rc = ndctl_cmd_submit(cmd); - if (rc < 0) { - dbg(ctx, "Error submitting command: %d\n", rc); - goto out; - } - rc = injection_status_to_bb(ndns, err_inj_stat, - ns_offset, ns_size); - if (rc) { - dbg(ctx, "Error converting status to badblocks: %d\n", - rc); - goto out; - } + rc = ndctl_cmd_submit(cmd); + if (rc < 0) { + dbg(ctx, "Error submitting command: %d\n", rc); + goto out; + } + rc = injection_status_to_bb(ndns, err_inj_stat, + ns_offset, ns_size); + if (rc) { + dbg(ctx, "Error converting status to badblocks: %d\n", + rc); + goto out; } out: diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index 78e993a..2364578 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -864,6 +864,7 @@ static void *add_bus(void *parent, int id, const char *ctl_base) struct ndctl_ctx *ctx = parent; struct ndctl_bus *bus, *bus_dup; char *path = calloc(1, strlen(ctl_base) + 100); + char *bus_name; if (!path) return NULL; @@ -893,15 +894,19 @@ static void *add_bus(void *parent, int id, const char *ctl_base) } else { bus->has_nfit = 1; bus->revision = strtoul(buf, NULL, 0); + bus_name = "nfit"; + bus->ops = nfit_bus_ops; } sprintf(path, "%s/device/of_node/compatible", ctl_base); if (sysfs_read_attr(ctx, path, buf) < 0) bus->has_of_node = 0; - else + else { bus->has_of_node = 1; + bus_name = "papr"; + } - sprintf(path, "%s/device/nfit/dsm_mask", ctl_base); + sprintf(path, "%s/device/%s/dsm_mask", ctl_base, bus_name); if (sysfs_read_attr(ctx, path, buf) < 0) bus->nfit_dsm_mask = 0; else @@ -920,7 +925,7 @@ static void *add_bus(void *parent, int id, const char *ctl_base) if (!bus->wait_probe_path) goto err_read; - sprintf(path, "%s/device/nfit/scrub", ctl_base); + sprintf(path, "%s/device/%s/scrub", ctl_base, bus_name); bus->scrub_path = strdup(path); if (!bus->scrub_path) goto err_read; diff --git a/ndctl/lib/nfit.c b/ndctl/lib/nfit.c index 6f68fcf..8ad0056 100644 --- a/ndctl/lib/nfit.c +++ b/ndctl/lib/nfit.c @@ -5,6 +5,19 @@ #include "private.h" #include <ndctl/libndctl-nfit.h> +static int nfit_is_errinj_supported(struct ndctl_bus *bus) +{ + if (!ndctl_bus_has_nfit(bus)) + return 0; + + if (ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_ARS_INJECT_SET) && + ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_ARS_INJECT_GET) && + ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_ARS_INJECT_CLEAR)) + return 1; + + return 0; +} + static u32 bus_get_firmware_status(struct ndctl_cmd *cmd) { struct nd_cmd_bus *cmd_bus = cmd->cmd_bus; @@ -234,3 +247,10 @@ struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_stat(struct ndctl_bus *bus, return cmd; } + +struct ndctl_bus_ops *const nfit_bus_ops = &(struct ndctl_bus_ops) { + .new_err_inj = ndctl_bus_cmd_new_err_inj, + .new_err_inj_clr = ndctl_bus_cmd_new_err_inj_clr, + .new_err_inj_stat = ndctl_bus_cmd_new_err_inj_stat, + .err_inj_supported = nfit_is_errinj_supported, +}; diff --git a/ndctl/lib/private.h b/ndctl/lib/private.h index c4a943d..0f36c67 100644 --- a/ndctl/lib/private.h +++ b/ndctl/lib/private.h @@ -157,6 +157,7 @@ struct ndctl_bus { struct list_head dimms; struct list_head regions; struct list_node list; + struct ndctl_bus_ops *ops; int dimms_init; int regions_init; int has_nfit; @@ -372,6 +373,17 @@ static inline int check_kmod(struct kmod_ctx *kmod_ctx) int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus, unsigned long long addr, unsigned int *handle, unsigned long long *dpa); + +struct ndctl_bus_ops { + int (*err_inj_supported)(struct ndctl_bus *bus); + struct ndctl_cmd *(*new_err_inj)(struct ndctl_bus *bus); + struct ndctl_cmd *(*new_err_inj_clr)(struct ndctl_bus *bus); + struct ndctl_cmd *(*new_err_inj_stat)(struct ndctl_bus *bus, + u32 buf_len); +}; + +extern struct ndctl_bus_ops * const nfit_bus_ops; + struct ndctl_cmd *ndctl_bus_cmd_new_err_inj(struct ndctl_bus *bus); struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_clr(struct ndctl_bus *bus); struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_stat(struct ndctl_bus *bus, -- 2.30.2