public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Eli Cohen <elic@nvidia.com>
To: <mst@redhat.com>, <jasowang@redhat.com>,
	<linux-kernel@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>
Cc: <si-wei.liu@oracle.com>, <eperezma@redhat.com>, <lulu@redhat.com>,
	"Eli Cohen" <elic@nvidia.com>
Subject: [PATH v2 2/8] vdpa/mlx5: Return error on vlan ctrl commands if not supported
Date: Mon, 14 Nov 2022 15:17:53 +0200	[thread overview]
Message-ID: <20221114131759.57883-3-elic@nvidia.com> (raw)
In-Reply-To: <20221114131759.57883-1-elic@nvidia.com>

Check if VIRTIO_NET_F_CTRL_VLAN is negotiated and return error if
control VQ command is received.

Signed-off-by: Eli Cohen <elic@nvidia.com>
---
 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


  parent reply	other threads:[~2022-11-14 13:19 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-14 13:17 [PATH v2 0/8] vdpa/mlx5: Add debugfs subtree and fixes Eli Cohen
2022-11-14 13:17 ` [PATH v2 1/8] vdpa/mlx5: Fix rule forwarding VLAN to TIR Eli Cohen
2022-11-14 13:17 ` Eli Cohen [this message]
2022-11-15  3:10   ` [PATH v2 2/8] vdpa/mlx5: Return error on vlan ctrl commands if not supported Jason Wang
2022-11-15  9:43   ` Eugenio Perez Martin
2022-11-14 13:17 ` [PATH v2 3/8] vdpa/mlx5: Fix wrong mac address deletion Eli Cohen
2022-11-14 13:17 ` [PATH v2 4/8] vdpa/mlx5: Avoid using reslock in event_handler Eli Cohen
2022-11-14 13:17 ` [PATH v2 5/8] vdpa/mlx5: Avoid overwriting CVQ iotlb Eli Cohen
2022-11-15  3:33   ` Jason Wang
2022-11-15  9:41   ` Eugenio Perez Martin
2022-11-14 13:17 ` [PATH v2 6/8] vdpa/mlx5: Move some definitions to a new header file Eli Cohen
2022-11-14 13:17 ` [PATH v2 7/8] vdpa/mlx5: Add debugfs subtree Eli Cohen
2022-11-14 13:17 ` [PATH v2 8/8] vdpa/mlx5: Add RX counters to debugfs Eli Cohen
2022-11-15  3:33   ` Jason Wang
2022-11-24  6:34 ` [PATH v2 0/8] vdpa/mlx5: Add debugfs subtree and fixes Eli Cohen
2022-12-13  7:33   ` Eli Cohen
2022-12-13 15:19     ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221114131759.57883-3-elic@nvidia.com \
    --to=elic@nvidia.com \
    --cc=eperezma@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lulu@redhat.com \
    --cc=mst@redhat.com \
    --cc=si-wei.liu@oracle.com \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox