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 05/11] dax: move the partition alignment check into fs_dax_get_by_bdev
Date: Mon, 18 Oct 2021 06:40:48 +0200 [thread overview]
Message-ID: <20211018044054.1779424-6-hch@lst.de> (raw)
In-Reply-To: <20211018044054.1779424-1-hch@lst.de>
fs_dax_get_by_bdev is the primary interface to find a dax device for a
block device, so move the partition alignment check there instead of
wiring it up through ->dax_supported.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/dax/super.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 04fc680542e8d..482fe775324a4 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -93,6 +93,12 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
if (!blk_queue_dax(bdev->bd_disk->queue))
return NULL;
+ if ((get_start_sect(bdev) * SECTOR_SIZE) % PAGE_SIZE ||
+ (bdev_nr_sectors(bdev) * SECTOR_SIZE) % PAGE_SIZE) {
+ pr_info("%pg: error: unaligned partition for dax\n", bdev);
+ return NULL;
+ }
+
id = dax_read_lock();
dax_dev = xa_load(&dax_hosts, (unsigned long)bdev->bd_disk);
if (!dax_dev || !dax_alive(dax_dev) || !igrab(&dax_dev->inode))
@@ -107,10 +113,6 @@ bool generic_fsdax_supported(struct dax_device *dax_dev,
struct block_device *bdev, int blocksize, sector_t start,
sector_t sectors)
{
- pgoff_t pgoff, pgoff_end;
- sector_t last_page;
- int err;
-
if (blocksize != PAGE_SIZE) {
pr_info("%pg: error: unsupported blocksize for dax\n", bdev);
return false;
@@ -121,19 +123,6 @@ bool generic_fsdax_supported(struct dax_device *dax_dev,
return false;
}
- err = bdev_dax_pgoff(bdev, start, PAGE_SIZE, &pgoff);
- if (err) {
- pr_info("%pg: error: unaligned partition for dax\n", bdev);
- return false;
- }
-
- last_page = PFN_DOWN((start + sectors - 1) * 512) * PAGE_SIZE / 512;
- err = bdev_dax_pgoff(bdev, last_page, PAGE_SIZE, &pgoff_end);
- if (err) {
- pr_info("%pg: error: unaligned partition for dax\n", bdev);
- return false;
- }
-
return true;
}
EXPORT_SYMBOL_GPL(generic_fsdax_supported);
--
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 ` Christoph Hellwig [this message]
2021-10-27 23:07 ` [PATCH 05/11] dax: move the partition alignment check into fs_dax_get_by_bdev 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 ` [PATCH 10/11] dm-stripe: add a stripe_dax_pgoff helper Christoph Hellwig
2021-10-28 1:41 ` 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-6-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).