libnvdimm: add mechanism to publish badblocks at the region level

badblocks sysfs file will be export at region level. When nvdimm event
notifier happens for NVDIMM_REVALIATE_POISON, the badblocks in the
region will be updated.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 2a99c83aa19f080ec866fc6cb3475c1b256cfc43..c3b33cf655fb9443858c372bf203ab49306f54c1 100644 (file)
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -154,6 +154,7 @@ struct nd_region {
        u64 ndr_start;
        int id, num_lanes, ro, numa_node;
        void *provider_data;
+       struct badblocks bb;
        struct nd_interleave_set *nd_set;
        struct nd_percpu_lane __percpu *lane;
        struct nd_mapping mapping[0];

diff --git a/drivers/nvdimm/region.c b/drivers/nvdimm/region.c
index 8f241772ec0b24d0a2d297a7549ceac9e072872a..869a886c292ebf94f963abb9f747b0c2802fb471 100644 (file)
--- a/drivers/nvdimm/region.c
+++ b/drivers/nvdimm/region.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/nd.h>
+#include "nd-core.h"
 #include "nd.h"
 
 static int nd_region_probe(struct device *dev)
@@ -52,6 +53,17 @@ static int nd_region_probe(struct device *dev)
        if (rc && err && rc == err)
                return -ENODEV;
 
+       if (is_nd_pmem(&nd_region->dev)) {
+               struct resource ndr_res;
+
+               if (devm_init_badblocks(dev, &nd_region->bb))
+                       return -ENODEV;
+               ndr_res.start = nd_region->ndr_start;
+               ndr_res.end = nd_region->ndr_start + nd_region->ndr_size - 1;
+               nvdimm_badblocks_populate(nd_region,
+                               &nd_region->bb, &ndr_res);
+       }
+
        nd_region->btt_seed = nd_btt_create(nd_region);
        nd_region->pfn_seed = nd_pfn_create(nd_region);
        nd_region->dax_seed = nd_dax_create(nd_region);
@@ -104,6 +116,18 @@ static int child_notify(struct device *dev, void *data)
 
 static void nd_region_notify(struct device *dev, enum nvdimm_event event)
 {
+       if (event == NVDIMM_REVALIDATE_POISON) {
+               struct nd_region *nd_region = to_nd_region(dev);
+               struct resource res;
+
+               if (is_nd_pmem(&nd_region->dev)) {
+                       res.start = nd_region->ndr_start;
+                       res.end = nd_region->ndr_start +
+                               nd_region->ndr_size - 1;
+                       nvdimm_badblocks_populate(nd_region,
+                                       &nd_region->bb, &res);
+               }
+       }
        device_for_each_child(dev, &event, child_notify);
 }
 

diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index b7cb5066d9613e681af289d6e97459b0d122526f..3500fc84d939abf70eae6ce2fb6a6a1f3afed653 100644 (file)
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -448,6 +448,21 @@ static ssize_t read_only_store(struct device *dev,
 }
 static DEVICE_ATTR_RW(read_only);
 
+static ssize_t nd_badblocks_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nd_region *nd_region = to_nd_region(dev);
+
+       return badblocks_show(&nd_region->bb, buf, 0);
+}
+static struct device_attribute dev_attr_nd_badblocks = {
+       .attr = {
+               .name = "badblocks",
+               .mode = S_IRUGO
+       },
+       .show = nd_badblocks_show,
+};
+
 static struct attribute *nd_region_attributes[] = {
        &dev_attr_size.attr,
        &dev_attr_nstype.attr,
@@ -460,6 +475,7 @@ static struct attribute *nd_region_attributes[] = {
        &dev_attr_available_size.attr,
        &dev_attr_namespace_seed.attr,
        &dev_attr_init_namespaces.attr,
+       &dev_attr_nd_badblocks.attr,
        NULL,
 };
 
@@ -476,6 +492,9 @@ static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n)
        if (!is_nd_pmem(dev) && a == &dev_attr_dax_seed.attr)
                return 0;
 
+       if (!is_nd_pmem(dev) && a == &dev_attr_nd_badblocks.attr)
+               return 0;
+
        if (a != &dev_attr_set_cookie.attr
                        && a != &dev_attr_available_size.attr)
                return a->mode;