From: Pavel Begunkov <asml.silence@gmail.com>
To: Jens Axboe <axboe@kernel.dk>, io-uring <io-uring@vger.kernel.org>
Subject: Re: [PATCH for-next] io_uring: ensure overflow entries are dropped when ring is exiting
Date: Mon, 15 Apr 2024 13:08:28 +0100 [thread overview]
Message-ID: <1ddaa0bd-e72f-4eef-882c-7b8b0fb57593@gmail.com> (raw)
In-Reply-To: <025b6c13-98fd-4b35-be83-257fd34291bc@kernel.dk>
On 4/12/24 20:18, Jens Axboe wrote:
> A previous consolidation cleanup missed handling the case where the ring
> is dying, and __io_cqring_overflow_flush() doesn't flush entries if the
> CQ ring is already full. This is fine for the normal CQE overflow
> flushing, but if the ring is going away, we need to flush everything,
> even if it means simply freeing the overflown entries.
Indeed, sounds like a good idea to enable leak detection
for my testing.
> Fixes: 6c948ec44b29 ("io_uring: consolidate overflow flushing")
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
>
> ---
>
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index c4419eef7e63..3c9087f37c43 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -674,7 +674,8 @@ static void __io_cqring_overflow_flush(struct io_ring_ctx *ctx, bool dying)
>
> lockdep_assert_held(&ctx->uring_lock);
>
> - if (__io_cqring_events(ctx) == ctx->cq_entries)
> + /* don't abort if we're dying, entries must get freed */
> + if (!dying && __io_cqring_events(ctx) == ctx->cq_entries)
> return;
>
> if (ctx->flags & IORING_SETUP_CQE32)
>
--
Pavel Begunkov
prev parent reply other threads:[~2024-04-15 12:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 19:18 [PATCH for-next] io_uring: ensure overflow entries are dropped when ring is exiting Jens Axboe
2024-04-15 12:08 ` Pavel Begunkov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1ddaa0bd-e72f-4eef-882c-7b8b0fb57593@gmail.com \
--to=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).