]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
io_uring/kbuf: account ring io_buffer_list memory
authorPavel Begunkov <asml.silence@gmail.com>
Tue, 13 May 2025 17:26:46 +0000 (18:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:11:14 +0000 (11:11 +0100)
commit 475a8d30371604a6363da8e304a608a5959afc40 upstream.

Follow the non-ringed pbuf struct io_buffer_list allocations and account
it against the memcg. There is low chance of that being an actual
problem as ring provided buffer should either pin user memory or
allocate it, which is already accounted.

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

index 7a8c3a004800ed341931076e9456c8051bf6c85a..94602d1f7e6ff322e5c0196a44bd727ae2f22626 100644 (file)
@@ -728,7 +728,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
                io_destroy_bl(ctx, bl);
        }
 
-       free_bl = bl = kzalloc(sizeof(*bl), GFP_KERNEL);
+       free_bl = bl = kzalloc(sizeof(*bl), GFP_KERNEL_ACCOUNT);
        if (!bl)
                return -ENOMEM;