Merge tag 'libnvdimm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[linux-2.6-microblaze.git] / drivers / nvdimm / pmem.c

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 24d7fe7..2bf3acd 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -184,6 +184,7 @@ static blk_status_t pmem_do_bvec(struct pmem_device *pmem, struct page *page,
 
 static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 {
+       int ret = 0;
        blk_status_t rc = 0;
        bool do_acct;
        unsigned long start;
@@ -193,7 +194,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
        struct nd_region *nd_region = to_region(pmem);
 
        if (bio->bi_opf & REQ_PREFLUSH)
-               nvdimm_flush(nd_region);
+               ret = nvdimm_flush(nd_region, bio);
 
        do_acct = nd_iostat_start(bio, &start);
        bio_for_each_segment(bvec, bio, iter) {
@@ -208,7 +209,10 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
                nd_iostat_end(bio, start);
 
        if (bio->bi_opf & REQ_FUA)
-               nvdimm_flush(nd_region);
+               ret = nvdimm_flush(nd_region, bio);
+
+       if (ret)
+               bio->bi_status = errno_to_blk_status(ret);
 
        bio_endio(bio);
        return BLK_QC_T_NONE;
@@ -303,24 +307,24 @@ static const struct attribute_group *pmem_attribute_groups[] = {
        NULL,
 };
 
-static void __pmem_release_queue(struct percpu_ref *ref)
+static void pmem_pagemap_cleanup(struct dev_pagemap *pgmap)
 {
-       struct request_queue *q;
+       struct request_queue *q =
+               container_of(pgmap->ref, struct request_queue, q_usage_counter);
 
-       q = container_of(ref, typeof(*q), q_usage_counter);
        blk_cleanup_queue(q);
 }
 
-static void pmem_release_queue(void *ref)
+static void pmem_release_queue(void *pgmap)
 {
-       __pmem_release_queue(ref);
+       pmem_pagemap_cleanup(pgmap);
 }
 
-static void pmem_freeze_queue(struct percpu_ref *ref)
+static void pmem_pagemap_kill(struct dev_pagemap *pgmap)
 {
-       struct request_queue *q;
+       struct request_queue *q =
+               container_of(pgmap->ref, struct request_queue, q_usage_counter);
 
-       q = container_of(ref, typeof(*q), q_usage_counter);
        blk_freeze_queue_start(q);
 }
 
@@ -334,26 +338,16 @@ static void pmem_release_disk(void *__pmem)
        put_disk(pmem->disk);
 }
 
-static void pmem_release_pgmap_ops(void *__pgmap)
-{
-       dev_pagemap_put_ops();
-}
-
-static void fsdax_pagefree(struct page *page, void *data)
+static void pmem_pagemap_page_free(struct page *page)
 {
        wake_up_var(&page->_refcount);
 }
 
-static int setup_pagemap_fsdax(struct device *dev, struct dev_pagemap *pgmap)
-{
-       dev_pagemap_get_ops();
-       if (devm_add_action_or_reset(dev, pmem_release_pgmap_ops, pgmap))
-               return -ENOMEM;
-       pgmap->type = MEMORY_DEVICE_FS_DAX;
-       pgmap->page_free = fsdax_pagefree;
-
-       return 0;
-}
+static const struct dev_pagemap_ops fsdax_pagemap_ops = {
+       .page_free              = pmem_pagemap_page_free,
+       .kill                   = pmem_pagemap_kill,
+       .cleanup                = pmem_pagemap_cleanup,
+};
 
 static int pmem_attach_disk(struct device *dev,
                struct nd_namespace_common *ndns)
@@ -372,6 +366,7 @@ static int pmem_attach_disk(struct device *dev,
        struct gendisk *disk;
        void *addr;
        int rc;
+       unsigned long flags = 0UL;
 
        pmem = devm_kzalloc(dev, sizeof(*pmem), GFP_KERNEL);
        if (!pmem)
@@ -409,11 +404,9 @@ static int pmem_attach_disk(struct device *dev,
 
        pmem->pfn_flags = PFN_DEV;
        pmem->pgmap.ref = &q->q_usage_counter;
-       pmem->pgmap.kill = pmem_freeze_queue;
-       pmem->pgmap.cleanup = __pmem_release_queue;
        if (is_nd_pfn(dev)) {
-               if (setup_pagemap_fsdax(dev, &pmem->pgmap))
-                       return -ENOMEM;
+               pmem->pgmap.type = MEMORY_DEVICE_FS_DAX;
+               pmem->pgmap.ops = &fsdax_pagemap_ops;
                addr = devm_memremap_pages(dev, &pmem->pgmap);
                pfn_sb = nd_pfn->pfn_sb;
                pmem->data_offset = le64_to_cpu(pfn_sb->dataoff);
@@ -424,15 +417,14 @@ static int pmem_attach_disk(struct device *dev,
                bb_res.start += pmem->data_offset;
        } else if (pmem_should_map_pages(dev)) {
                memcpy(&pmem->pgmap.res, &nsio->res, sizeof(pmem->pgmap.res));
-               pmem->pgmap.altmap_valid = false;
-               if (setup_pagemap_fsdax(dev, &pmem->pgmap))
-                       return -ENOMEM;
+               pmem->pgmap.type = MEMORY_DEVICE_FS_DAX;
+               pmem->pgmap.ops = &fsdax_pagemap_ops;
                addr = devm_memremap_pages(dev, &pmem->pgmap);
                pmem->pfn_flags |= PFN_MAP;
                memcpy(&bb_res, &pmem->pgmap.res, sizeof(bb_res));
        } else {
                if (devm_add_action_or_reset(dev, pmem_release_queue,
-                                       &q->q_usage_counter))
+                                       &pmem->pgmap))
                        return -ENOMEM;
                addr = devm_memremap(dev, pmem->phys_addr,
                                pmem->size, ARCH_MEMREMAP_PMEM);
@@ -470,14 +462,15 @@ static int pmem_attach_disk(struct device *dev,
        nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_res);
        disk->bb = &pmem->bb;
 
-       dax_dev = alloc_dax(pmem, disk->disk_name, &pmem_dax_ops);
+       if (is_nvdimm_sync(nd_region))
+               flags = DAXDEV_F_SYNC;
+       dax_dev = alloc_dax(pmem, disk->disk_name, &pmem_dax_ops, flags);
        if (!dax_dev) {
                put_disk(disk);
                return -ENOMEM;
        }
        dax_write_cache(dax_dev, nvdimm_has_cache(nd_region));
        pmem->dax_dev = dax_dev;
-
        gendev = disk_to_dev(disk);
        gendev->groups = pmem_attribute_groups;
 
@@ -535,14 +528,14 @@ static int nd_pmem_remove(struct device *dev)
                sysfs_put(pmem->bb_state);
                pmem->bb_state = NULL;
        }
-       nvdimm_flush(to_nd_region(dev->parent));
+       nvdimm_flush(to_nd_region(dev->parent), NULL);
 
        return 0;
 }
 
 static void nd_pmem_shutdown(struct device *dev)
 {
-       nvdimm_flush(to_nd_region(dev->parent));
+       nvdimm_flush(to_nd_region(dev->parent), NULL);
 }
 
 static void nd_pmem_notify(struct device *dev, enum nvdimm_event event)