lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 020/862] io_uring: correct pinned_vm accounting
    Date
    From: Pavel Begunkov <asml.silence@gmail.com>

    commit 42b6419d0aba47c5d8644cdc0b68502254671de5 upstream.

    ->mm_account should be released only after we free all registered
    buffers, otherwise __io_sqe_buffers_unregister() will see a NULL
    ->mm_account and skip locked_vm accounting.

    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
    Link: https://lore.kernel.org/r/6d798f65ed4ab8db3664c4d3397d4af16ca98846.1664849932.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 | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/io_uring/io_uring.c
    +++ b/io_uring/io_uring.c
    @@ -2422,12 +2422,6 @@ static void io_req_caches_free(struct io
    static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
    {
    io_sq_thread_finish(ctx);
    -
    - if (ctx->mm_account) {
    - mmdrop(ctx->mm_account);
    - ctx->mm_account = NULL;
    - }
    -
    io_rsrc_refs_drop(ctx);
    /* __io_rsrc_put_work() may need uring_lock to progress, wait w/o it */
    io_wait_rsrc_data(ctx->buf_data);
    @@ -2470,6 +2464,10 @@ static __cold void io_ring_ctx_free(stru
    WARN_ON_ONCE(!list_empty(&ctx->ltimeout_list));
    WARN_ON_ONCE(ctx->notif_slots || ctx->nr_notif_slots);

    + if (ctx->mm_account) {
    + mmdrop(ctx->mm_account);
    + ctx->mm_account = NULL;
    + }
    io_mem_free(ctx->rings);
    io_mem_free(ctx->sq_sqes);


    \
     
     \ /
      Last update: 2022-10-19 10:44    [W:4.045 / U:1.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site