net/macvtap: add vhost support

This adds support for passing a macvtap file descriptor into
vhost-net, much like we already do for tun/tap.

Most of the new code is taken from the respective patch
in the tun driver and may get consolidated in the future.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index 9e9355367bb3..e4e2fd1b5107 100644
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -1,6 +1,6 @@
 config VHOST_NET
         tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)"
-        depends on NET && EVENTFD && (TUN || !TUN) && EXPERIMENTAL
+        depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) && EXPERIMENTAL
         ---help---
           This kernel module can be loaded in host kernel to accelerate
           guest networking with virtio_net. Not to be confused with virtio_net
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 4c8928319e1d..91a324cc2298 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -22,6 +22,7 @@
 #include <linux/if_packet.h>
 #include <linux/if_arp.h>
 #include <linux/if_tun.h>
+#include <linux/if_macvlan.h>
 
 #include <net/sock.h>
 
@@ -452,13 +453,16 @@ err:
         return ERR_PTR(r);
 }
 
-static struct socket *get_tun_socket(int fd)
+static struct socket *get_tap_socket(int fd)
 {
         struct file *file = fget(fd);
         struct socket *sock;
         if (!file)
                 return ERR_PTR(-EBADF);
         sock = tun_get_socket(file);
+        if (!IS_ERR(sock))
+                return sock;
+        sock = macvtap_get_socket(file);
         if (IS_ERR(sock))
                 fput(file);
         return sock;
@@ -473,7 +477,7 @@ static struct socket *get_socket(int fd)
         sock = get_raw_socket(fd);
         if (!IS_ERR(sock))
                 return sock;
-        sock = get_tun_socket(fd);
+        sock = get_tap_socket(fd);
         if (!IS_ERR(sock))
                 return sock;
         return ERR_PTR(-ENOTSOCK);