]> git.itanic.dy.fi Git - linux-stable/commitdiff
s390/dasd: fix hanging blockdevice after request requeue
authorStefan Haberland <sth@linux.ibm.com>
Wed, 5 Apr 2023 14:20:17 +0000 (16:20 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 12 Apr 2023 01:53:08 +0000 (19:53 -0600)
The DASD driver does not kick the requeue list when requeuing IO requests
to the blocklayer. This might lead to hanging blockdevice when there is
no other trigger for this.

Fix by automatically kick the requeue list when requeuing DASD requests
to the blocklayer.

Fixes: e443343e509a ("s390/dasd: blk-mq conversion")
CC: stable@vger.kernel.org # 4.14+
Signed-off-by: Stefan Haberland <sth@linux.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Link: https://lore.kernel.org/r/20230405142017.2446986-8-sth@linux.ibm.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/s390/block/dasd.c

index 3696931f8015deab9f89161bbb2d5da5bec94a53..9fbfce735d56502d5fcdd2e1894d0cc4a97db449 100644 (file)
@@ -2953,7 +2953,7 @@ static int _dasd_requeue_request(struct dasd_ccw_req *cqr)
                return 0;
        spin_lock_irq(&cqr->dq->lock);
        req = (struct request *) cqr->callback_data;
-       blk_mq_requeue_request(req, false);
+       blk_mq_requeue_request(req, true);
        spin_unlock_irq(&cqr->dq->lock);
 
        return 0;