Commit e511c4a3 authored by Jane Chu's avatar Jane Chu Committed by Dan Williams
Browse files

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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJane Chu <jane.chu@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: default avatarVivek Goyal <vgoyal@redhat.com>
Link: https://lore.kernel.org/r/165247982851.52965.11024212198889762949.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 5898b43a

drivers/dax/super.c

+3 −2
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ enum dax_device_flags { 
 * @dax_dev: a dax_device instance representing the logical memory range

 * @pgoff: offset in pages from the start of the device to translate

 * @nr_pages: number of consecutive pages caller can handle relative to @pfn

 * @mode: indicator on normal access or recovery write

 * @kaddr: output parameter that returns a virtual address mapping of pfn

 * @pfn: output parameter that returns an absolute pfn translation of @pgoff

 *
@@ -124,7 +125,7 @@ enum dax_device_flags { 
 * pages accessible at the device relative @pgoff.

 */

long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages,

		void **kaddr, pfn_t *pfn)

		enum dax_access_mode mode, void **kaddr, pfn_t *pfn)

{

	long avail;
@@ -138,7 +139,7 @@ long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, 
		return -EINVAL;



	avail = dax_dev->ops->direct_access(dax_dev, pgoff, nr_pages,

			kaddr, pfn);

			mode, kaddr, pfn);

	if (!avail)

		return -ERANGE;

	return min(avail, nr_pages);

drivers/md/dm-linear.c

+3 −2
Original line number Diff line number Diff line
@@ -172,11 +172,12 @@ static struct dax_device *linear_dax_pgoff(struct dm_target *ti, pgoff_t *pgoff) 
}



static long linear_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,

		long nr_pages, void **kaddr, pfn_t *pfn)

		long nr_pages, enum dax_access_mode mode, void **kaddr,

		pfn_t *pfn)

{

	struct dax_device *dax_dev = linear_dax_pgoff(ti, &pgoff);



	return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn);

	return dax_direct_access(dax_dev, pgoff, nr_pages, mode, kaddr, pfn);

}



static int linear_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,

drivers/md/dm-log-writes.c

+3 −2
Original line number Diff line number Diff line
@@ -889,11 +889,12 @@ static struct dax_device *log_writes_dax_pgoff(struct dm_target *ti, 
}



static long log_writes_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,

					 long nr_pages, void **kaddr, pfn_t *pfn)

		long nr_pages, enum dax_access_mode mode, void **kaddr,

		pfn_t *pfn)

{

	struct dax_device *dax_dev = log_writes_dax_pgoff(ti, &pgoff);



	return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn);

	return dax_direct_access(dax_dev, pgoff, nr_pages, mode, kaddr, pfn);

}



static int log_writes_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,

drivers/md/dm-stripe.c

+3 −2
Original line number Diff line number Diff line
@@ -315,11 +315,12 @@ static struct dax_device *stripe_dax_pgoff(struct dm_target *ti, pgoff_t *pgoff) 
}



static long stripe_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,

		long nr_pages, void **kaddr, pfn_t *pfn)

		long nr_pages, enum dax_access_mode mode, void **kaddr,

		pfn_t *pfn)

{

	struct dax_device *dax_dev = stripe_dax_pgoff(ti, &pgoff);



	return dax_direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn);

	return dax_direct_access(dax_dev, pgoff, nr_pages, mode, kaddr, pfn);

}



static int stripe_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,

drivers/md/dm-target.c

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/init.h>

#include <linux/kmod.h>

#include <linux/bio.h>

#include <linux/dax.h>



#define DM_MSG_PREFIX "target"
@@ -142,7 +143,8 @@ static void io_err_release_clone_rq(struct request *clone, 
}



static long io_err_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,

		long nr_pages, void **kaddr, pfn_t *pfn)

		long nr_pages, enum dax_access_mode mode, void **kaddr,

		pfn_t *pfn)

{

	return -EIO;

}