OSDN Git Service

UPSTREAM: vhost_net: correctly check tx avail during rx busy polling
authorJason Wang <jasowang@redhat.com>
Tue, 5 Sep 2017 01:22:05 +0000 (09:22 +0800)
committerAlistair Strachan <astrachan@google.com>
Wed, 16 Jan 2019 01:08:37 +0000 (17:08 -0800)
commitea183988dee1e37542ddc1bbc84c5a2390074bfd
tree02f7b92cdbcc01cb556eef87b3c1a76fd78a4c8a
parentd6c52dda2c08eb74a92c722fa2655f5447161db7
UPSTREAM: vhost_net: correctly check tx avail during rx busy polling

[ Upstream commit 8b949bef9172ca69d918e93509a4ecb03d0355e0 ]

We check tx avail through vhost_enable_notify() in the past which is
wrong since it only checks whether or not guest has filled more
available buffer since last avail idx synchronization which was just
done by vhost_vq_avail_empty() before. What we really want is checking
pending buffers in the avail ring. Fix this by calling
vhost_vq_avail_empty() instead.

This issue could be noticed by doing netperf TCP_RR benchmark as
client from guest (but not host). With this fix, TCP_RR from guest to
localhost restores from 1375.91 trans per sec to 55235.28 trans per
sec on my laptop (Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz).

Fixes: 030881372460 ("vhost_net: basic polling support")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f5755c0e870056dd35c95a0b5c0a038cdb4382ee)
Bug: 121166534
Test: Ran cuttlefish with android-4.4 + VSOCKETS, VMWARE_VMCI_VSOCKETS
Signed-off-by: Alistair Strachan <astrachan@google.com>
Change-Id: Ia61d229fb5c82e64fd1c30aff06a9f938d20e467
drivers/vhost/net.c