net/mlx5: prefix all functions with mlx5
[dpdk.git] / drivers / net / mlx5 / mlx5.c
index b911d0a..15b7722 100644 (file)
@@ -1,40 +1,13 @@
-/*-
- *   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.
  */
 
 #include <stddef.h>
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
+#include <dlfcn.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -57,6 +30,7 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_common.h>
+#include <rte_config.h>
 #include <rte_eal_memconfig.h>
 #include <rte_kvargs.h>
 
@@ -191,13 +165,12 @@ mlx5_dev_close(struct rte_eth_dev *dev)
        unsigned int i;
        int ret;
 
-       priv_lock(priv);
        DEBUG("%p: closing device \"%s\"",
              (void *)dev,
              ((priv->ctx != NULL) ? priv->ctx->device->name : ""));
        /* In case mlx5_dev_stop() has not been called. */
-       priv_dev_interrupt_handler_uninstall(priv, dev);
-       priv_dev_traffic_disable(priv, dev);
+       mlx5_dev_interrupt_handler_uninstall(dev);
+       mlx5_traffic_disable(dev);
        /* Prevent crashes when queues are still in use. */
        dev->rx_pkt_burst = removed_rx_burst;
        dev->tx_pkt_burst = removed_tx_burst;
@@ -205,7 +178,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)
                /* XXX race condition if mlx5_rx_burst() is still running. */
                usleep(1000);
                for (i = 0; (i != priv->rxqs_n); ++i)
-                       mlx5_priv_rxq_release(priv, i);
+                       mlx5_rxq_release(dev, i);
                priv->rxqs_n = 0;
                priv->rxqs = NULL;
        }
@@ -213,7 +186,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)
                /* XXX race condition if mlx5_tx_burst() is still running. */
                usleep(1000);
                for (i = 0; (i != priv->txqs_n); ++i)
-                       mlx5_priv_txq_release(priv, i);
+                       mlx5_txq_release(dev, i);
                priv->txqs_n = 0;
                priv->txqs = NULL;
        }
@@ -227,32 +200,32 @@ mlx5_dev_close(struct rte_eth_dev *dev)
                rte_free(priv->rss_conf.rss_key);
        if (priv->reta_idx != NULL)
                rte_free(priv->reta_idx);
-       priv_socket_uninit(priv);
-       ret = mlx5_priv_hrxq_ibv_verify(priv);
+       if (priv->primary_socket)
+               mlx5_socket_uninit(dev);
+       ret = mlx5_hrxq_ibv_verify(dev);
        if (ret)
-               WARN("%p: some Hash Rx queue still remain", (void *)priv);
-       ret = mlx5_priv_ind_table_ibv_verify(priv);
+               WARN("%p: some Hash Rx queue still remain", (void *)dev);
+       ret = mlx5_ind_table_ibv_verify(dev);
        if (ret)
-               WARN("%p: some Indirection table still remain", (void *)priv);
-       ret = mlx5_priv_rxq_ibv_verify(priv);
+               WARN("%p: some Indirection table still remain", (void *)dev);
+       ret = mlx5_rxq_ibv_verify(dev);
        if (ret)
-               WARN("%p: some Verbs Rx queue still remain", (void *)priv);
-       ret = mlx5_priv_rxq_verify(priv);
+               WARN("%p: some Verbs Rx queue still remain", (void *)dev);
+       ret = mlx5_rxq_verify(dev);
        if (ret)
-               WARN("%p: some Rx Queues still remain", (void *)priv);
-       ret = mlx5_priv_txq_ibv_verify(priv);
+               WARN("%p: some Rx Queues still remain", (void *)dev);
+       ret = mlx5_txq_ibv_verify(dev);
        if (ret)
-               WARN("%p: some Verbs Tx queue still remain", (void *)priv);
-       ret = mlx5_priv_txq_verify(priv);
+               WARN("%p: some Verbs Tx queue still remain", (void *)dev);
+       ret = mlx5_txq_verify(dev);
        if (ret)
-               WARN("%p: some Tx Queues still remain", (void *)priv);
-       ret = priv_flow_verify(priv);
+               WARN("%p: some Tx Queues still remain", (void *)dev);
+       ret = mlx5_flow_verify(dev);
        if (ret)
-               WARN("%p: some flows still remain", (void *)priv);
-       ret = priv_mr_verify(priv);
+               WARN("%p: some flows still remain", (void *)dev);
+       ret = mlx5_mr_verify(dev);
        if (ret)
-               WARN("%p: some Memory Region still remain", (void *)priv);
-       priv_unlock(priv);
+               WARN("%p: some Memory Region still remain", (void *)dev);
        memset(priv, 0, sizeof(*priv));
 }
 
@@ -493,15 +466,16 @@ static void *uar_base;
 /**
  * Reserve UAR address space for primary process.
  *
- * @param[in] priv
- *   Pointer to private structure.
+ * @param[in] dev
+ *   Pointer to Ethernet device.
  *
  * @return
  *   0 on success, errno value on failure.
  */
 static int
-priv_uar_init_primary(struct priv *priv)
+mlx5_uar_init_primary(struct rte_eth_dev *dev)
 {
+       struct priv *priv = dev->data->dev_private;
        void *addr = (void *)0;
        int i;
        const struct rte_mem_config *mcfg;
@@ -543,15 +517,16 @@ priv_uar_init_primary(struct priv *priv)
  * Reserve UAR address space for secondary process, align with
  * primary process.
  *
- * @param[in] priv
- *   Pointer to private structure.
+ * @param[in] dev
+ *   Pointer to Ethernet device.
  *
  * @return
  *   0 on success, errno value on failure.
  */
 static int
-priv_uar_init_secondary(struct priv *priv)
+mlx5_uar_init_secondary(struct rte_eth_dev *dev)
 {
+       struct priv *priv = dev->data->dev_private;
        void *addr;
        int ret;
 
@@ -596,25 +571,24 @@ priv_uar_init_secondary(struct priv *priv)
  *   0 on success, negative errno value on failure.
  */
 static int
-mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+              struct rte_pci_device *pci_dev)
 {
        struct ibv_device **list;
        struct ibv_device *ibv_dev;
        int err = 0;
        struct ibv_context *attr_ctx = NULL;
        struct ibv_device_attr_ex device_attr;
-       unsigned int sriov;
        unsigned int mps;
        unsigned int cqe_comp;
        unsigned int tunnel_en = 0;
        int idx;
        int i;
-       struct mlx5dv_context attrs_out;
+       struct mlx5dv_context attrs_out = {0};
 #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
        struct ibv_counter_set_description cs_desc;
 #endif
 
-       (void)pci_drv;
        assert(pci_drv == &mlx5_driver);
        /* Get mlx5_dev[] index. */
        idx = mlx5_dev_idx(&pci_dev->addr);
@@ -623,7 +597,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                return -ENOMEM;
        }
        DEBUG("using driver device index %d", idx);
-
        /* Save PCI address. */
        mlx5_dev[idx].pci_addr = pci_dev->addr;
        list = mlx5_glue->get_device_list(&i);
@@ -650,32 +623,8 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                    (pci_dev->addr.devid != pci_addr.devid) ||
                    (pci_dev->addr.function != pci_addr.function))
                        continue;
-               sriov = ((pci_dev->id.device_id ==
-                      PCI_DEVICE_ID_MELLANOX_CONNECTX4VF) ||
-                     (pci_dev->id.device_id ==
-                      PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF) ||
-                     (pci_dev->id.device_id ==
-                      PCI_DEVICE_ID_MELLANOX_CONNECTX5VF) ||
-                     (pci_dev->id.device_id ==
-                      PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF));
-               switch (pci_dev->id.device_id) {
-               case PCI_DEVICE_ID_MELLANOX_CONNECTX4:
-                       tunnel_en = 1;
-                       break;
-               case PCI_DEVICE_ID_MELLANOX_CONNECTX4LX:
-               case PCI_DEVICE_ID_MELLANOX_CONNECTX5:
-               case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF:
-               case PCI_DEVICE_ID_MELLANOX_CONNECTX5EX:
-               case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
-                       tunnel_en = 1;
-                       break;
-               default:
-                       break;
-               }
-               INFO("PCI information matches, using device \"%s\""
-                    " (SR-IOV: %s)",
-                    list[i]->name,
-                    sriov ? "true" : "false");
+               INFO("PCI information matches, using device \"%s\"",
+                    list[i]->name);
                attr_ctx = mlx5_glue->open_device(list[i]);
                err = errno;
                break;
@@ -694,12 +643,14 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                return -err;
        }
        ibv_dev = list[i];
-
        DEBUG("device opened");
        /*
         * Multi-packet send is supported by ConnectX-4 Lx PF as well
         * as all ConnectX-5 devices.
         */
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+       attrs_out.comp_mask |= MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS;
+#endif
        mlx5_glue->dv_query_device(attr_ctx, &attrs_out);
        if (attrs_out.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
                if (attrs_out.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
@@ -718,10 +669,20 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                cqe_comp = 0;
        else
                cqe_comp = 1;
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+       if (attrs_out.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
+               tunnel_en = ((attrs_out.tunnel_offloads_caps &
+                             MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN) &&
+                            (attrs_out.tunnel_offloads_caps &
+                             MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE));
+       }
+       DEBUG("Tunnel offloading is %ssupported", tunnel_en ? "" : "not ");
+#else
+       WARN("Tunnel offloading disabled due to old OFED/rdma-core version");
+#endif
        if (mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr))
                goto error;
        INFO("%u port(s) detected", device_attr.orig_attr.phys_port_cnt);
-
        for (i = 0; i < device_attr.orig_attr.phys_port_cnt; i++) {
                char name[RTE_ETH_NAME_MAX_LEN];
                int len;
@@ -731,10 +692,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                struct ibv_port_attr port_attr;
                struct ibv_pd *pd = NULL;
                struct priv *priv = NULL;
-               struct rte_eth_dev *eth_dev;
+               struct rte_eth_dev *eth_dev = NULL;
                struct ibv_device_attr_ex device_attr_ex;
                struct ether_addr mac;
-               uint16_t num_vfs = 0;
                struct ibv_device_attr_ex device_attr;
                struct mlx5_dev_config config = {
                        .cqe_comp = cqe_comp,
@@ -753,9 +713,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                         pci_dev->addr.devid, pci_dev->addr.function);
                if (device_attr.orig_attr.phys_port_cnt > 1)
                        snprintf(name + len, sizeof(name), " port %u", i);
-
                mlx5_dev[idx].ports |= test;
-
                if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
                        eth_dev = rte_eth_dev_attach_secondary(name);
                        if (eth_dev == NULL) {
@@ -765,20 +723,19 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        }
                        eth_dev->device = &pci_dev->device;
                        eth_dev->dev_ops = &mlx5_dev_sec_ops;
-                       priv = eth_dev->data->dev_private;
-                       err = priv_uar_init_secondary(priv);
+                       err = mlx5_uar_init_secondary(eth_dev);
                        if (err < 0) {
                                err = -err;
                                goto error;
                        }
                        /* Receive command fd from primary process */
-                       err = priv_socket_connect(priv);
+                       err = mlx5_socket_connect(eth_dev);
                        if (err < 0) {
                                err = -err;
                                goto error;
                        }
                        /* Remap UAR for Tx queues. */
-                       err = priv_tx_uar_remap(priv, err);
+                       err = mlx5_tx_uar_remap(eth_dev, err);
                        if (err)
                                goto error;
                        /*
@@ -787,20 +744,17 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                         * secondary process.
                         */
                        eth_dev->rx_pkt_burst =
-                               priv_select_rx_function(priv, eth_dev);
+                               mlx5_select_rx_function(eth_dev);
                        eth_dev->tx_pkt_burst =
-                               priv_select_tx_function(priv, eth_dev);
+                               mlx5_select_tx_function(eth_dev);
                        continue;
                }
-
                DEBUG("using port %u (%08" PRIx32 ")", port, test);
-
                ctx = mlx5_glue->open_device(ibv_dev);
                if (ctx == NULL) {
                        err = ENODEV;
                        goto port_error;
                }
-
                mlx5_glue->query_device_ex(ctx, NULL, &device_attr);
                /* Check port status. */
                err = mlx5_glue->query_port(ctx, port, &port_attr);
@@ -808,19 +762,16 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        ERROR("port query failed: %s", strerror(err));
                        goto port_error;
                }
-
                if (port_attr.link_layer != IBV_LINK_LAYER_ETHERNET) {
                        ERROR("port %d is not configured in Ethernet mode",
                              port);
                        err = EINVAL;
                        goto port_error;
                }
-
                if (port_attr.state != IBV_PORT_ACTIVE)
                        DEBUG("port %d is not active: \"%s\" (%d)",
                              port, mlx5_glue->port_state_str(port_attr.state),
                              port_attr.state);
-
                /* Allocate protection domain. */
                pd = mlx5_glue->alloc_pd(ctx);
                if (pd == NULL) {
@@ -828,9 +779,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        err = ENOMEM;
                        goto port_error;
                }
-
                mlx5_dev[idx].ports |= test;
-
                /* from rte_ethdev.c */
                priv = rte_zmalloc("ethdev private structure",
                                   sizeof(*priv),
@@ -840,7 +789,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        err = ENOMEM;
                        goto port_error;
                }
-
                priv->ctx = ctx;
                strncpy(priv->ibdev_path, priv->ctx->device->ibdev_path,
                        sizeof(priv->ibdev_path));
@@ -858,20 +806,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        ERROR("ibv_query_device_ex() failed");
                        goto port_error;
                }
-
                config.hw_csum = !!(device_attr_ex.device_cap_flags_ex &
                                    IBV_DEVICE_RAW_IP_CSUM);
                DEBUG("checksum offloading is %ssupported",
                      (config.hw_csum ? "" : "not "));
-
-#ifdef HAVE_IBV_DEVICE_VXLAN_SUPPORT
-               config.hw_csum_l2tun =
-                               !!(exp_device_attr.exp_device_cap_flags &
-                                  IBV_DEVICE_VXLAN_SUPPORT);
-#endif
-               DEBUG("Rx L2 tunnel checksum offloads are %ssupported",
-                     (config.hw_csum_l2tun ? "" : "not "));
-
 #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
                config.flow_counter_en = !!(device_attr.max_counter_sets);
                mlx5_glue->describe_counter_set(ctx, 0, &cs_desc);
@@ -893,9 +831,8 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                DEBUG("VLAN stripping is %ssupported",
                      (config.hw_vlan_strip ? "" : "not "));
 
-               config.hw_fcs_strip =
-                               !!(device_attr_ex.orig_attr.device_cap_flags &
-                               IBV_WQ_FLAGS_SCATTER_FCS);
+               config.hw_fcs_strip = !!(device_attr_ex.raw_packet_caps &
+                                        IBV_RAW_PACKET_CAP_SCATTER_FCS);
                DEBUG("FCS stripping configuration is %ssupported",
                      (config.hw_fcs_strip ? "" : "not "));
 
@@ -904,9 +841,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 #endif
                DEBUG("hardware RX end alignment padding is %ssupported",
                      (config.hw_padding ? "" : "not "));
-
-               priv_get_num_vfs(priv, &num_vfs);
-               config.sriov = (num_vfs || sriov);
                config.tso = ((device_attr_ex.tso_caps.max_tso > 0) &&
                              (device_attr_ex.tso_caps.supported_qpts &
                              (1 << IBV_QPT_RAW_PACKET)));
@@ -926,11 +860,23 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                        WARN("Rx CQE compression isn't supported");
                        config.cqe_comp = 0;
                }
-               err = priv_uar_init_primary(priv);
+               eth_dev = rte_eth_dev_allocate(name);
+               if (eth_dev == NULL) {
+                       ERROR("can not allocate rte ethdev");
+                       err = ENOMEM;
+                       goto port_error;
+               }
+               eth_dev->data->dev_private = priv;
+               priv->dev = eth_dev;
+               eth_dev->data->mac_addrs = priv->mac;
+               eth_dev->device = &pci_dev->device;
+               rte_eth_copy_pci_info(eth_dev, pci_dev);
+               eth_dev->device->driver = &mlx5_driver.driver;
+               err = mlx5_uar_init_primary(eth_dev);
                if (err)
                        goto port_error;
                /* Configure the first MAC address by default. */
-               if (priv_get_mac(priv, &mac.addr_bytes)) {
+               if (mlx5_get_mac(eth_dev, &mac.addr_bytes)) {
                        ERROR("cannot get MAC address, is mlx5_en loaded?"
                              " (errno: %s)", strerror(errno));
                        err = ENODEV;
@@ -945,7 +891,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                {
                        char ifname[IF_NAMESIZE];
 
-                       if (priv_get_ifname(priv, &ifname) == 0)
+                       if (mlx5_get_ifname(eth_dev, &ifname) == 0)
                                DEBUG("port %u ifname is \"%s\"",
                                      priv->port, ifname);
                        else
@@ -953,32 +899,18 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                }
 #endif
                /* Get actual MTU if possible. */
-               priv_get_mtu(priv, &priv->mtu);
+               mlx5_get_mtu(eth_dev, &priv->mtu);
                DEBUG("port %u MTU is %u", priv->port, priv->mtu);
-
-               eth_dev = rte_eth_dev_allocate(name);
-               if (eth_dev == NULL) {
-                       ERROR("can not allocate rte ethdev");
-                       err = ENOMEM;
-                       goto port_error;
-               }
-               eth_dev->data->dev_private = priv;
-               eth_dev->data->mac_addrs = priv->mac;
-               eth_dev->device = &pci_dev->device;
-               rte_eth_copy_pci_info(eth_dev, pci_dev);
-               eth_dev->device->driver = &mlx5_driver.driver;
                /*
                 * Initialize burst functions to prevent crashes before link-up.
                 */
                eth_dev->rx_pkt_burst = removed_rx_burst;
                eth_dev->tx_pkt_burst = removed_tx_burst;
-               priv->dev = eth_dev;
                eth_dev->dev_ops = &mlx5_dev_ops;
                /* Register MAC address. */
                claim_zero(mlx5_mac_addr_add(eth_dev, &mac, 0, 0));
                TAILQ_INIT(&priv->flows);
                TAILQ_INIT(&priv->ctrl_flows);
-
                /* Hint libmlx5 to use PMD allocator for data plane resources */
                struct mlx5dv_ctx_allocators alctr = {
                        .alloc = &mlx5_alloc_verbs_buf,
@@ -988,14 +920,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                mlx5_glue->dv_set_context_attr(ctx,
                                               MLX5DV_CTX_ATTR_BUF_ALLOCATORS,
                                               (void *)((uintptr_t)&alctr));
-
                /* Bring Ethernet device up. */
                DEBUG("forcing Ethernet interface up");
-               priv_set_flags(priv, ~IFF_UP, IFF_UP);
+               mlx5_set_flags(eth_dev, ~IFF_UP, IFF_UP);
                /* Store device configuration on private structure. */
                priv->config = config;
                continue;
-
 port_error:
                if (priv)
                        rte_free(priv);
@@ -1005,20 +935,17 @@ port_error:
                        claim_zero(mlx5_glue->close_device(ctx));
                break;
        }
-
        /*
         * XXX if something went wrong in the loop above, there is a resource
         * leak (ctx, pd, priv, dpdk ethdev) but we can do nothing about it as
         * long as the dpdk does not provide a way to deallocate a ethdev and a
         * way to enumerate the registered ethdevs to free the previous ones.
         */
-
        /* no port found, complain */
        if (!mlx5_dev[idx].ports) {
                err = ENODEV;
                goto error;
        }
-
 error:
        if (attr_ctx)
                claim_zero(mlx5_glue->close_device(attr_ctx));
@@ -1075,6 +1002,136 @@ static struct rte_pci_driver mlx5_driver = {
        .drv_flags = RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_INTR_RMV,
 };
 
+#ifdef RTE_LIBRTE_MLX5_DLOPEN_DEPS
+
+/**
+ * Suffix RTE_EAL_PMD_PATH with "-glue".
+ *
+ * This function performs a sanity check on RTE_EAL_PMD_PATH before
+ * suffixing its last component.
+ *
+ * @param buf[out]
+ *   Output buffer, should be large enough otherwise NULL is returned.
+ * @param size
+ *   Size of @p out.
+ *
+ * @return
+ *   Pointer to @p buf or @p NULL in case suffix cannot be appended.
+ */
+static char *
+mlx5_glue_path(char *buf, size_t size)
+{
+       static const char *const bad[] = { "/", ".", "..", NULL };
+       const char *path = RTE_EAL_PMD_PATH;
+       size_t len = strlen(path);
+       size_t off;
+       int i;
+
+       while (len && path[len - 1] == '/')
+               --len;
+       for (off = len; off && path[off - 1] != '/'; --off)
+               ;
+       for (i = 0; bad[i]; ++i)
+               if (!strncmp(path + off, bad[i], (int)(len - off)))
+                       goto error;
+       i = snprintf(buf, size, "%.*s-glue", (int)len, path);
+       if (i == -1 || (size_t)i >= size)
+               goto error;
+       return buf;
+error:
+       ERROR("unable to append \"-glue\" to last component of"
+             " RTE_EAL_PMD_PATH (\"" RTE_EAL_PMD_PATH "\"),"
+             " please re-configure DPDK");
+       return NULL;
+}
+
+/**
+ * Initialization routine for run-time dependency on rdma-core.
+ */
+static int
+mlx5_glue_init(void)
+{
+       char glue_path[sizeof(RTE_EAL_PMD_PATH) - 1 + sizeof("-glue")];
+       const char *path[] = {
+               /*
+                * A basic security check is necessary before trusting
+                * MLX5_GLUE_PATH, which may override RTE_EAL_PMD_PATH.
+                */
+               (geteuid() == getuid() && getegid() == getgid() ?
+                getenv("MLX5_GLUE_PATH") : NULL),
+               /*
+                * When RTE_EAL_PMD_PATH is set, use its glue-suffixed
+                * variant, otherwise let dlopen() look up libraries on its
+                * own.
+                */
+               (*RTE_EAL_PMD_PATH ?
+                mlx5_glue_path(glue_path, sizeof(glue_path)) : ""),
+       };
+       unsigned int i = 0;
+       void *handle = NULL;
+       void **sym;
+       const char *dlmsg;
+
+       while (!handle && i != RTE_DIM(path)) {
+               const char *end;
+               size_t len;
+               int ret;
+
+               if (!path[i]) {
+                       ++i;
+                       continue;
+               }
+               end = strpbrk(path[i], ":;");
+               if (!end)
+                       end = path[i] + strlen(path[i]);
+               len = end - path[i];
+               ret = 0;
+               do {
+                       char name[ret + 1];
+
+                       ret = snprintf(name, sizeof(name), "%.*s%s" MLX5_GLUE,
+                                      (int)len, path[i],
+                                      (!len || *(end - 1) == '/') ? "" : "/");
+                       if (ret == -1)
+                               break;
+                       if (sizeof(name) != (size_t)ret + 1)
+                               continue;
+                       DEBUG("looking for rdma-core glue as \"%s\"", name);
+                       handle = dlopen(name, RTLD_LAZY);
+                       break;
+               } while (1);
+               path[i] = end + 1;
+               if (!*end)
+                       ++i;
+       }
+       if (!handle) {
+               rte_errno = EINVAL;
+               dlmsg = dlerror();
+               if (dlmsg)
+                       WARN("cannot load glue library: %s", dlmsg);
+               goto glue_error;
+       }
+       sym = dlsym(handle, "mlx5_glue");
+       if (!sym || !*sym) {
+               rte_errno = EINVAL;
+               dlmsg = dlerror();
+               if (dlmsg)
+                       ERROR("cannot resolve glue symbol: %s", dlmsg);
+               goto glue_error;
+       }
+       mlx5_glue = *sym;
+       return 0;
+glue_error:
+       if (handle)
+               dlclose(handle);
+       WARN("cannot initialize PMD due to missing run-time"
+            " dependency on rdma-core libraries (libibverbs,"
+            " libmlx5)");
+       return -rte_errno;
+}
+
+#endif
+
 /**
  * Driver initialization routine.
  */
@@ -1094,6 +1151,25 @@ rte_mlx5_pmd_init(void)
        /* Match the size of Rx completion entry to the size of a cacheline. */
        if (RTE_CACHE_LINE_SIZE == 128)
                setenv("MLX5_CQE_SIZE", "128", 0);
+#ifdef RTE_LIBRTE_MLX5_DLOPEN_DEPS
+       if (mlx5_glue_init())
+               return;
+       assert(mlx5_glue);
+#endif
+#ifndef NDEBUG
+       /* Glue structure must not contain any NULL pointers. */
+       {
+               unsigned int i;
+
+               for (i = 0; i != sizeof(*mlx5_glue) / sizeof(void *); ++i)
+                       assert(((const void *const *)mlx5_glue)[i]);
+       }
+#endif
+       if (strcmp(mlx5_glue->version, MLX5_GLUE_VERSION)) {
+               ERROR("rdma-core glue \"%s\" mismatch: \"%s\" is required",
+                     mlx5_glue->version, MLX5_GLUE_VERSION);
+               return;
+       }
        mlx5_glue->fork_init();
        rte_pci_register(&mlx5_driver);
 }