[dpdk-stable] patch 'regex/mlx5: fix memory rule alignment' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/07/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/dfbcce979787a17d93f05c45308804796c754a4b

Thanks.

Luca Boccassi

---
>From dfbcce979787a17d93f05c45308804796c754a4b Mon Sep 17 00:00:00 2001
From: Ori Kam <orika at nvidia.com>
Date: Thu, 7 Jan 2021 18:57:07 +0200
Subject: [PATCH] regex/mlx5: fix memory rule alignment

[ upstream commit 7e8b42e89aaa9217472fc2a3aa37718391ae08a5 ]

Due to Kernel requirement the memory allocated must be aligned to 2M.

Fixes: b34d816363b5 ("regex/mlx5: support rules import")

Signed-off-by: Ori Kam <orika at nvidia.com>
---
 drivers/regex/mlx5/mlx5_rxp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index fcbc766441..bd721f0b11 100644
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -892,7 +892,7 @@ rxp_db_setup(struct mlx5_regex_priv *priv)
 
 	/* 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, 0);
+		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;
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:34.833450377 +0000
+++ 0126-regex-mlx5-fix-memory-rule-alignment.patch	2021-02-05 11:18:28.998694767 +0000
@@ -1 +1 @@
-From 7e8b42e89aaa9217472fc2a3aa37718391ae08a5 Mon Sep 17 00:00:00 2001
+From dfbcce979787a17d93f05c45308804796c754a4b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7e8b42e89aaa9217472fc2a3aa37718391ae08a5 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org