On Thu, Nov 2, 2023 at 9:10 PM Heng Qi <hengqi@xxxxxxxxxxxxxxxxx> wrote:
>
> This patch separates the rx and tx global coalescing moderation
> commands to support netdim switches in subsequent patches.
>
> Signed-off-by: Heng Qi <hengqi@xxxxxxxxxxxxxxxxx>
Acked-by: Jason Wang <jasowang@xxxxxxxxxx>
Thanks
> ---
> v1->v2:
> - Add 'i' definition.
>
> drivers/net/virtio_net.c | 31 ++++++++++++++++++++++++++++---
> 1 file changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 0ad2894e6a5e..0285301caf78 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -3266,10 +3266,10 @@ static int virtnet_get_link_ksettings(struct net_device *dev,
> return 0;
> }
>
> -static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
> - struct ethtool_coalesce *ec)
> +static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,
> + struct ethtool_coalesce *ec)
> {
> - struct scatterlist sgs_tx, sgs_rx;
> + struct scatterlist sgs_tx;
> int i;
>
> vi->ctrl->coal_tx.tx_usecs = cpu_to_le32(ec->tx_coalesce_usecs);
> @@ -3289,6 +3289,15 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
> vi->sq[i].intr_coal.max_packets = ec->tx_max_coalesced_frames;
> }
>
> + return 0;
> +}
> +
> +static int virtnet_send_rx_notf_coal_cmds(struct virtnet_info *vi,
> + struct ethtool_coalesce *ec)
> +{
> + struct scatterlist sgs_rx;
> + int i;
> +
> vi->ctrl->coal_rx.rx_usecs = cpu_to_le32(ec->rx_coalesce_usecs);
> vi->ctrl->coal_rx.rx_max_packets = cpu_to_le32(ec->rx_max_coalesced_frames);
> sg_init_one(&sgs_rx, &vi->ctrl->coal_rx, sizeof(vi->ctrl->coal_rx));
> @@ -3309,6 +3318,22 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
> return 0;
> }
>
> +static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
> + struct ethtool_coalesce *ec)
> +{
> + int err;
> +
> + err = virtnet_send_tx_notf_coal_cmds(vi, ec);
> + if (err)
> + return err;
> +
> + err = virtnet_send_rx_notf_coal_cmds(vi, ec);
> + if (err)
> + return err;
> +
> + return 0;
> +}
> +
> static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
> u16 vqn, u32 max_usecs, u32 max_packets)
> {
> --
> 2.19.1.6.gb485710b
>
>
