diff options
| author | Jason Wang <jasowang@redhat.com> | 2012-05-02 05:42:32 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2012-05-02 17:22:24 +0200 |
| commit | dbf34207c62bdec16b49721d119647c470a3443c (patch) | |
| tree | 156779e1562f655cee6f383474d44e8960a818de /drivers/vhost | |
| parent | vhost_net: zerocopy: fix possible NULL pointer dereference of vq->bufs (diff) | |
| download | linux-dbf34207c62bdec16b49721d119647c470a3443c.tar.xz linux-dbf34207c62bdec16b49721d119647c470a3443c.zip | |
vhost_net: re-poll only on EAGAIN or ENOBUFS
Currently, we restart tx polling unconditionally when sendmsg()
fails. This would cause unnecessary wakeups of vhost wokers and waste
cpu utlization when evil userspace(guest driver) is able to hit EFAULT or
EINVAL.
The polling is only needed when the socket send buffer were exceeded or not
enough memory. So fix this by restarting polling only when sendmsg() returns
EAGAIN/ENOBUFS.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 35abe9019ba7..f54b1d5fc234 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -257,7 +257,8 @@ static void handle_tx(struct vhost_net *net) UIO_MAXIOV; } vhost_discard_vq_desc(vq, 1); - tx_poll_start(net, sock); + if (err == -EAGAIN || err == -ENOBUFS) + tx_poll_start(net, sock); break; } if (err != len) |