| Message ID | 20231217165359.604246-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 77360cadaae562f437b3e98dc3af748d8d75bdc2 |
| Headers | show |
| Series | [f2fs-dev,1/5] virtio_blk: cleanup zoned device probing | expand |
On 2023/12/18 1:53, Christoph Hellwig wrote: > Move reading and checking the zoned model from virtblk_probe_zoned_device > into the caller, leaving only the code to perform the actual setup for > host managed zoned devices in virtblk_probe_zoned_device. > > This allows to share the model reading and sharing between builds with > and without CONFIG_BLK_DEV_ZONED, and improve it for the > !CONFIG_BLK_DEV_ZONED case. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good. Reviewed-by: Damien Le Moal <dlemoal@kernel.org> > --- > drivers/block/virtio_blk.c | 50 +++++++++++++++++--------------------- > 1 file changed, 22 insertions(+), 28 deletions(-) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index d53d6aa8ee69a4..aeead732a24dc9 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -748,22 +748,6 @@ static int virtblk_probe_zoned_device(struct virtio_device *vdev, > struct request_queue *q) > { > u32 v, wg; > - u8 model; > - > - virtio_cread(vdev, struct virtio_blk_config, > - zoned.model, &model); > - > - switch (model) { > - case VIRTIO_BLK_Z_NONE: > - case VIRTIO_BLK_Z_HA: > - /* Present the host-aware device as non-zoned */ > - return 0; > - case VIRTIO_BLK_Z_HM: > - break; > - default: > - dev_err(&vdev->dev, "unsupported zone model %d\n", model); > - return -EINVAL; > - } > > dev_dbg(&vdev->dev, "probing host-managed zoned device\n"); > > @@ -846,16 +830,9 @@ static inline void virtblk_revalidate_zones(struct virtio_blk *vblk) > static inline int virtblk_probe_zoned_device(struct virtio_device *vdev, > struct virtio_blk *vblk, struct request_queue *q) > { > - u8 model; > - > - virtio_cread(vdev, struct virtio_blk_config, zoned.model, &model); > - if (model == VIRTIO_BLK_Z_HM) { > - dev_err(&vdev->dev, > - "virtio_blk: zoned devices are not supported"); > - return -EOPNOTSUPP; > - } > - > - return 0; > + dev_err(&vdev->dev, > + "virtio_blk: zoned devices are not supported"); > + return -EOPNOTSUPP; > } > #endif /* CONFIG_BLK_DEV_ZONED */ > > @@ -1570,9 +1547,26 @@ static int virtblk_probe(struct virtio_device *vdev) > * placed after the virtio_device_ready() call above. > */ > if (virtio_has_feature(vdev, VIRTIO_BLK_F_ZONED)) { > - err = virtblk_probe_zoned_device(vdev, vblk, q); > - if (err) > + u8 model; > + > + virtio_cread(vdev, struct virtio_blk_config, zoned.model, > + &model); > + switch (model) { > + case VIRTIO_BLK_Z_NONE: > + case VIRTIO_BLK_Z_HA: > + /* Present the host-aware device as non-zoned */ > + break; > + case VIRTIO_BLK_Z_HM: > + err = virtblk_probe_zoned_device(vdev, vblk, q); > + if (err) > + goto out_cleanup_disk; > + break; > + default: > + dev_err(&vdev->dev, "unsupported zone model %d\n", > + model); > + err = -EINVAL; > goto out_cleanup_disk; > + } > } > > err = device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);
Hello: This series was applied to jaegeuk/f2fs.git (dev) by Jens Axboe <axboe@kernel.dk>: On Sun, 17 Dec 2023 17:53:55 +0100 you wrote: > Move reading and checking the zoned model from virtblk_probe_zoned_device > into the caller, leaving only the code to perform the actual setup for > host managed zoned devices in virtblk_probe_zoned_device. > > This allows to share the model reading and sharing between builds with > and without CONFIG_BLK_DEV_ZONED, and improve it for the > !CONFIG_BLK_DEV_ZONED case. > > [...] Here is the summary with links: - [f2fs-dev,1/5] virtio_blk: cleanup zoned device probing https://git.kernel.org/jaegeuk/f2fs/c/77360cadaae5 - [f2fs-dev,2/5] virtio_blk: remove the broken zone revalidation support https://git.kernel.org/jaegeuk/f2fs/c/a971ed800211 - [f2fs-dev,3/5] block: remove support for the host aware zone model https://git.kernel.org/jaegeuk/f2fs/c/7437bb73f087 - [f2fs-dev,4/5] block: simplify disk_set_zoned https://git.kernel.org/jaegeuk/f2fs/c/d73e93b4dfab - [f2fs-dev,5/5] sd: only call disk_clear_zoned when needed https://git.kernel.org/jaegeuk/f2fs/c/5cc99b89785c You are awesome, thank you!
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index d53d6aa8ee69a4..aeead732a24dc9 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -748,22 +748,6 @@ static int virtblk_probe_zoned_device(struct virtio_device *vdev, struct request_queue *q) { u32 v, wg; - u8 model; - - virtio_cread(vdev, struct virtio_blk_config, - zoned.model, &model); - - switch (model) { - case VIRTIO_BLK_Z_NONE: - case VIRTIO_BLK_Z_HA: - /* Present the host-aware device as non-zoned */ - return 0; - case VIRTIO_BLK_Z_HM: - break; - default: - dev_err(&vdev->dev, "unsupported zone model %d\n", model); - return -EINVAL; - } dev_dbg(&vdev->dev, "probing host-managed zoned device\n"); @@ -846,16 +830,9 @@ static inline void virtblk_revalidate_zones(struct virtio_blk *vblk) static inline int virtblk_probe_zoned_device(struct virtio_device *vdev, struct virtio_blk *vblk, struct request_queue *q) { - u8 model; - - virtio_cread(vdev, struct virtio_blk_config, zoned.model, &model); - if (model == VIRTIO_BLK_Z_HM) { - dev_err(&vdev->dev, - "virtio_blk: zoned devices are not supported"); - return -EOPNOTSUPP; - } - - return 0; + dev_err(&vdev->dev, + "virtio_blk: zoned devices are not supported"); + return -EOPNOTSUPP; } #endif /* CONFIG_BLK_DEV_ZONED */ @@ -1570,9 +1547,26 @@ static int virtblk_probe(struct virtio_device *vdev) * placed after the virtio_device_ready() call above. */ if (virtio_has_feature(vdev, VIRTIO_BLK_F_ZONED)) { - err = virtblk_probe_zoned_device(vdev, vblk, q); - if (err) + u8 model; + + virtio_cread(vdev, struct virtio_blk_config, zoned.model, + &model); + switch (model) { + case VIRTIO_BLK_Z_NONE: + case VIRTIO_BLK_Z_HA: + /* Present the host-aware device as non-zoned */ + break; + case VIRTIO_BLK_Z_HM: + err = virtblk_probe_zoned_device(vdev, vblk, q); + if (err) + goto out_cleanup_disk; + break; + default: + dev_err(&vdev->dev, "unsupported zone model %d\n", + model); + err = -EINVAL; goto out_cleanup_disk; + } } err = device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);
Move reading and checking the zoned model from virtblk_probe_zoned_device into the caller, leaving only the code to perform the actual setup for host managed zoned devices in virtblk_probe_zoned_device. This allows to share the model reading and sharing between builds with and without CONFIG_BLK_DEV_ZONED, and improve it for the !CONFIG_BLK_DEV_ZONED case. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/block/virtio_blk.c | 50 +++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 28 deletions(-)