From: Elijah Wright <git@elijahs.space>
To: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Elijah Wright <git@elijahs.space>
Subject: [PATCH] block: mq-deadline: check if elevator is attached to queue in dd_finish_request
Date: Tue, 17 Jun 2025 13:56:08 -0700 [thread overview]
Message-ID: <20250617205630.207696-1-git@elijahs.space> (raw)
in dd_finish_request(), per_prio points to a rq->elv.priv[0], which could be
free memory if an in-flight requests completes after its associated scheduler
has been freed
Signed-off-by: Elijah Wright <git@elijahs.space>
---
block/mq-deadline.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 2edf1cac06d5..4d7b21b144d3 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -751,13 +751,15 @@ static void dd_finish_request(struct request *rq)
{
struct dd_per_prio *per_prio = rq->elv.priv[0];
- /*
- * The block layer core may call dd_finish_request() without having
- * called dd_insert_requests(). Skip requests that bypassed I/O
- * scheduling. See also blk_mq_request_bypass_insert().
- */
- if (per_prio)
- atomic_inc(&per_prio->stats.completed);
+ if (rq->q->elevator) {
+ /*
+ * The block layer core may call dd_finish_request() without having
+ * called dd_insert_requests(). Skip requests that bypassed I/O
+ * scheduling. See also blk_mq_request_bypass_insert().
+ */
+ if (per_prio)
+ atomic_inc(&per_prio->stats.completed);
+ }
}
static bool dd_has_work_for_prio(struct dd_per_prio *per_prio)
--
2.43.0
next reply other threads:[~2025-06-17 20:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-17 20:56 Elijah Wright [this message]
2025-06-17 22:25 ` Bart Van Assche
2025-06-17 22:52 ` Elijah Wright
2025-06-18 0:19 ` Bart Van Assche
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=20250617205630.207696-1-git@elijahs.space \
--to=git@elijahs.space \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®