net/virtio-user: fix status management

[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 1a47a34..2fa4f0d 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -7,26 +7,74 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <errno.h>
 #include <string.h>
 #include <limits.h>
 
+#include <rte_ether.h>
+
 #include "vhost_kernel_tap.h"
 #include "../virtio_logs.h"
+#include "../virtio_pci.h"
+
+int
+vhost_kernel_tap_set_offload(int fd, uint64_t features)
+{
+       unsigned int offload = 0;
+
+       if (features & (1ULL << VIRTIO_NET_F_GUEST_CSUM)) {
+               offload |= TUN_F_CSUM;
+               if (features & (1ULL << VIRTIO_NET_F_GUEST_TSO4))
+                       offload |= TUN_F_TSO4;
+               if (features & (1ULL << VIRTIO_NET_F_GUEST_TSO6))
+                       offload |= TUN_F_TSO6;
+               if (features & ((1ULL << VIRTIO_NET_F_GUEST_TSO4) |
+                       (1ULL << VIRTIO_NET_F_GUEST_TSO6)) &&
+                       (features & (1ULL << VIRTIO_NET_F_GUEST_ECN)))
+                       offload |= TUN_F_TSO_ECN;
+               if (features & (1ULL << VIRTIO_NET_F_GUEST_UFO))
+                       offload |= TUN_F_UFO;
+       }
+
+       /* 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) {
+                       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)
+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;
-       unsigned int offload =
-                       TUN_F_CSUM |
-                       TUN_F_TSO4 |
-                       TUN_F_TSO6 |
-                       TUN_F_TSO_ECN |
-                       TUN_F_UFO;
+       int ret;
 
        /* TODO:
         * 1. verify we can get/set vnet_hdr_len, tap_probe_vnet_hdr_len
@@ -74,6 +122,12 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq)
                goto error;
        }
 
+       tap_name = strdup(ifr.ifr_name);
+       if (!tap_name) {
+               PMD_DRV_LOG(ERR, "strdup ifname failed: %s", strerror(errno));
+               goto error;
+       }
+
        fcntl(tapfd, F_SETFL, O_NONBLOCK);
 
        if (ioctl(tapfd, TUNSETVNETHDRSZ, &hdr_size) < 0) {
@@ -86,19 +140,24 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq)
                goto error;
        }
 
-       /* TODO: before set the offload capabilities, we'd better (1) check
-        * negotiated features to see if necessary to offload; (2) query tap
-        * to see if it supports the offload capabilities.
-        */
-       if (ioctl(tapfd, TUNSETOFFLOAD, offload) != 0)
-               PMD_DRV_LOG(ERR, "TUNSETOFFLOAD ioctl() failed: %s",
-                          strerror(errno));
+       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, 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;
 }