Revert "io_uring/rsrc: simplify the bvec iter count calculation"
PATCH 1/1 Revert "io_uring/rsrc: simplify the bvec iter count calculation"
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.
--- io_uring/rsrc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
io_uring/rsrc.c +3 -1
@@ -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 ); } }
Signature · 1 line
2.47.1
Quoted 10 lines · Keith Busch
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]>
Quoted 37 lines
Signed-off-by Keith Busch <[email protected]>--- io_uring/rsrc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)io_uring/rsrc.c +3
-2@@ -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
Quoted 6 lines · Keith Busch
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,
Signature · 1 line
Jens Axboe