Commit 1db43c08 authored by Heng Qi's avatar Heng Qi Committed by David S. Miller
Browse files

virtio-net: extract virtqueue coalescig cmd for reuse 



Extract commands to set virtqueue coalescing parameters for reuse
by ethtool -Q, vq resize and netdim.

Signed-off-by: default avatarHeng Qi <hengqi@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7180080

drivers/net/virtio_net.c

+64 −42
Original line number Diff line number Diff line
@@ -2849,6 +2849,58 @@ static void virtnet_cpu_notif_remove(struct virtnet_info *vi) 
					    &vi->node_dead);

}



static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,

					 u16 vqn, u32 max_usecs, u32 max_packets)

{

	struct scatterlist sgs;



	vi->ctrl->coal_vq.vqn = cpu_to_le16(vqn);

	vi->ctrl->coal_vq.coal.max_usecs = cpu_to_le32(max_usecs);

	vi->ctrl->coal_vq.coal.max_packets = cpu_to_le32(max_packets);

	sg_init_one(&sgs, &vi->ctrl->coal_vq, sizeof(vi->ctrl->coal_vq));



	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_NOTF_COAL,

				  VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET,

				  &sgs))

		return -EINVAL;



	return 0;

}



static int virtnet_send_rx_ctrl_coal_vq_cmd(struct virtnet_info *vi,

					    u16 queue, u32 max_usecs,

					    u32 max_packets)

{

	int err;



	err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(queue),

					    max_usecs, max_packets);

	if (err)

		return err;



	vi->rq[queue].intr_coal.max_usecs = max_usecs;

	vi->rq[queue].intr_coal.max_packets = max_packets;



	return 0;

}



static int virtnet_send_tx_ctrl_coal_vq_cmd(struct virtnet_info *vi,

					    u16 queue, u32 max_usecs,

					    u32 max_packets)

{

	int err;



	err = virtnet_send_ctrl_coal_vq_cmd(vi, txq2vq(queue),

					    max_usecs, max_packets);

	if (err)

		return err;



	vi->sq[queue].intr_coal.max_usecs = max_usecs;

	vi->sq[queue].intr_coal.max_packets = max_packets;



	return 0;

}



static void virtnet_get_ringparam(struct net_device *dev,

				  struct ethtool_ringparam *ring,

				  struct kernel_ethtool_ringparam *kernel_ring,
@@ -2906,14 +2958,11 @@ static int virtnet_set_ringparam(struct net_device *dev, 
			 * through the VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver

			 * did not set any TX coalescing parameters, to 0.

			 */

			err = virtnet_send_ctrl_coal_vq_cmd(vi, txq2vq(i),

			err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, i,

							       vi->intr_coal_tx.max_usecs,

							       vi->intr_coal_tx.max_packets);

			if (err)

				return err;



			vi->sq[i].intr_coal.max_usecs = vi->intr_coal_tx.max_usecs;

			vi->sq[i].intr_coal.max_packets = vi->intr_coal_tx.max_packets;

		}



		if (ring->rx_pending != rx_pending) {
@@ -2922,14 +2971,11 @@ static int virtnet_set_ringparam(struct net_device *dev, 
				return err;



			/* The reason is same as the transmit virtqueue reset */

			err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(i),

			err = virtnet_send_rx_ctrl_coal_vq_cmd(vi, i,

							       vi->intr_coal_rx.max_usecs,

							       vi->intr_coal_rx.max_packets);

			if (err)

				return err;



			vi->rq[i].intr_coal.max_usecs = vi->intr_coal_rx.max_usecs;

			vi->rq[i].intr_coal.max_packets = vi->intr_coal_rx.max_packets;

		}

	}
@@ -3334,48 +3380,24 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi, 
	return 0;

}



static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,

					 u16 vqn, u32 max_usecs, u32 max_packets)

{

	struct scatterlist sgs;



	vi->ctrl->coal_vq.vqn = cpu_to_le16(vqn);

	vi->ctrl->coal_vq.coal.max_usecs = cpu_to_le32(max_usecs);

	vi->ctrl->coal_vq.coal.max_packets = cpu_to_le32(max_packets);

	sg_init_one(&sgs, &vi->ctrl->coal_vq, sizeof(vi->ctrl->coal_vq));



	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_NOTF_COAL,

				  VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET,

				  &sgs))

		return -EINVAL;



	return 0;

}



static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,

					  struct ethtool_coalesce *ec,

					  u16 queue)

{

	int err;



	err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(queue),

	err = virtnet_send_rx_ctrl_coal_vq_cmd(vi, queue,

					       ec->rx_coalesce_usecs,

					       ec->rx_max_coalesced_frames);

	if (err)

		return err;



	vi->rq[queue].intr_coal.max_usecs = ec->rx_coalesce_usecs;

	vi->rq[queue].intr_coal.max_packets = ec->rx_max_coalesced_frames;



	err = virtnet_send_ctrl_coal_vq_cmd(vi, txq2vq(queue),

	err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue,

					       ec->tx_coalesce_usecs,

					       ec->tx_max_coalesced_frames);

	if (err)

		return err;



	vi->sq[queue].intr_coal.max_usecs = ec->tx_coalesce_usecs;

	vi->sq[queue].intr_coal.max_packets = ec->tx_max_coalesced_frames;



	return 0;

}