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 <dave.ji...@intel.com>
---
drivers/dax/dax.c | 23 ++++++++++++++++++---
drivers/dax/dax.h | 8 ++++++-
drivers/dax/pmem.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 9352cbc..c5fd53e 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -73,6 +73,7 @@ struct dax_dev {
int id;
int num_resources;
struct resource res[0];
+ void *private;
};
static ssize_t id_show(struct device *dev,
@@ -326,6 +327,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)
{
@@ -345,9 +360,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,
@@ -653,7 +669,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;
@@ -720,7 +737,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);
rc = device_add(dev);
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 033f49b3..5ffb2e9 100644
--- a/drivers/dax/pmem.c
+++ b/drivers/dax/pmem.c
@@ -14,6 +14,7 @@
#include <linux/memremap.h>
#include <linux/module.h>
#include <linux/pfn_t.h>
+#include <linux/badblocks.h>
#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)
@@ -130,7 +157,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);
@@ -138,8 +173,28 @@ static int dax_pmem_probe(struct device *dev)
return PTR_ERR_OR_ZERO(dax_dev);
}
+static void dax_pmem_notify(struct device *dev, enum nvdimm_event event)
+{
+ struct dax_pmem *dax_pmem =
+ (struct dax_pmem *)dax_dev_get_private(dev);
+ struct nd_region *nd_region = to_nd_region(dev->parent);
+ struct nd_namespace_common *ndns;
+ struct nd_namespace_io *nsio;
+ struct resource res;
+
+ if (event != NVDIMM_REVALIDATE_POISON)
+ return;
+
+ ndns = nvdimm_namespace_common_probe(dev);
+ nsio = to_nd_namespace_io(&ndns->dev);
+ res.start = nsio->res.start;
+ res.end = nsio->res.end;
+ nvdimm_badblocks_populate(nd_region, &dax_pmem->bb, &res);
+}
+
static struct nd_device_driver dax_pmem_driver = {
.probe = dax_pmem_probe,
+ .notify = dax_pmem_notify,
.drv = {
.name = "dax_pmem",
},
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
