diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2019-11-25 23:14:38 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-11-26 15:02:56 -0700 |
| commit | cc42e0ac17d3664a70e020dfe7897f14e7aa7453 (patch) | |
| tree | c5b3956c7d10e89226590c4c79748cd9c8c43917 /fs/io_uring.c | |
| parent | net: disallow ancillary data for __sys_{send,recv}msg_file() (diff) | |
| download | linux-dev-cc42e0ac17d3664a70e020dfe7897f14e7aa7453.tar.xz linux-dev-cc42e0ac17d3664a70e020dfe7897f14e7aa7453.zip | |
io_uring: store timeout's sqe->off in proper place
Timeouts' sequence offset (i.e. sqe->off) is stored in
req->submit.sequence under a false name. Keep it in timeout.data
instead. The unused space for sequence will be reclaimed in the
following patches.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | fs/io_uring.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 7412fdefa35a..39409934e9e6 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -309,6 +309,7 @@ struct io_timeout_data { struct hrtimer timer; struct timespec64 ts; enum hrtimer_mode mode; + u32 seq_offset; }; struct io_timeout { @@ -2473,8 +2474,7 @@ static int io_timeout(struct io_kiocb *req, const struct io_uring_sqe *sqe) } req->sequence = ctx->cached_sq_head + count - 1; - /* reuse it to store the count */ - req->submit.sequence = count; + req->timeout.data->seq_offset = count; /* * Insertion sort, ensuring the first entry in the list is always @@ -2485,6 +2485,7 @@ static int io_timeout(struct io_kiocb *req, const struct io_uring_sqe *sqe) struct io_kiocb *nxt = list_entry(entry, struct io_kiocb, list); unsigned nxt_sq_head; long long tmp, tmp_nxt; + u32 nxt_offset = nxt->timeout.data->seq_offset; if (nxt->flags & REQ_F_TIMEOUT_NOSEQ) continue; @@ -2494,8 +2495,8 @@ static int io_timeout(struct io_kiocb *req, const struct io_uring_sqe *sqe) * long to store it. */ tmp = (long long)ctx->cached_sq_head + count - 1; - nxt_sq_head = nxt->sequence - nxt->submit.sequence + 1; - tmp_nxt = (long long)nxt_sq_head + nxt->submit.sequence - 1; + nxt_sq_head = nxt->sequence - nxt_offset + 1; + tmp_nxt = (long long)nxt_sq_head + nxt_offset - 1; /* * cached_sq_head may overflow, and it will never overflow twice |