block: return ELEVATOR_DISCARD_MERGE if possible
authorMing Lei <ming.lei@redhat.com>
Thu, 29 Jul 2021 03:42:26 +0000 (11:42 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 9 Aug 2021 20:37:47 +0000 (14:37 -0600)
commit866663b7b52d2da267b28e12eed89ee781b8fed1
treedffdcd640e5dc188e662a604cffaa68daa54d349
parenta11d7fc2d05fb509cd9e33d4093507d6eda3ad53
block: return ELEVATOR_DISCARD_MERGE if possible

When merging one bio to request, if they are discard IO and the queue
supports multi-range discard, we need to return ELEVATOR_DISCARD_MERGE
because both block core and related drivers(nvme, virtio-blk) doesn't
handle mixed discard io merge(traditional IO merge together with
discard merge) well.

Fix the issue by returning ELEVATOR_DISCARD_MERGE in this situation,
so both blk-mq and drivers just need to handle multi-range discard.

Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Fixes: 2705dfb20947 ("block: fix discard request merge")
Link: https://lore.kernel.org/r/20210729034226.1591070-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-iosched.c
block/blk-merge.c
block/elevator.c
block/mq-deadline-main.c
include/linux/blkdev.h