Skip to contentSkip to conversation

blk-mq: mark flush request as IDLE in flush_end_io()

PATCH Applied Ming Lei 2 participants 2 messages Oct 30, 2020 Block layer

lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 blk-mq: mark flush request as IDLE in flush_end_io()

Mark flush request as IDLE in its .end_io() for aligning to normal request since flush request stays in in-flight tags in case of !elevator, so we need to change its state into IDLE. Otherwise, we will hang in blk_mq_tagset_wait_completed_request() during error recovery because flush request's state is kept as COMPLETE.

---
 block/blk-flush.c | 1 +
 1 file changed, 1 insertion(+)
block/blk-flush.c +1 -0
index 53abb5c73d99..e32958f0b687 100644
@@ -225,6 +225,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
 	/* release the tag's ownership to the req cloned from */
 	spin_lock_irqsave(&fq->mq_flush_lock, flags);
 
+	WRITE_ONCE(flush_rq->state, MQ_RQ_IDLE);
 	if (!refcount_dec_and_test(&flush_rq->ref)) {
 		fq->rq_status = error;
 		spin_unlock_irqrestore(&fq->mq_flush_lock, flags);
Signature · 1 line
2.25.2
maintainer Applied
#1 lore raw
Quoted 4 lines · Ming Lei

Mark flush request as IDLE in its .end_io() for aligning to normal request since flush request stays in in-flight tags in case of !elevator, so we need to change its state into IDLE. Otherwise, we will hang in blk_mq_tagset_wait_completed_request() during error recovery because flush request's state is kept as COMPLETE.

Applied, thanks.

Signature · 1 line
Jens Axboe