|
@@ -325,6 +325,7 @@ struct nvdimm_bus *__nvdimm_bus_register(struct device *parent,
|
|
|
if (!nvdimm_bus)
|
|
|
return NULL;
|
|
|
INIT_LIST_HEAD(&nvdimm_bus->list);
|
|
|
+ INIT_LIST_HEAD(&nvdimm_bus->poison_list);
|
|
|
init_waitqueue_head(&nvdimm_bus->probe_wait);
|
|
|
nvdimm_bus->id = ida_simple_get(&nd_ida, 0, 0, GFP_KERNEL);
|
|
|
mutex_init(&nvdimm_bus->reconfig_mutex);
|
|
@@ -359,6 +360,191 @@ struct nvdimm_bus *__nvdimm_bus_register(struct device *parent,
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(__nvdimm_bus_register);
|
|
|
|
|
|
+/**
|
|
|
+ * __add_badblock_range() - Convert a physical address range to bad sectors
|
|
|
+ * @disk: the disk associated with the namespace
|
|
|
+ * @ns_offset: namespace offset where the error range begins (in bytes)
|
|
|
+ * @len: number of bytes of poison to be added
|
|
|
+ *
|
|
|
+ * This assumes that the range provided with (ns_offset, len) is within
|
|
|
+ * the bounds of physical addresses for this namespace, i.e. lies in the
|
|
|
+ * interval [ns_start, ns_start + ns_size)
|
|
|
+ */
|
|
|
+static int __add_badblock_range(struct gendisk *disk, u64 ns_offset, u64 len)
|
|
|
+{
|
|
|
+ unsigned int sector_size = queue_logical_block_size(disk->queue);
|
|
|
+ sector_t start_sector;
|
|
|
+ u64 num_sectors;
|
|
|
+ u32 rem;
|
|
|
+ int rc;
|
|
|
+
|
|
|
+ start_sector = div_u64(ns_offset, sector_size);
|
|
|
+ num_sectors = div_u64_rem(len, sector_size, &rem);
|
|
|
+ if (rem)
|
|
|
+ num_sectors++;
|
|
|
+
|
|
|
+ if (!disk->bb) {
|
|
|
+ rc = disk_alloc_badblocks(disk);
|
|
|
+ if (rc)
|
|
|
+ return rc;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (unlikely(num_sectors > (u64)INT_MAX)) {
|
|
|
+ u64 remaining = num_sectors;
|
|
|
+ sector_t s = start_sector;
|
|
|
+
|
|
|
+ while (remaining) {
|
|
|
+ int done = min_t(u64, remaining, INT_MAX);
|
|
|
+
|
|
|
+ rc = disk_set_badblocks(disk, s, done);
|
|
|
+ if (rc)
|
|
|
+ return rc;
|
|
|
+ remaining -= done;
|
|
|
+ s += done;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+ } else
|
|
|
+ return disk_set_badblocks(disk, start_sector, num_sectors);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * nvdimm_namespace_add_poison() - Convert a list of poison ranges to badblocks
|
|
|
+ * @disk: the gendisk associated with the namespace where badblocks
|
|
|
+ * will be stored
|
|
|
+ * @offset: offset at the start of the namespace before 'sector 0'
|
|
|
+ * @ndns: the namespace containing poison ranges
|
|
|
+ *
|
|
|
+ * The poison list generated during NFIT initialization may contain multiple,
|
|
|
+ * possibly overlapping ranges in the SPA (System Physical Address) space.
|
|
|
+ * Compare each of these ranges to the namespace currently being initialized,
|
|
|
+ * and add badblocks to the gendisk for all matching sub-ranges
|
|
|
+ *
|
|
|
+ * Return:
|
|
|
+ * 0 - Success
|
|
|
+ */
|
|
|
+int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset,
|
|
|
+ struct nd_namespace_common *ndns)
|
|
|
+{
|
|
|
+ struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);
|
|
|
+ struct nd_region *nd_region = to_nd_region(ndns->dev.parent);
|
|
|
+ struct nvdimm_bus *nvdimm_bus;
|
|
|
+ struct list_head *poison_list;
|
|
|
+ u64 ns_start, ns_end, ns_size;
|
|
|
+ struct nd_poison *pl;
|
|
|
+ int rc;
|
|
|
+
|
|
|
+ ns_size = nvdimm_namespace_capacity(ndns) - offset;
|
|
|
+ ns_start = nsio->res.start + offset;
|
|
|
+ ns_end = nsio->res.end;
|
|
|
+
|
|
|
+ nvdimm_bus = to_nvdimm_bus(nd_region->dev.parent);
|
|
|
+ poison_list = &nvdimm_bus->poison_list;
|
|
|
+ if (list_empty(poison_list))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ list_for_each_entry(pl, poison_list, list) {
|
|
|
+ u64 pl_end = pl->start + pl->length - 1;
|
|
|
+
|
|
|
+ /* Discard intervals with no intersection */
|
|
|
+ if (pl_end < ns_start)
|
|
|
+ continue;
|
|
|
+ if (pl->start > ns_end)
|
|
|
+ continue;
|
|
|
+ /* Deal with any overlap after start of the namespace */
|
|
|
+ if (pl->start >= ns_start) {
|
|
|
+ u64 start = pl->start;
|
|
|
+ u64 len;
|
|
|
+
|
|
|
+ if (pl_end <= ns_end)
|
|
|
+ len = pl->length;
|
|
|
+ else
|
|
|
+ len = ns_start + ns_size - pl->start;
|
|
|
+
|
|
|
+ rc = __add_badblock_range(disk, start - ns_start, len);
|
|
|
+ if (rc)
|
|
|
+ return rc;
|
|
|
+ dev_info(&nvdimm_bus->dev,
|
|
|
+ "Found a poison range (0x%llx, 0x%llx)\n",
|
|
|
+ start, len);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ /* Deal with overlap for poison starting before the namespace */
|
|
|
+ if (pl->start < ns_start) {
|
|
|
+ u64 len;
|
|
|
+
|
|
|
+ if (pl_end < ns_end)
|
|
|
+ len = pl->start + pl->length - ns_start;
|
|
|
+ else
|
|
|
+ len = ns_size;
|
|
|
+
|
|
|
+ rc = __add_badblock_range(disk, 0, len);
|
|
|
+ if (rc)
|
|
|
+ return rc;
|
|
|
+ dev_info(&nvdimm_bus->dev,
|
|
|
+ "Found a poison range (0x%llx, 0x%llx)\n",
|
|
|
+ pl->start, len);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+EXPORT_SYMBOL_GPL(nvdimm_namespace_add_poison);
|
|
|
+
|
|
|
+static int __add_poison(struct nvdimm_bus *nvdimm_bus, u64 addr, u64 length)
|
|
|
+{
|
|
|
+ struct nd_poison *pl;
|
|
|
+
|
|
|
+ pl = kzalloc(sizeof(*pl), GFP_KERNEL);
|
|
|
+ if (!pl)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
+ pl->start = addr;
|
|
|
+ pl->length = length;
|
|
|
+ list_add_tail(&pl->list, &nvdimm_bus->poison_list);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+int nvdimm_bus_add_poison(struct nvdimm_bus *nvdimm_bus, u64 addr, u64 length)
|
|
|
+{
|
|
|
+ struct nd_poison *pl;
|
|
|
+
|
|
|
+ if (list_empty(&nvdimm_bus->poison_list))
|
|
|
+ return __add_poison(nvdimm_bus, addr, length);
|
|
|
+
|
|
|
+ /*
|
|
|
+ * There is a chance this is a duplicate, check for those first.
|
|
|
+ * This will be the common case as ARS_STATUS returns all known
|
|
|
+ * errors in the SPA space, and we can't query it per region
|
|
|
+ */
|
|
|
+ list_for_each_entry(pl, &nvdimm_bus->poison_list, list)
|
|
|
+ if (pl->start == addr) {
|
|
|
+ /* If length has changed, update this list entry */
|
|
|
+ if (pl->length != length)
|
|
|
+ pl->length = length;
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * If not a duplicate or a simple length update, add the entry as is,
|
|
|
+ * as any overlapping ranges will get resolved when the list is consumed
|
|
|
+ * and converted to badblocks
|
|
|
+ */
|
|
|
+ return __add_poison(nvdimm_bus, addr, length);
|
|
|
+}
|
|
|
+EXPORT_SYMBOL_GPL(nvdimm_bus_add_poison);
|
|
|
+
|
|
|
+static void free_poison_list(struct list_head *poison_list)
|
|
|
+{
|
|
|
+ struct nd_poison *pl, *next;
|
|
|
+
|
|
|
+ list_for_each_entry_safe(pl, next, poison_list, list) {
|
|
|
+ list_del(&pl->list);
|
|
|
+ kfree(pl);
|
|
|
+ }
|
|
|
+ list_del_init(poison_list);
|
|
|
+}
|
|
|
+
|
|
|
static int child_unregister(struct device *dev, void *data)
|
|
|
{
|
|
|
/*
|
|
@@ -385,6 +571,7 @@ void nvdimm_bus_unregister(struct nvdimm_bus *nvdimm_bus)
|
|
|
|
|
|
nd_synchronize();
|
|
|
device_for_each_child(&nvdimm_bus->dev, NULL, child_unregister);
|
|
|
+ free_poison_list(&nvdimm_bus->poison_list);
|
|
|
nvdimm_bus_destroy_ndctl(nvdimm_bus);
|
|
|
|
|
|
device_unregister(&nvdimm_bus->dev);
|