• David Jeffery's avatar
    block: recalculate segment count for multi-segment discards correctly · a958937f
    David Jeffery authored
    When a stacked block device inserts a request into another block device
    using blk_insert_cloned_request, the request's nr_phys_segments field gets
    recalculated by a call to blk_recalc_rq_segments in
    blk_cloned_rq_check_limits. But blk_recalc_rq_segments does not know how to
    handle multi-segment discards. For disk types which can handle
    multi-segment discards like nvme, this results in discard requests which
    claim a single segment when it should report several, triggering a warning
    in nvme and causing nvme to fail the discard from the invalid state.
    
     WARNING: CPU: 5 PID: 191 at drivers/nvme/host/core.c:700 nvme_setup_discard+0x170/0x1e0 [nvme_core]
     ...
     nvme_setup_cmd+0x217/0x270 [nvme_core]
     nvme_loop_queue_rq+0x51/0x1b0 [nvme_loop]
     __blk_mq_try_issue_directly+0xe7/0x1b0
     blk_mq_request_issue_directly+0x41/0x70
     ? blk_account_io_start+0x40/0x50
     dm_mq_queue_rq+0x200/0x3e0
     blk_mq_dispatch_rq_list+0x10a/0x7d0
     ? __sbitmap_queue_get+0x...
    a958937f
blk-merge.c 30.5 KB