From: Dan Williams <[email protected]> From: Dan Williams <[email protected]>
Use the new bb_iter mechanism to provide APIs that retrieve the namespace badblocks from the kernel's block device representation in sysfs. This paves the way for a namespace based fallback if region-badblocks are unavailable. Signed-off-by: Dan Williams <[email protected]> [vishal] add the new global symbols to libndctl.sym [vishal] fix the badblocks path to remove the trailing 'badblocks' Signed-off-by: Vishal Verma <[email protected]> --- ndctl/lib/libndctl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ ndctl/lib/libndctl.sym | 6 ++++++ ndctl/libndctl.h | 6 ++++++ 3 files changed, 54 insertions(+) diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index d58be47..d341100 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -3610,6 +3610,48 @@ NDCTL_EXPORT int ndctl_namespace_is_enabled(struct ndctl_namespace *ndns) return is_enabled(ndctl_namespace_get_bus(ndns), path); } +NDCTL_EXPORT struct badblock *ndctl_namespace_get_next_badblock( + struct ndctl_namespace *ndns) +{ + return badblocks_iter_next(&ndns->bb_iter); +} + +NDCTL_EXPORT struct badblock *ndctl_namespace_get_first_badblock( + struct ndctl_namespace *ndns) +{ + struct ndctl_btt *btt = ndctl_namespace_get_btt(ndns); + struct ndctl_pfn *pfn = ndctl_namespace_get_pfn(ndns); + struct ndctl_dax *dax = ndctl_namespace_get_dax(ndns); + struct ndctl_ctx *ctx = ndctl_namespace_get_ctx(ndns); + const char *dev = ndctl_namespace_get_devname(ndns); + char path[SYSFS_ATTR_SIZE]; + ssize_t len = sizeof(path); + const char *bdev; + + if (btt || dax) { + dbg(ctx, "%s: badblocks not supported for %s\n", dev, + btt ? "btt" : "device-dax"); + return NULL; + } + + if (pfn) + bdev = ndctl_pfn_get_block_device(pfn); + else + bdev = ndctl_namespace_get_block_device(ndns); + + if (!bdev) { + dbg(ctx, "%s: failed to determine block device\n", dev); + return NULL; + } + + if (snprintf(path, len, "/sys/block/%s", bdev) >= len) { + err(ctx, "%s: buffer too small!\n", dev); + return NULL; + } + + return badblocks_iter_first(&ndns->bb_iter, ctx, path); +} + static int ndctl_bind(struct ndctl_ctx *ctx, struct kmod_module *module, const char *devname) { diff --git a/ndctl/lib/libndctl.sym b/ndctl/lib/libndctl.sym index a6849ee..185ee4a 100644 --- a/ndctl/lib/libndctl.sym +++ b/ndctl/lib/libndctl.sym @@ -378,3 +378,9 @@ global: ndctl_region_get_max_available_extent; ndctl_cmd_smart_inject_ctrl_temperature; } LIBNDCTL_16; + +LIBNDCTL_18 { +global: + ndctl_namespace_get_first_badblock; + ndctl_namespace_get_next_badblock; +} LIBNDCTL_17; diff --git a/ndctl/libndctl.h b/ndctl/libndctl.h index 83d6c6c..500c7de 100644 --- a/ndctl/libndctl.h +++ b/ndctl/libndctl.h @@ -439,6 +439,12 @@ struct ndctl_namespace *ndctl_namespace_get_next(struct ndctl_namespace *ndns); ndns != NULL; \ ndns = _ndns, \ _ndns = _ndns ? ndctl_namespace_get_next(_ndns) : NULL) +struct badblock *ndctl_namespace_get_first_badblock(struct ndctl_namespace *ndns); +struct badblock *ndctl_namespace_get_next_badblock(struct ndctl_namespace *ndns); +#define ndctl_namespace_badblock_foreach(ndns, badblock) \ + for (badblock = ndctl_namespace_get_first_badblock(ndns); \ + badblock != NULL; \ + badblock = ndctl_namespace_get_next_badblock(ndns)) struct ndctl_ctx *ndctl_namespace_get_ctx(struct ndctl_namespace *ndns); struct ndctl_bus *ndctl_namespace_get_bus(struct ndctl_namespace *ndns); struct ndctl_region *ndctl_namespace_get_region(struct ndctl_namespace *ndns); -- 2.17.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
