[dpdk-stable] patch 'net/mlx5: fix external memory registration' 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 f9e496d7e040dee9c05bcfcd548ae418ea04e51d Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh at mellanox.com>
Date: Mon, 1 Apr 2019 14:17:53 -0700
Subject: [PATCH] net/mlx5: fix external memory registration

[ upstream commit 207fe7ac72ad4a136a68fb979b7b7525161e4235 ]

Secondary process is not allowed to register MR due to a restriction of
library and kernel driver.

Fixes: 7e43a32ee060 ("net/mlx5: support externally allocated static memory")

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

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 2dd2b42ee..bfa6cf162 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -86,4 +86,9 @@ Limitations
   - Forked secondary process not supported.
   - All mempools must be initialized before rte_eth_dev_start().
+  - External memory unregistered in EAL memseg list cannot be used for DMA
+    unless such memory has been registered by ``mlx5_mr_update_ext_mp()`` in
+    primary process and remapped to the same virtual address in secondary
+    process. If the external memory is registered by primary process but has
+    different virtual address in secondary process, unexpected error may happen.
 
 - Flow pattern without any specific vlan will match for vlan packets as well:
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 8aaa87dd6..e255650ad 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -1133,4 +1133,5 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
 	uint32_t lkey;
 
+	assert(rte_eal_process_type() == RTE_PROC_PRIMARY);
 	/* If already registered, it should return. */
 	rte_rwlock_read_lock(&priv->mr.rwlock);
@@ -1234,4 +1235,13 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,
 	struct mlx5_priv *priv = txq_ctrl->priv;
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+		DRV_LOG(WARNING,
+			"port %u using address (%p) from unregistered mempool"
+			" having externally allocated memory"
+			" in secondary process, please create mempool"
+			" prior to rte_eth_dev_start()",
+			PORT_ID(priv), (void *)addr);
+		return UINT32_MAX;
+	}
 	mlx5_mr_update_ext_mp(ETH_DEV(priv), mr_ctrl, mp);
 	return mlx5_tx_addr2mr_bh(txq, addr);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.016580016 +0100
+++ 0004-net-mlx5-fix-external-memory-registration.patch	2019-04-30 17:58:13.752140905 +0100
@@ -1 +1 @@
-From 207fe7ac72ad4a136a68fb979b7b7525161e4235 Mon Sep 17 00:00:00 2001
+From f9e496d7e040dee9c05bcfcd548ae418ea04e51d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 207fe7ac72ad4a136a68fb979b7b7525161e4235 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index f4db921f7..fa9bf73da 100644
+index 2dd2b42ee..bfa6cf162 100644
@@ -23 +24 @@
-@@ -87,4 +87,9 @@ Limitations
+@@ -86,4 +86,9 @@ Limitations
@@ -34 +35 @@
-index 371887729..e7f55be6e 100644
+index 8aaa87dd6..e255650ad 100644
@@ -37 +38 @@
-@@ -1186,4 +1186,5 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
+@@ -1133,4 +1133,5 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
@@ -43 +44 @@
-@@ -1401,4 +1402,13 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,
+@@ -1234,4 +1235,13 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,