From patchwork Tue Oct 2 03:31:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10623015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99659175A for ; Tue, 2 Oct 2018 03:31:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BBE62872F for ; Tue, 2 Oct 2018 03:31:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FD2A28736; Tue, 2 Oct 2018 03:31:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 08A2328732 for ; Tue, 2 Oct 2018 03:31:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AA6642194D387; Mon, 1 Oct 2018 20:31:50 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8A6D721161680 for ; Mon, 1 Oct 2018 20:31:49 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Oct 2018 20:31:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,329,1534834800"; d="scan'208";a="95210346" Received: from vverma7-desk1.lm.intel.com ([10.232.112.133]) by fmsmga001.fm.intel.com with ESMTP; 01 Oct 2018 20:31:48 -0700 From: Vishal Verma To: Subject: [ndctl PATCH 2/5] ndctl, lib: add APIs for retrieving namespace badblocks Date: Mon, 1 Oct 2018 21:31:37 -0600 Message-Id: <20181002033140.21295-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181002033140.21295-1-vishal.l.verma@intel.com> References: <20181002033140.21295-1-vishal.l.verma@intel.com> X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP From: Dan Williams From: Dan Williams 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 [vishal] add the new global symbols to libndctl.sym [vishal] fix the badblocks path to remove the trailing 'badblocks' Signed-off-by: Vishal Verma --- 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);