vduse: validate block features only with block devices
[ Upstream commit a115b5716fc9a64652aa9cb332070087178ffafa ] This patch is preliminary work to enable network device type support to VDUSE. As VIRTIO_BLK_F_CONFIG_WCE shares the same value as VIRTIO_NET_F_HOST_TSO4, we need to restrict its check to Virtio-blk device type. Acked-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Xie Yongji <xieyongji@bytedance.com> Reviewed-by: Eugenio Pérez <eperezma@redhat.com> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com> Message-Id: <20240109111025.1320976-2-maxime.coquelin@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
489f38de33
Коммит
9649f8fdf8
|
@ -1227,13 +1227,14 @@ static bool device_is_allowed(u32 device_id)
|
|||
return false;
|
||||
}
|
||||
|
||||
static bool features_is_valid(u64 features)
|
||||
static bool features_is_valid(struct vduse_dev_config *config)
|
||||
{
|
||||
if (!(features & (1ULL << VIRTIO_F_ACCESS_PLATFORM)))
|
||||
if (!(config->features & BIT_ULL(VIRTIO_F_ACCESS_PLATFORM)))
|
||||
return false;
|
||||
|
||||
/* Now we only support read-only configuration space */
|
||||
if (features & (1ULL << VIRTIO_BLK_F_CONFIG_WCE))
|
||||
if ((config->device_id == VIRTIO_ID_BLOCK) &&
|
||||
(config->features & BIT_ULL(VIRTIO_BLK_F_CONFIG_WCE)))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
@ -1260,7 +1261,7 @@ static bool vduse_validate_config(struct vduse_dev_config *config)
|
|||
if (!device_is_allowed(config->device_id))
|
||||
return false;
|
||||
|
||||
if (!features_is_valid(config->features))
|
||||
if (!features_is_valid(config))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
Загрузка…
Ссылка в новой задаче