| Message ID | 20221220112340.518841-1-mst@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-blk: fix probe without CONFIG_BLK_DEV_ZONED | expand |
On Tue, Dec 20, 2022 at 06:23:44AM -0500, Michael S. Tsirkin wrote: > 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. > > Tested-by: Anders Roxell <anders.roxell@linaro.org> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/block/virtio_blk.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On 12/20/22 03:23, Michael S. Tsirkin wrote: > 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. > > Tested-by: Anders Roxell <anders.roxell@linaro.org> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> -ck
On Tue, Dec 20, 2022 at 7:23 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > 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. > > Tested-by: Anders Roxell <anders.roxell@linaro.org> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Thanks > --- > drivers/block/virtio_blk.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index 88b3639f8536..5ea1dc882a80 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -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 >
On Tue, Dec 20, 2022 at 06:23:44AM -0500, Michael S. Tsirkin wrote: > 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. > > Tested-by: Anders Roxell <anders.roxell@linaro.org> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/block/virtio_blk.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index 88b3639f8536..5ea1dc882a80 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -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 > > _______________________________________________ > Virtualization mailing list > Virtualization@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/virtualization Tested-by: Lorenzo Stoakes <lstoakes@gmail.com>
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 88b3639f8536..5ea1dc882a80 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -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;