* [PATCH net v2 1/6] virtio-net: initially change the value of tx-frames
2023-09-25 7:52 [PATCH net v2 0/6] virtio-net: Fix and update interrupt moderation Heng Qi
@ 2023-09-25 7:52 ` Heng Qi
2023-09-25 7:52 ` [PATCH net v2 2/6] virtio-net: fix mismatch of getting tx-frames Heng Qi
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Heng Qi @ 2023-09-25 7:52 UTC (permalink / raw)
To: netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo
Background:
1. Commit 0c465be183c7 ("virtio_net: ethtool tx napi configuration") uses
tx-frames to toggle napi_tx (0 off and 1 on) if notification coalescing
is not supported.
2. Commit 31c03aef9bc2 ("virtio_net: enable napi_tx by default") enables
napi_tx for all txqs by default.
Status:
When virtio-net supports notification coalescing, after initialization,
tx-frames is 0 and napi_tx is true.
Problem:
When the user only wants to set rx coalescing params using
ethtool -C eth0 rx-usecs 10, or
ethtool -Q eth0 queue_mask 0x1 -C rx-usecs 10,
these cmds will carry tx-frames as 0, causing the napi_tx switching condition
is satisfied. Then the user gets:
netlink error: Device or resource busy.
The same happens when trying to set rx-frames, adaptive_rx, adaptive_tx...
How to fix:
When notification coalescing feature is negotiated, initially make the
value of tx-frames to be consistent with napi_tx.
For compatibility with the past, it is still supported to use tx-frames
to toggle napi_tx.
Reported-by: Xiaoming Zhao <zxm377917@alibaba-inc.com>
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index fe7f314d65c9..10878c9d430a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -4442,13 +4442,6 @@ static int virtnet_probe(struct virtio_device *vdev)
dev->xdp_features |= NETDEV_XDP_ACT_RX_SG;
}
- if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_NOTF_COAL)) {
- vi->intr_coal_rx.max_usecs = 0;
- vi->intr_coal_tx.max_usecs = 0;
- vi->intr_coal_tx.max_packets = 0;
- vi->intr_coal_rx.max_packets = 0;
- }
-
if (virtio_has_feature(vdev, VIRTIO_NET_F_HASH_REPORT))
vi->has_rss_hash_report = true;
@@ -4523,6 +4516,27 @@ static int virtnet_probe(struct virtio_device *vdev)
if (err)
goto free;
+ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_NOTF_COAL)) {
+ vi->intr_coal_rx.max_usecs = 0;
+ vi->intr_coal_tx.max_usecs = 0;
+ vi->intr_coal_rx.max_packets = 0;
+
+ /* Keep the default values of the coalescing parameters
+ * aligned with the default napi_tx state.
+ */
+ if (vi->sq[0].napi.weight)
+ vi->intr_coal_tx.max_packets = 1;
+ else
+ vi->intr_coal_tx.max_packets = 0;
+ }
+
+ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL)) {
+ /* The reason is the same as VIRTIO_NET_F_NOTF_COAL. */
+ for (i = 0; i < vi->max_queue_pairs; i++)
+ if (vi->sq[i].napi.weight)
+ vi->sq[i].intr_coal.max_packets = 1;
+ }
+
#ifdef CONFIG_SYSFS
if (vi->mergeable_rx_bufs)
dev->sysfs_rx_queue_group = &virtio_net_mrg_rx_group;
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH net v2 2/6] virtio-net: fix mismatch of getting tx-frames
2023-09-25 7:52 [PATCH net v2 0/6] virtio-net: Fix and update interrupt moderation Heng Qi
2023-09-25 7:52 ` [PATCH net v2 1/6] virtio-net: initially change the value of tx-frames Heng Qi
@ 2023-09-25 7:52 ` Heng Qi
2023-09-25 7:52 ` [PATCH net v2 3/6] virtio-net: consistently save parameters for per-queue Heng Qi
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Heng Qi @ 2023-09-25 7:52 UTC (permalink / raw)
To: netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo, Gavin Li
Since virtio-net allows switching napi_tx for per txq, we have to
get the specific txq's result now.
Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
Cc: Gavin Li <gavinl@nvidia.com>
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 10878c9d430a..15bac303e3ff 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3453,7 +3453,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev,
} else {
ec->rx_max_coalesced_frames = 1;
- if (vi->sq[0].napi.weight)
+ if (vi->sq[queue].napi.weight)
ec->tx_max_coalesced_frames = 1;
}
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH net v2 3/6] virtio-net: consistently save parameters for per-queue
2023-09-25 7:52 [PATCH net v2 0/6] virtio-net: Fix and update interrupt moderation Heng Qi
2023-09-25 7:52 ` [PATCH net v2 1/6] virtio-net: initially change the value of tx-frames Heng Qi
2023-09-25 7:52 ` [PATCH net v2 2/6] virtio-net: fix mismatch of getting tx-frames Heng Qi
@ 2023-09-25 7:52 ` Heng Qi
2023-09-25 7:53 ` [PATCH net v2 4/6] virtio-net: fix per queue coalescing parameter setting Heng Qi
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Heng Qi @ 2023-09-25 7:52 UTC (permalink / raw)
To: netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo, Gavin Li
When using .set_coalesce interface to set all queue coalescing
parameters, we need to update both per-queue and global save values.
Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
Cc: Gavin Li <gavinl@nvidia.com>
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 15bac303e3ff..6120dd5343dd 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3233,6 +3233,7 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
struct ethtool_coalesce *ec)
{
struct scatterlist sgs_tx, sgs_rx;
+ int i;
vi->ctrl->coal_tx.tx_usecs = cpu_to_le32(ec->tx_coalesce_usecs);
vi->ctrl->coal_tx.tx_max_packets = cpu_to_le32(ec->tx_max_coalesced_frames);
@@ -3246,6 +3247,10 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
/* Save parameters */
vi->intr_coal_tx.max_usecs = ec->tx_coalesce_usecs;
vi->intr_coal_tx.max_packets = ec->tx_max_coalesced_frames;
+ for (i = 0; i < vi->max_queue_pairs; i++) {
+ vi->sq[i].intr_coal.max_usecs = ec->tx_coalesce_usecs;
+ vi->sq[i].intr_coal.max_packets = ec->tx_max_coalesced_frames;
+ }
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);
@@ -3259,6 +3264,10 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,
/* Save parameters */
vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs;
vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames;
+ for (i = 0; i < vi->max_queue_pairs; i++) {
+ vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs;
+ vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames;
+ }
return 0;
}
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH net v2 4/6] virtio-net: fix per queue coalescing parameter setting
2023-09-25 7:52 [PATCH net v2 0/6] virtio-net: Fix and update interrupt moderation Heng Qi
` (2 preceding siblings ...)
2023-09-25 7:52 ` [PATCH net v2 3/6] virtio-net: consistently save parameters for per-queue Heng Qi
@ 2023-09-25 7:53 ` Heng Qi
2023-10-08 5:20 ` Jason Wang
2023-09-25 7:53 ` [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize Heng Qi
2023-09-25 7:53 ` [PATCH net v2 6/6] virtio-net: a tiny comment update Heng Qi
5 siblings, 1 reply; 13+ messages in thread
From: Heng Qi @ 2023-09-25 7:53 UTC (permalink / raw)
To: netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo, Gavin Li
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: 394bd87764b6 ("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>
---
v1->v2:
1. Remove useless comments.
drivers/net/virtio_net.c | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6120dd5343dd..12ec3ae19b60 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -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;
}
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH net v2 4/6] virtio-net: fix per queue coalescing parameter setting
2023-09-25 7:53 ` [PATCH net v2 4/6] virtio-net: fix per queue coalescing parameter setting Heng Qi
@ 2023-10-08 5:20 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2023-10-08 5:20 UTC (permalink / raw)
To: Heng Qi
Cc: Xuan Zhuo, Jesper Dangaard Brouer, Daniel Borkmann,
Michael S . Tsirkin, netdev, John Fastabend, Alexei Starovoitov,
virtualization, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
David S . Miller, Gavin Li
On Mon, Sep 25, 2023 at 3:53 PM Heng Qi <hengqi@linux.alibaba.com> wrote:
>
> 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: 394bd87764b6 ("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>
Thanks
> ---
> v1->v2:
> 1. Remove useless comments.
>
> drivers/net/virtio_net.c | 36 ++++++++++++++++--------------------
> 1 file changed, 16 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 6120dd5343dd..12ec3ae19b60 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -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;
> }
> --
> 2.19.1.6.gb485710b
>
>
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH net v2 4/6] virtio-net: fix per queue coalescing parameter setting
@ 2023-10-08 5:20 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2023-10-08 5:20 UTC (permalink / raw)
To: Heng Qi
Cc: netdev, virtualization, Michael S . Tsirkin, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Alexei Starovoitov,
Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend,
Xuan Zhuo, Gavin Li
On Mon, Sep 25, 2023 at 3:53 PM Heng Qi <hengqi@linux.alibaba.com> wrote:
>
> 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: 394bd87764b6 ("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>
Thanks
> ---
> v1->v2:
> 1. Remove useless comments.
>
> drivers/net/virtio_net.c | 36 ++++++++++++++++--------------------
> 1 file changed, 16 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 6120dd5343dd..12ec3ae19b60 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -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;
> }
> --
> 2.19.1.6.gb485710b
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize
2023-09-25 7:52 [PATCH net v2 0/6] virtio-net: Fix and update interrupt moderation Heng Qi
` (3 preceding siblings ...)
2023-09-25 7:53 ` [PATCH net v2 4/6] virtio-net: fix per queue coalescing parameter setting Heng Qi
@ 2023-09-25 7:53 ` Heng Qi
2023-10-03 10:41 ` Paolo Abeni
2023-09-25 7:53 ` [PATCH net v2 6/6] virtio-net: a tiny comment update Heng Qi
5 siblings, 1 reply; 13+ messages in thread
From: Heng Qi @ 2023-09-25 7:53 UTC (permalink / raw)
To: netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo, Gavin Li
According to the definition of virtqueue coalescing spec[1]:
Upon disabling and re-enabling a transmit virtqueue, the device MUST set
the coalescing parameters of the virtqueue to those configured through the
VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver did not set
any TX coalescing parameters, to 0.
Upon disabling and re-enabling a receive virtqueue, the device MUST set
the coalescing parameters of the virtqueue to those configured through the
VIRTIO_NET_CTRL_NOTF_COAL_RX_SET command, or, if the driver did not set
any RX coalescing parameters, to 0.
We need to add this setting for vq resize (ethtool -G) where vq_reset happens.
[1] https://lists.oasis-open.org/archives/virtio-dev/202303/msg00415.html
Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
Cc: Gavin Li <gavinl@nvidia.com>
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
---
drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 12ec3ae19b60..cb19b224419b 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2855,6 +2855,9 @@ static void virtnet_get_ringparam(struct net_device *dev,
ring->tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
}
+static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
+ u16 vqn, u32 max_usecs, u32 max_packets);
+
static int virtnet_set_ringparam(struct net_device *dev,
struct ethtool_ringparam *ring,
struct kernel_ethtool_ringparam *kernel_ring,
@@ -2890,12 +2893,36 @@ static int virtnet_set_ringparam(struct net_device *dev,
err = virtnet_tx_resize(vi, sq, ring->tx_pending);
if (err)
return err;
+
+ /* Upon disabling and re-enabling a transmit virtqueue, the device must
+ * set the coalescing parameters of the virtqueue to those configured
+ * 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),
+ vi->intr_coal_tx.max_usecs,
+ vi->intr_coal_tx.max_packets);
+ if (err)
+ return err;
+ /* Save parameters */
+ 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) {
err = virtnet_rx_resize(vi, rq, ring->rx_pending);
if (err)
return err;
+
+ /* The reason is same as the transmit virtqueue reset */
+ err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(i),
+ vi->intr_coal_rx.max_usecs,
+ vi->intr_coal_rx.max_packets);
+ if (err)
+ return err;
+ /* Save parameters */
+ 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;
}
}
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize
2023-09-25 7:53 ` [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize Heng Qi
@ 2023-10-03 10:41 ` Paolo Abeni
0 siblings, 0 replies; 13+ messages in thread
From: Paolo Abeni @ 2023-10-03 10:41 UTC (permalink / raw)
To: Heng Qi, netdev, virtualization
Cc: Xuan Zhuo, Jesper Dangaard Brouer, Daniel Borkmann,
Michael S . Tsirkin, John Fastabend, Alexei Starovoitov,
Eric Dumazet, Jakub Kicinski, David S . Miller, Gavin Li
On Mon, 2023-09-25 at 15:53 +0800, Heng Qi wrote:
> According to the definition of virtqueue coalescing spec[1]:
>
> Upon disabling and re-enabling a transmit virtqueue, the device MUST set
> the coalescing parameters of the virtqueue to those configured through the
> VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver did not set
> any TX coalescing parameters, to 0.
>
> Upon disabling and re-enabling a receive virtqueue, the device MUST set
> the coalescing parameters of the virtqueue to those configured through the
> VIRTIO_NET_CTRL_NOTF_COAL_RX_SET command, or, if the driver did not set
> any RX coalescing parameters, to 0.
>
> We need to add this setting for vq resize (ethtool -G) where vq_reset happens.
>
> [1] https://lists.oasis-open.org/archives/virtio-dev/202303/msg00415.html
>
> Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
> Cc: Gavin Li <gavinl@nvidia.com>
> Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
@Jason, since you commented on v1, waiting for your ack.
> ---
> drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 12ec3ae19b60..cb19b224419b 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2855,6 +2855,9 @@ static void virtnet_get_ringparam(struct net_device *dev,
> ring->tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
> }
>
> +static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
> + u16 vqn, u32 max_usecs, u32 max_packets);
> +
> static int virtnet_set_ringparam(struct net_device *dev,
> struct ethtool_ringparam *ring,
> struct kernel_ethtool_ringparam *kernel_ring,
> @@ -2890,12 +2893,36 @@ static int virtnet_set_ringparam(struct net_device *dev,
> err = virtnet_tx_resize(vi, sq, ring->tx_pending);
> if (err)
> return err;
> +
> + /* Upon disabling and re-enabling a transmit virtqueue, the device must
> + * set the coalescing parameters of the virtqueue to those configured
> + * 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),
> + vi->intr_coal_tx.max_usecs,
> + vi->intr_coal_tx.max_packets);
> + if (err)
> + return err;
> + /* Save parameters */
As a very minor nit, I guess the comment could be dropped here (similar
to patch 4/6). @Heng Qi: please don't repost just for this, let's wait
for Jason' comments.
Cheers,
Paolo
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize
@ 2023-10-03 10:41 ` Paolo Abeni
0 siblings, 0 replies; 13+ messages in thread
From: Paolo Abeni @ 2023-10-03 10:41 UTC (permalink / raw)
To: Heng Qi, netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo, Gavin Li
On Mon, 2023-09-25 at 15:53 +0800, Heng Qi wrote:
> According to the definition of virtqueue coalescing spec[1]:
>
> Upon disabling and re-enabling a transmit virtqueue, the device MUST set
> the coalescing parameters of the virtqueue to those configured through the
> VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver did not set
> any TX coalescing parameters, to 0.
>
> Upon disabling and re-enabling a receive virtqueue, the device MUST set
> the coalescing parameters of the virtqueue to those configured through the
> VIRTIO_NET_CTRL_NOTF_COAL_RX_SET command, or, if the driver did not set
> any RX coalescing parameters, to 0.
>
> We need to add this setting for vq resize (ethtool -G) where vq_reset happens.
>
> [1] https://lists.oasis-open.org/archives/virtio-dev/202303/msg00415.html
>
> Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
> Cc: Gavin Li <gavinl@nvidia.com>
> Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
@Jason, since you commented on v1, waiting for your ack.
> ---
> drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 12ec3ae19b60..cb19b224419b 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2855,6 +2855,9 @@ static void virtnet_get_ringparam(struct net_device *dev,
> ring->tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
> }
>
> +static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
> + u16 vqn, u32 max_usecs, u32 max_packets);
> +
> static int virtnet_set_ringparam(struct net_device *dev,
> struct ethtool_ringparam *ring,
> struct kernel_ethtool_ringparam *kernel_ring,
> @@ -2890,12 +2893,36 @@ static int virtnet_set_ringparam(struct net_device *dev,
> err = virtnet_tx_resize(vi, sq, ring->tx_pending);
> if (err)
> return err;
> +
> + /* Upon disabling and re-enabling a transmit virtqueue, the device must
> + * set the coalescing parameters of the virtqueue to those configured
> + * 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),
> + vi->intr_coal_tx.max_usecs,
> + vi->intr_coal_tx.max_packets);
> + if (err)
> + return err;
> + /* Save parameters */
As a very minor nit, I guess the comment could be dropped here (similar
to patch 4/6). @Heng Qi: please don't repost just for this, let's wait
for Jason' comments.
Cheers,
Paolo
^ permalink raw reply [flat|nested] 13+ messages in thread[parent not found: <21d1ab6c-b94c-44c5-b8c3-2d7e7aa32dd9@linux.alibaba.com>]
* Re: [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize
[not found] ` <21d1ab6c-b94c-44c5-b8c3-2d7e7aa32dd9@linux.alibaba.com>
@ 2023-10-08 5:21 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2023-10-08 5:21 UTC (permalink / raw)
To: Heng Qi
Cc: Xuan Zhuo, Jesper Dangaard Brouer, Daniel Borkmann,
Michael S . Tsirkin, netdev, John Fastabend, Alexei Starovoitov,
virtualization, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
David S . Miller, Gavin Li
On Thu, Oct 5, 2023 at 2:12 PM Heng Qi <hengqi@linux.alibaba.com> wrote:
>
>
>
> 在 2023/10/3 下午6:41, Paolo Abeni 写道:
> > On Mon, 2023-09-25 at 15:53 +0800, Heng Qi wrote:
> >> According to the definition of virtqueue coalescing spec[1]:
> >>
> >> Upon disabling and re-enabling a transmit virtqueue, the device MUST set
> >> the coalescing parameters of the virtqueue to those configured through the
> >> VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver did not set
> >> any TX coalescing parameters, to 0.
> >>
> >> Upon disabling and re-enabling a receive virtqueue, the device MUST set
> >> the coalescing parameters of the virtqueue to those configured through the
> >> VIRTIO_NET_CTRL_NOTF_COAL_RX_SET command, or, if the driver did not set
> >> any RX coalescing parameters, to 0.
> >>
> >> We need to add this setting for vq resize (ethtool -G) where vq_reset happens.
> >>
> >> [1] https://lists.oasis-open.org/archives/virtio-dev/202303/msg00415.html
> >>
> >> Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
> >> Cc: Gavin Li <gavinl@nvidia.com>
> >> Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
> > @Jason, since you commented on v1, waiting for your ack.
> >
> >> ---
> >> drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++
> >> 1 file changed, 27 insertions(+)
> >>
> >> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> >> index 12ec3ae19b60..cb19b224419b 100644
> >> --- a/drivers/net/virtio_net.c
> >> +++ b/drivers/net/virtio_net.c
> >> @@ -2855,6 +2855,9 @@ static void virtnet_get_ringparam(struct net_device *dev,
> >> ring->tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
> >> }
> >>
> >> +static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
> >> + u16 vqn, u32 max_usecs, u32 max_packets);
> >> +
> >> static int virtnet_set_ringparam(struct net_device *dev,
> >> struct ethtool_ringparam *ring,
> >> struct kernel_ethtool_ringparam *kernel_ring,
> >> @@ -2890,12 +2893,36 @@ static int virtnet_set_ringparam(struct net_device *dev,
> >> err = virtnet_tx_resize(vi, sq, ring->tx_pending);
> >> if (err)
> >> return err;
> >> +
> >> + /* Upon disabling and re-enabling a transmit virtqueue, the device must
> >> + * set the coalescing parameters of the virtqueue to those configured
> >> + * 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),
> >> + vi->intr_coal_tx.max_usecs,
> >> + vi->intr_coal_tx.max_packets);
> >> + if (err)
> >> + return err;
> >> + /* Save parameters */
> > As a very minor nit, I guess the comment could be dropped here (similar
> > to patch 4/6). @Heng Qi: please don't repost just for this, let's wait
> > for Jason' comments.
>
> Ok. We are currently on the National Day holiday, Jason may reply in a
> few days, thanks!
With the comments removed.
Acked-by: Jason Wang <jasowang@redhat.com>
Thanks
>
> > Cheers,
> >
> > Paolo
>
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize
@ 2023-10-08 5:21 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2023-10-08 5:21 UTC (permalink / raw)
To: Heng Qi
Cc: Paolo Abeni, netdev, virtualization, Michael S . Tsirkin,
David S . Miller, Eric Dumazet, Jakub Kicinski,
Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
John Fastabend, Xuan Zhuo, Gavin Li
On Thu, Oct 5, 2023 at 2:12 PM Heng Qi <hengqi@linux.alibaba.com> wrote:
>
>
>
> 在 2023/10/3 下午6:41, Paolo Abeni 写道:
> > On Mon, 2023-09-25 at 15:53 +0800, Heng Qi wrote:
> >> According to the definition of virtqueue coalescing spec[1]:
> >>
> >> Upon disabling and re-enabling a transmit virtqueue, the device MUST set
> >> the coalescing parameters of the virtqueue to those configured through the
> >> VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver did not set
> >> any TX coalescing parameters, to 0.
> >>
> >> Upon disabling and re-enabling a receive virtqueue, the device MUST set
> >> the coalescing parameters of the virtqueue to those configured through the
> >> VIRTIO_NET_CTRL_NOTF_COAL_RX_SET command, or, if the driver did not set
> >> any RX coalescing parameters, to 0.
> >>
> >> We need to add this setting for vq resize (ethtool -G) where vq_reset happens.
> >>
> >> [1] https://lists.oasis-open.org/archives/virtio-dev/202303/msg00415.html
> >>
> >> Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command")
> >> Cc: Gavin Li <gavinl@nvidia.com>
> >> Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
> > @Jason, since you commented on v1, waiting for your ack.
> >
> >> ---
> >> drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++
> >> 1 file changed, 27 insertions(+)
> >>
> >> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> >> index 12ec3ae19b60..cb19b224419b 100644
> >> --- a/drivers/net/virtio_net.c
> >> +++ b/drivers/net/virtio_net.c
> >> @@ -2855,6 +2855,9 @@ static void virtnet_get_ringparam(struct net_device *dev,
> >> ring->tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
> >> }
> >>
> >> +static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
> >> + u16 vqn, u32 max_usecs, u32 max_packets);
> >> +
> >> static int virtnet_set_ringparam(struct net_device *dev,
> >> struct ethtool_ringparam *ring,
> >> struct kernel_ethtool_ringparam *kernel_ring,
> >> @@ -2890,12 +2893,36 @@ static int virtnet_set_ringparam(struct net_device *dev,
> >> err = virtnet_tx_resize(vi, sq, ring->tx_pending);
> >> if (err)
> >> return err;
> >> +
> >> + /* Upon disabling and re-enabling a transmit virtqueue, the device must
> >> + * set the coalescing parameters of the virtqueue to those configured
> >> + * 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),
> >> + vi->intr_coal_tx.max_usecs,
> >> + vi->intr_coal_tx.max_packets);
> >> + if (err)
> >> + return err;
> >> + /* Save parameters */
> > As a very minor nit, I guess the comment could be dropped here (similar
> > to patch 4/6). @Heng Qi: please don't repost just for this, let's wait
> > for Jason' comments.
>
> Ok. We are currently on the National Day holiday, Jason may reply in a
> few days, thanks!
With the comments removed.
Acked-by: Jason Wang <jasowang@redhat.com>
Thanks
>
> > Cheers,
> >
> > Paolo
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net v2 6/6] virtio-net: a tiny comment update
2023-09-25 7:52 [PATCH net v2 0/6] virtio-net: Fix and update interrupt moderation Heng Qi
` (4 preceding siblings ...)
2023-09-25 7:53 ` [PATCH net v2 5/6] virtio-net: fix the vq coalescing setting for vq resize Heng Qi
@ 2023-09-25 7:53 ` Heng Qi
5 siblings, 0 replies; 13+ messages in thread
From: Heng Qi @ 2023-09-25 7:53 UTC (permalink / raw)
To: netdev, virtualization
Cc: Jason Wang, Michael S . Tsirkin, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
Jesper Dangaard Brouer, John Fastabend, Xuan Zhuo
Update a comment because virtio-net now supports both
VIRTIO_NET_F_NOTF_COAL and VIRTIO_NET_F_VQ_NOTF_COAL.
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index cb19b224419b..4d746bb3d0be 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3347,7 +3347,7 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,
static int virtnet_coal_params_supported(struct ethtool_coalesce *ec)
{
/* usecs coalescing is supported only if VIRTIO_NET_F_NOTF_COAL
- * feature is negotiated.
+ * or VIRTIO_NET_F_VQ_NOTF_COAL feature is negotiated.
*/
if (ec->rx_coalesce_usecs || ec->tx_coalesce_usecs)
return -EOPNOTSUPP;
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 13+ messages in thread