From: Keith Busch <kbusch@meta.com>
To: <linux-block@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <snitzer@kernel.org>, <axboe@kernel.dk>, <dw@davidwei.uk>,
<brauner@kernel.org>, Keith Busch <kbusch@kernel.org>
Subject: [PATCHv2 7/7] iov_iter: remove iov_iter_is_aligned
Date: Tue, 5 Aug 2025 07:11:23 -0700 [thread overview]
Message-ID: <20250805141123.332298-8-kbusch@meta.com> (raw)
In-Reply-To: <20250805141123.332298-1-kbusch@meta.com>
From: Keith Busch <kbusch@kernel.org>
No more callers.
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Mike Snitzer <snitzer@kernel.org>
---
include/linux/uio.h | 2 -
lib/iov_iter.c | 95 ---------------------------------------------
2 files changed, 97 deletions(-)
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 2e86c653186c6..5b127043a1519 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -286,8 +286,6 @@ size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i);
#endif
size_t iov_iter_zero(size_t bytes, struct iov_iter *);
-bool iov_iter_is_aligned(const struct iov_iter *i, unsigned addr_mask,
- unsigned len_mask);
unsigned long iov_iter_alignment(const struct iov_iter *i);
unsigned long iov_iter_gap_alignment(const struct iov_iter *i);
void iov_iter_init(struct iov_iter *i, unsigned int direction, const struct iovec *iov,
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index f9193f952f499..2fe66a6b8789e 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -784,101 +784,6 @@ void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count)
}
EXPORT_SYMBOL(iov_iter_discard);
-static bool iov_iter_aligned_iovec(const struct iov_iter *i, unsigned addr_mask,
- unsigned len_mask)
-{
- const struct iovec *iov = iter_iov(i);
- size_t size = i->count;
- size_t skip = i->iov_offset;
-
- do {
- size_t len = iov->iov_len - skip;
-
- if (len > size)
- len = size;
- if (len & len_mask)
- return false;
- if ((unsigned long)(iov->iov_base + skip) & addr_mask)
- return false;
-
- iov++;
- size -= len;
- skip = 0;
- } while (size);
-
- return true;
-}
-
-static bool iov_iter_aligned_bvec(const struct iov_iter *i, unsigned addr_mask,
- unsigned len_mask)
-{
- const struct bio_vec *bvec = i->bvec;
- unsigned skip = i->iov_offset;
- size_t size = i->count;
-
- do {
- size_t len = bvec->bv_len - skip;
-
- if (len > size)
- len = size;
- if (len & len_mask)
- return false;
- if ((unsigned long)(bvec->bv_offset + skip) & addr_mask)
- return false;
-
- bvec++;
- size -= len;
- skip = 0;
- } while (size);
-
- return true;
-}
-
-/**
- * iov_iter_is_aligned() - Check if the addresses and lengths of each segments
- * are aligned to the parameters.
- *
- * @i: &struct iov_iter to restore
- * @addr_mask: bit mask to check against the iov element's addresses
- * @len_mask: bit mask to check against the iov element's lengths
- *
- * Return: false if any addresses or lengths intersect with the provided masks
- */
-bool iov_iter_is_aligned(const struct iov_iter *i, unsigned addr_mask,
- unsigned len_mask)
-{
- if (likely(iter_is_ubuf(i))) {
- if (i->count & len_mask)
- return false;
- if ((unsigned long)(i->ubuf + i->iov_offset) & addr_mask)
- return false;
- return true;
- }
-
- if (likely(iter_is_iovec(i) || iov_iter_is_kvec(i)))
- return iov_iter_aligned_iovec(i, addr_mask, len_mask);
-
- if (iov_iter_is_bvec(i))
- return iov_iter_aligned_bvec(i, addr_mask, len_mask);
-
- /* With both xarray and folioq types, we're dealing with whole folios. */
- if (iov_iter_is_xarray(i)) {
- if (i->count & len_mask)
- return false;
- if ((i->xarray_start + i->iov_offset) & addr_mask)
- return false;
- }
- if (iov_iter_is_folioq(i)) {
- if (i->count & len_mask)
- return false;
- if (i->iov_offset & addr_mask)
- return false;
- }
-
- return true;
-}
-EXPORT_SYMBOL_GPL(iov_iter_is_aligned);
-
static unsigned long iov_iter_alignment_iovec(const struct iov_iter *i)
{
const struct iovec *iov = iter_iov(i);
--
2.47.3
next prev parent reply other threads:[~2025-08-05 14:11 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-05 14:11 [PATCHv2 0/7] direct-io: even more flexible io vectors Keith Busch
2025-08-05 14:11 ` [PATCHv2 1/7] block: check for valid bio while splitting Keith Busch
2025-08-10 14:37 ` Christoph Hellwig
2025-08-10 15:39 ` Keith Busch
2025-08-10 17:14 ` Christoph Hellwig
2025-08-13 20:06 ` Keith Busch
2025-08-13 20:41 ` Bart Van Assche
2025-08-13 21:01 ` Keith Busch
2025-08-13 23:17 ` Bart Van Assche
2025-08-14 1:42 ` Damien Le Moal
2025-08-13 21:23 ` Martin K. Petersen
2025-08-13 21:52 ` Keith Busch
2025-08-18 4:49 ` Christoph Hellwig
2025-08-05 14:11 ` [PATCHv2 2/7] block: align the bio after building it Keith Busch
2025-08-06 6:07 ` Hannes Reinecke
2025-08-10 14:43 ` Christoph Hellwig
2025-08-05 14:11 ` [PATCHv2 3/7] block: simplify direct io validity check Keith Busch
2025-08-05 14:11 ` [PATCHv2 4/7] iomap: " Keith Busch
2025-08-06 6:07 ` Hannes Reinecke
2025-08-05 14:11 ` [PATCHv2 5/7] block: remove bdev_iter_is_aligned Keith Busch
2025-08-05 14:11 ` [PATCHv2 6/7] blk-integrity: use simpler alignment check Keith Busch
2025-08-05 14:11 ` Keith Busch [this message]
2025-08-06 6:08 ` [PATCHv2 7/7] iov_iter: remove iov_iter_is_aligned Hannes Reinecke
2025-08-06 3:03 ` [PATCHv2 0/7] direct-io: even more flexible io vectors Martin K. Petersen
2025-08-06 14:51 ` Christoph Hellwig
2025-08-07 23:20 ` Keith Busch
2025-08-11 10:32 ` Christoph Hellwig
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=20250805141123.332298-8-kbusch@meta.com \
--to=kbusch@meta.com \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=dw@davidwei.uk \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=snitzer@kernel.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
all inboxes | Powered by JetHome®