diff options
| author | Tobias Holl <tobias@tholl.xyz> | 2023-05-03 16:59:50 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-05-03 17:00:22 +0200 |
| commit | 776617db78c6d208780e7c69d4d68d1fa82913de (patch) | |
| tree | 8c81c3a20db72058af205842f0c34a809f64c830 /io_uring/rsrc.c | |
| parent | Revert "io_uring/rsrc: disallow multi-source reg buffers" (diff) | |
| download | linux-776617db78c6d208780e7c69d4d68d1fa82913de.tar.xz linux-776617db78c6d208780e7c69d4d68d1fa82913de.zip | |
io_uring/rsrc: check for nonconsecutive pages
Pages that are from the same folio do not necessarily need to be
consecutive. In that case, we cannot consolidate them into a single bvec
entry. Before applying the huge page optimization from commit 57bebf807e2a
("io_uring/rsrc: optimise registered huge pages"), check that the memory
is actually consecutive.
Cc: stable@vger.kernel.org
Fixes: 57bebf807e2a ("io_uring/rsrc: optimise registered huge pages")
Signed-off-by: Tobias Holl <tobias@tholl.xyz>
[axboe: formatting]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/rsrc.c')
| -rw-r--r-- | io_uring/rsrc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index ddee7adb4006..00affcf811ad 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1117,7 +1117,12 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov, if (nr_pages > 1) { folio = page_folio(pages[0]); for (i = 1; i < nr_pages; i++) { - if (page_folio(pages[i]) != folio) { + /* + * Pages must be consecutive and on the same folio for + * this to work + */ + if (page_folio(pages[i]) != folio || + pages[i] != pages[i - 1] + 1) { folio = NULL; break; } |