From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toshi Kani Subject: [PATCH v2 3/3] dm linear: add DAX support Date: Wed, 22 Jun 2016 17:54:54 -0600 Message-ID: <1466639694-25394-4-git-send-email-toshi.kani@hpe.com> References: <1466639694-25394-1-git-send-email-toshi.kani@hpe.com> Return-path: In-Reply-To: <1466639694-25394-1-git-send-email-toshi.kani@hpe.com> Sender: linux-kernel-owner@vger.kernel.org To: snitzer@redhat.com, axboe@kernel.dk, dan.j.williams@intel.com Cc: agk@redhat.com, ross.zwisler@linux.intel.com, viro@zeniv.linux.org.uk, toshi.kani@hpe.com, linux-nvdimm@lists.01.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-raid.ids Change dm-linear to implement direct_access function, linear_direct_access(), which maps sector and calls direct_access function of its physical target device. Change dm-linear to sets 'dax_supported' when its target physical device supports DAX. Signed-off-by: Toshi Kani Cc: Alasdair Kergon Cc: Dan Williams Cc: Ross Zwisler --- drivers/md/dm-linear.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index 05c35aa..c7fdd1d 100644 --- a/drivers/md/dm-linear.c +++ b/drivers/md/dm-linear.c @@ -59,6 +59,8 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv) ti->num_flush_bios = 1; ti->num_discard_bios = 1; ti->num_write_same_bios = 1; + if (blk_queue_dax(lc->dev->bdev->bd_queue)) + ti->dax_supported = true; ti->private = lc; return 0; @@ -141,9 +143,27 @@ static int linear_iterate_devices(struct dm_target *ti, return fn(ti, lc->dev, lc->start, ti->len, data); } +static long linear_direct_access(struct dm_target *ti, sector_t sector, + void __pmem **kaddr, pfn_t *pfn, long size) +{ + struct linear_c *lc = ti->private; + struct block_device *bdev = lc->dev->bdev; + struct blk_dax_ctl dax = { + .sector = linear_map_sector(ti, sector), + .size = size, + }; + long ret; + + ret = bdev_direct_access(bdev, &dax); + *kaddr = dax.addr; + *pfn = dax.pfn; + + return ret; +} + static struct target_type linear_target = { .name = "linear", - .version = {1, 2, 1}, + .version = {1, 3, 0}, .module = THIS_MODULE, .ctr = linear_ctr, .dtr = linear_dtr, @@ -151,6 +171,7 @@ static struct target_type linear_target = { .status = linear_status, .prepare_ioctl = linear_prepare_ioctl, .iterate_devices = linear_iterate_devices, + .direct_access = linear_direct_access, }; int __init dm_linear_init(void)