New upstream version 18.11-rc1

[deb_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 9ea7ade..a3faf1d 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -16,21 +16,55 @@
 
 #include "vhost_kernel_tap.h"
 #include "../virtio_logs.h"
+#include "../virtio_pci.h"
+
+static 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;
+       }
+
+       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;
+               }
+
+               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_open_tap(char **p_ifname, int hdr_size, int req_mq,
-                        const char *mac)
+                        const char *mac, uint64_t features)
 {
        unsigned int tap_features;
        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;
 
        /* TODO:
         * 1. verify we can get/set vnet_hdr_len, tap_probe_vnet_hdr_len
@@ -90,13 +124,7 @@ 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));
+       vhost_kernel_tap_set_offload(tapfd, features);
 
        memset(&ifr, 0, sizeof(ifr));
        ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;