virtio-net: correctly enable callback during start_xmit
authorJason Wang <jasowang@redhat.com>
Tue, 17 Jan 2023 03:47:07 +0000 (11:47 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jan 2023 14:28:56 +0000 (14:28 +0000)
commitd71ebe8114b4bf622804b810f5e274069060a174
tree66de68b440fb43e1fbdfe9002e9f83035eaf5ffb
parent7b90f5a665acd46efbbfa677a3a3a18d01ad6487
virtio-net: correctly enable callback during start_xmit

Commit a7766ef18b33("virtio_net: disable cb aggressively") enables
virtqueue callback via the following statement:

        do {
if (use_napi)
virtqueue_disable_cb(sq->vq);

free_old_xmit_skbs(sq, false);

} while (use_napi && kick &&
               unlikely(!virtqueue_enable_cb_delayed(sq->vq)));

When NAPI is used and kick is false, the callback won't be enabled
here. And when the virtqueue is about to be full, the tx will be
disabled, but we still don't enable tx interrupt which will cause a TX
hang. This could be observed when using pktgen with burst enabled.

TO be consistent with the logic that tries to disable cb only for
NAPI, fixing this by trying to enable delayed callback only when NAPI
is enabled when the queue is about to be full.

Fixes: a7766ef18b33 ("virtio_net: disable cb aggressively")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c