net/mlx5: use SPDX tags in 6WIND copyrighted files
[dpdk.git] / drivers / net / mlx5 / mlx5_ethdev.c
index ca57021..6665076 100644 (file)
@@ -1,36 +1,10 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2015 6WIND S.A.
- *   Copyright 2015 Mellanox.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of 6WIND S.A. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2015 6WIND S.A.
+ * Copyright 2015 Mellanox.
  */
 
+#define _GNU_SOURCE
+
 #include <stddef.h>
 #include <assert.h>
 #include <unistd.h>
 #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>
 
-/* DPDK headers don't like -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
-#endif
 #include <rte_atomic.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
+#include <rte_bus_pci.h>
 #include <rte_mbuf.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_malloc.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
-#endif
 
 #include "mlx5.h"
+#include "mlx5_glue.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_utils.h"
 
-/**
- * Return private structure associated with an Ethernet device.
- *
- * @param dev
- *   Pointer to Ethernet device structure.
- *
- * @return
- *   Pointer to private structure.
- */
-struct priv *
-mlx5_get_priv(struct rte_eth_dev *dev)
-{
-       struct mlx5_secondary_data *sd;
-
-       if (!mlx5_is_secondary())
-               return dev->data->dev_private;
-       sd = &mlx5_secondary_data[dev->data->port_id];
-       return sd->data.dev_private;
-}
-
-/**
- * Check if running as a secondary process.
- *
- * @return
- *   Nonzero if running as a secondary process.
- */
-inline int
-mlx5_is_secondary(void)
-{
-       return rte_eal_process_type() != RTE_PROC_PRIMARY;
-}
+/* Add defines in case the running kernel is not the same as user headers. */
+#ifndef ETHTOOL_GLINKSETTINGS
+struct ethtool_link_settings {
+       uint32_t cmd;
+       uint32_t speed;
+       uint8_t duplex;
+       uint8_t port;
+       uint8_t phy_address;
+       uint8_t autoneg;
+       uint8_t mdio_support;
+       uint8_t eth_to_mdix;
+       uint8_t eth_tp_mdix_ctrl;
+       int8_t link_mode_masks_nwords;
+       uint32_t reserved[8];
+       uint32_t link_mode_masks[];
+};
+
+#define ETHTOOL_GLINKSETTINGS 0x0000004c
+#define ETHTOOL_LINK_MODE_1000baseT_Full_BIT 5
+#define ETHTOOL_LINK_MODE_Autoneg_BIT 6
+#define ETHTOOL_LINK_MODE_1000baseKX_Full_BIT 17
+#define ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT 18
+#define ETHTOOL_LINK_MODE_10000baseKR_Full_BIT 19
+#define ETHTOOL_LINK_MODE_10000baseR_FEC_BIT 20
+#define ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT 21
+#define ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT 22
+#define ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT 23
+#define ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT 24
+#define ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT 25
+#define ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT 26
+#define ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT 27
+#define ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT 28
+#define ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT 29
+#define ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT 30
+#endif
+#ifndef HAVE_ETHTOOL_LINK_MODE_25G
+#define ETHTOOL_LINK_MODE_25000baseCR_Full_BIT 31
+#define ETHTOOL_LINK_MODE_25000baseKR_Full_BIT 32
+#define ETHTOOL_LINK_MODE_25000baseSR_Full_BIT 33
+#endif
+#ifndef HAVE_ETHTOOL_LINK_MODE_50G
+#define ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT 34
+#define ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT 35
+#endif
+#ifndef HAVE_ETHTOOL_LINK_MODE_100G
+#define ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT 36
+#define ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT 37
+#define ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT 38
+#define ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT 39
+#endif
 
 /**
  * Get interface name from private structure.
@@ -120,7 +112,7 @@ priv_get_ifname(const struct priv *priv, char (*ifname)[IF_NAMESIZE])
        char match[IF_NAMESIZE] = "";
 
        {
-               MKSTR(path, "%s/device/net", priv->ctx->device->ibdev_path);
+               MKSTR(path, "%s/device/net", priv->ibdev_path);
 
                dir = opendir(path);
                if (dir == NULL)
@@ -138,7 +130,7 @@ priv_get_ifname(const struct priv *priv, char (*ifname)[IF_NAMESIZE])
                        continue;
 
                MKSTR(path, "%s/device/net/%s/%s",
-                     priv->ctx->device->ibdev_path, name,
+                     priv->ibdev_path, name,
                      (dev_type ? "dev_id" : "dev_port"));
 
                file = fopen(path, "rb");
@@ -180,6 +172,23 @@ try_dev_id:
        return 0;
 }
 
+/**
+ * Check if the counter is located on ib counters file.
+ *
+ * @param[in] cntr
+ *   Counter name.
+ *
+ * @return
+ *   1 if counter is located on ib counters file , 0 otherwise.
+ */
+int
+priv_is_ib_cntr(const char *cntr)
+{
+       if (!strcmp(cntr, "out_of_buffer"))
+               return 1;
+       return 0;
+}
+
 /**
  * Read from sysfs entry.
  *
@@ -207,10 +216,15 @@ priv_sysfs_read(const struct priv *priv, const char *entry,
        if (priv_get_ifname(priv, &ifname))
                return -1;
 
-       MKSTR(path, "%s/device/net/%s/%s", priv->ctx->device->ibdev_path,
-             ifname, entry);
-
-       file = fopen(path, "rb");
+       if (priv_is_ib_cntr(entry)) {
+               MKSTR(path, "%s/ports/1/hw_counters/%s",
+                     priv->ibdev_path, entry);
+               file = fopen(path, "rb");
+       } else {
+               MKSTR(path, "%s/device/net/%s/%s",
+                     priv->ibdev_path, ifname, entry);
+               file = fopen(path, "rb");
+       }
        if (file == NULL)
                return -1;
        ret = fread(buf, 1, size, file);
@@ -251,8 +265,7 @@ priv_sysfs_write(const struct priv *priv, const char *entry,
        if (priv_get_ifname(priv, &ifname))
                return -1;
 
-       MKSTR(path, "%s/device/net/%s/%s", priv->ctx->device->ibdev_path,
-             ifname, entry);
+       MKSTR(path, "%s/device/net/%s/%s", priv->ibdev_path, ifname, entry);
 
        file = fopen(path, "wb");
        if (file == NULL)
@@ -415,6 +428,30 @@ priv_get_mtu(struct priv *priv, uint16_t *mtu)
        return 0;
 }
 
+/**
+ * Read device counter from sysfs.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param name
+ *   Counter name.
+ * @param[out] cntr
+ *   Counter output buffer.
+ *
+ * @return
+ *   0 on success, -1 on failure and errno is set.
+ */
+int
+priv_get_cntr_sysfs(struct priv *priv, const char *name, uint64_t *cntr)
+{
+       unsigned long ulong_ctr;
+
+       if (priv_get_sysfs_ulong(priv, name, &ulong_ctr) == -1)
+               return -1;
+       *cntr = ulong_ctr;
+       return 0;
+}
+
 /**
  * Set device MTU.
  *
@@ -461,7 +498,7 @@ priv_set_flags(struct priv *priv, unsigned int keep, unsigned int flags)
        if (priv_get_sysfs_ulong(priv, "flags", &tmp) == -1)
                return -1;
        tmp &= keep;
-       tmp |= flags;
+       tmp |= (flags & (~keep));
        return priv_set_sysfs_ulong(priv, "flags", tmp);
 }
 
@@ -485,8 +522,47 @@ dev_configure(struct rte_eth_dev *dev)
        unsigned int i;
        unsigned int j;
        unsigned int reta_idx_n;
-
-       priv->rss_hf = dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;
+       const uint8_t use_app_rss_key =
+               !!dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key;
+       uint64_t supp_tx_offloads = mlx5_priv_get_tx_port_offloads(priv);
+       uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;
+       uint64_t supp_rx_offloads =
+               (mlx5_priv_get_rx_port_offloads(priv) |
+                mlx5_priv_get_rx_queue_offloads(priv));
+       uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
+
+       if ((tx_offloads & supp_tx_offloads) != tx_offloads) {
+               ERROR("Some Tx offloads are not supported "
+                     "requested 0x%" PRIx64 " supported 0x%" PRIx64,
+                     tx_offloads, supp_tx_offloads);
+               return ENOTSUP;
+       }
+       if ((rx_offloads & supp_rx_offloads) != rx_offloads) {
+               ERROR("Some Rx offloads are not supported "
+                     "requested 0x%" PRIx64 " supported 0x%" PRIx64,
+                     rx_offloads, supp_rx_offloads);
+               return ENOTSUP;
+       }
+       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. */
+               return EINVAL;
+       }
+       priv->rss_conf.rss_key =
+               rte_realloc(priv->rss_conf.rss_key,
+                           rss_hash_default_key_len, 0);
+       if (!priv->rss_conf.rss_key) {
+               ERROR("cannot allocate RSS hash key memory (%u)", rxqs_n);
+               return ENOMEM;
+       }
+       memcpy(priv->rss_conf.rss_key,
+              use_app_rss_key ?
+              dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key :
+              rss_hash_default_key,
+              rss_hash_default_key_len);
+       priv->rss_conf.rss_key_len = rss_hash_default_key_len;
+       priv->rss_conf.rss_hf = dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;
        priv->rxqs = (void *)dev->data->rx_queues;
        priv->txqs = (void *)dev->data->tx_queues;
        if (txqs_n != priv->txqs_n) {
@@ -494,7 +570,7 @@ dev_configure(struct rte_eth_dev *dev)
                     (void *)dev, priv->txqs_n, txqs_n);
                priv->txqs_n = txqs_n;
        }
-       if (rxqs_n > priv->ind_table_max_size) {
+       if (rxqs_n > priv->config.ind_table_max_size) {
                ERROR("cannot handle this many RX queues (%u)", rxqs_n);
                return EINVAL;
        }
@@ -507,7 +583,7 @@ dev_configure(struct rte_eth_dev *dev)
         * maximum indirection table size for better balancing.
         * The result is always rounded to the next power of two. */
        reta_idx_n = (1 << log2above((rxqs_n & (rxqs_n - 1)) ?
-                                    priv->ind_table_max_size :
+                                    priv->config.ind_table_max_size :
                                     rxqs_n));
        if (priv_rss_reta_index_resize(priv, reta_idx_n))
                return ENOMEM;
@@ -537,9 +613,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
        struct priv *priv = dev->data->dev_private;
        int ret;
 
-       if (mlx5_is_secondary())
-               return -E_RTE_SECONDARY;
-
        priv_lock(priv);
        ret = dev_configure(dev);
        assert(ret >= 0);
@@ -558,10 +631,13 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
 void
 mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 {
-       struct priv *priv = mlx5_get_priv(dev);
+       struct priv *priv = dev->data->dev_private;
+       struct mlx5_dev_config *config = &priv->config;
        unsigned int max;
        char ifname[IF_NAMESIZE];
 
+       info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+
        priv_lock(priv);
        /* FIXME: we should ask the device for these values. */
        info->min_rx_bufsize = 32;
@@ -570,43 +646,26 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
         * Since we need one CQ per QP, the limit is the minimum number
         * between the two values.
         */
-       max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
-              priv->device_attr.max_qp : priv->device_attr.max_cq);
+       max = RTE_MIN(priv->device_attr.orig_attr.max_cq,
+                     priv->device_attr.orig_attr.max_qp);
        /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
        if (max >= 65535)
                max = 65535;
        info->max_rx_queues = max;
        info->max_tx_queues = max;
        info->max_mac_addrs = RTE_DIM(priv->mac);
-       info->rx_offload_capa =
-               (priv->hw_csum ?
-                (DEV_RX_OFFLOAD_IPV4_CKSUM |
-                 DEV_RX_OFFLOAD_UDP_CKSUM |
-                 DEV_RX_OFFLOAD_TCP_CKSUM) :
-                0);
-       info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT;
-       if (priv->hw_csum)
-               info->tx_offload_capa |=
-                       (DEV_TX_OFFLOAD_IPV4_CKSUM |
-                        DEV_TX_OFFLOAD_UDP_CKSUM |
-                        DEV_TX_OFFLOAD_TCP_CKSUM);
+       info->rx_queue_offload_capa =
+               mlx5_priv_get_rx_queue_offloads(priv);
+       info->rx_offload_capa = (mlx5_priv_get_rx_port_offloads(priv) |
+                                info->rx_queue_offload_capa);
+       info->tx_offload_capa = mlx5_priv_get_tx_port_offloads(priv);
        if (priv_get_ifname(priv, &ifname) == 0)
                info->if_index = if_nametoindex(ifname);
-       /* FIXME: RETA update/query API expects the callee to know the size of
-        * the indirection table, for this PMD the size varies depending on
-        * the number of RX queues, it becomes impossible to find the correct
-        * size if it is not fixed.
-        * The API should be updated to solve this problem. */
-       info->reta_size = priv->ind_table_max_size;
-       info->speed_capa =
-                       ETH_LINK_SPEED_1G |
-                       ETH_LINK_SPEED_10G |
-                       ETH_LINK_SPEED_20G |
-                       ETH_LINK_SPEED_25G |
-                       ETH_LINK_SPEED_40G |
-                       ETH_LINK_SPEED_50G |
-                       ETH_LINK_SPEED_56G |
-                       ETH_LINK_SPEED_100G;
+       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->speed_capa = priv->link_speed_capa;
+       info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK;
        priv_unlock(priv);
 }
 
@@ -615,21 +674,30 @@ mlx5_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 {
        static const uint32_t ptypes[] = {
                /* refers to rxq_cq_to_pkt_type() */
-               RTE_PTYPE_L3_IPV4,
-               RTE_PTYPE_L3_IPV6,
-               RTE_PTYPE_INNER_L3_IPV4,
-               RTE_PTYPE_INNER_L3_IPV6,
+               RTE_PTYPE_L2_ETHER,
+               RTE_PTYPE_L3_IPV4_EXT_UNKNOWN,
+               RTE_PTYPE_L3_IPV6_EXT_UNKNOWN,
+               RTE_PTYPE_L4_NONFRAG,
+               RTE_PTYPE_L4_FRAG,
+               RTE_PTYPE_L4_TCP,
+               RTE_PTYPE_L4_UDP,
+               RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN,
+               RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN,
+               RTE_PTYPE_INNER_L4_NONFRAG,
+               RTE_PTYPE_INNER_L4_FRAG,
+               RTE_PTYPE_INNER_L4_TCP,
+               RTE_PTYPE_INNER_L4_UDP,
                RTE_PTYPE_UNKNOWN
-
        };
 
-       if (dev->rx_pkt_burst == mlx5_rx_burst)
+       if (dev->rx_pkt_burst == mlx5_rx_burst ||
+           dev->rx_pkt_burst == mlx5_rx_burst_vec)
                return ptypes;
        return NULL;
 }
 
 /**
- * DPDK callback to retrieve physical link information (unlocked version).
+ * DPDK callback to retrieve physical link information.
  *
  * @param dev
  *   Pointer to Ethernet device structure.
@@ -637,16 +705,18 @@ mlx5_dev_supported_ptypes_get(struct rte_eth_dev *dev)
  *   Wait for request completion (ignored).
  */
 static int
-mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete)
+mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev, int wait_to_complete)
 {
-       struct priv *priv = mlx5_get_priv(dev);
+       struct priv *priv = dev->data->dev_private;
        struct ethtool_cmd edata = {
-               .cmd = ETHTOOL_GSET
+               .cmd = ETHTOOL_GSET /* Deprecated since Linux v4.5. */
        };
        struct ifreq ifr;
        struct rte_eth_link dev_link;
        int link_speed = 0;
 
+       /* priv_lock() is not taken to allow concurrent calls. */
+
        (void)wait_to_complete;
        if (priv_ifreq(priv, SIOCGIFFLAGS, &ifr)) {
                WARN("ioctl(SIOCGIFFLAGS) failed: %s", strerror(errno));
@@ -666,6 +736,19 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete)
                dev_link.link_speed = 0;
        else
                dev_link.link_speed = link_speed;
+       priv->link_speed_capa = 0;
+       if (edata.supported & SUPPORTED_Autoneg)
+               priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG;
+       if (edata.supported & (SUPPORTED_1000baseT_Full |
+                              SUPPORTED_1000baseKX_Full))
+               priv->link_speed_capa |= ETH_LINK_SPEED_1G;
+       if (edata.supported & SUPPORTED_10000baseKR_Full)
+               priv->link_speed_capa |= ETH_LINK_SPEED_10G;
+       if (edata.supported & (SUPPORTED_40000baseKR4_Full |
+                              SUPPORTED_40000baseCR4_Full |
+                              SUPPORTED_40000baseSR4_Full |
+                              SUPPORTED_40000baseLR4_Full))
+               priv->link_speed_capa |= ETH_LINK_SPEED_40G;
        dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ?
                                ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX);
        dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
@@ -679,6 +762,210 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete)
        return -1;
 }
 
+/**
+ * Retrieve physical link information (unlocked version using new ioctl).
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param wait_to_complete
+ *   Wait for request completion (ignored).
+ */
+static int
+mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete)
+{
+       struct priv *priv = dev->data->dev_private;
+       struct ethtool_link_settings gcmd = { .cmd = ETHTOOL_GLINKSETTINGS };
+       struct ifreq ifr;
+       struct rte_eth_link dev_link;
+       uint64_t sc;
+
+       (void)wait_to_complete;
+       if (priv_ifreq(priv, SIOCGIFFLAGS, &ifr)) {
+               WARN("ioctl(SIOCGIFFLAGS) failed: %s", strerror(errno));
+               return -1;
+       }
+       memset(&dev_link, 0, sizeof(dev_link));
+       dev_link.link_status = ((ifr.ifr_flags & IFF_UP) &&
+                               (ifr.ifr_flags & IFF_RUNNING));
+       ifr.ifr_data = (void *)&gcmd;
+       if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
+               DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s",
+                     strerror(errno));
+               return -1;
+       }
+       gcmd.link_mode_masks_nwords = -gcmd.link_mode_masks_nwords;
+
+       alignas(struct ethtool_link_settings)
+       uint8_t data[offsetof(struct ethtool_link_settings, link_mode_masks) +
+                    sizeof(uint32_t) * gcmd.link_mode_masks_nwords * 3];
+       struct ethtool_link_settings *ecmd = (void *)data;
+
+       *ecmd = gcmd;
+       ifr.ifr_data = (void *)ecmd;
+       if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
+               DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s",
+                     strerror(errno));
+               return -1;
+       }
+       dev_link.link_speed = ecmd->speed;
+       sc = ecmd->link_mode_masks[0] |
+               ((uint64_t)ecmd->link_mode_masks[1] << 32);
+       priv->link_speed_capa = 0;
+       if (sc & MLX5_BITSHIFT(ETHTOOL_LINK_MODE_Autoneg_BIT))
+               priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_1000baseT_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_1G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_10000baseR_FEC_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_10G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_20G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_40G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_56G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_25000baseCR_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_25000baseKR_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_25G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_50G;
+       if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT) |
+                 MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)))
+               priv->link_speed_capa |= ETH_LINK_SPEED_100G;
+       dev_link.link_duplex = ((ecmd->duplex == DUPLEX_HALF) ?
+                               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. */
+       return -1;
+}
+
+/**
+ * Enable receiving and transmitting traffic.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ */
+static void
+priv_link_start(struct priv *priv)
+{
+       struct rte_eth_dev *dev = priv->dev;
+       int err;
+
+       dev->tx_pkt_burst = priv_select_tx_function(priv, dev);
+       dev->rx_pkt_burst = priv_select_rx_function(priv, dev);
+       err = priv_dev_traffic_enable(priv, dev);
+       if (err)
+               ERROR("%p: error occurred while configuring control flows: %s",
+                     (void *)priv, strerror(err));
+       err = priv_flow_start(priv, &priv->flows);
+       if (err)
+               ERROR("%p: error occurred while configuring flows: %s",
+                     (void *)priv, strerror(err));
+}
+
+/**
+ * Disable receiving and transmitting traffic.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ */
+static void
+priv_link_stop(struct priv *priv)
+{
+       struct rte_eth_dev *dev = priv->dev;
+
+       priv_flow_stop(priv, &priv->flows);
+       priv_dev_traffic_disable(priv, dev);
+       dev->rx_pkt_burst = removed_rx_burst;
+       dev->tx_pkt_burst = removed_tx_burst;
+}
+
+/**
+ * Retrieve physical link information and update rx/tx_pkt_burst callbacks
+ * accordingly.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param wait_to_complete
+ *   Wait for request completion (ignored).
+ */
+int
+priv_link_update(struct priv *priv, int wait_to_complete)
+{
+       struct rte_eth_dev *dev = priv->dev;
+       struct utsname utsname;
+       int ver[3];
+       int ret;
+       struct rte_eth_link dev_link = dev->data->dev_link;
+
+       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, wait_to_complete);
+       else
+               ret = mlx5_link_update_unlocked_gs(dev, wait_to_complete);
+       /* If lsc interrupt is disabled, should always be ready for traffic. */
+       if (!dev->data->dev_conf.intr_conf.lsc) {
+               priv_link_start(priv);
+               return ret;
+       }
+       /* 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)
+                       priv_link_start(priv);
+               else
+                       priv_link_stop(priv);
+       }
+       return ret;
+}
+
+/**
+ * Querying the link status till it changes to the desired state.
+ * Number of query attempts is bounded by MLX5_MAX_LINK_QUERY_ATTEMPTS.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param status
+ *   Link desired status.
+ *
+ * @return
+ *   0 on success, negative errno value on failure.
+ */
+int
+priv_force_link_status_change(struct priv *priv, int status)
+{
+       int try = 0;
+
+       while (try < MLX5_MAX_LINK_QUERY_ATTEMPTS) {
+               priv_link_update(priv, 0);
+               if (priv->dev->data->dev_link.link_status == status)
+                       return 0;
+               try++;
+               sleep(1);
+       }
+       return -EAGAIN;
+}
+
 /**
  * DPDK callback to retrieve physical link information.
  *
@@ -690,11 +977,11 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete)
 int
 mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 {
-       struct priv *priv = mlx5_get_priv(dev);
+       struct priv *priv = dev->data->dev_private;
        int ret;
 
        priv_lock(priv);
-       ret = mlx5_link_update_unlocked(dev, wait_to_complete);
+       ret = priv_link_update(priv, wait_to_complete);
        priv_unlock(priv);
        return ret;
 }
@@ -702,12 +989,6 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 /**
  * DPDK callback to change the MTU.
  *
- * Setting the MTU affects hardware MRU (packets larger than the MTU cannot be
- * received). Use this as a hint to enable/disable scattered packets support
- * and improve performance when not needed.
- * Since failure is not an option, reconfiguring queues on the fly is not
- * recommended.
- *
  * @param dev
  *   Pointer to Ethernet device structure.
  * @param in_mtu
@@ -720,57 +1001,30 @@ int
 mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct priv *priv = dev->data->dev_private;
+       uint16_t kern_mtu;
        int ret = 0;
-       unsigned int i;
-       uint16_t (*rx_func)(void *, struct rte_mbuf **, uint16_t) =
-               mlx5_rx_burst;
-
-       if (mlx5_is_secondary())
-               return -E_RTE_SECONDARY;
 
        priv_lock(priv);
+       ret = priv_get_mtu(priv, &kern_mtu);
+       if (ret)
+               goto out;
        /* Set kernel interface MTU first. */
-       if (priv_set_mtu(priv, mtu)) {
-               ret = errno;
-               WARN("cannot set port %u MTU to %u: %s", priv->port, mtu,
-                    strerror(ret));
+       ret = priv_set_mtu(priv, mtu);
+       if (ret)
                goto out;
-       } else
+       ret = priv_get_mtu(priv, &kern_mtu);
+       if (ret)
+               goto out;
+       if (kern_mtu == mtu) {
+               priv->mtu = mtu;
                DEBUG("adapter port %u MTU set to %u", priv->port, mtu);
-       priv->mtu = mtu;
-       /* Temporarily replace RX handler with a fake one, assuming it has not
-        * been copied elsewhere. */
-       dev->rx_pkt_burst = removed_rx_burst;
-       /* Make sure everyone has left mlx5_rx_burst() and uses
-        * removed_rx_burst() instead. */
-       rte_wmb();
-       usleep(1000);
-       /* Reconfigure each RX queue. */
-       for (i = 0; (i != priv->rxqs_n); ++i) {
-               struct rxq *rxq = (*priv->rxqs)[i];
-               unsigned int mb_len;
-               unsigned int max_frame_len;
-               int sp;
-
-               if (rxq == NULL)
-                       continue;
-               /* Calculate new maximum frame length according to MTU and
-                * toggle scattered support (sp) if necessary. */
-               max_frame_len = (priv->mtu + ETHER_HDR_LEN +
-                                (ETHER_MAX_VLAN_FRAME_LEN - ETHER_MAX_LEN));
-               mb_len = rte_pktmbuf_data_room_size(rxq->mp);
-               assert(mb_len >= RTE_PKTMBUF_HEADROOM);
-               sp = (max_frame_len > (mb_len - RTE_PKTMBUF_HEADROOM));
-               if (sp) {
-                       ERROR("%p: RX scatter is not supported", (void *)dev);
-                       ret = ENOTSUP;
-                       goto out;
-               }
        }
-       /* Burst functions can now be called again. */
-       rte_wmb();
-       dev->rx_pkt_burst = rx_func;
+       priv_unlock(priv);
+       return 0;
 out:
+       ret = errno;
+       WARN("cannot set port %u MTU to %u: %s", priv->port, mtu,
+            strerror(ret));
        priv_unlock(priv);
        assert(ret >= 0);
        return -ret;
@@ -797,9 +1051,6 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        };
        int ret;
 
-       if (mlx5_is_secondary())
-               return -E_RTE_SECONDARY;
-
        ifr.ifr_data = (void *)&ethpause;
        priv_lock(priv);
        if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
@@ -848,9 +1099,6 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        };
        int ret;
 
-       if (mlx5_is_secondary())
-               return -E_RTE_SECONDARY;
-
        ifr.ifr_data = (void *)&ethpause;
        ethpause.autoneg = fc_conf->autoneg;
        if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
@@ -918,7 +1166,7 @@ mlx5_ibv_device_to_pci_addr(const struct ibv_device *device,
                /* Extract information. */
                if (sscanf(line,
                           "PCI_SLOT_NAME="
-                          "%" SCNx16 ":%" SCNx8 ":%" SCNx8 ".%" SCNx8 "\n",
+                          "%" SCNx32 ":%" SCNx8 ":%" SCNx8 ".%" SCNx8 "\n",
                           &pci_addr->domain,
                           &pci_addr->bus,
                           &pci_addr->devid,
@@ -932,52 +1180,77 @@ mlx5_ibv_device_to_pci_addr(const struct ibv_device *device,
 }
 
 /**
- * Link status handler.
+ * Update the link status.
  *
  * @param priv
  *   Pointer to private structure.
- * @param dev
- *   Pointer to the rte_eth_dev structure.
  *
  * @return
- *   Nonzero if the callback process can be called immediately.
+ *   Zero if the callback process can be called immediately.
  */
 static int
-priv_dev_link_status_handler(struct priv *priv, struct rte_eth_dev *dev)
+priv_link_status_update(struct priv *priv)
+{
+       struct rte_eth_link *link = &priv->dev->data->dev_link;
+
+       priv_link_update(priv, 0);
+       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.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param events
+ *   Pointer to event flags holder.
+ *
+ * @return
+ *   Events bitmap of callback process which can be called immediately.
+ */
+static uint32_t
+priv_dev_status_handler(struct priv *priv)
 {
        struct ibv_async_event event;
-       int port_change = 0;
-       int ret = 0;
+       uint32_t ret = 0;
 
        /* Read all message and acknowledge them. */
        for (;;) {
-               if (ibv_get_async_event(priv->ctx, &event))
+               if (mlx5_glue->get_async_event(priv->ctx, &event))
                        break;
-
-               if (event.event_type == IBV_EVENT_PORT_ACTIVE ||
-                   event.event_type == IBV_EVENT_PORT_ERR)
-                       port_change = 1;
+               if ((event.event_type == IBV_EVENT_PORT_ACTIVE ||
+                       event.event_type == IBV_EVENT_PORT_ERR) &&
+                       (priv->dev->data->dev_conf.intr_conf.lsc == 1))
+                       ret |= (1 << RTE_ETH_EVENT_INTR_LSC);
+               else if (event.event_type == IBV_EVENT_DEVICE_FATAL &&
+                       priv->dev->data->dev_conf.intr_conf.rmv == 1)
+                       ret |= (1 << RTE_ETH_EVENT_INTR_RMV);
                else
                        DEBUG("event type %d on port %d not handled",
                              event.event_type, event.element.port_num);
-               ibv_ack_async_event(&event);
-       }
-
-       if (port_change ^ priv->pending_alarm) {
-               struct rte_eth_link *link = &dev->data->dev_link;
-
-               priv->pending_alarm = 0;
-               mlx5_link_update_unlocked(dev, 0);
-               if (((link->link_speed == 0) && link->link_status) ||
-                   ((link->link_speed != 0) && !link->link_status)) {
-                       /* Inconsistent status, check again later. */
-                       priv->pending_alarm = 1;
-                       rte_eal_alarm_set(MLX5_ALARM_TIMEOUT_US,
-                                         mlx5_dev_link_status_handler,
-                                         dev);
-               } else
-                       ret = 1;
+               mlx5_glue->ack_async_event(&event);
        }
+       if (ret & (1 << RTE_ETH_EVENT_INTR_LSC))
+               if (priv_link_status_update(priv))
+                       ret &= ~(1 << RTE_ETH_EVENT_INTR_LSC);
        return ret;
 }
 
@@ -994,12 +1267,17 @@ mlx5_dev_link_status_handler(void *arg)
        struct priv *priv = dev->data->dev_private;
        int ret;
 
-       priv_lock(priv);
-       assert(priv->pending_alarm == 1);
-       ret = priv_dev_link_status_handler(priv, dev);
+       while (!priv_trylock(priv)) {
+               /* Alarm is being canceled. */
+               if (priv->pending_alarm == 0)
+                       return;
+               rte_pause();
+       }
+       priv->pending_alarm = 0;
+       ret = priv_link_status_update(priv);
        priv_unlock(priv);
-       if (ret)
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC);
+       if (!ret)
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 /**
@@ -1011,18 +1289,36 @@ mlx5_dev_link_status_handler(void *arg)
  *   Callback argument.
  */
 void
-mlx5_dev_interrupt_handler(struct rte_intr_handle *intr_handle, void *cb_arg)
+mlx5_dev_interrupt_handler(void *cb_arg)
 {
        struct rte_eth_dev *dev = cb_arg;
        struct priv *priv = dev->data->dev_private;
-       int ret;
+       uint32_t events;
 
-       (void)intr_handle;
        priv_lock(priv);
-       ret = priv_dev_link_status_handler(priv, dev);
+       events = priv_dev_status_handler(priv);
+       priv_unlock(priv);
+       if (events & (1 << RTE_ETH_EVENT_INTR_LSC))
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
+       if (events & (1 << RTE_ETH_EVENT_INTR_RMV))
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RMV, NULL);
+}
+
+/**
+ * Handle interrupts from the socket.
+ *
+ * @param cb_arg
+ *   Callback argument.
+ */
+static void
+mlx5_dev_handler_socket(void *cb_arg)
+{
+       struct rte_eth_dev *dev = cb_arg;
+       struct priv *priv = dev->data->dev_private;
+
+       priv_lock(priv);
+       priv_socket_handle(priv);
        priv_unlock(priv);
-       if (ret)
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC);
 }
 
 /**
@@ -1036,16 +1332,21 @@ mlx5_dev_interrupt_handler(struct rte_intr_handle *intr_handle, void *cb_arg)
 void
 priv_dev_interrupt_handler_uninstall(struct priv *priv, struct rte_eth_dev *dev)
 {
-       if (!dev->data->dev_conf.intr_conf.lsc)
-               return;
-       rte_intr_callback_unregister(&priv->intr_handle,
-                                    mlx5_dev_interrupt_handler,
-                                    dev);
-       if (priv->pending_alarm)
+       if (dev->data->dev_conf.intr_conf.lsc ||
+           dev->data->dev_conf.intr_conf.rmv)
+               rte_intr_callback_unregister(&priv->intr_handle,
+                                            mlx5_dev_interrupt_handler, 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->pending_alarm = 0;
+       }
        priv->intr_handle.fd = 0;
-       priv->intr_handle.type = 0;
+       priv->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+       priv->intr_handle_socket.fd = 0;
+       priv->intr_handle_socket.type = RTE_INTR_HANDLE_UNKNOWN;
 }
 
 /**
@@ -1061,28 +1362,36 @@ priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev)
 {
        int rc, flags;
 
-       if (!dev->data->dev_conf.intr_conf.lsc)
-               return;
        assert(priv->ctx->async_fd > 0);
        flags = fcntl(priv->ctx->async_fd, F_GETFL);
        rc = fcntl(priv->ctx->async_fd, F_SETFL, flags | O_NONBLOCK);
        if (rc < 0) {
                INFO("failed to change file descriptor async event queue");
                dev->data->dev_conf.intr_conf.lsc = 0;
-       } else {
+               dev->data->dev_conf.intr_conf.rmv = 0;
+       }
+       if (dev->data->dev_conf.intr_conf.lsc ||
+           dev->data->dev_conf.intr_conf.rmv) {
                priv->intr_handle.fd = priv->ctx->async_fd;
                priv->intr_handle.type = RTE_INTR_HANDLE_EXT;
                rte_intr_callback_register(&priv->intr_handle,
-                                          mlx5_dev_interrupt_handler,
-                                          dev);
+                                          mlx5_dev_interrupt_handler, dev);
+       }
+
+       rc = priv_socket_init(priv);
+       if (!rc && priv->primary_socket) {
+               priv->intr_handle_socket.fd = priv->primary_socket;
+               priv->intr_handle_socket.type = RTE_INTR_HANDLE_EXT;
+               rte_intr_callback_register(&priv->intr_handle_socket,
+                                          mlx5_dev_handler_socket, dev);
        }
 }
 
 /**
  * Change the link state (UP / DOWN).
  *
- * @param dev
- *   Pointer to Ethernet device structure.
+ * @param priv
+ *   Pointer to private data structure.
  * @param up
  *   Nonzero for link up, otherwise link down.
  *
@@ -1090,25 +1399,9 @@ priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev)
  *   0 on success, errno value on failure.
  */
 static int
-priv_set_link(struct priv *priv, int up)
+priv_dev_set_link(struct priv *priv, int up)
 {
-       struct rte_eth_dev *dev = priv->dev;
-       int err;
-
-       if (up) {
-               err = priv_set_flags(priv, ~IFF_UP, IFF_UP);
-               if (err)
-                       return err;
-               dev->rx_pkt_burst = mlx5_rx_burst;
-               dev->tx_pkt_burst = mlx5_tx_burst;
-       } else {
-               err = priv_set_flags(priv, ~IFF_UP, ~IFF_UP);
-               if (err)
-                       return err;
-               dev->rx_pkt_burst = removed_rx_burst;
-               dev->tx_pkt_burst = removed_tx_burst;
-       }
-       return 0;
+       return priv_set_flags(priv, ~IFF_UP, up ? IFF_UP : ~IFF_UP);
 }
 
 /**
@@ -1127,7 +1420,7 @@ mlx5_set_link_down(struct rte_eth_dev *dev)
        int err;
 
        priv_lock(priv);
-       err = priv_set_link(priv, 0);
+       err = priv_dev_set_link(priv, 0);
        priv_unlock(priv);
        return err;
 }
@@ -1148,158 +1441,98 @@ mlx5_set_link_up(struct rte_eth_dev *dev)
        int err;
 
        priv_lock(priv);
-       err = priv_set_link(priv, 1);
+       err = priv_dev_set_link(priv, 1);
        priv_unlock(priv);
        return err;
 }
 
 /**
- * Configure secondary process queues from a private data pointer (primary
- * or secondary) and update burst callbacks. Can take place only once.
- *
- * All queues must have been previously created by the primary process to
- * avoid undefined behavior.
+ * Configure the TX function to use.
  *
  * @param priv
- *   Private data pointer from either primary or secondary process.
+ *   Pointer to private data structure.
+ * @param dev
+ *   Pointer to rte_eth_dev structure.
  *
  * @return
- *   Private data pointer from secondary process, NULL in case of error.
+ *   Pointer to selected Tx burst function.
  */
-struct priv *
-mlx5_secondary_data_setup(struct priv *priv)
+eth_tx_burst_t
+priv_select_tx_function(struct priv *priv, struct rte_eth_dev *dev)
 {
-       unsigned int port_id = 0;
-       struct mlx5_secondary_data *sd;
-       void **tx_queues;
-       void **rx_queues;
-       unsigned int nb_tx_queues;
-       unsigned int nb_rx_queues;
-       unsigned int i;
+       eth_tx_burst_t tx_pkt_burst = mlx5_tx_burst;
+       struct mlx5_dev_config *config = &priv->config;
+       uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;
+       int tso = !!(tx_offloads & (DEV_TX_OFFLOAD_TCP_TSO |
+                                   DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                                   DEV_TX_OFFLOAD_GRE_TNL_TSO));
+       int vlan_insert = !!(tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT);
 
-       /* priv must be valid at this point. */
        assert(priv != NULL);
-       /* priv->dev must also be valid but may point to local memory from
-        * another process, possibly with the same address and must not
-        * be dereferenced yet. */
-       assert(priv->dev != NULL);
-       /* Determine port ID by finding out where priv comes from. */
-       while (1) {
-               sd = &mlx5_secondary_data[port_id];
-               rte_spinlock_lock(&sd->lock);
-               /* Primary process? */
-               if (sd->primary_priv == priv)
-                       break;
-               /* Secondary process? */
-               if (sd->data.dev_private == priv)
-                       break;
-               rte_spinlock_unlock(&sd->lock);
-               if (++port_id == RTE_DIM(mlx5_secondary_data))
-                       port_id = 0;
-       }
-       /* Switch to secondary private structure. If private data has already
-        * been updated by another thread, there is nothing else to do. */
-       priv = sd->data.dev_private;
-       if (priv->dev->data == &sd->data)
-               goto end;
-       /* Sanity checks. Secondary private structure is supposed to point
-        * to local eth_dev, itself still pointing to the shared device data
-        * structure allocated by the primary process. */
-       assert(sd->shared_dev_data != &sd->data);
-       assert(sd->data.nb_tx_queues == 0);
-       assert(sd->data.tx_queues == NULL);
-       assert(sd->data.nb_rx_queues == 0);
-       assert(sd->data.rx_queues == NULL);
-       assert(priv != sd->primary_priv);
-       assert(priv->dev->data == sd->shared_dev_data);
-       assert(priv->txqs_n == 0);
-       assert(priv->txqs == NULL);
-       assert(priv->rxqs_n == 0);
-       assert(priv->rxqs == NULL);
-       nb_tx_queues = sd->shared_dev_data->nb_tx_queues;
-       nb_rx_queues = sd->shared_dev_data->nb_rx_queues;
-       /* Allocate local storage for queues. */
-       tx_queues = rte_zmalloc("secondary ethdev->tx_queues",
-                               sizeof(sd->data.tx_queues[0]) * nb_tx_queues,
-                               RTE_CACHE_LINE_SIZE);
-       rx_queues = rte_zmalloc("secondary ethdev->rx_queues",
-                               sizeof(sd->data.rx_queues[0]) * nb_rx_queues,
-                               RTE_CACHE_LINE_SIZE);
-       if (tx_queues == NULL || rx_queues == NULL)
-               goto error;
-       /* Lock to prevent control operations during setup. */
-       priv_lock(priv);
-       /* TX queues. */
-       for (i = 0; i != nb_tx_queues; ++i) {
-               struct txq *primary_txq = (*sd->primary_priv->txqs)[i];
-               struct txq *txq;
-
-               if (primary_txq == NULL)
-                       continue;
-               txq = rte_calloc_socket("TXQ", 1, sizeof(*txq), 0,
-                                       primary_txq->socket);
-               if (txq != NULL) {
-                       if (txq_setup(priv->dev,
-                                     txq,
-                                     primary_txq->elts_n,
-                                     primary_txq->socket,
-                                     NULL) == 0) {
-                               txq->stats.idx = primary_txq->stats.idx;
-                               tx_queues[i] = txq;
-                               continue;
-                       }
-                       rte_free(txq);
-               }
-               while (i) {
-                       txq = tx_queues[--i];
-                       txq_cleanup(txq);
-                       rte_free(txq);
+       /* Select appropriate TX function. */
+       if (vlan_insert || tso)
+               return tx_pkt_burst;
+       if (config->mps == MLX5_MPW_ENHANCED) {
+               if (priv_check_vec_tx_support(priv, dev) > 0) {
+                       if (priv_check_raw_vec_tx_support(priv, dev) > 0)
+                               tx_pkt_burst = mlx5_tx_burst_raw_vec;
+                       else
+                               tx_pkt_burst = mlx5_tx_burst_vec;
+                       DEBUG("selected Enhanced MPW TX vectorized function");
+               } else {
+                       tx_pkt_burst = mlx5_tx_burst_empw;
+                       DEBUG("selected Enhanced MPW TX function");
                }
-               goto error;
+       } else if (config->mps && (config->txq_inline > 0)) {
+               tx_pkt_burst = mlx5_tx_burst_mpw_inline;
+               DEBUG("selected MPW inline TX function");
+       } else if (config->mps) {
+               tx_pkt_burst = mlx5_tx_burst_mpw;
+               DEBUG("selected MPW TX function");
        }
-       /* RX queues. */
-       for (i = 0; i != nb_rx_queues; ++i) {
-               struct rxq *primary_rxq = (*sd->primary_priv->rxqs)[i];
+       return tx_pkt_burst;
+}
 
-               if (primary_rxq == NULL)
-                       continue;
-               /* Not supported yet. */
-               rx_queues[i] = NULL;
+/**
+ * Configure the RX function to use.
+ *
+ * @param priv
+ *   Pointer to private data structure.
+ * @param dev
+ *   Pointer to rte_eth_dev structure.
+ *
+ * @return
+ *   Pointer to selected Rx burst function.
+ */
+eth_rx_burst_t
+priv_select_rx_function(struct priv *priv, __rte_unused struct rte_eth_dev *dev)
+{
+       eth_rx_burst_t rx_pkt_burst = mlx5_rx_burst;
+
+       assert(priv != NULL);
+       if (priv_check_vec_rx_support(priv) > 0) {
+               rx_pkt_burst = mlx5_rx_burst_vec;
+               DEBUG("selected RX vectorized function");
        }
-       /* Update everything. */
-       priv->txqs = (void *)tx_queues;
-       priv->txqs_n = nb_tx_queues;
-       priv->rxqs = (void *)rx_queues;
-       priv->rxqs_n = nb_rx_queues;
-       sd->data.rx_queues = rx_queues;
-       sd->data.tx_queues = tx_queues;
-       sd->data.nb_rx_queues = nb_rx_queues;
-       sd->data.nb_tx_queues = nb_tx_queues;
-       sd->data.dev_link = sd->shared_dev_data->dev_link;
-       sd->data.mtu = sd->shared_dev_data->mtu;
-       memcpy(sd->data.rx_queue_state, sd->shared_dev_data->rx_queue_state,
-              sizeof(sd->data.rx_queue_state));
-       memcpy(sd->data.tx_queue_state, sd->shared_dev_data->tx_queue_state,
-              sizeof(sd->data.tx_queue_state));
-       sd->data.dev_flags = sd->shared_dev_data->dev_flags;
-       /* Use local data from now on. */
-       rte_mb();
-       priv->dev->data = &sd->data;
-       rte_mb();
-       priv->dev->tx_pkt_burst = mlx5_tx_burst;
-       priv->dev->rx_pkt_burst = removed_rx_burst;
-       priv_unlock(priv);
-end:
-       /* More sanity checks. */
-       assert(priv->dev->tx_pkt_burst == mlx5_tx_burst);
-       assert(priv->dev->rx_pkt_burst == removed_rx_burst);
-       assert(priv->dev->data == &sd->data);
-       rte_spinlock_unlock(&sd->lock);
-       return priv;
-error:
-       priv_unlock(priv);
-       rte_free(tx_queues);
-       rte_free(rx_queues);
-       rte_spinlock_unlock(&sd->lock);
-       return NULL;
+       return rx_pkt_burst;
+}
+
+/**
+ * Check if mlx5 device was removed.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   1 when device is removed, otherwise 0.
+ */
+int
+mlx5_is_removed(struct rte_eth_dev *dev)
+{
+       struct ibv_device_attr device_attr;
+       struct priv *priv = dev->data->dev_private;
+
+       if (mlx5_glue->query_device(priv->ctx, &device_attr) == EIO)
+               return 1;
+       return 0;
 }