]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
io_uring: account drain memory to cgroup
authorPavel Begunkov <asml.silence@gmail.com>
Fri, 9 May 2025 11:12:47 +0000 (12:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:11:13 +0000 (11:11 +0100)
commit f979c20547e72568e3c793bc92c7522bc3166246 upstream.

Account drain allocations against memcg. It's not a big problem as each
such allocation is paired with a request, which is accounted, but it's
nicer to follow the limits more closely.

Cc: stable@vger.kernel.org # 6.1
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/f8dfdbd755c41fd9c75d12b858af07dfba5bbb68.1746788718.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
io_uring/io_uring.c

index 64870f51b678837f6797e5401c5a9ebbd69a99e7..52ada466bf98f37829ed54e7d6b12a146a207699 100644 (file)
@@ -1681,7 +1681,7 @@ queue:
        spin_unlock(&ctx->completion_lock);
 
        io_prep_async_link(req);
-       de = kmalloc(sizeof(*de), GFP_KERNEL);
+       de = kmalloc(sizeof(*de), GFP_KERNEL_ACCOUNT);
        if (!de) {
                ret = -ENOMEM;
                io_req_defer_failed(req, ret);