From patchwork Mon Oct 10 18:05:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 9369811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9428960487 for ; Mon, 10 Oct 2016 18:05:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EA5028C82 for ; Mon, 10 Oct 2016 18:05:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 704B428CBB; Mon, 10 Oct 2016 18:05:05 +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=-1.9 required=2.0 tests=BAYES_00, 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 DF4E928C82 for ; Mon, 10 Oct 2016 18:05:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 548A71A1E40; Mon, 10 Oct 2016 11:05:04 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0969D1A1E40 for ; Mon, 10 Oct 2016 11:05:04 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP; 10 Oct 2016 11:05:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,325,1473145200"; d="scan'208";a="18179861" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by orsmga005.jf.intel.com with ESMTP; 10 Oct 2016 11:05:03 -0700 Subject: [PATCH v2] dev-dax: add support to display badblocks in sysfs for dev-dax From: Dave Jiang To: dan.j.williams@intel.com Date: Mon, 10 Oct 2016 11:05:03 -0700 Message-ID: <147612270288.117105.4963186004028519782.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Adding support to show badblocks in the pmem region that's provided by the poison_list. This should show up in /sys/class/dax/daxN.N/badblocks as read only. Currently we only support a single resource and we do not support badblocks for seeds. Additional support code will be implemented to support. Signed-off-by: Dave Jiang --- drivers/dax/dax.c | 25 +++++++++++++++++++++---- drivers/dax/dax.h | 8 +++++++- drivers/dax/pmem.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index ed4843a9..6580f85 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c @@ -79,6 +79,7 @@ struct dax_dev { int id; int num_resources; struct resource **res; + void *private; }; #define for_each_dax_region_resource(dax_region, res) \ @@ -336,6 +337,20 @@ static struct dax_dev *to_dax_dev(struct device *dev) return container_of(dev, struct dax_dev, dev); } +void *dax_dev_get_private(struct device *dev) +{ + struct dax_dev *dax_dev = to_dax_dev(dev); + + return dax_dev->private; +} +EXPORT_SYMBOL_GPL(dax_dev_get_private); + +void dax_dev_set_private(struct dax_dev *dax_dev, void *priv) +{ + dax_dev->private = priv; +} +EXPORT_SYMBOL_GPL(dax_dev_set_private); + static ssize_t size_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -355,9 +370,10 @@ static struct attribute *dax_device_attributes[] = { NULL, }; -static const struct attribute_group dax_device_attribute_group = { +struct attribute_group dax_device_attribute_group = { .attrs = dax_device_attributes, }; +EXPORT_SYMBOL_GPL(dax_device_attribute_group); static const struct attribute_group *dax_attribute_groups[] = { &dax_device_attribute_group, @@ -676,7 +692,8 @@ static void unregister_dax_dev(void *dev) } struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, - struct resource *res, int count) + struct resource *res, int count, + const struct attribute_group **groups) { struct device *parent = dax_region->dev; struct dax_dev *dax_dev; @@ -757,7 +774,7 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, dev->devt = dev_t; dev->class = dax_class; dev->parent = parent; - dev->groups = dax_attribute_groups; + dev->groups = groups ? groups : dax_attribute_groups; dev->release = dax_dev_release; dev_set_name(dev, "dax%d.%d", dax_region->id, dax_dev->id); /* update resource names now that the owner device is named */ @@ -777,7 +794,7 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, if (atomic_inc_return(&dax_region->child_count) == 1) { struct dax_dev *seed; - seed = devm_create_dax_dev(dax_region, NULL, 0); + seed = devm_create_dax_dev(dax_region, NULL, 0, NULL); if (IS_ERR(seed)) dev_warn(parent, "failed to create region seed\n"); else diff --git a/drivers/dax/dax.h b/drivers/dax/dax.h index ddd829a..c23c7ac 100644 --- a/drivers/dax/dax.h +++ b/drivers/dax/dax.h @@ -16,10 +16,16 @@ struct device; struct dax_dev; struct resource; struct dax_region; +extern struct attribute_group dax_device_attribute_group; + void dax_region_put(struct dax_region *dax_region); struct dax_region *alloc_dax_region(struct device *parent, int region_id, struct resource *res, unsigned int align, void *addr, unsigned long flags); struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, - struct resource *res, int count); + struct resource *res, int count, + const struct attribute_group **groups); +void *dax_dev_get_private(struct device *dev); +void dax_dev_set_private(struct dax_dev *dax_dev, void *priv); + #endif /* __DAX_H__ */ diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index 9630d88..56282a9 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "../nvdimm/pfn.h" #include "../nvdimm/nd.h" #include "dax.h" @@ -22,6 +23,32 @@ struct dax_pmem { struct device *dev; struct percpu_ref ref; struct completion cmp; + struct badblocks bb; +}; + +static ssize_t dax_pmem_badblocks_show(struct device *dev, + struct device_attribute *attr, char *page) +{ + struct dax_pmem *dax_pmem = + (struct dax_pmem *)dax_dev_get_private(dev); + + return badblocks_show(&dax_pmem->bb, page, 0); +} +static DEVICE_ATTR(badblocks, S_IRUGO, dax_pmem_badblocks_show, NULL); + +static struct attribute *dax_pmem_badblock_attributes[] = { + &dev_attr_badblocks.attr, + NULL, +}; + +static struct attribute_group dax_pmem_badblock_attribute_group = { + .attrs = dax_pmem_badblock_attributes, +}; + +static const struct attribute_group *dax_pmem_attribute_groups[] = { + &dax_device_attribute_group, + &dax_pmem_badblock_attribute_group, + NULL, }; static struct dax_pmem *to_dax_pmem(struct percpu_ref *ref) @@ -127,7 +154,15 @@ static int dax_pmem_probe(struct device *dev) return -ENOMEM; /* TODO: support for subdividing a dax region... */ - dax_dev = devm_create_dax_dev(dax_region, &res, 1); + dax_dev = devm_create_dax_dev(dax_region, &res, 1, + dax_pmem_attribute_groups); + dax_dev_set_private(dax_dev, dax_pmem); + + rc = devm_init_badblocks(dev, &dax_pmem->bb); + if (rc) + return rc; + + nvdimm_badblocks_populate(nd_region, &dax_pmem->bb, &res); /* child dax_dev instances now own the lifetime of the dax_region */ dax_region_put(dax_region);