* [PATCH] Revert "io_uring/rsrc: simplify the bvec iter count calculation"
@ 2025-03-10 18:48 Keith Busch
2025-03-10 18:50 ` Caleb Sander Mateos
2025-03-10 19:37 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Keith Busch @ 2025-03-10 18:48 UTC (permalink / raw)
To: axboe, asml.silence, io-uring; +Cc: Keith Busch, Caleb Sander Mateos
From: Keith Busch <[email protected]>
This reverts commit 2a51c327d4a4a2eb62d67f4ea13a17efd0f25c5c.
The kernel registered bvecs do use the iov_iter_advance() API, so we
can't rely on this simplification anymore.
Fixes: 27cb27b6d5ea40 ("io_uring: add support for kernel registered bvecs")
Reported-by: Caleb Sander Mateos <[email protected]>
Signed-off-by: Keith Busch <[email protected]>
---
io_uring/rsrc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 5dd1e08275594..5fff6ba2b7c05 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -1024,7 +1024,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
* and advance us to the beginning.
*/
offset = buf_addr - imu->ubuf;
- iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, len);
+ iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, offset + len);
if (offset) {
/*
@@ -1051,6 +1051,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
* to use the slow iter advance.
*/
if (offset < bvec->bv_len) {
+ iter->count -= offset;
iter->iov_offset = offset;
} else if (imu->is_kbuf) {
iov_iter_advance(iter, offset);
@@ -1063,6 +1064,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
iter->bvec += seg_skip;
iter->nr_segs -= seg_skip;
+ iter->count -= bvec->bv_len + offset;
iter->iov_offset = offset & ((1UL << imu->folio_shift) - 1);
}
}
--
2.47.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "io_uring/rsrc: simplify the bvec iter count calculation"
2025-03-10 18:48 [PATCH] Revert "io_uring/rsrc: simplify the bvec iter count calculation" Keith Busch
@ 2025-03-10 18:50 ` Caleb Sander Mateos
2025-03-10 19:37 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Caleb Sander Mateos @ 2025-03-10 18:50 UTC (permalink / raw)
To: Keith Busch; +Cc: axboe, asml.silence, io-uring, Keith Busch
On Mon, Mar 10, 2025 at 11:48 AM Keith Busch <[email protected]> wrote:
>
> From: Keith Busch <[email protected]>
>
> This reverts commit 2a51c327d4a4a2eb62d67f4ea13a17efd0f25c5c.
>
> The kernel registered bvecs do use the iov_iter_advance() API, so we
> can't rely on this simplification anymore.
>
> Fixes: 27cb27b6d5ea40 ("io_uring: add support for kernel registered bvecs")
> Reported-by: Caleb Sander Mateos <[email protected]>
Reviewed-by: Caleb Sander Mateos <[email protected]>
> Signed-off-by: Keith Busch <[email protected]>
> ---
> io_uring/rsrc.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
> index 5dd1e08275594..5fff6ba2b7c05 100644
> --- a/io_uring/rsrc.c
> +++ b/io_uring/rsrc.c
> @@ -1024,7 +1024,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
> * and advance us to the beginning.
> */
> offset = buf_addr - imu->ubuf;
> - iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, len);
> + iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, offset + len);
>
> if (offset) {
> /*
> @@ -1051,6 +1051,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
> * to use the slow iter advance.
> */
> if (offset < bvec->bv_len) {
> + iter->count -= offset;
> iter->iov_offset = offset;
> } else if (imu->is_kbuf) {
> iov_iter_advance(iter, offset);
> @@ -1063,6 +1064,7 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
>
> iter->bvec += seg_skip;
> iter->nr_segs -= seg_skip;
> + iter->count -= bvec->bv_len + offset;
> iter->iov_offset = offset & ((1UL << imu->folio_shift) - 1);
> }
> }
> --
> 2.47.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "io_uring/rsrc: simplify the bvec iter count calculation"
2025-03-10 18:48 [PATCH] Revert "io_uring/rsrc: simplify the bvec iter count calculation" Keith Busch
2025-03-10 18:50 ` Caleb Sander Mateos
@ 2025-03-10 19:37 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2025-03-10 19:37 UTC (permalink / raw)
To: asml.silence, io-uring, Keith Busch; +Cc: Keith Busch, Caleb Sander Mateos
On Mon, 10 Mar 2025 11:48:25 -0700, Keith Busch wrote:
> This reverts commit 2a51c327d4a4a2eb62d67f4ea13a17efd0f25c5c.
>
> The kernel registered bvecs do use the iov_iter_advance() API, so we
> can't rely on this simplification anymore.
>
>
Applied, thanks!
[1/1] Revert "io_uring/rsrc: simplify the bvec iter count calculation"
commit: c93edef0374b203a7109e876ecd396446cb6e1d3
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-10 19:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 18:48 [PATCH] Revert "io_uring/rsrc: simplify the bvec iter count calculation" Keith Busch
2025-03-10 18:50 ` Caleb Sander Mateos
2025-03-10 19:37 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox