diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-12-06 14:03:34 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2012-12-06 17:09:18 +0200 |
| commit | 935cdee7ee159569b0aaa10bd9244660f6672b08 (patch) | |
| tree | 366e06bee572c2578fcce51926a8ae25e04ce66d /drivers/vhost/net.c | |
| parent | 4a7d6455b07845d92e025da222f11de519f90def (diff) | |
| download | talos-obmc-linux-935cdee7ee159569b0aaa10bd9244660f6672b08.tar.gz talos-obmc-linux-935cdee7ee159569b0aaa10bd9244660f6672b08.zip | |
vhost: avoid backend flush on vring ops
vring changes already do a flush internally where appropriate, so we do
not need a second flush.
It's currently not very expensive but a follow-up patch makes flush more
heavy-weight, so remove the extra flush here to avoid regressing
performance if call or kick fds are changed on data path.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index ff6c91995c96..1802ab662082 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -942,8 +942,11 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl, return vhost_net_reset_owner(n); default: mutex_lock(&n->dev.mutex); - r = vhost_dev_ioctl(&n->dev, ioctl, arg); - vhost_net_flush(n); + r = vhost_dev_ioctl(&n->dev, ioctl, argp); + if (r == -ENOIOCTLCMD) + r = vhost_vring_ioctl(&n->dev, ioctl, argp); + else + vhost_net_flush(n); mutex_unlock(&n->dev.mutex); return r; } |
