Commit 7f90d45e authored by Justin Sanders's avatar Justin Sanders Committed by Jens Axboe
Browse files

aoe: clean device rq_list in aoedev_downdev() 

An aoe device's rq_list contains accepted block requests that are
waiting to be transmitted to the aoe target. This queue was added as
part of the conversion to blk_mq. However, the queue was not cleaned out
when an aoe device is downed which caused blk_mq_freeze_queue() to sleep
indefinitely waiting for those requests to complete, causing a hang. This
fix cleans out the queue before calling blk_mq_freeze_queue().

Link: https://bugzilla.kernel.org/show_bug.cgi?id=212665


Fixes: 3582dd29 ("aoe: convert aoeblk to blk-mq")
Signed-off-by: default avatarJustin Sanders <jsanders.devel@gmail.com>
Link: https://lore.kernel.org/r/20250610170600.869-1-jsanders.devel@gmail.com


Tested-By: default avatarValentin Kleibel <valentin@vrvis.at>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9ce6c987

drivers/block/aoe/aoedev.c

+8 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ aoedev_downdev(struct aoedev *d) 
{

	struct aoetgt *t, **tt, **te;

	struct list_head *head, *pos, *nx;

	struct request *rq, *rqnext;

	int i;



	d->flags &= ~DEVFL_UP;
@@ -223,6 +224,13 @@ aoedev_downdev(struct aoedev *d) 
	/* clean out the in-process request (if any) */

	aoe_failip(d);



	/* clean out any queued block requests */

	list_for_each_entry_safe(rq, rqnext, &d->rq_list, queuelist) {

		list_del_init(&rq->queuelist);

		blk_mq_start_request(rq);

		blk_mq_end_request(rq, BLK_STS_IOERR);

	}



	/* fast fail all pending I/O */

	if (d->blkq) {

		/* UP is cleared, freeze+quiesce to insure all are errored */