I tested this patch with virito-net regression tests, everything works fine.
Tested-by: Lei Yang <leiyang@xxxxxxxxxx>
On Wed, Jul 2, 2025 at 9:42 AM <liming.wu@xxxxxxxxxxxxxxx> wrote:
>
> From: Liming Wu <liming.wu@xxxxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxxxx>
> ---
> 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
>
>
