Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dax: introduce DAX_RECOVERY_WRITE dax access mode

Up till now, dax_direct_access() is used implicitly for normal
access, but for the purpose of recovery write, dax range with
poison is requested. To make the interface clear, introduce
enum dax_access_mode {
DAX_ACCESS,
DAX_RECOVERY_WRITE,
}
where DAX_ACCESS is used for normal dax access, and
DAX_RECOVERY_WRITE is used for dax recovery write.

Suggested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jane Chu <jane.chu@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Vivek Goyal <vgoyal@redhat.com>
Link: https://lore.kernel.org/r/165247982851.52965.11024212198889762949.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

authored by

Jane Chu and committed by
Dan Williams
e511c4a3 5898b43a

+61 -33
+3 -2
drivers/dax/super.c
··· 117 117 * @dax_dev: a dax_device instance representing the logical memory range 118 118 * @pgoff: offset in pages from the start of the device to translate 119 119 * @nr_pages: number of consecutive pages caller can handle relative to @pfn 120 + * @mode: indicator on normal access or recovery write 120 121 * @kaddr: output parameter that returns a virtual address mapping of pfn 121 122 * @pfn: output parameter that returns an absolute pfn translation of @pgoff 122 123 * ··· 125 124 * pages accessible at the device relative @pgoff. 126 125 */ 127 126 long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, 128 - void **kaddr, pfn_t *pfn) 127 + enum dax_access_mode mode, void **kaddr, pfn_t *pfn) 129 128 { 130 129 long avail; 131 130 ··· 139 138 return -EINVAL; 140 139 141 140 avail = dax_dev->ops->direct_access(dax_dev, pgoff, nr_pages, 142 - kaddr, pfn); 141 + mode, kaddr, pfn); 143 142 if (!avail) 144 143 return -ERANGE; 145 144 return min(avail, nr_pages);
+3 -2
drivers/md/dm-linear.c
··· 172 172 } 173 173 174 174 static long linear_dax_direct_access(struct dm_target *ti, pgoff_t pgoff, 175 - long nr_pages, void **kaddr, pfn_t *pfn) 175 + long nr_pages, enum dax_access_mode mode, void **kaddr, 176 + pfn_t *pfn) 176 177 { 177 178 struct dax_device *dax_dev = linear_dax_pgoff(ti, &pgoff); 178 179 179 - return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn); 180 + return dax_direct_access(dax_dev, pgoff, nr_pages, mode, kaddr, pfn); 180 181 } 181 182 182 183 static int linear_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,
+3 -2
drivers/md/dm-log-writes.c
··· 889 889 } 890 890 891 891 static long log_writes_dax_direct_access(struct dm_target *ti, pgoff_t pgoff, 892 - long nr_pages, void **kaddr, pfn_t *pfn) 892 + long nr_pages, enum dax_access_mode mode, void **kaddr, 893 + pfn_t *pfn) 893 894 { 894 895 struct dax_device *dax_dev = log_writes_dax_pgoff(ti, &pgoff); 895 896 896 - return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn); 897 + return dax_direct_access(dax_dev, pgoff, nr_pages, mode, kaddr, pfn); 897 898 } 898 899 899 900 static int log_writes_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,
+3 -2
drivers/md/dm-stripe.c
··· 315 315 } 316 316 317 317 static long stripe_dax_direct_access(struct dm_target *ti, pgoff_t pgoff, 318 - long nr_pages, void **kaddr, pfn_t *pfn) 318 + long nr_pages, enum dax_access_mode mode, void **kaddr, 319 + pfn_t *pfn) 319 320 { 320 321 struct dax_device *dax_dev = stripe_dax_pgoff(ti, &pgoff); 321 322 322 - return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn); 323 + return dax_direct_access(dax_dev, pgoff, nr_pages, mode, kaddr, pfn); 323 324 } 324 325 325 326 static int stripe_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,
+3 -1
drivers/md/dm-target.c
··· 10 10 #include <linux/init.h> 11 11 #include <linux/kmod.h> 12 12 #include <linux/bio.h> 13 + #include <linux/dax.h> 13 14 14 15 #define DM_MSG_PREFIX "target" 15 16 ··· 143 142 } 144 143 145 144 static long io_err_dax_direct_access(struct dm_target *ti, pgoff_t pgoff, 146 - long nr_pages, void **kaddr, pfn_t *pfn) 145 + long nr_pages, enum dax_access_mode mode, void **kaddr, 146 + pfn_t *pfn) 147 147 { 148 148 return -EIO; 149 149 }
+4 -3
drivers/md/dm-writecache.c
··· 286 286 287 287 id = dax_read_lock(); 288 288 289 - da = dax_direct_access(wc->ssd_dev->dax_dev, offset, p, &wc->memory_map, &pfn); 289 + da = dax_direct_access(wc->ssd_dev->dax_dev, offset, p, DAX_ACCESS, 290 + &wc->memory_map, &pfn); 290 291 if (da < 0) { 291 292 wc->memory_map = NULL; 292 293 r = da; ··· 309 308 i = 0; 310 309 do { 311 310 long daa; 312 - daa = dax_direct_access(wc->ssd_dev->dax_dev, offset + i, p - i, 313 - NULL, &pfn); 311 + daa = dax_direct_access(wc->ssd_dev->dax_dev, offset + i, 312 + p - i, DAX_ACCESS, NULL, &pfn); 314 313 if (daa <= 0) { 315 314 r = daa ? daa : -EINVAL; 316 315 goto err3;
+3 -2
drivers/md/dm.c
··· 1093 1093 } 1094 1094 1095 1095 static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, 1096 - long nr_pages, void **kaddr, pfn_t *pfn) 1096 + long nr_pages, enum dax_access_mode mode, void **kaddr, 1097 + pfn_t *pfn) 1097 1098 { 1098 1099 struct mapped_device *md = dax_get_private(dax_dev); 1099 1100 sector_t sector = pgoff * PAGE_SECTORS; ··· 1112 1111 if (len < 1) 1113 1112 goto out; 1114 1113 nr_pages = min(len, nr_pages); 1115 - ret = ti->type->direct_access(ti, pgoff, nr_pages, kaddr, pfn); 1114 + ret = ti->type->direct_access(ti, pgoff, nr_pages, mode, kaddr, pfn); 1116 1115 1117 1116 out: 1118 1117 dm_put_live_table(md, srcu_idx);
+5 -3
drivers/nvdimm/pmem.c
··· 239 239 240 240 /* see "strong" declaration in tools/testing/nvdimm/pmem-dax.c */ 241 241 __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, 242 - long nr_pages, void **kaddr, pfn_t *pfn) 242 + long nr_pages, enum dax_access_mode mode, void **kaddr, 243 + pfn_t *pfn) 243 244 { 244 245 resource_size_t offset = PFN_PHYS(pgoff) + pmem->data_offset; 245 246 ··· 279 278 } 280 279 281 280 static long pmem_dax_direct_access(struct dax_device *dax_dev, 282 - pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn) 281 + pgoff_t pgoff, long nr_pages, enum dax_access_mode mode, 282 + void **kaddr, pfn_t *pfn) 283 283 { 284 284 struct pmem_device *pmem = dax_get_private(dax_dev); 285 285 286 - return __pmem_direct_access(pmem, pgoff, nr_pages, kaddr, pfn); 286 + return __pmem_direct_access(pmem, pgoff, nr_pages, mode, kaddr, pfn); 287 287 } 288 288 289 289 static const struct dax_operations pmem_dax_ops = {
+4 -1
drivers/nvdimm/pmem.h
··· 8 8 #include <linux/pfn_t.h> 9 9 #include <linux/fs.h> 10 10 11 + enum dax_access_mode; 12 + 11 13 /* this definition is in it's own header for tools/testing/nvdimm to consume */ 12 14 struct pmem_device { 13 15 /* One contiguous memory region per device */ ··· 30 28 }; 31 29 32 30 long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, 33 - long nr_pages, void **kaddr, pfn_t *pfn); 31 + long nr_pages, enum dax_access_mode mode, void **kaddr, 32 + pfn_t *pfn); 34 33 35 34 #ifdef CONFIG_MEMORY_FAILURE 36 35 static inline bool test_and_clear_pmem_poison(struct page *page)
+6 -3
drivers/s390/block/dcssblk.c
··· 32 32 static void dcssblk_release(struct gendisk *disk, fmode_t mode); 33 33 static void dcssblk_submit_bio(struct bio *bio); 34 34 static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, 35 - long nr_pages, void **kaddr, pfn_t *pfn); 35 + long nr_pages, enum dax_access_mode mode, void **kaddr, 36 + pfn_t *pfn); 36 37 37 38 static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0"; 38 39 ··· 51 50 long rc; 52 51 void *kaddr; 53 52 54 - rc = dax_direct_access(dax_dev, pgoff, nr_pages, &kaddr, NULL); 53 + rc = dax_direct_access(dax_dev, pgoff, nr_pages, DAX_ACCESS, 54 + &kaddr, NULL); 55 55 if (rc < 0) 56 56 return rc; 57 57 memset(kaddr, 0, nr_pages << PAGE_SHIFT); ··· 929 927 930 928 static long 931 929 dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, 932 - long nr_pages, void **kaddr, pfn_t *pfn) 930 + long nr_pages, enum dax_access_mode mode, void **kaddr, 931 + pfn_t *pfn) 933 932 { 934 933 struct dcssblk_dev_info *dev_info = dax_get_private(dax_dev); 935 934
+5 -4
fs/dax.c
··· 721 721 int id; 722 722 723 723 id = dax_read_lock(); 724 - rc = dax_direct_access(iter->iomap.dax_dev, pgoff, 1, &kaddr, NULL); 724 + rc = dax_direct_access(iter->iomap.dax_dev, pgoff, 1, DAX_ACCESS, 725 + &kaddr, NULL); 725 726 if (rc < 0) { 726 727 dax_read_unlock(id); 727 728 return rc; ··· 1014 1013 1015 1014 id = dax_read_lock(); 1016 1015 length = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), 1017 - NULL, pfnp); 1016 + DAX_ACCESS, NULL, pfnp); 1018 1017 if (length < 0) { 1019 1018 rc = length; 1020 1019 goto out; ··· 1123 1122 void *kaddr; 1124 1123 long ret; 1125 1124 1126 - ret = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL); 1125 + ret = dax_direct_access(dax_dev, pgoff, 1, DAX_ACCESS, &kaddr, NULL); 1127 1126 if (ret > 0) { 1128 1127 memset(kaddr + offset, 0, size); 1129 1128 dax_flush(dax_dev, kaddr + offset, size); ··· 1248 1247 } 1249 1248 1250 1249 map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), 1251 - &kaddr, NULL); 1250 + DAX_ACCESS, &kaddr, NULL); 1252 1251 if (map_len < 0) { 1253 1252 ret = map_len; 1254 1253 break;
+2 -2
fs/fuse/dax.c
··· 1241 1241 INIT_DELAYED_WORK(&fcd->free_work, fuse_dax_free_mem_worker); 1242 1242 1243 1243 id = dax_read_lock(); 1244 - nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), NULL, 1245 - NULL); 1244 + nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), 1245 + DAX_ACCESS, NULL, NULL); 1246 1246 dax_read_unlock(id); 1247 1247 if (nr_pages < 0) { 1248 1248 pr_debug("dax_direct_access() returned %ld\n", nr_pages);
+4 -2
fs/fuse/virtio_fs.c
··· 752 752 * offset. 753 753 */ 754 754 static long virtio_fs_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, 755 - long nr_pages, void **kaddr, pfn_t *pfn) 755 + long nr_pages, enum dax_access_mode mode, 756 + void **kaddr, pfn_t *pfn) 756 757 { 757 758 struct virtio_fs *fs = dax_get_private(dax_dev); 758 759 phys_addr_t offset = PFN_PHYS(pgoff); ··· 773 772 long rc; 774 773 void *kaddr; 775 774 776 - rc = dax_direct_access(dax_dev, pgoff, nr_pages, &kaddr, NULL); 775 + rc = dax_direct_access(dax_dev, pgoff, nr_pages, DAX_ACCESS, &kaddr, 776 + NULL); 777 777 if (rc < 0) 778 778 return rc; 779 779 memset(kaddr, 0, nr_pages << PAGE_SHIFT);
+7 -2
include/linux/dax.h
··· 14 14 struct iomap_iter; 15 15 struct iomap; 16 16 17 + enum dax_access_mode { 18 + DAX_ACCESS, 19 + DAX_RECOVERY_WRITE, 20 + }; 21 + 17 22 struct dax_operations { 18 23 /* 19 24 * direct_access: translate a device-relative ··· 26 21 * number of pages available for DAX at that pfn. 27 22 */ 28 23 long (*direct_access)(struct dax_device *, pgoff_t, long, 29 - void **, pfn_t *); 24 + enum dax_access_mode, void **, pfn_t *); 30 25 /* 31 26 * Validate whether this device is usable as an fsdax backing 32 27 * device. ··· 183 178 bool dax_alive(struct dax_device *dax_dev); 184 179 void *dax_get_private(struct dax_device *dax_dev); 185 180 long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, 186 - void **kaddr, pfn_t *pfn); 181 + enum dax_access_mode mode, void **kaddr, pfn_t *pfn); 187 182 size_t dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr, 188 183 size_t bytes, struct iov_iter *i); 189 184 size_t dax_copy_to_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr,
+3 -1
include/linux/device-mapper.h
··· 20 20 struct dm_report_zones_args; 21 21 struct mapped_device; 22 22 struct bio_vec; 23 + enum dax_access_mode; 23 24 24 25 /* 25 26 * Type of table, mapped_device's mempool and request_queue ··· 147 146 * >= 0 : the number of bytes accessible at the address 148 147 */ 149 148 typedef long (*dm_dax_direct_access_fn) (struct dm_target *ti, pgoff_t pgoff, 150 - long nr_pages, void **kaddr, pfn_t *pfn); 149 + long nr_pages, enum dax_access_mode node, void **kaddr, 150 + pfn_t *pfn); 151 151 typedef int (*dm_dax_zero_page_range_fn)(struct dm_target *ti, pgoff_t pgoff, 152 152 size_t nr_pages); 153 153
+3 -1
tools/testing/nvdimm/pmem-dax.c
··· 4 4 */ 5 5 #include "test/nfit_test.h" 6 6 #include <linux/blkdev.h> 7 + #include <linux/dax.h> 7 8 #include <pmem.h> 8 9 #include <nd.h> 9 10 10 11 long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, 11 - long nr_pages, void **kaddr, pfn_t *pfn) 12 + long nr_pages, enum dax_access_mode mode, void **kaddr, 13 + pfn_t *pfn) 12 14 { 13 15 resource_size_t offset = PFN_PHYS(pgoff) + pmem->data_offset; 14 16