linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Keith Busch <kbusch@fb.com>
To: <linux-fsdevel@vger.kernel.org>, <linux-block@vger.kernel.org>,
	<linux-nvme@lists.infradead.org>
Cc: <axboe@kernel.dk>, Kernel Team <Kernel-team@fb.com>, <hch@lst.de>,
	<bvanassche@acm.org>, <damien.lemoal@opensource.wdc.com>,
	<ebiggers@kernel.org>, <pankydev8@gmail.com>,
	Keith Busch <kbusch@kernel.org>
Subject: [PATCHv5 05/11] block: add a helper function for dio alignment
Date: Tue, 31 May 2022 12:11:31 -0700	[thread overview]
Message-ID: <20220531191137.2291467-6-kbusch@fb.com> (raw)
In-Reply-To: <20220531191137.2291467-1-kbusch@fb.com>

From: Keith Busch <kbusch@kernel.org>

This will make it easier to add more complex acceptable alignment
criteria in the future.

Signed-off-by: Keith Busch <kbusch@kernel.org>
---
v4->v5:

  Return a bool (Damien)

 block/fops.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/block/fops.c b/block/fops.c
index b9b83030e0df..5aec9a130812 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -42,6 +42,13 @@ static unsigned int dio_bio_write_op(struct kiocb *iocb)
 	return op;
 }
 
+static bool blkdev_dio_unaligned(struct block_device *bdev, loff_t pos,
+			      struct iov_iter *iter)
+{
+	return ((pos | iov_iter_alignment(iter)) &
+	    (bdev_logical_block_size(bdev) - 1));
+}
+
 #define DIO_INLINE_BIO_VECS 4
 
 static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
@@ -54,8 +61,7 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
 	struct bio bio;
 	ssize_t ret;
 
-	if ((pos | iov_iter_alignment(iter)) &
-	    (bdev_logical_block_size(bdev) - 1))
+	if (blkdev_dio_unaligned(bdev, pos, iter))
 		return -EINVAL;
 
 	if (nr_pages <= DIO_INLINE_BIO_VECS)
@@ -173,8 +179,7 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
 	loff_t pos = iocb->ki_pos;
 	int ret = 0;
 
-	if ((pos | iov_iter_alignment(iter)) &
-	    (bdev_logical_block_size(bdev) - 1))
+	if (blkdev_dio_unaligned(bdev, pos, iter))
 		return -EINVAL;
 
 	if (iocb->ki_flags & IOCB_ALLOC_CACHE)
@@ -298,8 +303,7 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb,
 	loff_t pos = iocb->ki_pos;
 	int ret = 0;
 
-	if ((pos | iov_iter_alignment(iter)) &
-	    (bdev_logical_block_size(bdev) - 1))
+	if (blkdev_dio_unaligned(bdev, pos, iter))
 		return -EINVAL;
 
 	if (iocb->ki_flags & IOCB_ALLOC_CACHE)
-- 
2.30.2


  parent reply	other threads:[~2022-05-31 19:23 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-31 19:11 [PATCHv5 00/11] direct-io dma alignment Keith Busch
2022-05-31 19:11 ` [PATCHv5 01/11] block: fix infinite loop for invalid zone append Keith Busch
2022-06-01  8:03   ` Johannes Thumshirn
2022-05-31 19:11 ` [PATCHv5 02/11] block/bio: remove duplicate append pages code Keith Busch
2022-05-31 19:11 ` [PATCHv5 03/11] block: export dma_alignment attribute Keith Busch
2022-05-31 19:11 ` [PATCHv5 04/11] block: introduce bdev_dma_alignment helper Keith Busch
2022-05-31 19:11 ` Keith Busch [this message]
2022-06-01  5:29   ` [PATCHv5 05/11] block: add a helper function for dio alignment Christoph Hellwig
2022-06-01  8:04   ` Johannes Thumshirn
2022-05-31 19:11 ` [PATCHv5 06/11] block/merge: count bytes instead of sectors Keith Busch
2022-06-01  8:05   ` Johannes Thumshirn
2022-05-31 19:11 ` [PATCHv5 08/11] iov: introduce iov_iter_aligned Keith Busch
2022-06-01  5:30   ` Christoph Hellwig
2022-05-31 19:11 ` [PATCHv5 09/11] block: introduce bdev_iter_is_aligned helper Keith Busch
2022-05-31 21:46   ` Eric Biggers
2022-06-01  5:31   ` Christoph Hellwig
2022-05-31 19:11 ` [PATCHv5 10/11] block: relax direct io memory alignment Keith Busch
2022-06-01  5:31   ` Christoph Hellwig
2022-05-31 19:11 ` [PATCHv5 11/11] fs: add support for dma aligned direct-io Keith Busch
2022-06-01  5:32   ` Christoph Hellwig
     [not found] ` <20220531191137.2291467-8-kbusch@fb.com>
2022-06-01  7:04   ` [PATCHv5 07/11] block/bounce: count bytes instead of sectors Eric Biggers
2022-06-01  7:11 ` [PATCHv5 00/11] direct-io dma alignment Eric Biggers
2022-06-01 14:28   ` Keith Busch
2022-06-01 16:12     ` Keith Busch
2022-06-06 16:24       ` Keith Busch

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=20220531191137.2291467-6-kbusch@fb.com \
    --to=kbusch@fb.com \
    --cc=Kernel-team@fb.com \
    --cc=axboe@kernel.dk \
    --cc=bvanassche@acm.org \
    --cc=damien.lemoal@opensource.wdc.com \
    --cc=ebiggers@kernel.org \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=pankydev8@gmail.com \
    /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).