OSDN Git Service

io_uring: fix refcounting with batched allocations at OOM
authorPavel Begunkov <asml.silence@gmail.com>
Sat, 25 Jan 2020 19:34:01 +0000 (22:34 +0300)
committerJens Axboe <axboe@kernel.dk>
Mon, 27 Jan 2020 22:36:30 +0000 (15:36 -0700)
In case of out of memory the second argument of percpu_ref_put_many() in
io_submit_sqes() may evaluate into "nr - (-EAGAIN)", that is clearly
wrong.

Fixes: 2b85edfc0c90 ("io_uring: batch getting pcpu references")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index a700ee5..1dd2030 100644 (file)
@@ -4830,8 +4830,11 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr,
                        break;
        }
 
-       if (submitted != nr)
-               percpu_ref_put_many(&ctx->refs, nr - submitted);
+       if (unlikely(submitted != nr)) {
+               int ref_used = (submitted == -EAGAIN) ? 0 : submitted;
+
+               percpu_ref_put_many(&ctx->refs, nr - ref_used);
+       }
        if (link)
                io_queue_link_head(link);
        if (statep)