• Ross Lagerwall's avatar
    blk-mq: Fix stall due to recursive flush plug · 70904263
    Ross Lagerwall authored
    We have seen rare IO stalls as follows:
    
    * blk_mq_plug_issue_direct() is entered with an mq_list containing two
    requests.
    * For the first request, it sets last == false and enters the driver's
    queue_rq callback.
    * The driver queue_rq callback indirectly calls schedule() which calls
    blk_flush_plug(). This may happen if the driver has the
    BLK_MQ_F_BLOCKING flag set and is allowed to sleep in ->queue_rq.
    * blk_flush_plug() handles the remaining request in the mq_list. mq_list
    is now empty.
    * The original call to queue_rq resumes (with last == false).
    * The loop in blk_mq_plug_issue_direct() terminates because there are no
    remaining requests in mq_list.
    
    The IO is now stalled because the last request submitted to the driver
    had last == false and there was no subsequent call to commit_rqs().
    
    Fix this by returning early in blk_mq_flush_plug_list() if rq_count is 0
    which it will be in the recursive case, rather than checking if the
    mq_list is empty. At the same time, adjust one of the callers to skip
    the mq_list empty check as it is not necessary.
    
    Fixes: dc5fc361 ("block: attempt direct issue of plug list")
    Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
    Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
    Link: https://lore.kernel.org/r/20230714101106.3635611-1-ross.lagerwall@citrix.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
    70904263
blk-mq.c 122 KB