Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

virtio-net: fix per queue coalescing parameter setting

Browse source 
[ Upstream commit bfb2b36091 ]

When the user sets a non-zero coalescing parameter to 0 for a specific
virtqueue, it does not work as expected, so let's fix this.

Fixes: 394bd87764 ("virtio_net: support per queue interrupt coalesce command")
Reported-by: Xiaoming Zhao <zxm377917@alibaba-inc.com>
Cc: Gavin Li <gavinl@nvidia.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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Heng Qi 2023-10-08 14:27:42 +08:00 committed by Greg Kroah-Hartman
parent 829cce76cf
commit 7c1453ab95
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/net/virtio_net.c
View file

@ -3296,27 +3296,23 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,
{
int err;
if (ec->rx_coalesce_usecs || ec->rx_max_coalesced_frames) {
err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(queue),
ec->rx_coalesce_usecs,
ec->rx_max_coalesced_frames);
if (err)
return err;
/* Save parameters */
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, rxq2vq(queue),
ec->rx_coalesce_usecs,
ec->rx_max_coalesced_frames);
if (err)
return err;
if (ec->tx_coalesce_usecs || ec->tx_max_coalesced_frames) {
err = virtnet_send_ctrl_coal_vq_cmd(vi, txq2vq(queue),
ec->tx_coalesce_usecs,
ec->tx_max_coalesced_frames);
if (err)
return err;
/* Save parameters */
vi->sq[queue].intr_coal.max_usecs = ec->tx_coalesce_usecs;
vi->sq[queue].intr_coal.max_packets = ec->tx_max_coalesced_frames;
}
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),
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;
}