]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Revert "vhost/net: Defer TX queue re-enable until after sendmsg"
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 17 Sep 2025 06:30:44 +0000 (14:30 +0800)
committerMichael S. Tsirkin <mst@redhat.com>
Fri, 19 Sep 2025 08:15:26 +0000 (04:15 -0400)
commit4174152771bf0d014d58f7d7e148bb0c8830fe53
tree00dff7ca5a75d61d8756d77de246085eb119b90d
parent90beccb3e1287b8d596c4816530ef54df01aa11f
Revert "vhost/net: Defer TX queue re-enable until after sendmsg"

This reverts commit 8c2e6b26ffe243be1e78f5a4bfb1a857d6e6f6d6. It tries
to defer the notification enabling by moving the logic out of the loop
after the vhost_tx_batch() when nothing new is spotted. This will
bring side effects as the new logic would be reused for several other
error conditions.

One example is the IOTLB: when there's an IOTLB miss, get_tx_bufs()
might return -EAGAIN and exit the loop and see there's still available
buffers, so it will queue the tx work again until userspace feed the
IOTLB entry correctly. This will slowdown the tx processing and
trigger the TX watchdog in the guest as reported in
https://lkml.org/lkml/2025/9/10/1596.

To fix, revert the change. A follow up patch will bring the performance
back in a safe way.

Reported-by: Jon Kohler <jon@nutanix.com>
Cc: stable@vger.kernel.org
Fixes: 8c2e6b26ffe2 ("vhost/net: Defer TX queue re-enable until after sendmsg")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20250917063045.2042-2-jasowang@redhat.com>
drivers/vhost/net.c