diff options
| author | Jason Wang <[email protected]> | 2025-09-17 06:30:45 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <[email protected]> | 2025-09-19 08:15:26 +0000 |
| commit | e430451613c7a27beeadd00d707bcf7ceec6328e (patch) | |
| tree | cab83dc6f972207ae909a4ad714709d1eb9d966c | |
| parent | Revert "vhost/net: Defer TX queue re-enable until after sendmsg" (diff) | |
| download | kernel-e430451613c7a27beeadd00d707bcf7ceec6328e.tar.gz kernel-e430451613c7a27beeadd00d707bcf7ceec6328e.zip | |
vhost-net: flush batched before enabling notifications
Commit 8c2e6b26ffe2 ("vhost/net: Defer TX queue re-enable until after
sendmsg") 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 caused unexpected side effects as the new logic is reused for
several other error conditions.
A previous patch reverted 8c2e6b26ffe2. Now, bring the performance
back up by flushing batched buffers before enabling notifications.
Reported-by: Jon Kohler <[email protected]>
Cc: [email protected]
Fixes: 8c2e6b26ffe2 ("vhost/net: Defer TX queue re-enable until after sendmsg")
Signed-off-by: Jason Wang <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
Message-Id: <[email protected]>
| -rw-r--r-- | drivers/vhost/net.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 57efd5c55f89..35ded4330431 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -780,6 +780,11 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) break; /* Nothing new? Wait for eventfd to tell us they refilled. */ if (head == vq->num) { + /* Flush batched packets to handle pending RX + * work (if busyloop_intr is set) and to avoid + * unnecessary virtqueue kicks. + */ + vhost_tx_batch(net, nvq, sock, &msg); if (unlikely(busyloop_intr)) { vhost_poll_queue(&vq->poll); } else if (unlikely(vhost_enable_notify(&net->dev, |