From: Dan Williams Date: Tue, 5 Jan 2016 07:31:24 +0000 (-0800) Subject: libnvdimm, pmem: nvdimm_read_bytes() badblocks support X-Git-Tag: v4.1.12-92~18^2^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56ab6eda374e69ee6735016a06de09501910ce23;p=users%2Fjedix%2Flinux-maple.git libnvdimm, pmem: nvdimm_read_bytes() badblocks support Orabug: 22913653 Support badblock checking in all the pmem read paths that do not go through the block layer. This protects info block reads (btt or pfn) as well as data reads to a pmem namespace via a btt instance. Signed-off-by: Dan Williams (cherry picked from commit 710d69cc99507803ed91b4ec7368fbd66d59f014) Signed-off-by: Dan Duval --- diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index fd0262c2868e0..25e74701017ff 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -226,6 +226,7 @@ static int pmem_attach_disk(struct device *dev, disk->driverfs_dev = dev; set_capacity(disk, (pmem->size - pmem->data_offset) / 512); pmem->pmem_disk = disk; + devm_exit_badblocks(dev, &pmem->bb); if (devm_init_badblocks(dev, &pmem->bb)) return -ENOMEM; nvdimm_namespace_add_poison(ndns, &pmem->bb, pmem->data_offset); @@ -246,9 +247,13 @@ static int pmem_rw_bytes(struct nd_namespace_common *ndns, return -EFAULT; } - if (rw == READ) + if (rw == READ) { + unsigned int sz_align = ALIGN(size + (offset & (512 - 1)), 512); + + if (unlikely(is_bad_pmem(&pmem->bb, offset / 512, sz_align))) + return -EIO; memcpy_from_pmem(buf, pmem->virt_addr + offset, size); - else { + } else { memcpy_to_pmem(pmem->virt_addr + offset, buf, size); wmb_pmem(); } @@ -411,6 +416,9 @@ static int nd_pmem_probe(struct device *dev) pmem->ndns = ndns; dev_set_drvdata(dev, pmem); ndns->rw_bytes = pmem_rw_bytes; + if (devm_init_badblocks(dev, &pmem->bb)) + return -ENOMEM; + nvdimm_namespace_add_poison(ndns, &pmem->bb, 0); if (is_nd_btt(dev)) return nvdimm_namespace_attach_btt(ndns);