net/enic: allow to change RSS settings

[dpdk.git] / drivers / net / mlx5 / mlx5.c

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 69664ef..61cb931 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -201,7 +201,8 @@ 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);
+       if (priv->primary_socket)
+               priv_socket_uninit(priv);
        ret = mlx5_priv_hrxq_ibv_verify(priv);
        if (ret)
                WARN("%p: some Hash Rx queue still remain", (void *)priv);
@@ -583,7 +584,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
        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
@@ -632,20 +633,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                       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,
@@ -674,6 +661,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
         * 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) {
@@ -692,6 +682,17 @@ 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);
@@ -837,15 +838,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                                    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);
@@ -867,9 +859,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 "));
 
@@ -1057,11 +1048,52 @@ static struct rte_pci_driver mlx5_driver = {
 static int
 mlx5_glue_init(void)
 {
+       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),
+               RTE_EAL_PMD_PATH,
+       };
+       unsigned int i = 0;
        void *handle = NULL;
        void **sym;
        const char *dlmsg;
 
-       handle = dlopen(MLX5_GLUE, RTLD_LAZY);
+       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();
@@ -1114,6 +1146,20 @@ rte_mlx5_pmd_init(void)
                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);
 }