Skip to content

Commit

Permalink
io_uring: fix issue with io_write() not always undoing sb_start_write()
Browse files Browse the repository at this point in the history
This is actually an older issue, but we never used to hit the -EAGAIN
path before having done sb_start_write(). Make sure that we always call
kiocb_end_write() if we need to retry the write, so that we keep the
calls to sb_start_write() etc balanced.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
axboe committed Jul 25, 2022
1 parent 4e17aaa commit e053aaf
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion io_uring/rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,8 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
if (rw)
rw->bytes_done += ret2;

if (kiocb->ki_flags & IOCB_WRITE)
kiocb_end_write(req);
return ret ? ret : -EAGAIN;
}
done:
Expand All @@ -953,7 +955,12 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
copy_iov:
iov_iter_restore(&s->iter, &s->iter_state);
ret = io_setup_async_rw(req, iovec, s, false);
return ret ?: -EAGAIN;
if (!ret) {
if (kiocb->ki_flags & IOCB_WRITE)
kiocb_end_write(req);
return -EAGAIN;
}
return ret;
}
/* it's reportedly faster than delegating the null check to kfree() */
if (iovec)
Expand Down

0 comments on commit e053aaf

Please sign in to comment.