regex/mlx5: move RXP to CrSpace

Add patch for programming the regex database through ROF file,
using the firmware instead of manually through the software.
No need to setup the DB anymore, the regex-daemon is responsible
for that always.
In the new flow the regex driver only has to program ROF rules
by using set params DevX cmd, requires ROF mkey creation.
The rules file has to be read into 4KB aligned memory.

Signed-off-by: Ady Agbarih <adypodoman@gmail.com>
Acked-by: Ori Kam <orika@nvidia.com>

diff --git a/doc/guides/regexdevs/mlx5.rst b/doc/guides/regexdevs/mlx5.rst
index 7c3a7c84bbb7f014fd5ab29e694647df7a6a0e3c..b2bf0afd01ecf8097f56579ef60f7d6c2f432f61 100644 (file)
--- a/doc/guides/regexdevs/mlx5.rst
+++ b/doc/guides/regexdevs/mlx5.rst
@@ -55,7 +55,7 @@ Prerequisites
 Limitations
 -----------
 
-- The firmware version must be equal to or lower than XX.30.1004
+- The firmware version must be greater than XX.31.0364
 
 Run-time configuration
 ~~~~~~~~~~~~~~~~~~~~~~

diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 502cc5ceb2c60ddb6c0b0c8052f9377ee3884dd9..13c58dbd47371630399b521c03d1b3c3c9f76b22 100644 (file)
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -261,6 +261,10 @@ New Features
   * Added a new baseband PMD driver for NXP LA12xx Software defined radio.
   * See the :doc:`../bbdevs/la12xx` for more details.
 
+* **Updated Mellanox regex driver.**
+
+  * Added support for new ROF file format.
+
 * **Updated IPsec library.**
 
   * Added support for more AEAD algorithms AES_CCM, CHACHA20_POLY1305

diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 513d3feb6acf7f3f7c96a57fe188d8cb3a73bde9..b3c96861bce55c6f402d4211e3b0c3e0751e7b1a 100644 (file)
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -46,16 +46,6 @@ struct mlx5_regex_qp {
        struct mlx5_mr_ctrl mr_ctrl;
 };
 
-struct mlx5_regex_db {
-       void *ptr; /* Pointer to the db memory. */
-       uint32_t len; /* The memory len. */
-       bool active; /* Active flag. */
-       uint8_t db_assigned_to_eng_num;
-       /**< To which engine the db is connected. */
-       struct mlx5_regex_umem umem;
-       /**< The umem struct. */
-};
-
 struct mlx5_regex_priv {
        TAILQ_ENTRY(mlx5_regex_priv) next;
        struct mlx5_common_device *cdev; /* Backend mlx5 device. */
@@ -64,8 +54,6 @@ struct mlx5_regex_priv {
        struct mlx5_regex_qp *qps; /* Pointer to the qp array. */
        uint16_t nb_max_matches; /* Max number of matches. */
        enum mlx5_rxp_program_mode prog_mode;
-       struct mlx5_regex_db db[MLX5_RXP_MAX_ENGINES +
-                               MLX5_RXP_EM_COUNT];
        uint32_t nb_engines; /* Number of RegEx engines. */
        struct mlx5dv_devx_uar *uar; /* UAR object. */
        uint8_t is_bf2; /* The device is BF2 device. */

diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index 750a2b955013d8069741bf30419d33bde3ddd461..f8681c0ae2562cac3c9c43a51c1b1f37561bf7fa 100644 (file)
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -28,6 +28,12 @@
 #define MLX5_REGEX_RXP_ROF2_LINE_LEN 34
 
 /* Private Declarations */
+static int
+rxp_create_mkey(struct mlx5_regex_priv *priv, void *ptr, size_t size,
+       uint32_t access, struct mlx5_regex_mkey *mkey);
+static inline void
+rxp_destroy_mkey(struct mlx5_regex_mkey *mkey);
+
 int
 mlx5_regex_info_get(struct rte_regexdev *dev __rte_unused,
                    struct rte_regexdev_info *info)
@@ -44,45 +50,43 @@ mlx5_regex_info_get(struct rte_regexdev *dev __rte_unused,
 }
 
 static int
-rxp_db_setup(struct mlx5_regex_priv *priv)
+rxp_create_mkey(struct mlx5_regex_priv *priv, void *ptr, size_t size,
+       uint32_t access, struct mlx5_regex_mkey *mkey)
 {
-       int ret;
-       uint8_t i;
+       struct mlx5_devx_mkey_attr mkey_attr;
 
-       /* Setup database memories for both RXP engines + reprogram memory. */
-       for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) {
-               priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 1 << 21);
-               if (!priv->db[i].ptr) {
-                       DRV_LOG(ERR, "Failed to alloc db memory!");
-                       ret = ENODEV;
-                       goto tidyup_error;
-               }
-               /* Register the memory. */
-               priv->db[i].umem.umem = mlx5_glue->devx_umem_reg
-                                                       (priv->cdev->ctx,
-                                                        priv->db[i].ptr,
-                                                        MLX5_MAX_DB_SIZE, 7);
-               if (!priv->db[i].umem.umem) {
-                       DRV_LOG(ERR, "Failed to register memory!");
-                       ret = ENODEV;
-                       goto tidyup_error;
-               }
-               /* Ensure set all DB memory to 0's before setting up DB. */
-               memset(priv->db[i].ptr, 0x00, MLX5_MAX_DB_SIZE);
-               /* No data currently in database. */
-               priv->db[i].len = 0;
-               priv->db[i].active = false;
-               priv->db[i].db_assigned_to_eng_num = MLX5_RXP_DB_NOT_ASSIGNED;
+       /* Register the memory. */
+       mkey->umem = mlx5_glue->devx_umem_reg(priv->cdev->ctx, ptr, size, access);
+       if (!mkey->umem) {
+               DRV_LOG(ERR, "Failed to register memory!");
+               return -ENODEV;
        }
-       return 0;
-tidyup_error:
-       for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) {
-               if (priv->db[i].umem.umem)
-                       mlx5_glue->devx_umem_dereg(priv->db[i].umem.umem);
-               rte_free(priv->db[i].ptr);
-               priv->db[i].ptr = NULL;
+       /* Create mkey */
+       mkey_attr = (struct mlx5_devx_mkey_attr) {
+               .addr = (uintptr_t)ptr,
+               .size = (uint32_t)size,
+               .umem_id = mlx5_os_get_umem_id(mkey->umem),
+               .pg_access = 1,
+               .umr_en = 0,
+       };
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       mkey_attr.pd = priv->cdev->pdn;
+#endif
+       mkey->mkey = mlx5_devx_cmd_mkey_create(priv->cdev->ctx, &mkey_attr);
+       if (!mkey->mkey) {
+               DRV_LOG(ERR, "Failed to create direct mkey!");
+               return -ENODEV;
        }
-       return -ret;
+       return 0;
+}
+
+static inline void
+rxp_destroy_mkey(struct mlx5_regex_mkey *mkey)
+{
+       if (mkey->mkey)
+               claim_zero(mlx5_devx_cmd_destroy(mkey->mkey));
+       if (mkey->umem)
+               claim_zero(mlx5_glue->devx_umem_dereg(mkey->umem));
 }
 
 int
@@ -90,6 +94,10 @@ mlx5_regex_rules_db_import(struct rte_regexdev *dev,
                     const char *rule_db, uint32_t rule_db_len)
 {
        struct mlx5_regex_priv *priv = dev->data->dev_private;
+       struct mlx5_regex_mkey mkey;
+       uint32_t id;
+       int ret;
+       void *ptr;
 
        if (priv->prog_mode == MLX5_RXP_MODE_NOT_DEFINED) {
                DRV_LOG(ERR, "RXP programming mode not set!");
@@ -101,8 +109,31 @@ mlx5_regex_rules_db_import(struct rte_regexdev *dev,
        }
        if (rule_db_len == 0)
                return -EINVAL;
+       /* copy rules - rules have to be 4KB aligned. */
+       ptr = rte_malloc("", rule_db_len, 1 << 12);
+       if (!ptr) {
+               DRV_LOG(ERR, "Failed to allocate rules file memory.");
+               return -ENOMEM;
+       }
+       rte_memcpy(ptr, rule_db, rule_db_len);
+       /* Register umem and create rof mkey. */
+       ret = rxp_create_mkey(priv, ptr, rule_db_len, /*access=*/7, &mkey);
+       if (ret < 0)
+               return ret;
 
-       return 0;
+       for (id = 0; id < priv->nb_engines; id++) {
+               ret = mlx5_devx_regex_rules_program(priv->cdev->ctx, id,
+                       mkey.mkey->id, rule_db_len, (uintptr_t)ptr);
+               if (ret < 0) {
+                       DRV_LOG(ERR, "Failed to program rxp rules.");
+                       ret = -ENODEV;
+                       break;
+               }
+               ret = 0;
+       }
+       rxp_destroy_mkey(&mkey);
+       rte_free(ptr);
+       return ret;
 }
 
 int
@@ -124,12 +155,6 @@ mlx5_regex_configure(struct rte_regexdev *dev,
                return -rte_errno;
        }
        priv->nb_max_matches = cfg->nb_max_matches;
-       /* Setup rxp db memories. */
-       if (rxp_db_setup(priv)) {
-               DRV_LOG(ERR, "Failed to setup RXP db memory");
-               rte_errno = ENOMEM;
-               return -rte_errno;
-       }
        if (cfg->rule_db != NULL) {
                ret = mlx5_regex_rules_db_import(dev, cfg->rule_db,
                                                 cfg->rule_db_len);

diff --git a/drivers/regex/mlx5/mlx5_rxp.h b/drivers/regex/mlx5/mlx5_rxp.h
index 9686e24cdb616ace0cb5525f2c6fa9f5e79ac6d6..254e9cfa2b47d0b3f23d9411d1966c1e893e287f 100644 (file)
--- a/drivers/regex/mlx5/mlx5_rxp.h
+++ b/drivers/regex/mlx5/mlx5_rxp.h
@@ -129,9 +129,9 @@ enum mlx5_rxp_program_mode {
 #define MLX5_RXP_EM_COUNT 1u /* Extra External Memories to use. */
 #define MLX5_RXP_DB_NOT_ASSIGNED 0xFF
 
-struct mlx5_regex_umem {
+struct mlx5_regex_mkey {
        struct mlx5dv_devx_umem *umem;
-       uint32_t id;
+       struct mlx5_devx_obj *mkey;
        uint64_t offset;
 };