block: virtio_blk: fix handling single range discard request
authorMing Lei <ming.lei@redhat.com>
Mon, 17 Aug 2020 09:52:40 +0000 (17:52 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 17 Aug 2020 13:59:41 +0000 (06:59 -0700)
commitaf822aa68fbdf0a480a17462ed70232998127453
treeab7651acb496d12ef007108e8005c3fd07864d87
parent943b40c832beb71115e38a1c4d99b640b5342738
block: virtio_blk: fix handling single range discard request

1f23816b8eb8 ("virtio_blk: add discard and write zeroes support") starts
to support multi-range discard for virtio-blk. However, the virtio-blk
disk may report max discard segment as 1, at least that is exactly what
qemu is doing.

So far, block layer switches to normal request merge if max discard segment
limit is 1, and multiple bios can be merged to single segment. This way may
cause memory corruption in virtblk_setup_discard_write_zeroes().

Fix the issue by handling single max discard segment in straightforward
way.

Fixes: 1f23816b8eb8 ("virtio_blk: add discard and write zeroes support")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Changpeng Liu <changpeng.liu@intel.com>
Cc: Daniel Verkamp <dverkamp@chromium.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/virtio_blk.c