regex/mlx5: support probing
authorOri Kam <orika@mellanox.com>
Mon, 20 Jul 2020 06:26:07 +0000 (06:26 +0000)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 21 Jul 2020 17:04:05 +0000 (19:04 +0200)
This commit adds the probe function to the RegEx PMD.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Ori Kam <orika@mellanox.com>
drivers/common/mlx5/mlx5_devx_cmds.c
drivers/common/mlx5/mlx5_devx_cmds.h
drivers/common/mlx5/mlx5_prm.h
drivers/regex/mlx5/Makefile
drivers/regex/mlx5/mlx5_regex.c
drivers/regex/mlx5/mlx5_regex.h
mk/rte.app.mk

index 2179a83..54b20a7 100644 (file)
@@ -467,6 +467,9 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        attr->vdpa.queue_counters_valid = !!(MLX5_GET64(cmd_hca_cap, hcattr,
                                                        general_obj_types) &
                                  MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_Q_COUNTERS);
+       attr->regex = MLX5_GET(cmd_hca_cap, hcattr, regexp);
+       attr->regexp_num_of_engines = MLX5_GET(cmd_hca_cap, hcattr,
+                                              regexp_num_of_engines);
        if (attr->qos.sup) {
                MLX5_SET(query_hca_cap_in, in, op_mod,
                         MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP |
index 25704ef..bb14ca5 100644 (file)
@@ -90,6 +90,8 @@ struct mlx5_hca_attr {
        uint32_t vhca_id:16;
        uint32_t relaxed_ordering_write:1;
        uint32_t relaxed_ordering_read:1;
+       uint32_t regex:1;
+       uint32_t regexp_num_of_engines;
        struct mlx5_hca_qos_attr qos;
        struct mlx5_hca_vdpa_attr vdpa;
 };
index c63795f..a24a10d 100644 (file)
@@ -994,9 +994,14 @@ struct mlx5_ifc_cmd_hca_cap_bits {
        u8 log_max_qp_sz[0x8];
        u8 reserved_at_90[0xb];
        u8 log_max_qp[0x5];
-       u8 reserved_at_a0[0xb];
+       u8 regexp[0x1];
+       u8 reserved_at_a1[0x3];
+       u8 regexp_num_of_engines[0x4];
+       u8 reserved_at_a8[0x3];
        u8 log_max_srq[0x5];
-       u8 reserved_at_b0[0x10];
+       u8 reserved_at_b0[0x3];
+       u8 regexp_log_crspace_size[0x5];
+       u8 reserved_at_b8[0x8];
        u8 reserved_at_c0[0x8];
        u8 log_max_cq_sz[0x8];
        u8 reserved_at_d0[0xb];
index fa32cda..c5978b5 100644 (file)
@@ -16,6 +16,7 @@ CFLAGS += -g
 CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5
 CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
 CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
+CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5/linux
 CFLAGS += -D_BSD_SOURCE
 CFLAGS += -D_DEFAULT_SOURCE
 CFLAGS += -D_XOPEN_SOURCE=600
@@ -26,6 +27,7 @@ LDLIBS += -lm
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_regexdev
 LDLIBS += -lrte_kvargs
 LDLIBS += -lrte_bus_pci
+LDLIBS += -lrte_pci
 
 # A few warnings cannot be avoided in external headers.
 CFLAGS += -Wno-error=cast-qual
index 922c236..5c0b2c4 100644 (file)
@@ -2,9 +2,176 @@
  * Copyright 2020 Mellanox Technologies, Ltd
  */
 
+#include <rte_malloc.h>
+#include <rte_log.h>
+#include <rte_errno.h>
+#include <rte_bus_pci.h>
+#include <rte_pci.h>
+#include <rte_regexdev.h>
+#include <rte_regexdev_core.h>
+#include <rte_regexdev_driver.h>
+
+#include <mlx5_glue.h>
+#include <mlx5_devx_cmds.h>
+#include <mlx5_prm.h>
+
 #include "mlx5_regex.h"
 #include "mlx5_regex_utils.h"
 
 int mlx5_regex_logtype;
 
+static const struct rte_regexdev_ops mlx5_regexdev_ops = {0};
+
+static struct ibv_device *
+mlx5_regex_get_ib_device_match(struct rte_pci_addr *addr)
+{
+       int n;
+       struct ibv_device **ibv_list = mlx5_glue->get_device_list(&n);
+       struct ibv_device *ibv_match = NULL;
+
+       if (!ibv_list) {
+               rte_errno = ENOSYS;
+               return NULL;
+       }
+       while (n-- > 0) {
+               struct rte_pci_addr pci_addr;
+
+               DRV_LOG(DEBUG, "Checking device \"%s\"..", ibv_list[n]->name);
+               if (mlx5_dev_to_pci_addr(ibv_list[n]->ibdev_path, &pci_addr))
+                       continue;
+               if (rte_pci_addr_cmp(addr, &pci_addr))
+                       continue;
+               ibv_match = ibv_list[n];
+               break;
+       }
+       if (!ibv_match)
+               rte_errno = ENOENT;
+       mlx5_glue->free_device_list(ibv_list);
+       return ibv_match;
+}
+
+static void
+mlx5_regex_get_name(char *name, struct rte_pci_device *pci_dev __rte_unused)
+{
+       sprintf(name, "mlx5_regex_%02x:%02x.%02x", pci_dev->addr.bus,
+               pci_dev->addr.devid, pci_dev->addr.function);
+}
+
+static int
+mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+                    struct rte_pci_device *pci_dev)
+{
+       struct ibv_device *ibv;
+       struct mlx5_regex_priv *priv = NULL;
+       struct ibv_context *ctx = NULL;
+       struct mlx5_hca_attr attr;
+       char name[RTE_REGEXDEV_NAME_MAX_LEN];
+       int ret;
+
+       ibv = mlx5_regex_get_ib_device_match(&pci_dev->addr);
+       if (!ibv) {
+               DRV_LOG(ERR, "No matching IB device for PCI slot "
+                       PCI_PRI_FMT ".", pci_dev->addr.domain,
+                       pci_dev->addr.bus, pci_dev->addr.devid,
+                       pci_dev->addr.function);
+               return -rte_errno;
+       }
+       DRV_LOG(INFO, "PCI information matches for device \"%s\".",
+               ibv->name);
+       ctx = mlx5_glue->dv_open_device(ibv);
+       if (!ctx) {
+               DRV_LOG(ERR, "Failed to open IB device \"%s\".", ibv->name);
+               rte_errno = ENODEV;
+               return -rte_errno;
+       }
+       ret = mlx5_devx_cmd_query_hca_attr(ctx, &attr);
+       if (ret) {
+               DRV_LOG(ERR, "Unable to read HCA capabilities.");
+               rte_errno = ENOTSUP;
+               goto error;
+       } else if (!attr.regex || attr.regexp_num_of_engines == 0) {
+               DRV_LOG(ERR, "Not enough capabilities to support RegEx, maybe "
+                       "old FW/OFED version?");
+               rte_errno = ENOTSUP;
+               goto error;
+       }
+       priv = rte_zmalloc("mlx5 regex device private", sizeof(*priv),
+                          RTE_CACHE_LINE_SIZE);
+       if (!priv) {
+               DRV_LOG(ERR, "Failed to allocate private memory.");
+               rte_errno = ENOMEM;
+               goto error;
+       }
+       priv->ctx = ctx;
+       mlx5_regex_get_name(name, pci_dev);
+       priv->regexdev = rte_regexdev_register(name);
+       if (priv->regexdev == NULL) {
+               DRV_LOG(ERR, "Failed to register RegEx device.");
+               rte_errno = rte_errno ? rte_errno : EINVAL;
+               goto error;
+       }
+       priv->regexdev->dev_ops = &mlx5_regexdev_ops;
+       priv->regexdev->device = (struct rte_device *)pci_dev;
+       priv->regexdev->data->dev_private = priv;
+       return 0;
+
+error:
+       if (ctx)
+               mlx5_glue->close_device(ctx);
+       if (priv)
+               rte_free(priv);
+       return -rte_errno;
+}
+
+static int
+mlx5_regex_pci_remove(struct rte_pci_device *pci_dev)
+{
+       char name[RTE_REGEXDEV_NAME_MAX_LEN];
+       struct rte_regexdev *dev;
+       struct mlx5_regex_priv *priv = NULL;
+
+       mlx5_regex_get_name(name, pci_dev);
+       dev = rte_regexdev_get_device_by_name(name);
+       if (!dev)
+               return 0;
+       priv = dev->data->dev_private;
+       if (priv) {
+               if (priv->ctx)
+                       mlx5_glue->close_device(priv->ctx);
+               if (priv->regexdev)
+                       rte_regexdev_unregister(priv->regexdev);
+               rte_free(priv);
+       }
+       return 0;
+}
+
+static const struct rte_pci_id mlx5_regex_pci_id_map[] = {
+       {
+               RTE_PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
+                               PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF)
+       },
+       {
+               .vendor_id = 0
+       }
+};
+
+static struct rte_pci_driver mlx5_regex_driver = {
+       .driver = {
+               .name = "mlx5_regex",
+       },
+       .id_table = mlx5_regex_pci_id_map,
+       .probe = mlx5_regex_pci_probe,
+       .remove = mlx5_regex_pci_remove,
+       .drv_flags = 0,
+};
+
+RTE_INIT(rte_mlx5_regex_init)
+{
+       if (mlx5_glue)
+               rte_pci_register(&mlx5_regex_driver);
+}
+
 RTE_LOG_REGISTER(mlx5_regex_logtype, pmd.regex.mlx5, NOTICE)
+RTE_PMD_EXPORT_NAME(net_mlx5_regex, __COUNTER__);
+RTE_PMD_REGISTER_PCI_TABLE(net_mlx5_regex, mlx5_regex_pci_id_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_mlx5_regex, "* ib_uverbs & mlx5_core & mlx5_ib");
index 0e0495c..0ce1e4d 100644 (file)
@@ -5,4 +5,10 @@
 #ifndef MLX5_REGEX_H
 #define MLX5_REGEX_H
 
+struct mlx5_regex_priv {
+       TAILQ_ENTRY(mlx5_regex_priv) next;
+       struct ibv_context *ctx; /* Device context. */
+       struct rte_pci_device *pci_dev;
+       struct rte_regexdev *regexdev; /* Pointer to the RegEx dev. */
+};
 #endif /* MLX5_REGEX_H */
index 1b9551e..a544259 100644 (file)
@@ -85,6 +85,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_BBDEV)          += -lrte_bbdev
 _LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV)      += -lrte_cryptodev
 _LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY)       += -lrte_security
 _LDLIBS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV)    += -lrte_compressdev
+_LDLIBS-$(CONFIG_RTE_LIBRTE_REGEXDEV)       += -lrte_regexdev
 _LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV)       += -lrte_eventdev
 _LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV)         += -lrte_rawdev
 _LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER)          += -lrte_timer