From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Sender: List-Post: List-Help: List-Unsubscribe: List-Subscribe: Received: from lists.oasis-open.org (oasis-open.org [10.110.1.242]) by lists.oasis-open.org (Postfix) with ESMTP id 4D42A9863D8 for ; Wed, 21 Dec 2022 19:16:06 +0000 (UTC) Date: Wed, 21 Dec 2022 14:15:58 -0500 From: "Michael S. Tsirkin" Message-ID: <20221221141451-mutt-send-email-mst@kernel.org> References: <20221221145433.254805-1-lstoakes@gmail.com> MIME-Version: 1.0 In-Reply-To: <20221221145433.254805-1-lstoakes@gmail.com> Subject: [virtio-dev] Re: [PATCH v2] virtio-blk: avoid kernel panic on VIRTIO_BLK_F_ZONED check Content-Type: text/plain; charset=us-ascii Content-Disposition: inline To: Lorenzo Stoakes Cc: linux-block@vger.kernel.org, Dmitry Fomichev , Stefan Hajnoczi , Jason Wang , Paolo Bonzini , Jens Axboe , Damien Le Moal , virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org, linux-kernel@vger.kernel.org, Hannes Reinecke , Sam Li , Steven Rostedt List-ID: On Wed, Dec 21, 2022 at 02:54:33PM +0000, Lorenzo Stoakes wrote: > virtio zoned block device support is added by commit 0562d7bf1604 > ("virtio-blk: add support for zoned block devices") which adds > VIRTIO_BLK_F_ZONED to the features array in virtio_blk.c but makes it > conditional on CONFIG_BLK_DEV_ZONED. > > In it virtblk_probe() calls virtio_has_feature(vdev, VIRTIO_BLK_F_ZONED) > unconditionally, which invokes virtio_check_driver_offered_feature(). > This function checks whether virtio_blk.feature_table (assigned to > the static features array) contains the specified feature enum, and if not > _causes a kernel panic_ via BUG(). > > This therefore means that failing to enable CONFIG_BLK_DEV_ZONED while > using virtio is a guaranteed kernel panic. Fix the issue by making the > feature test also conditional on CONFIG_BLK_DEV_ZONED. > > Signed-off-by: Lorenzo Stoakes I think this was fixed by Message-ID: <20221220112340.518841-1-mst@redhat.com> > --- > drivers/block/virtio_blk.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index ff49052e26f7..94d210b10ebb 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -1580,7 +1580,8 @@ 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 (IS_ENABLED(CONFIG_BLK_DEV_ZONED) && > + virtio_has_feature(vdev, VIRTIO_BLK_F_ZONED)) { > err = virtblk_probe_zoned_device(vdev, vblk, q); > if (err) > goto out_cleanup_disk; > -- > 2.39.0 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org