net/virtio-user: check tap system call setting

[dpdk.git] / drivers / net / virtio / virtio_user / vhost_kernel_tap.c

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
index a3faf1d..acddefa 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -18,7 +18,7 @@
 #include "../virtio_logs.h"
 #include "../virtio_pci.h"
 
-static int
+int
 vhost_kernel_tap_set_offload(int fd, uint64_t features)
 {
        unsigned int offload = 0;
@@ -37,34 +37,44 @@ vhost_kernel_tap_set_offload(int fd, uint64_t features)
                        offload |= TUN_F_UFO;
        }
 
-       if (offload != 0) {
-               /* Check if our kernel supports TUNSETOFFLOAD */
-               if (ioctl(fd, TUNSETOFFLOAD, 0) != 0 && errno == EINVAL) {
-                       PMD_DRV_LOG(ERR, "Kernel does't support TUNSETOFFLOAD\n");
-                       return -ENOTSUP;
-               }
+       /* Check if our kernel supports TUNSETOFFLOAD */
+       if (ioctl(fd, TUNSETOFFLOAD, 0) != 0 && errno == EINVAL) {
+               PMD_DRV_LOG(ERR, "Kernel does't support TUNSETOFFLOAD\n");
+               return -ENOTSUP;
+       }
 
+       if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
+               offload &= ~TUN_F_UFO;
                if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
-                       offload &= ~TUN_F_UFO;
-                       if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
-                               PMD_DRV_LOG(ERR, "TUNSETOFFLOAD ioctl() failed: %s\n",
-                                       strerror(errno));
-                               return -1;
-                       }
+                       PMD_DRV_LOG(ERR, "TUNSETOFFLOAD ioctl() failed: %s\n",
+                               strerror(errno));
+                       return -1;
                }
        }
 
        return 0;
 }
 
+int
+vhost_kernel_tap_set_queue(int fd, bool attach)
+{
+       struct ifreq ifr = {
+               .ifr_flags = attach ? IFF_ATTACH_QUEUE : IFF_DETACH_QUEUE,
+       };
+
+       return ioctl(fd, TUNSETQUEUE, &ifr);
+}
+
 int
 vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
                         const char *mac, uint64_t features)
 {
        unsigned int tap_features;
+       char *tap_name = NULL;
        int sndbuf = INT_MAX;
        struct ifreq ifr;
        int tapfd;
+       int ret;
 
        /* TODO:
         * 1. verify we can get/set vnet_hdr_len, tap_probe_vnet_hdr_len
@@ -112,7 +122,16 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
                goto error;
        }
 
-       fcntl(tapfd, F_SETFL, O_NONBLOCK);
+       tap_name = strdup(ifr.ifr_name);
+       if (!tap_name) {
+               PMD_DRV_LOG(ERR, "strdup ifname failed: %s", strerror(errno));
+               goto error;
+       }
+
+       if (fcntl(tapfd, F_SETFL, O_NONBLOCK) < 0) {
+               PMD_DRV_LOG(ERR, "fcntl tapfd failed: %s", strerror(errno));
+               goto error;
+       }
 
        if (ioctl(tapfd, TUNSETVNETHDRSZ, &hdr_size) < 0) {
                PMD_DRV_LOG(ERR, "TUNSETVNETHDRSZ failed: %s", strerror(errno));
@@ -124,21 +143,24 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
                goto error;
        }
 
-       vhost_kernel_tap_set_offload(tapfd, features);
+       ret = vhost_kernel_tap_set_offload(tapfd, features);
+       if (ret < 0 && ret != -ENOTSUP)
+               goto error;
 
        memset(&ifr, 0, sizeof(ifr));
        ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-       memcpy(ifr.ifr_hwaddr.sa_data, mac, ETHER_ADDR_LEN);
+       memcpy(ifr.ifr_hwaddr.sa_data, mac, RTE_ETHER_ADDR_LEN);
        if (ioctl(tapfd, SIOCSIFHWADDR, (void *)&ifr) == -1) {
                PMD_DRV_LOG(ERR, "SIOCSIFHWADDR failed: %s", strerror(errno));
                goto error;
        }
 
-       if (!(*p_ifname))
-               *p_ifname = strdup(ifr.ifr_name);
+       free(*p_ifname);
+       *p_ifname = tap_name;
 
        return tapfd;
 error:
+       free(tap_name);
        close(tapfd);
        return -1;
 }