virtio-blk: fix probe without CONFIG_BLK_DEV_ZONED
Subsystems (3)
Michael S. Tsirkin
maintainerPATCH 1/1 virtio-blk: fix probe without CONFIG_BLK_DEV_ZONED
When building without CONFIG_BLK_DEV_ZONED, VIRTIO_BLK_F_ZONED is excluded from array of driver features.
As a result virtio_has_feature panics in virtio_check_driver_offered_feature since that by design verifies that a feature we are checking for is listed in the feature array.
To fix, replace the call to virtio_has_feature with a stub.
--- drivers/block/virtio_blk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/block/virtio_blk.c +10 -1
@@ -760,6 +760,10 @@ static int virtblk_probe_zoned_device(struct virtio_device *vdev, return ret; } +static inline bool virtblk_has_zoned_feature (struct virtio_device *vdev) +{ +return virtio_has_feature (vdev,VIRTIO_BLK_F_ZONED ); +}#else /*
@@ -775,6 +779,11 @@ static inline int virtblk_probe_zoned_device(struct virtio_device *vdev, {return -EOPNOTSUPP ; } + +static inline bool virtblk_has_zoned_feature (struct virtio_device *vdev) +{ +return false; +}#endif /* CONFIG_BLK_DEV_ZONED */ /* return id (s/n) string for *disk to *id_str
@@ -1480,7 +1489,7 @@ static int virtblk_probe(struct virtio_device *vdev)virtblk_update_capacity (vblk, false);virtio_device_ready (vdev); -if (virtio_has_feature (vdev,VIRTIO_BLK_F_ZONED )) { +if (virtblk_has_zoned_feature (vdev)) { err =virtblk_probe_zoned_device (vdev, vblk, q);if (err) goto out_cleanup_disk;
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 6 lines · Michael S. Tsirkin
When building without
CONFIG_BLK_DEV_ZONED,VIRTIO_BLK_F_ZONEDis excluded from array of driver features.
As a resultvirtio_has_featurepanics invirtio_check_driver_offered_featuresince that by design verifies that a feature we are checking for is listed in the feature array.
Quoted 7 lines
To fix, replace the call to
virtio_has_featurewith a stub.Tested-by Anders Roxell <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>--- drivers/block/virtio_blk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 11 lines · Michael S. Tsirkin
When building without
CONFIG_BLK_DEV_ZONED,VIRTIO_BLK_F_ZONEDis excluded from array of driver features.
As a resultvirtio_has_featurepanics invirtio_check_driver_offered_featuresince that by design verifies that a feature we are checking for is listed in the feature array.To fix, replace the call to
virtio_has_featurewith a stub.Tested-by Anders Roxell <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
-ck
Quoted 11 lines · Michael S. Tsirkin
When building without
CONFIG_BLK_DEV_ZONED,VIRTIO_BLK_F_ZONEDis excluded from array of driver features.
As a resultvirtio_has_featurepanics invirtio_check_driver_offered_featuresince that by design verifies that a feature we are checking for is listed in the feature array.To fix, replace the call to
virtio_has_featurewith a stub.Tested-by Anders Roxell <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Thanks
Quoted 43 lines
--- drivers/block/virtio_blk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/block/virtio_blk.c +10
-2@@ -760,6 +760,10 @@ static int virtblk_probe_zoned_device(struct virtio_device *vdev, return ret; } +static inline bool virtblk_has_zoned_feature (struct virtio_device *vdev) +{ +return virtio_has_feature (vdev,VIRTIO_BLK_F_ZONED ); +}#else /* @@ -775,6 +779,11 @@ static inline int virtblk_probe_zoned_device(struct virtio_device *vdev, {return -EOPNOTSUPP ; } + +static inline bool virtblk_has_zoned_feature (struct virtio_device *vdev) +{ +return false; +}#endif /* CONFIG_BLK_DEV_ZONED */ /* return id (s/n) string for *disk to *id_str @@ -1480,7 +1489,7 @@ static int virtblk_probe(struct virtio_device *vdev)virtblk_update_capacity (vblk, false);virtio_device_ready (vdev); -if (virtio_has_feature (vdev,VIRTIO_BLK_F_ZONED )) { +if (virtblk_has_zoned_feature (vdev)) { err =virtblk_probe_zoned_device (vdev, vblk, q);if (err) goto out_cleanup_disk; --MST
Quoted 53 lines · Michael S. Tsirkin
When building without
CONFIG_BLK_DEV_ZONED,VIRTIO_BLK_F_ZONEDis excluded from array of driver features.
As a resultvirtio_has_featurepanics invirtio_check_driver_offered_featuresince that by design verifies that a feature we are checking for is listed in the feature array.To fix, replace the call to
virtio_has_featurewith a stub.Tested-by Anders Roxell <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>--- drivers/block/virtio_blk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/block/virtio_blk.c +10
-2@@ -760,6 +760,10 @@ static int virtblk_probe_zoned_device(struct virtio_device *vdev, return ret; } +static inline bool virtblk_has_zoned_feature (struct virtio_device *vdev) +{ +return virtio_has_feature (vdev,VIRTIO_BLK_F_ZONED ); +}#else /* @@ -775,6 +779,11 @@ static inline int virtblk_probe_zoned_device(struct virtio_device *vdev, {return -EOPNOTSUPP ; } + +static inline bool virtblk_has_zoned_feature (struct virtio_device *vdev) +{ +return false; +}#endif /* CONFIG_BLK_DEV_ZONED */ /* return id (s/n) string for *disk to *id_str @@ -1480,7 +1489,7 @@ static int virtblk_probe(struct virtio_device *vdev)virtblk_update_capacity (vblk, false);virtio_device_ready (vdev); -if (virtio_has_feature (vdev,VIRTIO_BLK_F_ZONED )) { +if (virtblk_has_zoned_feature (vdev)) { err =virtblk_probe_zoned_device (vdev, vblk, q);if (err) goto out_cleanup_disk; --MST
Quoted 4 lines
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization