]> git.baikalelectronics.ru Git - kernel.git/commitdiff
io_uring: prep req when do IOSQE_ASYNC
authorPavel Begunkov <asml.silence@gmail.com>
Wed, 22 Jan 2020 20:09:35 +0000 (23:09 +0300)
committerJens Axboe <axboe@kernel.dk>
Wed, 22 Jan 2020 20:57:46 +0000 (13:57 -0700)
Whenever IOSQE_ASYNC is set, requests will be punted to async without
getting into io_issue_req() and without proper preparation done (e.g.
io_req_defer_prep()). Hence they will be left uninitialised.

Prepare them before punting.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 09503d1e9e45697f2208a57fb5186c6d5cd5ced2..cdbc711ae5fd7cf0ad751807bc3e3f3db053d05b 100644 (file)
@@ -4558,11 +4558,15 @@ static void io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        ret = io_req_defer(req, sqe);
        if (ret) {
                if (ret != -EIOCBQUEUED) {
+fail_req:
                        io_cqring_add_event(req, ret);
                        req_set_fail_links(req);
                        io_double_put_req(req);
                }
        } else if (req->flags & REQ_F_FORCE_ASYNC) {
+               ret = io_req_defer_prep(req, sqe);
+               if (unlikely(ret < 0))
+                       goto fail_req;
                /*
                 * Never try inline submit of IOSQE_ASYNC is set, go straight
                 * to async execution.