Jason Wang
2022-Nov-15 03:10 UTC
[PATH v2 2/8] vdpa/mlx5: Return error on vlan ctrl commands if not supported
On Mon, Nov 14, 2022 at 9:18 PM Eli Cohen <elic at nvidia.com> wrote:> > Check if VIRTIO_NET_F_CTRL_VLAN is negotiated and return error if > control VQ command is received. > > Signed-off-by: Eli Cohen <elic at nvidia.com>Acked-by: Jason Wang <jasowang at redhat.com> Thanks> --- > drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > index 3fb06dcee943..01da229d22da 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -1823,6 +1823,9 @@ static virtio_net_ctrl_ack handle_ctrl_vlan(struct mlx5_vdpa_dev *mvdev, u8 cmd) > size_t read; > u16 id; > > + if (!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VLAN))) > + return status; > + > switch (cmd) { > case VIRTIO_NET_CTRL_VLAN_ADD: > read = vringh_iov_pull_iotlb(&cvq->vring, &cvq->riov, &vlan, sizeof(vlan)); > -- > 2.38.1 >