From: jhubbard.send.patches@gmail.com
To: Jens Axboe <axboe@kernel.dk>, Jan Kara <jack@suse.cz>,
Christoph Hellwig <hch@infradead.org>,
Dave Chinner <dchinner@redhat.com>,
"Darrick J . Wong" <djwong@kernel.org>,
Theodore Ts'o <tytso@mit.edu>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Miklos Szeredi <miklos@szeredi.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Chaitanya Kulkarni <kch@nvidia.com>
Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-mm@kvack.org,
LKML <linux-kernel@vger.kernel.org>,
John Hubbard <jhubbard@nvidia.com>
Subject: [PATCH 3/6] block, fs: assert that key paths use iovecs, and nothing else
Date: Sun, 27 Feb 2022 01:34:31 -0800 [thread overview]
Message-ID: <20220227093434.2889464-4-jhubbard@nvidia.com> (raw)
In-Reply-To: <20220227093434.2889464-1-jhubbard@nvidia.com>
From: John Hubbard <jhubbard@nvidia.com>
Upcoming changes to Direct IO will change it from acquiring pages via
get_user_pages_fast(), to calling pin_user_pages_fast() instead.
Place a few assertions at key points, that the pages are IOVEC (user
pages), to enforce the assumptions that there are no kernel or pipe or
other odd variations being passed.
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
block/bio.c | 4 ++++
fs/direct-io.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/block/bio.c b/block/bio.c
index b15f5466ce08..4679d6539e2d 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1167,6 +1167,8 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
BUILD_BUG_ON(PAGE_PTRS_PER_BVEC < 2);
pages += entries_left * (PAGE_PTRS_PER_BVEC - 1);
+ WARN_ON_ONCE(!iter_is_iovec(iter));
+
size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset);
if (unlikely(size <= 0))
return size ? size : -EFAULT;
@@ -1217,6 +1219,8 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter)
BUILD_BUG_ON(PAGE_PTRS_PER_BVEC < 2);
pages += entries_left * (PAGE_PTRS_PER_BVEC - 1);
+ WARN_ON_ONCE(!iter_is_iovec(iter));
+
size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset);
if (unlikely(size <= 0))
return size ? size : -EFAULT;
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 38bca4980a1c..7dbbbfef300d 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -169,6 +169,8 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio)
{
ssize_t ret;
+ WARN_ON_ONCE(!iter_is_iovec(sdio->iter));
+
ret = iov_iter_get_pages(sdio->iter, dio->pages, LONG_MAX, DIO_PAGES,
&sdio->from);
--
2.35.1
next prev parent reply other threads:[~2022-02-27 9:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-27 9:34 [PATCH 0/6] block, fs: convert most Direct IO cases to FOLL_PIN jhubbard.send.patches
2022-02-27 9:34 ` [PATCH 1/6] mm/gup: introduce pin_user_page() jhubbard.send.patches
2022-02-27 9:34 ` [PATCH 2/6] iov_iter: new iov_iter_pin_pages*(), for FOLL_PIN pages jhubbard.send.patches
2022-02-27 21:57 ` Jens Axboe
2022-02-27 22:09 ` John Hubbard
2022-02-28 22:49 ` John Hubbard
2022-02-27 9:34 ` jhubbard.send.patches [this message]
2022-02-27 21:58 ` [PATCH 3/6] block, fs: assert that key paths use iovecs, and nothing else Jens Axboe
2022-02-27 22:12 ` John Hubbard
2022-02-27 22:15 ` Al Viro
2022-02-27 22:27 ` John Hubbard
2022-02-28 3:29 ` John Hubbard
2022-02-27 9:34 ` [PATCH 4/6] block, bio, fs: convert most filesystems to pin_user_pages_fast() jhubbard.send.patches
2022-02-27 21:59 ` Jens Axboe
2022-02-27 22:13 ` John Hubbard
2022-02-27 9:34 ` [PATCH 5/6] NFS: direct-io: convert to FOLL_PIN pages jhubbard.send.patches
2022-02-27 9:34 ` [PATCH 6/6] fuse: convert direct IO paths to use FOLL_PIN jhubbard.send.patches
2022-02-28 15:59 ` Miklos Szeredi
2022-02-28 21:16 ` John Hubbard
2022-03-01 9:41 ` Miklos Szeredi
2022-03-02 8:07 ` John Hubbard
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=20220227093434.2889464-4-jhubbard@nvidia.com \
--to=jhubbard.send.patches@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=dchinner@redhat.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=jhubbard@nvidia.com \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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