]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
aoe: clean device rq_list in aoedev_downdev()
authorJustin Sanders <jsanders.devel@gmail.com>
Tue, 10 Jun 2025 17:05:59 +0000 (17:05 +0000)
committerJens Axboe <axboe@kernel.dk>
Tue, 17 Jun 2025 12:12:30 +0000 (06:12 -0600)
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: 3582dd291788 ("aoe: convert aoeblk to blk-mq")
Signed-off-by: Justin Sanders <jsanders.devel@gmail.com>
Link: https://lore.kernel.org/r/20250610170600.869-1-jsanders.devel@gmail.com
Tested-By: Valentin Kleibel <valentin@vrvis.at>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/aoe/aoedev.c

index 141b2a0e03f2cbf5c2a352b225072fae8771753c..8c18034cb3d69e85efcd20c6d902a4711b344bfe 100644 (file)
@@ -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 */