[dpdk-stable] patch 'net/mlx5: fix Multi-Packet RQ mempool name' has been queued to LTS release 18.11.2

[dpdk-stable] patch 'net/mlx5: fix Multi-Packet RQ mempool name' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/5b7bd3d481b883ea2c49802fa3800a10a26ed759

Thanks.

Kevin Traynor

---
From 5b7bd3d481b883ea2c49802fa3800a10a26ed759 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Mon, 6 May 2019 16:21:58 -0700
Subject: [PATCH] net/mlx5: fix Multi-Packet RQ mempool name

[ upstream commit 4594487b7822c3418a5fc5f1a94129471c2e5622 ]

Currently, the name of MPRQ mempool is set by
	snprintf(name, sizeof(name), "%s-mprq", dev->device->name);
For port representor, the name is duplicate of its master and failed to
create such a mempool having the same name. Port ID is used in the name
instead.

Fixes: 7d6bf6b866b8 ("net/mlx5: add Multi-Packet Rx support")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index e2728f273..ded7ae8c7 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1273,5 +1273,5 @@ mlx5_mprq_alloc_mp(struct rte_eth_dev *dev)
 		}
 	}
-	snprintf(name, sizeof(name), "%s-mprq", dev->device->name);
+	snprintf(name, sizeof(name), "port-%u-mprq", dev->data->port_id);
 	mp = rte_mempool_create(name, obj_num, obj_size, MLX5_MPRQ_MP_CACHE_SZ,
 				0, NULL, NULL, mlx5_mprq_buf_init, NULL,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.365144699 +0100
+++ 0001-net-mlx5-fix-Multi-Packet-RQ-mempool-name.patch	2019-05-14 15:39:07.294559191 +0100
@@ -1 +1 @@
-From 4594487b7822c3418a5fc5f1a94129471c2e5622 Mon Sep 17 00:00:00 2001
+From 5b7bd3d481b883ea2c49802fa3800a10a26ed759 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4594487b7822c3418a5fc5f1a94129471c2e5622 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 0a4c02e71..85e6f2918 100644
+index e2728f273..ded7ae8c7 100644

[dpdk-stable] patch 'net/mlx5: fix release of Rx queue object' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/577b678c66d0d0a1e5c549e24fc8fd7931729a5f

Thanks.

Kevin Traynor

---
From 577b678c66d0d0a1e5c549e24fc8fd7931729a5f Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Tue, 7 May 2019 10:26:02 +0300
Subject: [PATCH] net/mlx5: fix release of Rx queue object

[ upstream commit 10cfa5f2d4affef0561e5245aad4bc69b29cd671 ]

Function mlx5_rx_intr_disable() calls mlx5_rxq_ibv_get() and performs
some actions on the returned rxq_ibv.
It doesn't release the rxq_ibv when all is completed with success.

This patch adds call to mlx5_rxq_ibv_release() where it's missing.

Fixes: 09cb5b581762 ("net/mlx5: separate DPDK from verbs Rx queue objects")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index ded7ae8c7..f1ce31703 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -731,4 +731,5 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 	rxq_data->cq_arm_sn++;
 	mlx5_glue->ack_cq_events(rxq_ibv->cq, 1);
+	mlx5_rxq_ibv_release(rxq_ibv);
 	return 0;
 exit:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.412688066 +0100
+++ 0002-net-mlx5-fix-release-of-Rx-queue-object.patch	2019-05-14 15:39:07.296559151 +0100
@@ -1 +1 @@
-From 10cfa5f2d4affef0561e5245aad4bc69b29cd671 Mon Sep 17 00:00:00 2001
+From 577b678c66d0d0a1e5c549e24fc8fd7931729a5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 10cfa5f2d4affef0561e5245aad4bc69b29cd671 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 85e6f2918..a00cb1298 100644
+index ded7ae8c7..f1ce31703 100644

[dpdk-stable] patch 'doc: fix typo in mlx5 guide' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e0fe033f442f3a5428007a2b9a0916b3b454cddf

Thanks.

Kevin Traynor

---
From e0fe033f442f3a5428007a2b9a0916b3b454cddf Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Wed, 8 May 2019 02:24:09 -0700
Subject: [PATCH] doc: fix typo in mlx5 guide

[ upstream commit 4d6e0352e137a11972f40c18687be8135489a02e ]

Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/nics/mlx5.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index cee167bfe..31238ae35 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -570,5 +570,5 @@ Either RDMA Core library with a recent enough Linux kernel release
 releases.
 
-RMDA Core with Linux Kernel
+RDMA Core with Linux Kernel
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.458509676 +0100
+++ 0003-doc-fix-typo-in-mlx5-guide.patch	2019-05-14 15:39:07.298559111 +0100
@@ -1 +1 @@
-From 4d6e0352e137a11972f40c18687be8135489a02e Mon Sep 17 00:00:00 2001
+From e0fe033f442f3a5428007a2b9a0916b3b454cddf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4d6e0352e137a11972f40c18687be8135489a02e ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
-index af1e408ea..325e9f697 100644
+index cee167bfe..31238ae35 100644
@@ -19 +20 @@
-@@ -593,5 +593,5 @@ Either RDMA Core library with a recent enough Linux kernel release
+@@ -570,5 +570,5 @@ Either RDMA Core library with a recent enough Linux kernel release

[dpdk-stable] patch 'ipc: unlock on failure' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4bd4eac2b748c1daadf9172d9b2566dfed55ee9e

Thanks.

Kevin Traynor

---
From 4bd4eac2b748c1daadf9172d9b2566dfed55ee9e Mon Sep 17 00:00:00 2001
From: Aaron Conole <aconole@redhat.com>
Date: Mon, 6 May 2019 09:48:25 -0400
Subject: [PATCH] ipc: unlock on failure

[ upstream commit e377285aba5c4268d5af86852faca3235aab1308 ]

Coverity issue: 340076
Fixes: a2a06860b8c4 ("ipc: fix memory leak on request failure")

Signed-off-by: Aaron Conole <aconole@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Tested-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/eal_common_proc.c | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index d098803b1..852e52e02 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -935,5 +935,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		const struct timespec *ts)
 {
-	int dir_fd, ret = 0;
+	int dir_fd, ret = -1;
 	DIR *mp_dir;
 	struct dirent *ent;
@@ -948,5 +948,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 
 	if (check_input(req) == false)
-		goto err;
+		goto end;
 
 	if (internal_config.no_shconf) {
@@ -958,5 +958,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		RTE_LOG(ERR, EAL, "Failed to get current time\n");
 		rte_errno = errno;
-		goto err;
+		goto end;
 	}
 
@@ -970,7 +970,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
 		pthread_mutex_unlock(&pending_requests.lock);
-		if (ret)
-			goto err;
-		return ret;
+		goto end;
 	}
 
@@ -980,5 +978,5 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
 		rte_errno = errno;
-		goto err;
+		goto end;
 	}
 
@@ -988,7 +986,6 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
 			mp_dir_path);
-		closedir(mp_dir);
 		rte_errno = errno;
-		goto err;
+		goto close_end;
 	}
 
@@ -1007,19 +1004,24 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		 */
 		if (mp_request_sync(path, req, reply, &end))
-			goto err;
+			goto unlock_end;
 	}
+	ret = 0;
+
+unlock_end:
 	pthread_mutex_unlock(&pending_requests.lock);
 	/* unlock the directory */
 	flock(dir_fd, LOCK_UN);
 
+close_end:
 	/* dir_fd automatically closed on closedir */
 	closedir(mp_dir);
+
+end:
+	if (ret) {
+		free(reply->msgs);
+		reply->nb_received = 0;
+		reply->msgs = NULL;
+	}
 	return ret;
-
-err:
-	free(reply->msgs);
-	reply->nb_received = 0;
-	reply->msgs = NULL;
-	return -1;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.508150634 +0100
+++ 0004-ipc-unlock-on-failure.patch	2019-05-14 15:39:07.299559091 +0100
@@ -1 +1 @@
-From e377285aba5c4268d5af86852faca3235aab1308 Mon Sep 17 00:00:00 2001
+From 4bd4eac2b748c1daadf9172d9b2566dfed55ee9e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e377285aba5c4268d5af86852faca3235aab1308 ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index d23728604..1a2259fe3 100644
+index d098803b1..852e52e02 100644
@@ -31 +32 @@
- 	if (check_input(req) != 0)
+ 	if (check_input(req) == false)

[dpdk-stable] patch 'doc: fix typo in IPC guide' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/214301715e1d057b5fd10313cefb2ac33d128038

Thanks.

Kevin Traynor

---
From 214301715e1d057b5fd10313cefb2ac33d128038 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 3 May 2019 12:50:48 +0100
Subject: [PATCH] doc: fix typo in IPC guide

[ upstream commit ab96056d13c02b375c9557f09a5d3dc28731d488 ]

The word "synchronous" appears twice. Fix it.

Fixes: e22266669e86 ("doc: add IPC guide")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 doc/guides/prog_guide/multi_proc_support.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index f6f012db1..966097924 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -264,7 +264,7 @@ Additionally, a ``timespec`` value must be specified as a timeout, after which
 IPC will stop waiting and return.
 
-For synchronous synchronous requests, the ``rte_mp_reply`` descriptor must also
-be created. This is where the responses will be stored. The list of fields that
-will be populated by IPC are as follows:
+For synchronous requests, the ``rte_mp_reply`` descriptor must also be created.
+This is where the responses will be stored.
+The list of fields that will be populated by IPC are as follows:
 
 * ``nb_sent`` - number indicating how many requests were sent (i.e. how many
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.553934853 +0100
+++ 0005-doc-fix-typo-in-IPC-guide.patch	2019-05-14 15:39:07.300559071 +0100
@@ -1 +1 @@
-From ab96056d13c02b375c9557f09a5d3dc28731d488 Mon Sep 17 00:00:00 2001
+From 214301715e1d057b5fd10313cefb2ac33d128038 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ab96056d13c02b375c9557f09a5d3dc28731d488 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'ipc: add warnings about not using IPC with memory API' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/38d3874a0cf2cbfd5552d52eea99776cbd1e5b57

Thanks.

Kevin Traynor

---
From 38d3874a0cf2cbfd5552d52eea99776cbd1e5b57 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 3 May 2019 12:50:49 +0100
Subject: [PATCH] ipc: add warnings about not using IPC with memory API

[ upstream commit 3855b4150037142435b5c1f4195e44c142785f1f ]

IPC and memory-related API's should not be mixed because memory
relies on IPC internally. Add explicit warnings to IPC API and
to the documentation about this.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 doc/guides/prog_guide/env_abstraction_layer.rst | 8 ++++++++
 doc/guides/prog_guide/multi_proc_support.rst    | 5 +++++
 lib/librte_eal/common/include/rte_eal.h         | 7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst
index 94d19682e..2bb77b019 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -148,4 +148,12 @@ A default validator callback is provided by EAL, which can be enabled with a
 of memory that can be used by DPDK application.
 
+.. warning::
+    Memory subsystem uses DPDK IPC internally, so memory allocations/callbacks
+    and IPC must not be mixed: it is not safe to allocate/free memory inside
+    memory-related or IPC callbacks, and it is not safe to use IPC inside
+    memory-related callbacks. See chapter
+    :ref:`Multi-process Support <Multi-process_Support>` for more details about
+    DPDK IPC.
+
 + Legacy memory mode
 
diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 966097924..63d08b609 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -319,4 +319,9 @@ IPC thread, sending messages while processing another message or request is
 supported.
 
+Since the memory sybsystem uses IPC internally, memory allocations and IPC must
+not be mixed: it is not safe to use IPC inside a memory-related callback, nor is
+it safe to allocate/free memory inside IPC callbacks. Attempting to do so may
+lead to a deadlock.
+
 Asynchronous request callbacks may be triggered either from IPC thread or from
 interrupt thread, depending on whether the request has timed out. It is
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 67a4ffb6b..1d3553cea 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -229,4 +229,6 @@ struct rte_mp_reply {
  * As we create  socket channel for primary/secondary communication, use
  * this function typedef to register action for coming messages.
+ *
+ * @note No memory allocations should take place inside the callback.
  */
 typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
@@ -238,4 +240,6 @@ typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
  * this function typedef to register action for coming responses to asynchronous
  * requests.
+ *
+ * @note No memory allocations should take place inside the callback.
  */
 typedef int (*rte_mp_async_reply_t)(const struct rte_mp_msg *request,
@@ -312,4 +316,7 @@ rte_mp_sendmsg(struct rte_mp_msg *msg);
  * @note The caller is responsible to free reply->replies.
  *
+ * @note This API must not be used inside memory-related or IPC callbacks, and
+ *   no memory allocations should take place inside such callback.
+ *
  * @param req
  *   The req argument contains the customized request message.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.601604422 +0100
+++ 0006-ipc-add-warnings-about-not-using-IPC-with-memory-API.patch	2019-05-14 15:39:07.303559011 +0100
@@ -1 +1 @@
-From 3855b4150037142435b5c1f4195e44c142785f1f Mon Sep 17 00:00:00 2001
+From 38d3874a0cf2cbfd5552d52eea99776cbd1e5b57 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3855b4150037142435b5c1f4195e44c142785f1f ]
+
@@ -10,2 +11,0 @@
-Cc: stable@dpdk.org
-
@@ -20 +20 @@
-index c27f730c7..f15bcd976 100644
+index 94d19682e..2bb77b019 100644
@@ -51 +51 @@
-index 0603eaf25..7db022532 100644
+index 67a4ffb6b..1d3553cea 100644
@@ -54 +54 @@
-@@ -226,4 +226,6 @@ struct rte_mp_reply {
+@@ -229,4 +229,6 @@ struct rte_mp_reply {
@@ -61 +61 @@
-@@ -235,4 +237,6 @@ typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
+@@ -238,4 +240,6 @@ typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
@@ -68 +68 @@
-@@ -309,4 +313,7 @@ rte_mp_sendmsg(struct rte_mp_msg *msg);
+@@ -312,4 +316,7 @@ rte_mp_sendmsg(struct rte_mp_msg *msg);

[dpdk-stable] patch 'ipc: add warnings about correct API usage' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8807801ca323864f45fc8d1cabb0b836c2b0b1cc

Thanks.

Kevin Traynor

---
From 8807801ca323864f45fc8d1cabb0b836c2b0b1cc Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 3 May 2019 12:50:50 +0100
Subject: [PATCH] ipc: add warnings about correct API usage

[ upstream commit bfbc3a50416419d79c9cbe7868d1e9901919c346 ]

When handling synchronous or asynchronous requests, the reply
must be sent explicitly even if the result of the operation is
an error, to avoid the other side timing out. Make note of this
in documentation explicitly.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 doc/guides/prog_guide/multi_proc_support.rst |  7 +++++++
 lib/librte_eal/common/include/rte_eal.h      | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 63d08b609..a84083b96 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -310,4 +310,11 @@ constructed and sent via ``rte_mp_reply()`` function, along with ``peer``
 pointer. The resulting response will then be delivered to the correct requestor.
 
+.. warning::
+    Simply returning a value when processing a request callback will not send a
+    response to the request - it must always be explicitly sent even in case
+    of errors. Implementation of error signalling rests with the application,
+    there is no built-in way to indicate success or error for a request. Failing
+    to do so will cause the requestor to time out while waiting on a response.
+
 Misc considerations
 ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 1d3553cea..9951228e0 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -230,4 +230,9 @@ struct rte_mp_reply {
  * this function typedef to register action for coming messages.
  *
+ * @note When handling IPC request callbacks, the reply must be sent even in
+ *   cases of error handling. Simply returning success or failure will *not*
+ *   send a response to the requestor.
+ *   Implementation of error signalling mechanism is up to the application.
+ *
  * @note No memory allocations should take place inside the callback.
  */
@@ -241,4 +246,9 @@ typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
  * requests.
  *
+ * @note When handling IPC request callbacks, the reply must be sent even in
+ *   cases of error handling. Simply returning success or failure will *not*
+ *   send a response to the requestor.
+ *   Implementation of error signalling mechanism is up to the application.
+ *
  * @note No memory allocations should take place inside the callback.
  */
@@ -372,4 +382,9 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
  * received previously.
  *
+ * @note When handling IPC request callbacks, the reply must be sent even in
+ *   cases of error handling. Simply returning success or failure will *not*
+ *   send a response to the requestor.
+ *   Implementation of error signalling mechanism is up to the application.
+ *
  * @param msg
  *   The msg argument contains the customized message.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.647717944 +0100
+++ 0007-ipc-add-warnings-about-correct-API-usage.patch	2019-05-14 15:39:07.304558991 +0100
@@ -1 +1 @@
-From bfbc3a50416419d79c9cbe7868d1e9901919c346 Mon Sep 17 00:00:00 2001
+From 8807801ca323864f45fc8d1cabb0b836c2b0b1cc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bfbc3a50416419d79c9cbe7868d1e9901919c346 ]
+
@@ -11,2 +12,0 @@
-Cc: stable@dpdk.org
-
@@ -36 +36 @@
-index 7db022532..73754aaf2 100644
+index 1d3553cea..9951228e0 100644
@@ -39 +39 @@
-@@ -227,4 +227,9 @@ struct rte_mp_reply {
+@@ -230,4 +230,9 @@ struct rte_mp_reply {
@@ -49 +49 @@
-@@ -238,4 +243,9 @@ typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
+@@ -241,4 +246,9 @@ typedef int (*rte_mp_t)(const struct rte_mp_msg *msg, const void *peer);
@@ -59 +59 @@
-@@ -369,4 +379,9 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
+@@ -372,4 +382,9 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,

[dpdk-stable] patch 'power: fix cache line alignment' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ee000d5f005424bf2988694bded75e0033fba01d

Thanks.

Kevin Traynor

---
From ee000d5f005424bf2988694bded75e0033fba01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
Date: Sun, 5 May 2019 20:12:16 +0200
Subject: [PATCH] power: fix cache line alignment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 7727ad9107137ee3f4dea212ad77e35cd4f3e6bc ]

The ACPI and PState CPU frequency scaling drivers used the
__rte_cache_aligned attribute without including rte_memory.h, which
turns what looks as the declaration of a cache line-aligned struct
into a non-aligned struct declaration and the definition of an
instance of the struct.

Fixes: e6c6dc0f96 ("power: add p-state driver compatibility")
Fixes: 445c6528b5 ("power: common interface for guest and host")

Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
---
 lib/librte_power/power_acpi_cpufreq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c
index 7addde274..f7d3f9ca9 100644
--- a/lib/librte_power/power_acpi_cpufreq.c
+++ b/lib/librte_power/power_acpi_cpufreq.c
@@ -13,6 +13,7 @@
 #include <limits.h>
 
-#include <rte_memcpy.h>
 #include <rte_atomic.h>
+#include <rte_memcpy.h>
+#include <rte_memory.h>
 
 #include "power_acpi_cpufreq.h"
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.697204142 +0100
+++ 0008-power-fix-cache-line-alignment.patch	2019-05-14 15:39:07.305558971 +0100
@@ -1 +1 @@
-From 7727ad9107137ee3f4dea212ad77e35cd4f3e6bc Mon Sep 17 00:00:00 2001
+From ee000d5f005424bf2988694bded75e0033fba01d Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 7727ad9107137ee3f4dea212ad77e35cd4f3e6bc ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -21,3 +22,2 @@
- lib/librte_power/power_acpi_cpufreq.c   | 5 +++--
- lib/librte_power/power_pstate_cpufreq.c | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
+ lib/librte_power/power_acpi_cpufreq.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -26 +26 @@
-index 5672c594e..7c386f891 100644
+index 7addde274..f7d3f9ca9 100644
@@ -29 +29 @@
-@@ -13,7 +13,8 @@
+@@ -13,6 +13,7 @@
@@ -32 +31,0 @@
--#include <rte_string_fns.h>
@@ -37 +35,0 @@
-+#include <rte_string_fns.h>
@@ -40,15 +37,0 @@
-diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
-index 44a0b4a3f..ecbcb3ac9 100644
---- a/lib/librte_power/power_pstate_cpufreq.c
-+++ b/lib/librte_power/power_pstate_cpufreq.c
-@@ -15,7 +15,8 @@
- #include <inttypes.h>
- 
--#include <rte_string_fns.h>
--#include <rte_memcpy.h>
- #include <rte_atomic.h>
-+#include <rte_memcpy.h>
-+#include <rte_memory.h>
-+#include <rte_string_fns.h>
- 
- #include "power_pstate_cpufreq.h"

[dpdk-stable] patch 'test/barrier: fix typo in log' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/087ea6e13eeb699e071429574108983fa0218f89

Thanks.

Kevin Traynor

---
From 087ea6e13eeb699e071429574108983fa0218f89 Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Wed, 8 May 2019 16:02:08 -0500
Subject: [PATCH] test/barrier: fix typo in log

[ upstream commit 834e4896a5a24d8fae72e9ad3f83bac2a537f8b8 ]

Change "much" to "match" in a printf.

Fixes: 93da5b59afc9 ("test: introduce memory barrier test case")

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 test/test/test_barrier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c
index 82b572c3e..c219d5602 100644
--- a/test/test/test_barrier.c
+++ b/test/test/test_barrier.c
@@ -253,5 +253,5 @@ plock_test(uint32_t iter, enum plock_use_type utype)
 		/* race condition occurred, lock doesn't work properly */
 		if (sum[i] != pt[i].val || 2 * iter != pt[i].iter) {
-			printf("error: local and shared sums don't much\n");
+			printf("error: local and shared sums don't match\n");
 			rc = -1;
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.743229964 +0100
+++ 0009-test-barrier-fix-typo-in-log.patch	2019-05-14 15:39:07.306558951 +0100
@@ -1 +1 @@
-From 834e4896a5a24d8fae72e9ad3f83bac2a537f8b8 Mon Sep 17 00:00:00 2001
+From 087ea6e13eeb699e071429574108983fa0218f89 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 834e4896a5a24d8fae72e9ad3f83bac2a537f8b8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14 +15 @@
- app/test/test_barrier.c | 2 +-
+ test/test/test_barrier.c | 2 +-
@@ -17 +18 @@
-diff --git a/app/test/test_barrier.c b/app/test/test_barrier.c
+diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c
@@ -19,2 +20,2 @@
---- a/app/test/test_barrier.c
-+++ b/app/test/test_barrier.c
+--- a/test/test/test_barrier.c
++++ b/test/test/test_barrier.c

[dpdk-stable] patch 'test/barrier: fix allocation check' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a508e75946a2ce93250961175c8c581498a4e0f3

Thanks.

Kevin Traynor

---
From a508e75946a2ce93250961175c8c581498a4e0f3 Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Wed, 8 May 2019 16:02:19 -0500
Subject: [PATCH] test/barrier: fix allocation check

[ upstream commit 50882a1ec02173f4ef30facb5c7c18a60ef65472 ]

Code tested calloc failures for pt & lpt variables
but not for the sum variable. Add a test for calloc
failure of sum.

Fixes: 93da5b59afc9 ("test: introduce memory barrier test case")

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 test/test/test_barrier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c
index c219d5602..ae37b1e5c 100644
--- a/test/test/test_barrier.c
+++ b/test/test/test_barrier.c
@@ -203,5 +203,5 @@ plock_test(uint32_t iter, enum plock_use_type utype)
 		__func__, iter, utype, n);
 
-	if (pt == NULL || lpt == NULL) {
+	if (pt == NULL || lpt == NULL || sum == NULL) {
 		printf("%s: failed to allocate memory for %u lcores\n",
 			__func__, n);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.792540327 +0100
+++ 0010-test-barrier-fix-allocation-check.patch	2019-05-14 15:39:07.306558951 +0100
@@ -1 +1 @@
-From 50882a1ec02173f4ef30facb5c7c18a60ef65472 Mon Sep 17 00:00:00 2001
+From a508e75946a2ce93250961175c8c581498a4e0f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 50882a1ec02173f4ef30facb5c7c18a60ef65472 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- app/test/test_barrier.c | 2 +-
+ test/test/test_barrier.c | 2 +-
@@ -19 +20 @@
-diff --git a/app/test/test_barrier.c b/app/test/test_barrier.c
+diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c
@@ -21,2 +22,2 @@
---- a/app/test/test_barrier.c
-+++ b/app/test/test_barrier.c
+--- a/test/test/test_barrier.c
++++ b/test/test/test_barrier.c

[dpdk-stable] patch 'test/barrier: fix for Power CPUs' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/73fcd00b3a697668fe203a178d65e7029380c67b

Thanks.

Kevin Traynor

---
From 73fcd00b3a697668fe203a178d65e7029380c67b Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Wed, 8 May 2019 16:02:43 -0500
Subject: [PATCH] test/barrier: fix for Power CPUs

[ upstream commit 2d119c3baac4409092d064d386deb33d8f61f90f ]

The memory barrier test fails on IBM Power 9 systems.  Add additional
barriers to accommodate the weakly ordered model used on Power CPUs.

Fixes: 93da5b59afc9 ("test: introduce memory barrier test case")

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 test/test/test_barrier.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c
index ae37b1e5c..92f3d325f 100644
--- a/test/test/test_barrier.c
+++ b/test/test/test_barrier.c
@@ -93,4 +93,5 @@ plock_lock(struct plock *l, uint32_t self)
 
 	l->flag[self] = 1;
+	rte_smp_wmb();
 	l->victim = self;
 
@@ -99,4 +100,5 @@ plock_lock(struct plock *l, uint32_t self)
 	while (l->flag[other] == 1 && l->victim == self)
 		rte_pause();
+	rte_smp_rmb();
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.838812101 +0100
+++ 0011-test-barrier-fix-for-Power-CPUs.patch	2019-05-14 15:39:07.307558931 +0100
@@ -1 +1 @@
-From 2d119c3baac4409092d064d386deb33d8f61f90f Mon Sep 17 00:00:00 2001
+From 73fcd00b3a697668fe203a178d65e7029380c67b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2d119c3baac4409092d064d386deb33d8f61f90f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/test_barrier.c | 2 ++
+ test/test/test_barrier.c | 2 ++
@@ -18,4 +19,4 @@
-diff --git a/app/test/test_barrier.c b/app/test/test_barrier.c
-index a0b47042f..43b5f6232 100644
---- a/app/test/test_barrier.c
-+++ b/app/test/test_barrier.c
+diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c
+index ae37b1e5c..92f3d325f 100644
+--- a/test/test/test_barrier.c
++++ b/test/test/test_barrier.c

[dpdk-stable] patch 'hash: fix position returned in free slots' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9ad57899f6f785239451296b293124faa6ca2b45

Thanks.

Kevin Traynor

---
From 9ad57899f6f785239451296b293124faa6ca2b45 Mon Sep 17 00:00:00 2001
From: Dharmik Thakkar <dharmik.thakkar@arm.com>
Date: Thu, 9 May 2019 17:19:05 +0000
Subject: [PATCH] hash: fix position returned in free slots

[ upstream commit 2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 ]

Currently, in rte_hash_free_key_with_position(), the position returned
to the ring of free_slots leads to an unexpected conflict with a key
already in use.

This patch fixes incorrect position returned to the ring of free_slots.

Bugzilla ID: 261
Fixes: 9d033dac7d7c ("hash: support no free on delete")

Reported-by: Linfan <zhongdahulinfan@163.com>
Suggested-by: Linfan <zhongdahulinfan@163.com>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 lib/librte_hash/rte_cuckoo_hash.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index c01489ba5..07c248191 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -1537,12 +1537,15 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
 				const int32_t position)
 {
-	RETURN_IF_TRUE(((h == NULL) || (position == EMPTY_SLOT)), -EINVAL);
+	/* Key index where key is stored, adding the first dummy index */
+	uint32_t key_idx = position + 1;
+
+	RETURN_IF_TRUE(((h == NULL) || (key_idx == EMPTY_SLOT)), -EINVAL);
 
 	unsigned int lcore_id, n_slots;
 	struct lcore_cache *cached_free_slots;
-	const int32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
+	const uint32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
 
 	/* Out of bounds */
-	if (position >= total_entries)
+	if (key_idx >= total_entries)
 		return -EINVAL;
 
@@ -1561,9 +1564,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
 		/* Put index of new free slot in cache. */
 		cached_free_slots->objs[cached_free_slots->len] =
-					(void *)((uintptr_t)position);
+					(void *)((uintptr_t)key_idx);
 		cached_free_slots->len++;
 	} else {
 		rte_ring_sp_enqueue(h->free_slots,
-				(void *)((uintptr_t)position));
+				(void *)((uintptr_t)key_idx));
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.885058526 +0100
+++ 0012-hash-fix-position-returned-in-free-slots.patch	2019-05-14 15:39:07.309558891 +0100
@@ -1 +1 @@
-From 2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 Mon Sep 17 00:00:00 2001
+From 9ad57899f6f785239451296b293124faa6ca2b45 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 261267b7f..1f5808eba 100644
+index c01489ba5..07c248191 100644
@@ -28 +29 @@
-@@ -1588,12 +1588,15 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
+@@ -1537,12 +1537,15 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
@@ -46,2 +47,2 @@
- 	if (h->ext_table_support && h->readwrite_concur_lf_support) {
-@@ -1620,9 +1623,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
+ 
+@@ -1561,9 +1564,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h,

[dpdk-stable] patch 'hash: fix total entries count' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4b66ba8b26af23c282f36b532c17accb2bfa2a99

Thanks.

Kevin Traynor

---
From 4b66ba8b26af23c282f36b532c17accb2bfa2a99 Mon Sep 17 00:00:00 2001
From: Dharmik Thakkar <dharmik.thakkar@arm.com>
Date: Thu, 9 May 2019 17:19:06 +0000
Subject: [PATCH] hash: fix total entries count

[ upstream commit 52c7abbea95064edd73eee6ab1ceafaab066d55a ]

In rte_hash, with current implementation, it is possible that keys
are stored at indexes greater than the number of total entries.

Currently, in rte_hash_free_key_with_position(), due to incorrect
computation of total_entries, application cannot free keys with
indexes greater than the number of total entries.

This patch fixes this incorrect computation of total_entries.

Bugzilla ID: 261
Fixes: 9d033dac7d7c ("hash: support no free on delete")

Reported-by: Linfan <zhongdahulinfan@163.com>
Suggested-by: Linfan <zhongdahulinfan@163.com>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 lib/librte_hash/rte_cuckoo_hash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 07c248191..d7a5f4c21 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -1544,5 +1544,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
 	unsigned int lcore_id, n_slots;
 	struct lcore_cache *cached_free_slots;
-	const uint32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
+	const uint32_t total_entries = h->use_local_cache ?
+		h->entries + (RTE_MAX_LCORE - 1) * (LCORE_CACHE_SIZE - 1) + 1
+							: h->entries + 1;
 
 	/* Out of bounds */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.931165432 +0100
+++ 0013-hash-fix-total-entries-count.patch	2019-05-14 15:39:07.311558851 +0100
@@ -1 +1 @@
-From 52c7abbea95064edd73eee6ab1ceafaab066d55a Mon Sep 17 00:00:00 2001
+From 4b66ba8b26af23c282f36b532c17accb2bfa2a99 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 52c7abbea95064edd73eee6ab1ceafaab066d55a ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index 1f5808eba..2dc423fba 100644
+index 07c248191..d7a5f4c21 100644
@@ -31 +32 @@
-@@ -1595,5 +1595,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
+@@ -1544,5 +1544,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h,

[dpdk-stable] patch 'examples/ipsec-secgw: fix build error log' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0acafc986ed2f39946068b4b8aec2df10ea4c889

Thanks.

Kevin Traynor

---
From 0acafc986ed2f39946068b4b8aec2df10ea4c889 Mon Sep 17 00:00:00 2001
From: Marcin Smoczynski <marcinx.smoczynski@intel.com>
Date: Wed, 8 May 2019 15:09:56 +0200
Subject: [PATCH] examples/ipsec-secgw: fix build error log

[ upstream commit 96d8ea839bded055fbbc01bfca44a7df3710e2ef ]

Fix invalid indentation - extra whitespace before error directive which
is causing syntax error when no pkgconfig file for the DPDK is found and
RTE_SDK is not specified.

Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")

Signed-off-by: Marcin Smoczynski <marcinx.smoczynski@intel.com>
---
 examples/ipsec-secgw/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile
index 02d41e39a..a6933801a 100644
--- a/examples/ipsec-secgw/Makefile
+++ b/examples/ipsec-secgw/Makefile
@@ -53,5 +53,5 @@ else
 
 ifeq ($(RTE_SDK),)
-	$(error "Please define RTE_SDK environment variable")
+$(error "Please define RTE_SDK environment variable")
 endif
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.981262965 +0100
+++ 0014-examples-ipsec-secgw-fix-build-error-log.patch	2019-05-14 15:39:07.312558831 +0100
@@ -1 +1 @@
-From 96d8ea839bded055fbbc01bfca44a7df3710e2ef Mon Sep 17 00:00:00 2001
+From 0acafc986ed2f39946068b4b8aec2df10ea4c889 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 96d8ea839bded055fbbc01bfca44a7df3710e2ef ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index ac042e4ce..75f2bcd00 100644
+index 02d41e39a..a6933801a 100644
@@ -22 +23 @@
-@@ -54,5 +54,5 @@ else
+@@ -53,5 +53,5 @@ else

[dpdk-stable] patch 'devtools: fix symbol name in check log' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/003a29f84a0170b0f81003232a53cae90a2da5d2

Thanks.

Kevin Traynor

---
From 003a29f84a0170b0f81003232a53cae90a2da5d2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 3 May 2019 16:34:19 +0200
Subject: [PATCH] devtools: fix symbol name in check log

[ upstream commit d4ef40f3c60e0d8a93a86373f81beaba5731c58b ]

We have an incorrect variable name in this log.

Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 devtools/check-symbol-change.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 8f986a5d7..9fe8a5229 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -98,5 +98,5 @@ check_for_rule_violations()
 				# Just inform the user of this occurrence, but
 				# don't flag it as an error
-				echo -n "INFO: symbol $syname is added but "
+				echo -n "INFO: symbol $symname is added but "
 				echo -n "patch has insuficient context "
 				echo -n "to determine the section name "
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.027271655 +0100
+++ 0015-devtools-fix-symbol-name-in-check-log.patch	2019-05-14 15:39:07.312558831 +0100
@@ -1 +1 @@
-From d4ef40f3c60e0d8a93a86373f81beaba5731c58b Mon Sep 17 00:00:00 2001
+From 003a29f84a0170b0f81003232a53cae90a2da5d2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d4ef40f3c60e0d8a93a86373f81beaba5731c58b ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index 8da765081..28f093a9f 100755
+index 8f986a5d7..9fe8a5229 100755

[dpdk-stable] patch 'devtools: accept experimental symbol promotion' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/81673cbe5baf20c81890155a68181d4fc6915acd

Thanks.

Kevin Traynor

---
From 81673cbe5baf20c81890155a68181d4fc6915acd Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 5 Apr 2019 10:17:47 +0200
Subject: [PATCH] devtools: accept experimental symbol promotion

[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]

Currently, when symbols get promoted from the EXPERIMENTAL section to a
stable ABI section, the script complains they should go to the
EXPERIMENTAL section.

Example:
ERROR: symbol rte_devargs_add is added in the DPDK_19.05 section, but is
expected to be added in the EXPERIMENTAL section of the version map

This is legit.
Moving from a stable ABI to another is also allowed, but must have gone
through the proper process.

Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 9fe8a5229..cd59b8b5d 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -106,24 +106,35 @@ check_for_rule_violations()
 			fi
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			oldsecname=$(sed -n \
+			"s#$mname $symname \(.*\) del#\1#p" "$mapdb")
+
+			# A symbol can not enter a non experimental
+			# section directly
+			if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ]
 			then
-				# Symbols that are getting added in a section
-				# other than the experimental section
-				# to be moving from an already supported
-				# section or its a violation
-				grep -q \
-				"$mname $symname [^EXPERIMENTAL] del" "$mapdb"
-				if [ $? -ne 0 ]
-				then
-					echo -n "ERROR: symbol $symname "
-					echo -n "is added in a section "
-					echo -n "other than the EXPERIMENTAL "
-					echo "section of the version map"
-					ret=1
-				fi
+				echo -n "ERROR: symbol $symname "
+				echo -n "is added in the $secname "
+				echo -n "section, but is expected to "
+				echo -n "be added in the EXPERIMENTAL "
+				echo "section of the version map"
+				ret=1
+				continue
+			fi
+
+			# This symbol is moving between two sections (the
+			# original section is not experimental).
+			# This can be legit, just warn.
+			if [ "$oldsecname" != 'EXPERIMENTAL' ]
+			then
+				echo -n "INFO: symbol $symname is being "
+				echo -n "moved from $oldsecname to $secname. "
+				echo -n "Ensure that it has gone through the "
+				echo "deprecation process"
+				continue
 			fi
 		else
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			if ! grep -q "$mname $symname .* add" "$mapdb" && \
+			   [ "$secname" != "EXPERIMENTAL" ]
 			then
 				# Just inform users that non-experimenal
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.075559129 +0100
+++ 0016-devtools-accept-experimental-symbol-promotion.patch	2019-05-14 15:39:07.313558811 +0100
@@ -1 +1 @@
-From 3630757803ab2f914ab36bb0285b662b3cff50db Mon Sep 17 00:00:00 2001
+From 81673cbe5baf20c81890155a68181d4fc6915acd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -24,2 +25,2 @@
- devtools/check-symbol-change.sh | 44 ++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 17 deletions(-)
+ devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
+ 1 file changed, 27 insertions(+), 16 deletions(-)
@@ -28 +29 @@
-index 020da7ed0..40eb95322 100755
+index 9fe8a5229..cd59b8b5d 100755
@@ -31 +32 @@
-@@ -106,25 +106,35 @@ check_for_rule_violations()
+@@ -106,24 +106,35 @@ check_for_rule_violations()
@@ -51,3 +52,2 @@
--					echo -n "is added in the $secname "
--					echo -n "section, but is expected to "
--					echo -n "be added in the EXPERIMENTAL "
+-					echo -n "is added in a section "
+-					echo -n "other than the EXPERIMENTAL "

[dpdk-stable] patch 'devtools: fix check of symbol added as stable API' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/920f07edb9d0c6ac65cbd683f92e0ba30e09f7ff

Thanks.

Kevin Traynor

---
From 920f07edb9d0c6ac65cbd683f92e0ba30e09f7ff Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 3 May 2019 16:34:20 +0200
Subject: [PATCH] devtools: fix check of symbol added as stable API

[ upstream commit af14b150df78ec46de919ae4a30efbefbcd44c95 ]

The incriminated commit broke the detection of new symbols skipping the
EXPERIMENTAL step before entering a stable ABI section.
sed won't return an error, check a null output instead.

Fixes: 3630757803ab ("devtools: accept experimental symbol promotion")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 devtools/check-symbol-change.sh | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index cd59b8b5d..f6f79a883 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -111,13 +111,22 @@ check_for_rule_violations()
 			# A symbol can not enter a non experimental
 			# section directly
-			if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ]
+			if [ -z "$oldsecname" ]
 			then
-				echo -n "ERROR: symbol $symname "
-				echo -n "is added in the $secname "
-				echo -n "section, but is expected to "
-				echo -n "be added in the EXPERIMENTAL "
-				echo "section of the version map"
-				ret=1
-				continue
+				if [ "$secname" = 'EXPERIMENTAL' ]
+				then
+					echo -n "INFO: symbol $symname has "
+					echo -n "been added to the "
+					echo -n "EXPERIMENTAL section of the "
+					echo "version map"
+					continue
+				else
+					echo -n "ERROR: symbol $symname "
+					echo -n "is added in the $secname "
+					echo -n "section, but is expected to "
+					echo -n "be added in the EXPERIMENTAL "
+					echo "section of the version map"
+					ret=1
+					continue
+				fi
 			fi
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.120438741 +0100
+++ 0017-devtools-fix-check-of-symbol-added-as-stable-API.patch	2019-05-14 15:39:07.313558811 +0100
@@ -1 +1 @@
-From af14b150df78ec46de919ae4a30efbefbcd44c95 Mon Sep 17 00:00:00 2001
+From 920f07edb9d0c6ac65cbd683f92e0ba30e09f7ff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit af14b150df78ec46de919ae4a30efbefbcd44c95 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 28f093a9f..c5434f3bb 100755
+index cd59b8b5d..f6f79a883 100755

[dpdk-stable] patch 'doc: fix formatting in testpmd guide' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/16261afbb04f6e5e7cf8d00bcfb8e0406311626f

Thanks.

Kevin Traynor

---
From 16261afbb04f6e5e7cf8d00bcfb8e0406311626f Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor@redhat.com>
Date: Thu, 2 May 2019 19:43:42 +0100
Subject: [PATCH] doc: fix formatting in testpmd guide

[ upstream commit 7fa1a2de3663d7ae702f2ac956b449931f8c5971 ]

Minor formatting error related to code block noticed when reading the doc.
Fix it and some other errors.

Fixes: c7217b9dd8ef ("app/testpmd: change log level at run time")
Fixes: 3c272b280a50 ("app/testpmd: add commands for RSS queue region")
Fixes: e38ea44f1714 ("app/testpmd: add configuration for input set")
Fixes: 08e0b3440baf ("app/testpmd: add option to configure UDP tunnel port")
Fixes: e977e4199a8d ("app/testpmd: add commands to load/unload BPF filters")

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 6b08a01c8..81f10727f 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -527,7 +527,9 @@ Where:
 
 For example, to change the global log level::
+
 	testpmd> set log global (level)
 
 Regexes can also be used for type. To change log level of user1, user2 and user3::
+
 	testpmd> set log user[1-3] (level)
 
@@ -981,9 +983,10 @@ Flush all queue region related configuration on a port::
 where:
 
-* "on"is just an enable function which server for other configuration,
+* ``on``: is just an enable function which server for other configuration,
   it is for all configuration about queue region from up layer,
   at first will only keep in DPDK software stored in driver,
   only after "flush on", it commit all configuration to HW.
-  "off" is just clean all configuration about queue region just now,
+
+* ``off``: is just clean all configuration about queue region just now,
   and restore all to DPDK i40e driver default config when start up.
 
@@ -2194,4 +2197,5 @@ port config input set
 
 Config RSS/FDIR/FDIR flexible payload input set for some pctype::
+
    testpmd> port config (port_id) pctype (pctype_id) \
             (hash_inset|fdir_inset|fdir_flx_inset) \
@@ -2199,4 +2203,5 @@ Config RSS/FDIR/FDIR flexible payload input set for some pctype::
 
 Clear RSS/FDIR/FDIR flexible payload input set for some pctype::
+
    testpmd> port config (port_id) pctype (pctype_id) \
             (hash_inset|fdir_inset|fdir_flx_inset) clear all
@@ -2211,4 +2216,5 @@ port config udp_tunnel_port
 
 Add/remove UDP tunnel port for VXLAN/GENEVE tunneling protocols::
+
     testpmd> port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)
 
@@ -4591,5 +4597,5 @@ For example:
    clang -O2 -target bpf -c t1.c
 
-Then to load (and JIT compile) t1.o at RX queue 0, port 1::
+Then to load (and JIT compile) t1.o at RX queue 0, port 1:
 
 .. code-block:: console
@@ -4597,5 +4603,5 @@ Then to load (and JIT compile) t1.o at RX queue 0, port 1::
    testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o
 
-To load (not JITed) t1.o at TX queue 0, port 0::
+To load (not JITed) t1.o at TX queue 0, port 0:
 
 .. code-block:: console
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.167600937 +0100
+++ 0018-doc-fix-formatting-in-testpmd-guide.patch	2019-05-14 15:39:07.318558711 +0100
@@ -1 +1 @@
-From 7fa1a2de3663d7ae702f2ac956b449931f8c5971 Mon Sep 17 00:00:00 2001
+From 16261afbb04f6e5e7cf8d00bcfb8e0406311626f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7fa1a2de3663d7ae702f2ac956b449931f8c5971 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 89d494c5b..cb83a3ce8 100644
+index 6b08a01c8..81f10727f 100644
@@ -26 +27 @@
-@@ -564,7 +564,9 @@ Where:
+@@ -527,7 +527,9 @@ Where:
@@ -36 +37 @@
-@@ -1020,9 +1022,10 @@ Flush all queue region related configuration on a port::
+@@ -981,9 +983,10 @@ Flush all queue region related configuration on a port::
@@ -46 +47 @@
-+* ``"off``: is just clean all configuration about queue region just now,
++* ``off``: is just clean all configuration about queue region just now,
@@ -49 +50 @@
-@@ -2237,4 +2240,5 @@ port config input set
+@@ -2194,4 +2197,5 @@ port config input set
@@ -55 +56 @@
-@@ -2242,4 +2246,5 @@ Config RSS/FDIR/FDIR flexible payload input set for some pctype::
+@@ -2199,4 +2203,5 @@ Config RSS/FDIR/FDIR flexible payload input set for some pctype::
@@ -61 +62 @@
-@@ -2254,4 +2259,5 @@ port config udp_tunnel_port
+@@ -2211,4 +2216,5 @@ port config udp_tunnel_port
@@ -65 +66 @@
-     testpmd> port config (port_id) udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe (udp_port)
+     testpmd> port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)
@@ -67 +68 @@
-@@ -4646,5 +4652,5 @@ For example:
+@@ -4591,5 +4597,5 @@ For example:
@@ -74,2 +75,2 @@
-@@ -4652,5 +4658,5 @@ Then to load (and JIT compile) t1.o at RX queue 0, port 1::
-    testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o
+@@ -4597,5 +4603,5 @@ Then to load (and JIT compile) t1.o at RX queue 0, port 1::
+    testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o

[dpdk-stable] patch 'eventdev: fix Rx adapter event flush' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/897b241d2d5baaf6de15133608b573da241d8e4e

Thanks.

Kevin Traynor

---
From 897b241d2d5baaf6de15133608b573da241d8e4e Mon Sep 17 00:00:00 2001
From: Nikhil Rao <nikhil.rao@intel.com>
Date: Fri, 10 May 2019 13:38:10 +0530
Subject: [PATCH] eventdev: fix Rx adapter event flush
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 339677f87023ccfa8d96b88dd4469a0dc25f813d ]

The Rx adapter flushes events only if it has BATCH_SIZE
events buffered where BATCH_SIZE is set to 32, e.g., if a
single packet is sent, it is never passed to
eventdev. Fix this issue by adding an event buffer flush
either when a Rx queue is found to be empty or the adapter service
function has processed the max number of packets for an invocation.

Bugzilla ID: 277
Fixes: 6b83f5935543 ("eventdev: add event buffer flush in Rx adapter")

Reported-by: Matias Elo <matias.elo@nokia.com>
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Reviewed-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Tested-by: Matias Elo <matias.elo@nokia.com>
---
 lib/librte_eventdev/rte_event_eth_rx_adapter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
index 8d178be15..627875a95 100644
--- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
@@ -873,5 +873,5 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter,
 	}
 
-	if (buf->count >= BATCH_SIZE)
+	if (buf->count > 0)
 		rxa_flush_event_buffer(rx_adapter);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.216116484 +0100
+++ 0019-eventdev-fix-Rx-adapter-event-flush.patch	2019-05-14 15:39:07.321558651 +0100
@@ -1 +1 @@
-From 339677f87023ccfa8d96b88dd4469a0dc25f813d Mon Sep 17 00:00:00 2001
+From 897b241d2d5baaf6de15133608b573da241d8e4e Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 339677f87023ccfa8d96b88dd4469a0dc25f813d ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 8b6e69daf..b60674b61 100644
+index 8d178be15..627875a95 100644

[dpdk-stable] patch 'event/dsw: ignore scheduling type for single-link queues' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c8a8ccd7f1bfbe2696be4dbdb967aa4e4f65f3ce

Thanks.

Kevin Traynor

---
From c8a8ccd7f1bfbe2696be4dbdb967aa4e4f65f3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
Date: Fri, 10 May 2019 14:18:16 +0200
Subject: [PATCH] event/dsw: ignore scheduling type for single-link queues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 7e192bdb0c55745a81e7f5e0eaf2b7a911aeadd4 ]

The scheduling type parameter is not applicable for single link
queues. DSW would, at the time of rte_event_queue_setup(), erroneously
verify that scheduling type was one of the supported types, and
returned -ENOTSUP in case of RTE_SCHED_TYPE_ORDERED.

Fixes: 4540ee9c68 ("event/dsw: add device and queue configuration")

Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Acked-by: Gage Eads <gage.eads@intel.com>
---
 drivers/event/dsw/dsw_evdev.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 4157d130c..9387d4149 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -103,7 +103,4 @@ dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
 		return -ENOTSUP;
 
-	if (conf->schedule_type == RTE_SCHED_TYPE_ORDERED)
-		return -ENOTSUP;
-
 	/* SINGLE_LINK is better off treated as TYPE_ATOMIC, since it
 	 * avoid the "fake" TYPE_PARALLEL flow_id assignment. Since
@@ -114,6 +111,10 @@ dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
 	if (RTE_EVENT_QUEUE_CFG_SINGLE_LINK & conf->event_queue_cfg)
 		queue->schedule_type = RTE_SCHED_TYPE_ATOMIC;
-	else /* atomic or parallel */
+	else {
+		if (conf->schedule_type == RTE_SCHED_TYPE_ORDERED)
+			return -ENOTSUP;
+		/* atomic or parallel */
 		queue->schedule_type = conf->schedule_type;
+	}
 
 	queue->num_serving_ports = 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.265832781 +0100
+++ 0020-event-dsw-ignore-scheduling-type-for-single-link-que.patch	2019-05-14 15:39:07.322558631 +0100
@@ -1 +1 @@
-From 7e192bdb0c55745a81e7f5e0eaf2b7a911aeadd4 Mon Sep 17 00:00:00 2001
+From c8a8ccd7f1bfbe2696be4dbdb967aa4e4f65f3ce Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 7e192bdb0c55745a81e7f5e0eaf2b7a911aeadd4 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'app/testpmd: fix offload flags after port config' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c14f54bd7feabbd28d80b069f6089fccf71b23ea

Thanks.

Kevin Traynor

---
From c14f54bd7feabbd28d80b069f6089fccf71b23ea Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Thu, 9 May 2019 15:20:47 +0800
Subject: [PATCH] app/testpmd: fix offload flags after port config

[ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]

There is an error in function rxtx_port_config(), which may overwrite
offloads configuration get from function launch_args_parse() when run
testpmd app. So rxtx_port_config() should do "or" for port offloads.

Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Tested-by: Peng Yuan <yuan.peng@intel.com>
---
 app/test-pmd/testpmd.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index cf983b16b..cf1fc7ab5 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2736,7 +2736,10 @@ rxtx_port_config(struct rte_port *port)
 {
 	uint16_t qid;
+	uint64_t offloads;
 
 	for (qid = 0; qid < nb_rxq; qid++) {
+		offloads = port->rx_conf[qid].offloads;
 		port->rx_conf[qid] = port->dev_info.default_rxconf;
+		port->rx_conf[qid].offloads |= offloads;
 
 		/* Check if any Rx parameters have been passed */
@@ -2760,5 +2763,7 @@ rxtx_port_config(struct rte_port *port)
 
 	for (qid = 0; qid < nb_txq; qid++) {
+		offloads = port->tx_conf[qid].offloads;
 		port->tx_conf[qid] = port->dev_info.default_txconf;
+		port->tx_conf[qid].offloads |= offloads;
 
 		/* Check if any Tx parameters have been passed */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.310485890 +0100
+++ 0021-app-testpmd-fix-offload-flags-after-port-config.patch	2019-05-14 15:39:07.325558571 +0100
@@ -1 +1 @@
-From 5e91aeef218c452c370aacf74265c7a42b67dffa Mon Sep 17 00:00:00 2001
+From c14f54bd7feabbd28d80b069f6089fccf71b23ea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 6fbfd29dd..f0061d99f 100644
+index cf983b16b..cf1fc7ab5 100644
@@ -23 +24 @@
-@@ -2810,7 +2810,10 @@ rxtx_port_config(struct rte_port *port)
+@@ -2736,7 +2736,10 @@ rxtx_port_config(struct rte_port *port)
@@ -34 +35 @@
-@@ -2834,5 +2837,7 @@ rxtx_port_config(struct rte_port *port)
+@@ -2760,5 +2763,7 @@ rxtx_port_config(struct rte_port *port)

[dpdk-stable] patch 'doc: fix JSON interface for power sample' 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/20/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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/d6678ae521f075639d7208e6c5bb1bc85b8976b0

Thanks.

Kevin Traynor

---
From d6678ae521f075639d7208e6c5bb1bc85b8976b0 Mon Sep 17 00:00:00 2001
From: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
Date: Mon, 13 May 2019 15:13:55 +0100
Subject: [PATCH] doc: fix JSON interface for power sample

[ upstream commit deb103d7abc5b160f4b4e5e8db554f5098aca84b ]

Updated doc for JSON sample code related to vm_power_manager
fifo interface: "command": "destroy", "command": "power".

There is no code change to go with this doc update, it is to fix
the docs to match the implementation in the code.

Fixes: a63504a90f ("examples/power: add JSON string handling")

Signed-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 doc/guides/sample_app_ug/vm_power_management.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 57758ca00..a7b7a2c7b 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -593,5 +593,5 @@ Profile destroy example:
   .. code-block:: javascript
 
-    {"profile": {
+    {"policy": {
       "name": "ubuntu",
       "command": "destroy",
@@ -602,6 +602,7 @@ Power command example:
   .. code-block:: javascript
 
-    {"command": {
+    {"instruction": {
       "name": "ubuntu",
+      "command": "power",
       "unit": "SCALE_MAX",
       "resource_id": 10
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.369602120 +0100
+++ 0022-doc-fix-JSON-interface-for-power-sample.patch	2019-05-14 15:39:07.327558531 +0100
@@ -1 +1 @@
-From deb103d7abc5b160f4b4e5e8db554f5098aca84b Mon Sep 17 00:00:00 2001
+From d6678ae521f075639d7208e6c5bb1bc85b8976b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit deb103d7abc5b160f4b4e5e8db554f5098aca84b ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 109d10957..5d9a26172 100644
+index 57758ca00..a7b7a2c7b 100644
@@ -25 +26 @@
-@@ -598,5 +598,5 @@ Profile destroy example:
+@@ -593,5 +593,5 @@ Profile destroy example:
@@ -32 +33 @@
-@@ -607,6 +607,7 @@ Power command example:
+@@ -602,6 +602,7 @@ Power command example: