From: Jens Axboe <[email protected]>
To: Dylan Yudaken <[email protected]>,
Pavel Begunkov <[email protected]>,
[email protected]
Cc: [email protected], [email protected]
Subject: Re: [PATCH v2 2/4] io_uring: update kiocb->ki_pos at execution time
Date: Mon, 21 Feb 2022 09:32:32 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On 2/21/22 7:16 AM, Dylan Yudaken wrote:
> Update kiocb->ki_pos at execution time rather than in io_prep_rw().
> io_prep_rw() happens before the job is enqueued to a worker and so the
> offset might be read multiple times before being executed once.
>
> Ensures that the file position in a set of _linked_ SQEs will be only
> obtained after earlier SQEs have completed, and so will include their
> incremented file position.
>
> Signed-off-by: Dylan Yudaken <[email protected]>
> ---
> fs/io_uring.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 1f9b4466c269..50b93ff2ee12 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -3000,14 +3000,6 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
>
> kiocb->ki_pos = READ_ONCE(sqe->off);
> - if (kiocb->ki_pos == -1) {
> - if (!(file->f_mode & FMODE_STREAM)) {
> - req->flags |= REQ_F_CUR_POS;
> - kiocb->ki_pos = file->f_pos;
> - } else {
> - kiocb->ki_pos = 0;
> - }
> - }
> kiocb->ki_flags = iocb_flags(file);
> ret = kiocb_set_rw_flags(kiocb, READ_ONCE(sqe->rw_flags));
> if (unlikely(ret))
> @@ -3074,6 +3066,19 @@ static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret)
> }
> }
>
> +static inline void
> +io_kiocb_update_pos(struct io_kiocb *req, struct kiocb *kiocb)
> +{
> + if (kiocb->ki_pos == -1) {
> + if (!(req->file->f_mode & FMODE_STREAM)) {
> + req->flags |= REQ_F_CUR_POS;
> + kiocb->ki_pos = req->file->f_pos;
> + } else {
> + kiocb->ki_pos = 0;
> + }
> + }
> +}
static inline void io_kiocb_update_pos(struct io_kiocb *req,
struct kiocb *kiocb)
{
}
Can we just drop the kiocb argument? It'll always be req->rw.kiocb.
Should generate the same code if you do:
static inline void io_kiocb_update_pos(struct io_kiocb *req)
{
struct kiocb *kiocb = &req->rw.kiocb;
...
}
Apart from that minor thing, looks good to me.
--
Jens Axboe
next prev parent reply other threads:[~2022-02-21 16:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 14:16 [PATCH v2 0/4] io_uring: consistent behaviour with linked read/write Dylan Yudaken
2022-02-21 14:16 ` [PATCH v2 1/4] io_uring: remove duplicated calls to io_kiocb_ppos Dylan Yudaken
2022-02-21 14:16 ` [PATCH v2 2/4] io_uring: update kiocb->ki_pos at execution time Dylan Yudaken
2022-02-21 16:32 ` Jens Axboe [this message]
2022-02-21 14:16 ` [PATCH v2 3/4] io_uring: do not recalculate ppos unnecessarily Dylan Yudaken
2022-02-21 14:16 ` [PATCH v2 4/4] io_uring: pre-increment f_pos on rw Dylan Yudaken
2022-02-21 18:00 ` Pavel Begunkov
2022-02-22 7:20 ` Hao Xu
2022-02-22 8:26 ` Dylan Yudaken
2022-02-22 7:34 ` Hao Xu
2022-02-22 10:52 ` Dylan Yudaken
2022-02-21 16:33 ` [PATCH v2 0/4] io_uring: consistent behaviour with linked read/write Jens Axboe
2022-02-21 17:48 ` Dylan Yudaken
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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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