[dpdk-stable] patch 'net/mlx5: fix memory event on secondary process' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/19. 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 can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 2cca8e4a1d44e055853562b04d34f45efac7038a Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh at mellanox.com>
Date: Mon, 1 Apr 2019 14:12:53 -0700
Subject: [PATCH] net/mlx5: fix memory event on secondary process

[ upstream commit 3ebe65805992aff61f87a9808c4a56053e9f0351 ]

As the memory event is propagated to secondary processes, the event is
processed redundantly. This should be processed once because the data
structure used for MR and the event is global across the processes.

Fixes: 974f1e7ef146 ("net/mlx5: add new memory region support")

Signed-off-by: Yongseok Koh <yskoh at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5.c    | 5 +++--
 drivers/net/mlx5/mlx5_mr.c | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 80a27da89..d91d55b56 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -158,7 +158,8 @@ mlx5_prepare_shared_data(void)
 			LIST_INIT(&mlx5_shared_data->mem_event_cb_list);
 			rte_rwlock_init(&mlx5_shared_data->mem_event_rwlock);
+			rte_mem_event_callback_register("MLX5_MEM_EVENT_CB",
+							mlx5_mr_mem_event_cb,
+							NULL);
 		}
-		rte_mem_event_callback_register("MLX5_MEM_EVENT_CB",
-						mlx5_mr_mem_event_cb, NULL);
 	}
 	rte_spinlock_unlock(&mlx5_shared_data_lock);
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 700d83d1b..d336a77e4 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -892,4 +892,6 @@ mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
 	struct mlx5_dev_list *dev_list = &mlx5_shared_data->mem_event_cb_list;
 
+	/* Must be called from the primary process. */
+	assert(rte_eal_process_type() == RTE_PROC_PRIMARY);
 	switch (event_type) {
 	case RTE_MEM_EVENT_FREE:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:13.870612931 +0100
+++ 0001-net-mlx5-fix-memory-event-on-secondary-process.patch	2019-04-30 17:58:13.740141151 +0100
@@ -1 +1 @@
-From 3ebe65805992aff61f87a9808c4a56053e9f0351 Mon Sep 17 00:00:00 2001
+From 2cca8e4a1d44e055853562b04d34f45efac7038a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3ebe65805992aff61f87a9808c4a56053e9f0351 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 1d7ca615b..2208cc922 100644
+index 80a27da89..d91d55b56 100644
@@ -24 +25 @@
-@@ -323,7 +323,8 @@ mlx5_prepare_shared_data(void)
+@@ -158,7 +158,8 @@ mlx5_prepare_shared_data(void)
@@ -36 +37 @@
-index 0f0a64f0a..88484dd50 100644
+index 700d83d1b..d336a77e4 100644
@@ -39 +40 @@
-@@ -893,4 +893,6 @@ mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
+@@ -892,4 +892,6 @@ mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,