3 files changed, 46 insertions, 3 deletions

diff --git a/block/partition-generic.c b/block/partition-generic.c
index 746935a5973c..fefd01b496a0 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -16,6 +16,7 @@
 #include <linux/kmod.h>
 #include <linux/ctype.h>
 #include <linux/genhd.h>
+#include <linux/dax.h>
 #include <linux/blktrace_api.h>
 
 #include "partitions/check.h"
@@ -550,13 +551,24 @@ int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
         return 0;
 }
 
-unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
+static struct page *read_pagecache_sector(struct block_device *bdev, sector_t n)
 {
         struct address_space *mapping = bdev->bd_inode->i_mapping;
+
+        return read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)),
+                        NULL);
+}
+
+unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
+{
         struct page *page;
 
-        page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)),
-                                 NULL);
+        /* don't populate page cache for dax capable devices */
+        if (IS_DAX(bdev->bd_inode))
+                page = read_dax_sector(bdev, n);
+        else
+                page = read_pagecache_sector(bdev, n);
+
         if (!IS_ERR(page)) {
                 if (PageError(page))
                         goto fail;
diff --git a/fs/dax.c b/fs/dax.c
index 4fd6b0c5c6b5..e0e9358baf35 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -58,6 +58,26 @@ static void dax_unmap_atomic(struct block_device *bdev,
         blk_queue_exit(bdev->bd_queue);
 }
 
+struct page *read_dax_sector(struct block_device *bdev, sector_t n)
+{
+        struct page *page = alloc_pages(GFP_KERNEL, 0);
+        struct blk_dax_ctl dax = {
+                .size = PAGE_SIZE,
+                .sector = n & ~((((int) PAGE_SIZE) / 512) - 1),
+        };
+        long rc;
+
+        if (!page)
+                return ERR_PTR(-ENOMEM);
+
+        rc = dax_map_atomic(bdev, &dax);
+        if (rc < 0)
+                return ERR_PTR(rc);
+        memcpy_from_pmem(page_address(page), dax.addr, PAGE_SIZE);
+        dax_unmap_atomic(bdev, &dax);
+        return page;
+}
+
 /*
  * dax_clear_blocks() is called from within transaction context from XFS,
  * and hence this means the stack from this point must follow GFP_NOFS
diff --git a/include/linux/dax.h b/include/linux/dax.h
index 8204c3dc3800..818e45078929 100644
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@ -14,6 +14,17 @@ int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t,
                 dax_iodone_t);
 int __dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t,
                 dax_iodone_t);
+
+#ifdef CONFIG_FS_DAX
+struct page *read_dax_sector(struct block_device *bdev, sector_t n);
+#else
+static inline struct page *read_dax_sector(struct block_device *bdev,
+                sector_t n)
+{
+        return ERR_PTR(-ENXIO);
+}
+#endif
+
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 int dax_pmd_fault(struct vm_area_struct *, unsigned long addr, pmd_t *,
                                 unsigned int flags, get_block_t, dax_iodone_t);