net/mlx5: add Rx and Tx tuning parameters
[dpdk.git] / drivers / net / mlx5 / mlx5_ethdev.c
index 5baf843..3fad199 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2015 6WIND S.A.
- * Copyright 2015 Mellanox.
+ * Copyright 2015 Mellanox Technologies, Ltd
  */
 
 #define _GNU_SOURCE
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/utsname.h>
 #include <netinet/in.h>
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
-#include <linux/version.h>
 #include <fcntl.h>
 #include <stdalign.h>
 #include <sys/un.h>
+#include <time.h>
 
 #include <rte_atomic.h>
 #include <rte_ethdev_driver.h>
@@ -33,8 +32,8 @@
 #include <rte_mbuf.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
-#include <rte_alarm.h>
 #include <rte_malloc.h>
+#include <rte_string_fns.h>
 
 #include "mlx5.h"
 #include "mlx5_glue.h"
@@ -167,7 +166,7 @@ try_dev_id:
                        goto try_dev_id;
                dev_port_prev = dev_port;
                if (dev_port == (priv->port - 1u))
-                       snprintf(match, sizeof(match), "%s", name);
+                       strlcpy(match, name, sizeof(match));
        }
        closedir(dir);
        if (match[0] == '\0') {
@@ -178,6 +177,33 @@ try_dev_id:
        return 0;
 }
 
+/**
+ * Get the interface index from device name.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ *
+ * @return
+ *   Interface index on success, a negative errno value otherwise and
+ *   rte_errno is set.
+ */
+int
+mlx5_ifindex(const struct rte_eth_dev *dev)
+{
+       char ifname[IF_NAMESIZE];
+       int ret;
+
+       ret = mlx5_get_ifname(dev, &ifname);
+       if (ret)
+               return ret;
+       ret = if_nametoindex(ifname);
+       if (ret == -1) {
+               rte_errno = errno;
+               return -rte_errno;
+       }
+       return ret;
+}
+
 /**
  * Perform ifreq ioctl() on associated Ethernet device.
  *
@@ -313,23 +339,26 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
        int ret = 0;
 
        if ((tx_offloads & supp_tx_offloads) != tx_offloads) {
-               ERROR("port %u some Tx offloads are not supported "
-                     "requested 0x%" PRIx64 " supported 0x%" PRIx64,
-                     dev->data->port_id, tx_offloads, supp_tx_offloads);
+               DRV_LOG(ERR,
+                       "port %u some Tx offloads are not supported requested"
+                       " 0x%" PRIx64 " supported 0x%" PRIx64,
+                       dev->data->port_id, tx_offloads, supp_tx_offloads);
                rte_errno = ENOTSUP;
                return -rte_errno;
        }
        if ((rx_offloads & supp_rx_offloads) != rx_offloads) {
-               ERROR("port %u some Rx offloads are not supported "
-                     "requested 0x%" PRIx64 " supported 0x%" PRIx64,
-                     dev->data->port_id, rx_offloads, supp_rx_offloads);
+               DRV_LOG(ERR,
+                       "port %u some Rx offloads are not supported requested"
+                       " 0x%" PRIx64 " supported 0x%" PRIx64,
+                       dev->data->port_id, rx_offloads, supp_rx_offloads);
                rte_errno = ENOTSUP;
                return -rte_errno;
        }
        if (use_app_rss_key &&
            (dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len !=
             rss_hash_default_key_len)) {
-               /* MLX5 RSS only support 40bytes key. */
+               DRV_LOG(ERR, "port %u RSS key len must be %zu Bytes long",
+                       dev->data->port_id, rss_hash_default_key_len);
                rte_errno = EINVAL;
                return -rte_errno;
        }
@@ -337,8 +366,8 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
                rte_realloc(priv->rss_conf.rss_key,
                            rss_hash_default_key_len, 0);
        if (!priv->rss_conf.rss_key) {
-               ERROR("port %u cannot allocate RSS hash key memory (%u)",
-                     dev->data->port_id, rxqs_n);
+               DRV_LOG(ERR, "port %u cannot allocate RSS hash key memory (%u)",
+                       dev->data->port_id, rxqs_n);
                rte_errno = ENOMEM;
                return -rte_errno;
        }
@@ -352,20 +381,20 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
        priv->rxqs = (void *)dev->data->rx_queues;
        priv->txqs = (void *)dev->data->tx_queues;
        if (txqs_n != priv->txqs_n) {
-               INFO("port %u Tx queues number update: %u -> %u",
-                    dev->data->port_id, priv->txqs_n, txqs_n);
+               DRV_LOG(INFO, "port %u Tx queues number update: %u -> %u",
+                       dev->data->port_id, priv->txqs_n, txqs_n);
                priv->txqs_n = txqs_n;
        }
        if (rxqs_n > priv->config.ind_table_max_size) {
-               ERROR("port %u cannot handle this many Rx queues (%u)",
-                     dev->data->port_id, rxqs_n);
+               DRV_LOG(ERR, "port %u cannot handle this many Rx queues (%u)",
+                       dev->data->port_id, rxqs_n);
                rte_errno = EINVAL;
                return -rte_errno;
        }
        if (rxqs_n == priv->rxqs_n)
                return 0;
-       INFO("port %u Rx queues number update: %u -> %u",
-            dev->data->port_id, priv->rxqs_n, rxqs_n);
+       DRV_LOG(INFO, "port %u Rx queues number update: %u -> %u",
+               dev->data->port_id, priv->rxqs_n, rxqs_n);
        priv->rxqs_n = rxqs_n;
        /* If the requested number of RX queues is not a power of two, use the
         * maximum indirection table size for better balancing.
@@ -387,6 +416,45 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
        return 0;
 }
 
+/**
+ * Sets default tuning parameters.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ * @param[out] info
+ *   Info structure output buffer.
+ */
+static void
+mlx5_set_default_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
+{
+       struct priv *priv = dev->data->dev_private;
+
+       /* Minimum CPU utilization. */
+       info->default_rxportconf.ring_size = 256;
+       info->default_txportconf.ring_size = 256;
+       info->default_rxportconf.burst_size = 64;
+       info->default_txportconf.burst_size = 64;
+       if (priv->link_speed_capa & ETH_LINK_SPEED_100G) {
+               info->default_rxportconf.nb_queues = 16;
+               info->default_txportconf.nb_queues = 16;
+               if (dev->data->nb_rx_queues > 2 ||
+                   dev->data->nb_tx_queues > 2) {
+                       /* Max Throughput. */
+                       info->default_rxportconf.ring_size = 2048;
+                       info->default_txportconf.ring_size = 2048;
+               }
+       } else {
+               info->default_rxportconf.nb_queues = 8;
+               info->default_txportconf.nb_queues = 8;
+               if (dev->data->nb_rx_queues > 2 ||
+                   dev->data->nb_tx_queues > 2) {
+                       /* Max Throughput. */
+                       info->default_rxportconf.ring_size = 4096;
+                       info->default_txportconf.ring_size = 4096;
+               }
+       }
+}
+
 /**
  * DPDK callback to get information about the device.
  *
@@ -403,7 +471,6 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
        unsigned int max;
        char ifname[IF_NAMESIZE];
 
-       info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        /* FIXME: we should ask the device for these values. */
        info->min_rx_bufsize = 32;
        info->max_rx_pktlen = 65536;
@@ -418,7 +485,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
                max = 65535;
        info->max_rx_queues = max;
        info->max_tx_queues = max;
-       info->max_mac_addrs = RTE_DIM(priv->mac);
+       info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES;
        info->rx_queue_offload_capa = mlx5_get_rx_queue_offloads(dev);
        info->rx_offload_capa = (mlx5_get_rx_port_offloads() |
                                 info->rx_queue_offload_capa);
@@ -427,9 +494,10 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
                info->if_index = if_nametoindex(ifname);
        info->reta_size = priv->reta_idx_n ?
                priv->reta_idx_n : config->ind_table_max_size;
-       info->hash_key_size = priv->rss_conf.rss_key_len;
+       info->hash_key_size = rss_hash_default_key_len;
        info->speed_capa = priv->link_speed_capa;
        info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK;
+       mlx5_set_default_params(dev, info);
 }
 
 /**
@@ -473,12 +541,15 @@ mlx5_dev_supported_ptypes_get(struct rte_eth_dev *dev)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ * @param[out] link
+ *   Storage for current link status.
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev)
+mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev,
+                              struct rte_eth_link *link)
 {
        struct priv *priv = dev->data->dev_private;
        struct ethtool_cmd edata = {
@@ -491,8 +562,8 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev)
 
        ret = mlx5_ifreq(dev, SIOCGIFFLAGS, &ifr);
        if (ret) {
-               WARN("port %u ioctl(SIOCGIFFLAGS) failed: %s",
-                    dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(WARNING, "port %u ioctl(SIOCGIFFLAGS) failed: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        memset(&dev_link, 0, sizeof(dev_link));
@@ -501,13 +572,14 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev)
        ifr.ifr_data = (void *)&edata;
        ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
-               WARN("port %u ioctl(SIOCETHTOOL, ETHTOOL_GSET) failed: %s",
-                    dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(WARNING,
+                       "port %u ioctl(SIOCETHTOOL, ETHTOOL_GSET) failed: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        link_speed = ethtool_cmd_speed(&edata);
        if (link_speed == -1)
-               dev_link.link_speed = 0;
+               dev_link.link_speed = ETH_SPEED_NUM_NONE;
        else
                dev_link.link_speed = link_speed;
        priv->link_speed_capa = 0;
@@ -527,14 +599,13 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev)
                                ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX);
        dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
                        ETH_LINK_SPEED_FIXED);
-       if (memcmp(&dev_link, &dev->data->dev_link, sizeof(dev_link))) {
-               /* Link status changed. */
-               dev->data->dev_link = dev_link;
-               return 0;
+       if ((dev_link.link_speed && !dev_link.link_status) ||
+           (!dev_link.link_speed && dev_link.link_status)) {
+               rte_errno = EAGAIN;
+               return -rte_errno;
        }
-       /* Link status is still the same. */
-       rte_errno = EAGAIN;
-       return -rte_errno;
+       *link = dev_link;
+       return 0;
 }
 
 /**
@@ -542,12 +613,16 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ * @param[out] link
+ *   Storage for current link status.
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev)
+mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev,
+                            struct rte_eth_link *link)
+
 {
        struct priv *priv = dev->data->dev_private;
        struct ethtool_link_settings gcmd = { .cmd = ETHTOOL_GLINKSETTINGS };
@@ -558,8 +633,8 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev)
 
        ret = mlx5_ifreq(dev, SIOCGIFFLAGS, &ifr);
        if (ret) {
-               WARN("port %u ioctl(SIOCGIFFLAGS) failed: %s",
-                    dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(WARNING, "port %u ioctl(SIOCGIFFLAGS) failed: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        memset(&dev_link, 0, sizeof(dev_link));
@@ -568,8 +643,10 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev)
        ifr.ifr_data = (void *)&gcmd;
        ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
-               DEBUG("port %u ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS)"
-                     " failed: %s", dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(DEBUG,
+                       "port %u ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS)"
+                       " failed: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        gcmd.link_mode_masks_nwords = -gcmd.link_mode_masks_nwords;
@@ -583,8 +660,10 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev)
        ifr.ifr_data = (void *)ecmd;
        ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
-               DEBUG("port %u ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS)"
-                     " failed: %s", dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(DEBUG,
+                       "port %u ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS)"
+                       " failed: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        dev_link.link_speed = ecmd->speed;
@@ -629,85 +708,13 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev)
                                ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX);
        dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
                                  ETH_LINK_SPEED_FIXED);
-       if (memcmp(&dev_link, &dev->data->dev_link, sizeof(dev_link))) {
-               /* Link status changed. */
-               dev->data->dev_link = dev_link;
-               return 0;
-       }
-       /* Link status is still the same. */
-       rte_errno = EAGAIN;
-       return -rte_errno;
-}
-
-/**
- * Enable receiving and transmitting traffic.
- *
- * @param dev
- *   Pointer to Ethernet device.
- */
-static void
-mlx5_link_start(struct rte_eth_dev *dev)
-{
-       struct priv *priv = dev->data->dev_private;
-       int ret;
-
-       dev->tx_pkt_burst = mlx5_select_tx_function(dev);
-       dev->rx_pkt_burst = mlx5_select_rx_function(dev);
-       ret = mlx5_traffic_enable(dev);
-       if (ret) {
-               ERROR("port %u error occurred while configuring control flows:"
-                     " %s", dev->data->port_id, strerror(rte_errno));
-               return;
-       }
-       ret = mlx5_flow_start(dev, &priv->flows);
-       if (ret)
-               ERROR("port %u error occurred while configuring flows: %s",
-                      dev->data->port_id, strerror(rte_errno));
-}
-
-/**
- * Disable receiving and transmitting traffic.
- *
- * @param dev
- *   Pointer to Ethernet device.
- */
-static void
-mlx5_link_stop(struct rte_eth_dev *dev)
-{
-       struct priv *priv = dev->data->dev_private;
-
-       mlx5_flow_stop(dev, &priv->flows);
-       mlx5_traffic_disable(dev);
-       dev->rx_pkt_burst = removed_rx_burst;
-       dev->tx_pkt_burst = removed_tx_burst;
-}
-
-/**
- * Querying the link status till it changes to the desired state.
- * Number of query attempts is bounded by MLX5_MAX_LINK_QUERY_ATTEMPTS.
- *
- * @param dev
- *   Pointer to Ethernet device.
- * @param status
- *   Link desired status.
- *
- * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
- */
-int
-mlx5_force_link_status_change(struct rte_eth_dev *dev, int status)
-{
-       int try = 0;
-
-       while (try < MLX5_MAX_LINK_QUERY_ATTEMPTS) {
-               mlx5_link_update(dev, 0);
-               if (dev->data->dev_link.link_status == status)
-                       return 0;
-               try++;
-               sleep(1);
+       if ((dev_link.link_speed && !dev_link.link_status) ||
+           (!dev_link.link_speed && dev_link.link_status)) {
+               rte_errno = EAGAIN;
+               return -rte_errno;
        }
-       rte_errno = EAGAIN;
-       return -rte_errno;
+       *link = dev_link;
+       return 0;
 }
 
 /**
@@ -716,41 +723,43 @@ mlx5_force_link_status_change(struct rte_eth_dev *dev, int status)
  * @param dev
  *   Pointer to Ethernet device structure.
  * @param wait_to_complete
- *   Wait for request completion (ignored).
+ *   Wait for request completion.
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
+ *   0 if link status was not updated, positive if it was, a negative errno
+ *   value otherwise and rte_errno is set.
  */
 int
-mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
+mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 {
-       struct utsname utsname;
-       int ver[3];
        int ret;
-       struct rte_eth_link dev_link = dev->data->dev_link;
+       struct rte_eth_link dev_link;
+       time_t start_time = time(NULL);
 
-       if (uname(&utsname) == -1 ||
-           sscanf(utsname.release, "%d.%d.%d",
-                  &ver[0], &ver[1], &ver[2]) != 3 ||
-           KERNEL_VERSION(ver[0], ver[1], ver[2]) < KERNEL_VERSION(4, 9, 0))
-               ret = mlx5_link_update_unlocked_gset(dev);
-       else
-               ret = mlx5_link_update_unlocked_gs(dev);
-       if (ret)
-               return ret;
-       /* If lsc interrupt is disabled, should always be ready for traffic. */
-       if (!dev->data->dev_conf.intr_conf.lsc) {
-               mlx5_link_start(dev);
-               return 0;
-       }
-       /* Re-select burst callbacks only if link status has been changed. */
-       if (!ret && dev_link.link_status != dev->data->dev_link.link_status) {
-               if (dev->data->dev_link.link_status == ETH_LINK_UP)
-                       mlx5_link_start(dev);
-               else
-                       mlx5_link_stop(dev);
-       }
-       return 0;
+       do {
+               ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
+               if (ret)
+                       ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
+               if (ret == 0)
+                       break;
+               /* Handle wait to complete situation. */
+               if (wait_to_complete && ret == -EAGAIN) {
+                       if (abs((int)difftime(time(NULL), start_time)) <
+                           MLX5_LINK_STATUS_TIMEOUT) {
+                               usleep(0);
+                               continue;
+                       } else {
+                               rte_errno = EBUSY;
+                               return -rte_errno;
+                       }
+               } else if (ret < 0) {
+                       return ret;
+               }
+       } while (wait_to_complete);
+       ret = !!memcmp(&dev->data->dev_link, &dev_link,
+                      sizeof(struct rte_eth_link));
+       dev->data->dev_link = dev_link;
+       return ret;
 }
 
 /**
@@ -783,7 +792,8 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                return ret;
        if (kern_mtu == mtu) {
                priv->mtu = mtu;
-               DEBUG("port %u adapter MTU set to %u", dev->data->port_id, mtu);
+               DRV_LOG(DEBUG, "port %u adapter MTU set to %u",
+                       dev->data->port_id, mtu);
                return 0;
        }
        rte_errno = EAGAIN;
@@ -813,8 +823,10 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        ifr.ifr_data = (void *)&ethpause;
        ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
-               WARN("port %u ioctl(SIOCETHTOOL, ETHTOOL_GPAUSEPARAM) failed:"
-                    " %s", dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(WARNING,
+                       "port %u ioctl(SIOCETHTOOL, ETHTOOL_GPAUSEPARAM) failed:"
+                       " %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        fc_conf->autoneg = ethpause.autoneg;
@@ -864,8 +876,10 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
                ethpause.tx_pause = 0;
        ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
-               WARN("port %u ioctl(SIOCETHTOOL, ETHTOOL_SPAUSEPARAM)"
-                    " failed: %s", dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(WARNING,
+                       "port %u ioctl(SIOCETHTOOL, ETHTOOL_SPAUSEPARAM)"
+                       " failed: %s",
+                       dev->data->port_id, strerror(rte_errno));
                return ret;
        }
        return 0;
@@ -923,47 +937,6 @@ mlx5_ibv_device_to_pci_addr(const struct ibv_device *device,
        return 0;
 }
 
-/**
- * Update the link status.
- *
- * @param dev
- *   Pointer to Ethernet device.
- *
- * @return
- *   Zero if the callback process can be called immediately, negative errno
- *   value otherwise and rte_errno is set.
- */
-static int
-mlx5_link_status_update(struct rte_eth_dev *dev)
-{
-       struct priv *priv = dev->data->dev_private;
-       struct rte_eth_link *link = &dev->data->dev_link;
-       int ret;
-
-       ret = mlx5_link_update(dev, 0);
-       if (ret)
-               return ret;
-       if (((link->link_speed == 0) && link->link_status) ||
-               ((link->link_speed != 0) && !link->link_status)) {
-               /*
-                * Inconsistent status. Event likely occurred before the
-                * kernel netdevice exposes the new status.
-                */
-               if (!priv->pending_alarm) {
-                       priv->pending_alarm = 1;
-                       rte_eal_alarm_set(MLX5_ALARM_TIMEOUT_US,
-                                         mlx5_dev_link_status_handler,
-                                         priv->dev);
-               }
-               return 1;
-       } else if (unlikely(priv->pending_alarm)) {
-               /* Link interrupt occurred while alarm is already scheduled. */
-               priv->pending_alarm = 0;
-               rte_eal_alarm_cancel(mlx5_dev_link_status_handler, priv->dev);
-       }
-       return 0;
-}
-
 /**
  * Device status handler.
  *
@@ -982,6 +955,10 @@ mlx5_dev_status_handler(struct rte_eth_dev *dev)
        struct ibv_async_event event;
        uint32_t ret = 0;
 
+       if (mlx5_link_update(dev, 0) == -EAGAIN) {
+               usleep(0);
+               return 0;
+       }
        /* Read all message and acknowledge them. */
        for (;;) {
                if (mlx5_glue->get_async_event(priv->ctx, &event))
@@ -994,35 +971,14 @@ mlx5_dev_status_handler(struct rte_eth_dev *dev)
                        dev->data->dev_conf.intr_conf.rmv == 1)
                        ret |= (1 << RTE_ETH_EVENT_INTR_RMV);
                else
-                       DEBUG("port %u event type %d on not handled",
-                             dev->data->port_id, event.event_type);
+                       DRV_LOG(DEBUG,
+                               "port %u event type %d on not handled",
+                               dev->data->port_id, event.event_type);
                mlx5_glue->ack_async_event(&event);
        }
-       if (ret & (1 << RTE_ETH_EVENT_INTR_LSC))
-               if (mlx5_link_status_update(dev))
-                       ret &= ~(1 << RTE_ETH_EVENT_INTR_LSC);
        return ret;
 }
 
-/**
- * Handle delayed link status event.
- *
- * @param arg
- *   Registered argument.
- */
-void
-mlx5_dev_link_status_handler(void *arg)
-{
-       struct rte_eth_dev *dev = arg;
-       struct priv *priv = dev->data->dev_private;
-       int ret;
-
-       priv->pending_alarm = 0;
-       ret = mlx5_link_status_update(dev);
-       if (!ret)
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
-}
-
 /**
  * Handle interrupts from the NIC.
  *
@@ -1076,10 +1032,6 @@ mlx5_dev_interrupt_handler_uninstall(struct rte_eth_dev *dev)
        if (priv->primary_socket)
                rte_intr_callback_unregister(&priv->intr_handle_socket,
                                             mlx5_dev_handler_socket, dev);
-       if (priv->pending_alarm) {
-               priv->pending_alarm = 0;
-               rte_eal_alarm_cancel(mlx5_dev_link_status_handler, dev);
-       }
        priv->intr_handle.fd = 0;
        priv->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
        priv->intr_handle_socket.fd = 0;
@@ -1103,8 +1055,10 @@ mlx5_dev_interrupt_handler_install(struct rte_eth_dev *dev)
        flags = fcntl(priv->ctx->async_fd, F_GETFL);
        ret = fcntl(priv->ctx->async_fd, F_SETFL, flags | O_NONBLOCK);
        if (ret) {
-               INFO("port %u failed to change file descriptor async event"
-                    " queue", dev->data->port_id);
+               DRV_LOG(INFO,
+                       "port %u failed to change file descriptor async event"
+                       " queue",
+                       dev->data->port_id);
                dev->data->dev_conf.intr_conf.lsc = 0;
                dev->data->dev_conf.intr_conf.rmv = 0;
        }
@@ -1117,8 +1071,8 @@ mlx5_dev_interrupt_handler_install(struct rte_eth_dev *dev)
        }
        ret = mlx5_socket_init(dev);
        if (ret)
-               ERROR("port %u cannot initialise socket: %s",
-                     dev->data->port_id, strerror(rte_errno));
+               DRV_LOG(ERR, "port %u cannot initialise socket: %s",
+                       dev->data->port_id, strerror(rte_errno));
        else if (priv->primary_socket) {
                priv->intr_handle_socket.fd = priv->primary_socket;
                priv->intr_handle_socket.type = RTE_INTR_HANDLE_EXT;
@@ -1176,11 +1130,14 @@ mlx5_select_tx_function(struct rte_eth_dev *dev)
        int tso = !!(tx_offloads & (DEV_TX_OFFLOAD_TCP_TSO |
                                    DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
                                    DEV_TX_OFFLOAD_GRE_TNL_TSO));
+       int swp = !!(tx_offloads & (DEV_TX_OFFLOAD_IP_TNL_TSO |
+                                   DEV_TX_OFFLOAD_UDP_TNL_TSO |
+                                   DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM));
        int vlan_insert = !!(tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT);
 
        assert(priv != NULL);
        /* Select appropriate TX function. */
-       if (vlan_insert || tso)
+       if (vlan_insert || tso || swp)
                return tx_pkt_burst;
        if (config->mps == MLX5_MPW_ENHANCED) {
                if (mlx5_check_vec_tx_support(dev) > 0) {
@@ -1188,20 +1145,24 @@ mlx5_select_tx_function(struct rte_eth_dev *dev)
                                tx_pkt_burst = mlx5_tx_burst_raw_vec;
                        else
                                tx_pkt_burst = mlx5_tx_burst_vec;
-                       DEBUG("port %u selected enhanced MPW Tx vectorized"
-                             " function", dev->data->port_id);
+                       DRV_LOG(DEBUG,
+                               "port %u selected enhanced MPW Tx vectorized"
+                               " function",
+                               dev->data->port_id);
                } else {
                        tx_pkt_burst = mlx5_tx_burst_empw;
-                       DEBUG("port %u selected enhanced MPW Tx function",
-                             dev->data->port_id);
+                       DRV_LOG(DEBUG,
+                               "port %u selected enhanced MPW Tx function",
+                               dev->data->port_id);
                }
        } else if (config->mps && (config->txq_inline > 0)) {
                tx_pkt_burst = mlx5_tx_burst_mpw_inline;
-               DEBUG("port %u selected MPW inline Tx function",
-                     dev->data->port_id);
+               DRV_LOG(DEBUG, "port %u selected MPW inline Tx function",
+                       dev->data->port_id);
        } else if (config->mps) {
                tx_pkt_burst = mlx5_tx_burst_mpw;
-               DEBUG("port %u selected MPW Tx function", dev->data->port_id);
+               DRV_LOG(DEBUG, "port %u selected MPW Tx function",
+                       dev->data->port_id);
        }
        return tx_pkt_burst;
 }
@@ -1223,8 +1184,8 @@ mlx5_select_rx_function(struct rte_eth_dev *dev)
        assert(dev != NULL);
        if (mlx5_check_vec_rx_support(dev) > 0) {
                rx_pkt_burst = mlx5_rx_burst_vec;
-               DEBUG("port %u selected Rx vectorized function",
-                     dev->data->port_id);
+               DRV_LOG(DEBUG, "port %u selected Rx vectorized function",
+                       dev->data->port_id);
        }
        return rx_pkt_burst;
 }