From: Christoph Hellwig <hch@lst.de>
Cc: Dan Williams <dan.j.williams@intel.com>,
Mike Snitzer <snitzer@redhat.com>,
Ira Weiny <ira.weiny@intel.com>,
dm-devel@redhat.com, linux-xfs@vger.kernel.org,
nvdimm@lists.linux.dev, linux-s390@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org,
linux-ext4@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: [PATCH 10/11] dm-stripe: add a stripe_dax_pgoff helper
Date: Mon, 18 Oct 2021 06:40:53 +0200 [thread overview]
Message-ID: <20211018044054.1779424-11-hch@lst.de> (raw)
In-Reply-To: <20211018044054.1779424-1-hch@lst.de>
Add a helper to perform the entire remapping for DAX accesses. This
helper open codes bdev_dax_pgoff given that the alignment checks have
already been done by the submitting file system and don't need to be
repeated.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/md/dm-stripe.c | 63 ++++++++++--------------------------------
1 file changed, 15 insertions(+), 48 deletions(-)
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index f084607220293..50dba3f39274c 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -301,83 +301,50 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
}
#if IS_ENABLED(CONFIG_FS_DAX)
-static long stripe_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,
- long nr_pages, void **kaddr, pfn_t *pfn)
+static struct dax_device *stripe_dax_pgoff(struct dm_target *ti, pgoff_t *pgoff)
{
- sector_t dev_sector, sector = pgoff * PAGE_SECTORS;
struct stripe_c *sc = ti->private;
- struct dax_device *dax_dev;
struct block_device *bdev;
+ sector_t dev_sector;
uint32_t stripe;
- long ret;
- stripe_map_sector(sc, sector, &stripe, &dev_sector);
+ stripe_map_sector(sc, *pgoff * PAGE_SECTORS, &stripe, &dev_sector);
dev_sector += sc->stripe[stripe].physical_start;
- dax_dev = sc->stripe[stripe].dev->dax_dev;
bdev = sc->stripe[stripe].dev->bdev;
- ret = bdev_dax_pgoff(bdev, dev_sector, nr_pages * PAGE_SIZE, &pgoff);
- if (ret)
- return ret;
+ *pgoff = (get_start_sect(bdev) + dev_sector) >> PAGE_SECTORS_SHIFT;
+ return sc->stripe[stripe].dev->dax_dev;
+}
+
+static long stripe_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,
+ long nr_pages, 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);
}
static size_t stripe_dax_copy_from_iter(struct dm_target *ti, pgoff_t pgoff,
void *addr, size_t bytes, struct iov_iter *i)
{
- sector_t dev_sector, sector = pgoff * PAGE_SECTORS;
- struct stripe_c *sc = ti->private;
- struct dax_device *dax_dev;
- struct block_device *bdev;
- uint32_t stripe;
-
- stripe_map_sector(sc, sector, &stripe, &dev_sector);
- dev_sector += sc->stripe[stripe].physical_start;
- dax_dev = sc->stripe[stripe].dev->dax_dev;
- bdev = sc->stripe[stripe].dev->bdev;
+ struct dax_device *dax_dev = stripe_dax_pgoff(ti, &pgoff);
- if (bdev_dax_pgoff(bdev, dev_sector, ALIGN(bytes, PAGE_SIZE), &pgoff))
- return 0;
return dax_copy_from_iter(dax_dev, pgoff, addr, bytes, i);
}
static size_t stripe_dax_copy_to_iter(struct dm_target *ti, pgoff_t pgoff,
void *addr, size_t bytes, struct iov_iter *i)
{
- sector_t dev_sector, sector = pgoff * PAGE_SECTORS;
- struct stripe_c *sc = ti->private;
- struct dax_device *dax_dev;
- struct block_device *bdev;
- uint32_t stripe;
-
- stripe_map_sector(sc, sector, &stripe, &dev_sector);
- dev_sector += sc->stripe[stripe].physical_start;
- dax_dev = sc->stripe[stripe].dev->dax_dev;
- bdev = sc->stripe[stripe].dev->bdev;
+ struct dax_device *dax_dev = stripe_dax_pgoff(ti, &pgoff);
- if (bdev_dax_pgoff(bdev, dev_sector, ALIGN(bytes, PAGE_SIZE), &pgoff))
- return 0;
return dax_copy_to_iter(dax_dev, pgoff, addr, bytes, i);
}
static int stripe_dax_zero_page_range(struct dm_target *ti, pgoff_t pgoff,
size_t nr_pages)
{
- int ret;
- sector_t dev_sector, sector = pgoff * PAGE_SECTORS;
- struct stripe_c *sc = ti->private;
- struct dax_device *dax_dev;
- struct block_device *bdev;
- uint32_t stripe;
+ struct dax_device *dax_dev = stripe_dax_pgoff(ti, &pgoff);
- stripe_map_sector(sc, sector, &stripe, &dev_sector);
- dev_sector += sc->stripe[stripe].physical_start;
- dax_dev = sc->stripe[stripe].dev->dax_dev;
- bdev = sc->stripe[stripe].dev->bdev;
-
- ret = bdev_dax_pgoff(bdev, dev_sector, nr_pages << PAGE_SHIFT, &pgoff);
- if (ret)
- return ret;
return dax_zero_page_range(dax_dev, pgoff, nr_pages);
}
--
2.30.2
next prev parent reply other threads:[~2021-10-18 4:41 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 4:40 futher decouple DAX from block devices Christoph Hellwig
2021-10-18 4:40 ` [PATCH 01/11] dm: make the DAX support dependend on CONFIG_FS_DAX Christoph Hellwig
2021-10-27 20:53 ` Dan Williams
2021-11-01 16:12 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 02/11] dax: remove CONFIG_DAX_DRIVER Christoph Hellwig
2021-10-27 20:54 ` Dan Williams
2021-10-18 4:40 ` [PATCH 03/11] dax: simplify the dax_device <-> gendisk association Christoph Hellwig
2021-10-27 22:03 ` Dan Williams
2021-10-29 4:57 ` Ira Weiny
2021-11-01 16:28 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 04/11] dax: remove the pgmap sanity checks in generic_fsdax_supported Christoph Hellwig
2021-10-27 23:02 ` Dan Williams
2021-10-18 4:40 ` [PATCH 05/11] dax: move the partition alignment check into fs_dax_get_by_bdev Christoph Hellwig
2021-10-27 23:07 ` Dan Williams
2021-10-18 4:40 ` [PATCH 06/11] xfs: factor out a xfs_setup_dax helper Christoph Hellwig
2021-10-18 16:43 ` Darrick J. Wong
2021-10-19 7:23 ` Christoph Hellwig
2021-10-27 23:37 ` Dan Williams
2021-10-18 4:40 ` [PATCH 07/11] dax: remove dax_capable Christoph Hellwig
2021-10-18 12:25 ` Gao Xiang
2021-10-19 15:44 ` [dm-devel] " Darrick J. Wong
2021-10-28 0:20 ` Dan Williams
2021-10-28 0:16 ` Dan Williams
2021-11-01 16:17 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 08/11] dm-linear: add a linear_dax_pgoff helper Christoph Hellwig
2021-10-28 1:32 ` Dan Williams
2021-11-01 16:18 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 09/11] dm-log-writes: add a log_writes_dax_pgoff helper Christoph Hellwig
2021-10-28 1:36 ` Dan Williams
2021-11-01 16:19 ` Mike Snitzer
2021-10-18 4:40 ` Christoph Hellwig [this message]
2021-10-28 1:41 ` [PATCH 10/11] dm-stripe: add a stripe_dax_pgoff helper Dan Williams
2021-11-01 16:21 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 11/11] dax: move bdev_dax_pgoff to fs/dax.c Christoph Hellwig
2021-10-28 1:44 ` Dan Williams
2021-10-27 20:46 ` futher decouple DAX from block devices Dan Williams
2021-10-28 23:51 ` Stephen Rothwell
2021-10-29 15:42 ` Dan Williams
2021-10-29 15:55 ` Darrick J. Wong
2021-10-29 16:16 ` Dan Williams
2021-11-03 17:59 ` Eric Sandeen
2021-11-04 8:17 ` Christoph Hellwig
2021-11-04 17:34 ` Darrick J. Wong
2021-11-04 17:35 ` Christoph Hellwig
2021-11-04 18:10 ` Dan Williams
2021-11-04 19:04 ` Darrick J. Wong
2021-11-05 3:09 ` Theodore Ts'o
2021-11-05 3:30 ` Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211018044054.1779424-11-hch@lst.de \
--to=hch@lst.de \
--cc=dan.j.williams@intel.com \
--cc=dm-devel@redhat.com \
--cc=ira.weiny@intel.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=snitzer@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).