* [PATCH] virtio_net: simplify tx queue wake condition check
@ 2025-07-02 1:41 liming.wu
2025-07-04 10:03 ` Lei Yang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: liming.wu @ 2025-07-02 1:41 UTC (permalink / raw)
To: Michael S . Tsirkin, Jason Wang
Cc: kvm, virtualization, netdev, linux-kernel, angus.chen, Liming Wu
From: Liming Wu <liming.wu@jaguarmicro.com>
Consolidate the two nested if conditions for checking tx queue wake
conditions into a single combined condition. This improves code
readability without changing functionality. And move netif_tx_wake_queue
into if condition to reduce unnecessary checks for queue stops.
Signed-off-by: Liming Wu <liming.wu@jaguarmicro.com>
---
drivers/net/virtio_net.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index e53ba600605a..6f3d69feb427 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2998,12 +2998,11 @@ static void virtnet_poll_cleantx(struct receive_queue *rq, int budget)
free_old_xmit(sq, txq, !!budget);
} while (unlikely(!virtqueue_enable_cb_delayed(sq->vq)));
- if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) {
- if (netif_tx_queue_stopped(txq)) {
- u64_stats_update_begin(&sq->stats.syncp);
- u64_stats_inc(&sq->stats.wake);
- u64_stats_update_end(&sq->stats.syncp);
- }
+ if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS &&
+ netif_tx_queue_stopped(txq)) {
+ u64_stats_update_begin(&sq->stats.syncp);
+ u64_stats_inc(&sq->stats.wake);
+ u64_stats_update_end(&sq->stats.syncp);
netif_tx_wake_queue(txq);
}
@@ -3195,12 +3194,11 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)
else
free_old_xmit(sq, txq, !!budget);
- if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) {
- if (netif_tx_queue_stopped(txq)) {
- u64_stats_update_begin(&sq->stats.syncp);
- u64_stats_inc(&sq->stats.wake);
- u64_stats_update_end(&sq->stats.syncp);
- }
+ if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS &&
+ netif_tx_queue_stopped(txq)) {
+ u64_stats_update_begin(&sq->stats.syncp);
+ u64_stats_inc(&sq->stats.wake);
+ u64_stats_update_end(&sq->stats.syncp);
netif_tx_wake_queue(txq);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] virtio_net: simplify tx queue wake condition check
2025-07-02 1:41 [PATCH] virtio_net: simplify tx queue wake condition check liming.wu
@ 2025-07-04 10:03 ` Lei Yang
2025-07-07 3:38 ` Jason Wang
2025-07-08 1:37 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Lei Yang @ 2025-07-04 10:03 UTC (permalink / raw)
To: liming.wu
Cc: Michael S . Tsirkin, Jason Wang, kvm, virtualization, netdev,
linux-kernel, angus.chen
I tested this patch with virito-net regression tests, everything works fine.
Tested-by: Lei Yang <leiyang@redhat.com>
On Wed, Jul 2, 2025 at 9:42 AM <liming.wu@jaguarmicro.com> wrote:
>
> From: Liming Wu <liming.wu@jaguarmicro.com>
>
> Consolidate the two nested if conditions for checking tx queue wake
> conditions into a single combined condition. This improves code
> readability without changing functionality. And move netif_tx_wake_queue
> into if condition to reduce unnecessary checks for queue stops.
>
> Signed-off-by: Liming Wu <liming.wu@jaguarmicro.com>
> ---
> drivers/net/virtio_net.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index e53ba600605a..6f3d69feb427 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2998,12 +2998,11 @@ static void virtnet_poll_cleantx(struct receive_queue *rq, int budget)
> free_old_xmit(sq, txq, !!budget);
> } while (unlikely(!virtqueue_enable_cb_delayed(sq->vq)));
>
> - if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) {
> - if (netif_tx_queue_stopped(txq)) {
> - u64_stats_update_begin(&sq->stats.syncp);
> - u64_stats_inc(&sq->stats.wake);
> - u64_stats_update_end(&sq->stats.syncp);
> - }
> + if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS &&
> + netif_tx_queue_stopped(txq)) {
> + u64_stats_update_begin(&sq->stats.syncp);
> + u64_stats_inc(&sq->stats.wake);
> + u64_stats_update_end(&sq->stats.syncp);
> netif_tx_wake_queue(txq);
> }
>
> @@ -3195,12 +3194,11 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)
> else
> free_old_xmit(sq, txq, !!budget);
>
> - if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) {
> - if (netif_tx_queue_stopped(txq)) {
> - u64_stats_update_begin(&sq->stats.syncp);
> - u64_stats_inc(&sq->stats.wake);
> - u64_stats_update_end(&sq->stats.syncp);
> - }
> + if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS &&
> + netif_tx_queue_stopped(txq)) {
> + u64_stats_update_begin(&sq->stats.syncp);
> + u64_stats_inc(&sq->stats.wake);
> + u64_stats_update_end(&sq->stats.syncp);
> netif_tx_wake_queue(txq);
> }
>
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] virtio_net: simplify tx queue wake condition check
2025-07-02 1:41 [PATCH] virtio_net: simplify tx queue wake condition check liming.wu
2025-07-04 10:03 ` Lei Yang
@ 2025-07-07 3:38 ` Jason Wang
2025-07-08 1:37 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2025-07-07 3:38 UTC (permalink / raw)
To: liming.wu
Cc: Michael S . Tsirkin, kvm, virtualization, netdev, linux-kernel,
angus.chen
On Wed, Jul 2, 2025 at 9:41 AM <liming.wu@jaguarmicro.com> wrote:
>
> From: Liming Wu <liming.wu@jaguarmicro.com>
>
> Consolidate the two nested if conditions for checking tx queue wake
> conditions into a single combined condition. This improves code
> readability without changing functionality. And move netif_tx_wake_queue
> into if condition to reduce unnecessary checks for queue stops.
>
> Signed-off-by: Liming Wu <liming.wu@jaguarmicro.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] virtio_net: simplify tx queue wake condition check
2025-07-02 1:41 [PATCH] virtio_net: simplify tx queue wake condition check liming.wu
2025-07-04 10:03 ` Lei Yang
2025-07-07 3:38 ` Jason Wang
@ 2025-07-08 1:37 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2025-07-08 1:37 UTC (permalink / raw)
To: liming.wu
Cc: Michael S . Tsirkin, Jason Wang, kvm, virtualization, netdev,
linux-kernel, angus.chen
On Wed, 2 Jul 2025 09:41:39 +0800 liming.wu@jaguarmicro.com wrote:
> From: Liming Wu <liming.wu@jaguarmicro.com>
>
> Consolidate the two nested if conditions for checking tx queue wake
> conditions into a single combined condition. This improves code
> readability without changing functionality. And move netif_tx_wake_queue
> into if condition to reduce unnecessary checks for queue stops.
No longer applies, please rebase and repost if its still necessary.
--
pw-bot: cr
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-07-08 1:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-02 1:41 [PATCH] virtio_net: simplify tx queue wake condition check liming.wu
2025-07-04 10:03 ` Lei Yang
2025-07-07 3:38 ` Jason Wang
2025-07-08 1:37 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).