• Bart Van Assche's avatar
    skd: Avoid double completions in case of a timeout · f2fe4459
    Bart Van Assche authored
    Avoid that normal request completion and the timeout handler can
    run concurrently by calling blk_mq_complete_request() instead of
    blk_mq_end_request() from skd_end_request(). Avoid that the block
    layer can reuse a request while the firmware is still processing
    it. Convert skd_softirq_done() to blk-mq. Pass the pointer to
    skd_softirq_done() to the block layer core through
    blk_mq_ops.complete instead of by calling blk_queue_softirq_done().
    Pass the pointer to skd_timed_out() to the block layer core
    through blk_mq_ops.timeout instead of by calling
    blk_queue_timed_out(). The timeout handler has been tested as
    follows:
    
        echo 1 > /sys/block/skd0/io-timeout-fail &&
        (cd /sys/kernel/debug/fail_io_timeout &&
          echo 100 > probability &&
          echo N > task-filter &&
          echo 1 > times)
    
    Fixes: commit a74d5b76 ("skd: Switch to block layer timeout mechanism")
    Reported-by: default avatarChristoph Hellwig <hch@lst.de>
    Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Hannes Reinecke <hare@suse.de>
    Cc: Johannes Thumshirn <jthumshirn@suse.de>
    Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
    f2fe4459
skd_main.c 94.1 KB