pmem: fail io-requests to known bad blocks

[cascardo/linux.git] / drivers / nvdimm / pmem.c

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 2b1f300..d00c659 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -47,7 +47,20 @@ struct pmem_device {
 
 static int pmem_major;
 
-static void pmem_do_bvec(struct pmem_device *pmem, struct page *page,
+static bool is_bad_pmem(struct badblocks *bb, sector_t sector, unsigned int len)
+{
+       if (bb->count) {
+               sector_t first_bad;
+               int num_bad;
+
+               return !!badblocks_check(bb, sector, len / 512, &first_bad,
+                               &num_bad);
+       }
+
+       return false;
+}
+
+static int pmem_do_bvec(struct pmem_device *pmem, struct page *page,
                        unsigned int len, unsigned int off, int rw,
                        sector_t sector)
 {
@@ -56,6 +69,8 @@ static void pmem_do_bvec(struct pmem_device *pmem, struct page *page,
        void __pmem *pmem_addr = pmem->virt_addr + pmem_off;
 
        if (rw == READ) {
+               if (unlikely(is_bad_pmem(&pmem->bb, sector, len)))
+                       return -EIO;
                memcpy_from_pmem(mem + off, pmem_addr, len);
                flush_dcache_page(page);
        } else {
@@ -64,10 +79,12 @@ static void pmem_do_bvec(struct pmem_device *pmem, struct page *page,
        }
 
        kunmap_atomic(mem);
+       return 0;
 }
 
 static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 {
+       int rc = 0;
        bool do_acct;
        unsigned long start;
        struct bio_vec bvec;
@@ -76,9 +93,15 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
        struct pmem_device *pmem = bdev->bd_disk->private_data;
 
        do_acct = nd_iostat_start(bio, &start);
-       bio_for_each_segment(bvec, bio, iter)
-               pmem_do_bvec(pmem, bvec.bv_page, bvec.bv_len, bvec.bv_offset,
-                               bio_data_dir(bio), iter.bi_sector);
+       bio_for_each_segment(bvec, bio, iter) {
+               rc = pmem_do_bvec(pmem, bvec.bv_page, bvec.bv_len,
+                               bvec.bv_offset, bio_data_dir(bio),
+                               iter.bi_sector);
+               if (rc) {
+                       bio->bi_error = rc;
+                       break;
+               }
+       }
        if (do_acct)
                nd_iostat_end(bio, start);
 
@@ -93,13 +116,22 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,
                       struct page *page, int rw)
 {
        struct pmem_device *pmem = bdev->bd_disk->private_data;
+       int rc;
 
-       pmem_do_bvec(pmem, page, PAGE_CACHE_SIZE, 0, rw, sector);
+       rc = pmem_do_bvec(pmem, page, PAGE_CACHE_SIZE, 0, rw, sector);
        if (rw & WRITE)
                wmb_pmem();
-       page_endio(page, rw & WRITE, 0);
 
-       return 0;
+       /*
+        * The ->rw_page interface is subtle and tricky.  The core
+        * retries on any error, so we can only invoke page_endio() in
+        * the successful completion case.  Otherwise, we'll see crashes
+        * caused by double completion.
+        */
+       if (rc == 0)
+               page_endio(page, rw & WRITE, 0);
+
+       return rc;
 }
 
 static long pmem_direct_access(struct block_device *bdev, sector_t sector,