virtio_blk: fix the discard_granularity and discard_alignment queue limits
authorChristoph Hellwig <hch@lst.de>
Mon, 18 Apr 2022 04:53:07 +0000 (06:53 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 3 May 2022 16:38:50 +0000 (10:38 -0600)
commit62952cc5bccd89b76d710de1d0b43244af0f2903
tree5345281eeb00cffa1579beea26b274c76ebe9a2e
parentfb749a87f4536d2fa86ea135ae4eff1072903438
virtio_blk: fix the discard_granularity and discard_alignment queue limits

The discard_alignment queue limit is named a bit misleading means the
offset into the block device at which the discard granularity starts.

On the other hand the discard_sector_alignment from the virtio 1.1 looks
similar to what Linux uses as discard granularity (even if not very well
described):

  "discard_sector_alignment can be used by OS when splitting a request
   based on alignment. "

And at least qemu does set it to the discard granularity.

So stop setting the discard_alignment and use the virtio
discard_sector_alignment to set the discard granularity.

Fixes: 1f23816b8eb8 ("virtio_blk: add discard and write zeroes support")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20220418045314.360785-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/virtio_blk.c