Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

virtio_blk: remove the broken zone revalidation support

virtblk_revalidate_zones is called unconditionally from
virtblk_config_changed_work from the virtio config_changed callback.

virtblk_revalidate_zones is a bit odd in that it re-clears the zoned
state for host aware or non-zoned devices, which isn't needed unless the
zoned mode changed - but a zone mode change to a host managed model isn't
handled at all, and virtio_blk also doesn't handle any other config
change except for a capacity change is handled (and even if it was
the upper layers above virtio_blk wouldn't handle it very well).

But even the useful case of a size change that would add or remove
zones isn't handled properly as blk_revalidate_disk_zones expects the
device capacity to cover all zones, but the capacity is only updated
after virtblk_revalidate_zones.

As this code appears to be entirely untested and is getting in the way
remove it for now, but it can be readded in a fixed version with
proper test coverage if needed.

Fixes: 95bfec41bd3d ("virtio-blk: add support for zoned block devices")
Fixes: f1ba4e674feb ("virtio-blk: fix to match virtio spec")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20231217165359.604246-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
a971ed80 77360cad

-26
-26
drivers/block/virtio_blk.c
··· 722 722 return ret; 723 723 } 724 724 725 - static void virtblk_revalidate_zones(struct virtio_blk *vblk) 726 - { 727 - u8 model; 728 - 729 - virtio_cread(vblk->vdev, struct virtio_blk_config, 730 - zoned.model, &model); 731 - switch (model) { 732 - default: 733 - dev_err(&vblk->vdev->dev, "unknown zone model %d\n", model); 734 - fallthrough; 735 - case VIRTIO_BLK_Z_NONE: 736 - case VIRTIO_BLK_Z_HA: 737 - disk_set_zoned(vblk->disk, BLK_ZONED_NONE); 738 - return; 739 - case VIRTIO_BLK_Z_HM: 740 - WARN_ON_ONCE(!vblk->zone_sectors); 741 - if (!blk_revalidate_disk_zones(vblk->disk, NULL)) 742 - set_capacity_and_notify(vblk->disk, 0); 743 - } 744 - } 745 - 746 725 static int virtblk_probe_zoned_device(struct virtio_device *vdev, 747 726 struct virtio_blk *vblk, 748 727 struct request_queue *q) ··· 801 822 * good to go as regular block devices. 802 823 */ 803 824 #define virtblk_report_zones NULL 804 - 805 - static inline void virtblk_revalidate_zones(struct virtio_blk *vblk) 806 - { 807 - } 808 825 809 826 static inline int virtblk_probe_zoned_device(struct virtio_device *vdev, 810 827 struct virtio_blk *vblk, struct request_queue *q) ··· 957 982 struct virtio_blk *vblk = 958 983 container_of(work, struct virtio_blk, config_work); 959 984 960 - virtblk_revalidate_zones(vblk); 961 985 virtblk_update_capacity(vblk, true); 962 986 } 963 987