]> git.dujemihanovic.xyz Git - linux.git/commitdiff
virtio-net: check feature before configuring the vq coalescing command
authorHeng Qi <hengqi@linux.alibaba.com>
Thu, 1 Aug 2024 13:23:37 +0000 (21:23 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Aug 2024 10:10:22 +0000 (11:10 +0100)
Virtio spec says:

The driver MUST have negotiated the VIRTIO_NET_F_VQ_NOTF_COAL
feature when issuing commands VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET
and VIRTIO_NET_CTRL_NOTF_COAL_VQ_GET.

So we add the feature negotiation check to
virtnet_send_{r,t}x_ctrl_coal_vq_cmd as a basis for the next bugfix patch.

Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index 0383a3e136d6a07f57d71dbdd5a8ae09ac792a4a..b1176be8fcfdf6a09ed6fde02b5c989272b7274a 100644 (file)
@@ -3658,6 +3658,9 @@ static int virtnet_send_rx_ctrl_coal_vq_cmd(struct virtnet_info *vi,
 {
        int err;
 
+       if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL))
+               return -EOPNOTSUPP;
+
        err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(queue),
                                            max_usecs, max_packets);
        if (err)
@@ -3675,6 +3678,9 @@ static int virtnet_send_tx_ctrl_coal_vq_cmd(struct virtnet_info *vi,
 {
        int err;
 
+       if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL))
+               return -EOPNOTSUPP;
+
        err = virtnet_send_ctrl_coal_vq_cmd(vi, txq2vq(queue),
                                            max_usecs, max_packets);
        if (err)