[dpdk-stable] patch 'drivers: fix SPDX license id consistency' has been queued to LTS release 18.11.2

[dpdk-stable] patch 'drivers: fix SPDX license id consistency' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 5f73fcf125e6a8fadf188674214e7eeee8ed065e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 6 Feb 2019 14:27:57 -0800
Subject: [PATCH] drivers: fix SPDX license id consistency

[ upstream commit c6b571574636be15faccae52b55910ed30f52746 ]

All drivers should have SPDX on the first line of the source
files in the format
  /* SPDX-License-Identifier: ...

Several files used minor modifications which were inconsistent
with the pattern. Fix it to make scanning tools easier.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h | 6 +++---
 drivers/bus/fslmc/qbman/qbman_debug.c             | 5 ++---
 drivers/crypto/dpaa2_sec/hw/desc/pdcp.h           | 4 +---
 drivers/event/dpaa2/dpaa2_eventdev.h              | 7 ++-----
 drivers/event/dpaa2/dpaa2_eventdev_logs.h         | 3 +--
 drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h     | 3 +--
 drivers/net/dpaa2/dpaa2_pmd_logs.h                | 3 +--
 drivers/net/mvpp2/mrvl_mtr.c                      | 3 +--
 8 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h b/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
index 072ad551c..e010b1b6a 100644
--- a/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
+++ b/drivers/bus/fslmc/qbman/include/fsl_qbman_debug.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:        BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
+
 struct qbman_swp;
 
diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 591673abc..0bb2ce880 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:        BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
 
diff --git a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h b/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
index 719ef605f..fee844100 100644
--- a/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
+++ b/drivers/crypto/dpaa2_sec/hw/desc/pdcp.h
@@ -1,6 +1,4 @@
-/*
+/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
  * Copyright 2008-2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+
  */
 
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h
index c847b3eab..bdac1aa56 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -1,7 +1,4 @@
-/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017 NXP
  */
 
diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
index a2c2060cf..86f2e5393 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2018 NXP
  */
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
index c79b3d1cf..986264319 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2017 NXP
  */
diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h b/drivers/net/dpaa2/dpaa2_pmd_logs.h
index c04babdb4..c47ba8e10 100644
--- a/drivers/net/dpaa2/dpaa2_pmd_logs.h
+++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2017 NXP
  */
diff --git a/drivers/net/mvpp2/mrvl_mtr.c b/drivers/net/mvpp2/mrvl_mtr.c
index 9adcd9751..39272acea 100644
--- a/drivers/net/mvpp2/mrvl_mtr.c
+++ b/drivers/net/mvpp2/mrvl_mtr.c
@@ -1,4 +1,3 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 Marvell International Ltd.
  * Copyright(c) 2018 Semihalf.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.820654426 +0100
+++ 0001-drivers-fix-SPDX-license-id-consistency.patch	2019-04-25 16:37:46.677296505 +0100
@@ -1 +1 @@
-From c6b571574636be15faccae52b55910ed30f52746 Mon Sep 17 00:00:00 2001
+From 5f73fcf125e6a8fadf188674214e7eeee8ed065e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,2 @@
+
+[ upstream commit c6b571574636be15faccae52b55910ed30f52746 ]

[dpdk-stable] patch 'malloc: fix IPC message initialization' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From b4465709f3cfdb50c4926cdb3491ae0cbdf13037 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 29 Mar 2019 10:56:15 +0000
Subject: [PATCH] malloc: fix IPC message initialization

[ upstream commit 3660216ef115779b00e7b4093072166ed104fab9 ]

The memset size for an IPC message is set incorrectly. Fix it to
cover the entire IPC message.

Fixes: 07dcbfe0101f ("malloc: support multiprocess memory hotplug")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/malloc_mp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c
index f3a13353b..b470565e0 100644
--- a/lib/librte_eal/common/malloc_mp.c
+++ b/lib/librte_eal/common/malloc_mp.c
@@ -502,5 +502,5 @@ handle_rollback_response(const struct rte_mp_msg *request,
 	pthread_mutex_lock(&mp_request_list.lock);
 
-	memset(&msg, 0, sizeof(0));
+	memset(&msg, 0, sizeof(msg));
 
 	entry = find_request_by_id(mpreq->id);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.864533940 +0100
+++ 0002-malloc-fix-IPC-message-initialization.patch	2019-04-25 16:37:46.678296482 +0100
@@ -1 +1 @@
-From 3660216ef115779b00e7b4093072166ed104fab9 Mon Sep 17 00:00:00 2001
+From b4465709f3cfdb50c4926cdb3491ae0cbdf13037 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3660216ef115779b00e7b4093072166ed104fab9 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'bus/vmbus: fix secondary process setup' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 286c2bd5779875bae2f32ca6d8ba00aa8ebeeed7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Thu, 7 Feb 2019 19:44:01 -0800
Subject: [PATCH] bus/vmbus: fix secondary process setup

[ upstream commit fc20b5809dbc7ee8a341ec5db166de5a51d7118a ]

The secondary process doesn't correctly map the second
and later resources because it doesn't change the offset.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/bus/vmbus/vmbus_common_uio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c
index 5ddd36ab6..46e233d9f 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -48,7 +48,8 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
 		for (i = 0; i != uio_res->nb_maps; i++) {
 			void *mapaddr;
+			off_t offset = i * PAGE_SIZE;
 
 			mapaddr = vmbus_map_resource(uio_res->maps[i].addr,
-						     fd, 0,
+						     fd, offset,
 						     uio_res->maps[i].size, 0);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.905782767 +0100
+++ 0003-bus-vmbus-fix-secondary-process-setup.patch	2019-04-25 16:37:46.679296459 +0100
@@ -1 +1 @@
-From fc20b5809dbc7ee8a341ec5db166de5a51d7118a Mon Sep 17 00:00:00 2001
+From 286c2bd5779875bae2f32ca6d8ba00aa8ebeeed7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fc20b5809dbc7ee8a341ec5db166de5a51d7118a ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/netvsc: fix VF support with 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 7d8bb5bf17ab230c58aad1e8a046e0514190442c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Thu, 7 Feb 2019 19:44:02 -0800
Subject: [PATCH] net/netvsc: fix VF support with secondary process

[ upstream commit 4a9efcddaddd2477d370f3720bf93079717c6ddb ]

The VF device management in netvsc was using a pointer to the
rte_eth_devices. But the actual rte_eth_devices array is likely to
be place in the secondary process; which causes a crash.

The solution is to record the port of the VF (instead of a pointer)
and find the device in the per process array as needed.

Fixes: dc7680e8597c ("net/netvsc: support integrated VF")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/net/netvsc/hn_ethdev.c |  3 +-
 drivers/net/netvsc/hn_rxtx.c   |  8 ++--
 drivers/net/netvsc/hn_var.h    | 32 +++++++++++--
 drivers/net/netvsc/hn_vf.c     | 84 +++++++++++++++++-----------------
 4 files changed, 77 insertions(+), 50 deletions(-)

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index da76b0db6..fad209f21 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -734,4 +734,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
 	hv->latency = HN_CHAN_LATENCY_NS;
 	hv->max_queues = 1;
+	hv->vf_port = HN_INVALID_PORT;
 
 	err = hn_parse_args(eth_dev);
@@ -787,5 +788,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
 
 	/* If VF was reported but not added, do it now */
-	if (hv->vf_present && !hv->vf_dev) {
+	if (hv->vf_present && !hn_vf_attached(hv)) {
 		PMD_INIT_LOG(DEBUG, "Adding VF device");
 
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 487f76466..96b7f1855 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1306,6 +1306,6 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
 	/* Transmit over VF if present and up */
-	vf_dev = hv->vf_dev;
-	rte_compiler_barrier();
+	vf_dev = hn_get_vf_dev(hv);
+
 	if (vf_dev && vf_dev->data->dev_started) {
 		void *sub_q = vf_dev->data->tx_queues[queue_id];
@@ -1397,6 +1397,6 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 		return 0;
 
-	vf_dev = hv->vf_dev;
-	rte_compiler_barrier();
+	/* Transmit over VF if present and up */
+	vf_dev = hn_get_vf_dev(hv);
 
 	if (vf_dev && vf_dev->data->dev_started) {
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index a6516c1e6..b31563435 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -92,12 +92,16 @@ struct hn_rx_bufinfo {
 } __rte_cache_aligned;
 
+#define HN_INVALID_PORT	UINT16_MAX
+
 struct hn_data {
 	struct rte_vmbus_device *vmbus;
 	struct hn_rx_queue *primary;
-	struct rte_eth_dev *vf_dev;		/* Subordinate device */
 	rte_spinlock_t  vf_lock;
 	uint16_t	port_id;
-	bool		closed;
-	bool		vf_present;
+	uint16_t	vf_port;
+
+	uint8_t		vf_present;
+	uint8_t		closed;
+
 	uint32_t	link_status;
 	uint32_t	link_speed;
@@ -170,4 +174,26 @@ int	hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
 void	hn_dev_rx_queue_release(void *arg);
 
+/* Check if VF is attached */
+static inline bool
+hn_vf_attached(const struct hn_data *hv)
+{
+	return hv->vf_port != HN_INVALID_PORT;
+}
+
+/* Get VF device for existing netvsc device */
+static inline struct rte_eth_dev *
+hn_get_vf_dev(const struct hn_data *hv)
+{
+	uint16_t vf_port = hv->vf_port;
+
+	/* make sure vf_port is loaded */
+	rte_smp_rmb();
+
+	if (vf_port == HN_INVALID_PORT)
+		return NULL;
+	else
+		return &rte_eth_devices[vf_port];
+}
+
 void	hn_vf_info_get(struct hn_data *hv,
 		       struct rte_eth_dev_info *info);
diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index 3f714ec99..de278eb7b 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -52,13 +52,18 @@ static int hn_vf_match(const struct rte_eth_dev *dev)
 }
 
+
 /*
  * Attach new PCI VF device and return the port_id
  */
-static int hn_vf_attach(struct hn_data *hv, uint16_t port_id,
-			struct rte_eth_dev **vf_dev)
+static int hn_vf_attach(struct hn_data *hv, uint16_t port_id)
 {
 	struct rte_eth_dev_owner owner = { .id = RTE_ETH_DEV_NO_OWNER };
 	int ret;
 
+	if (hn_vf_attached(hv)) {
+		PMD_DRV_LOG(ERR, "VF already attached");
+		return -EEXIST;
+	}
+
 	ret = rte_eth_dev_owner_get(port_id, &owner);
 	if (ret < 0) {
@@ -80,6 +85,7 @@ static int hn_vf_attach(struct hn_data *hv, uint16_t port_id,
 
 	PMD_DRV_LOG(DEBUG, "Attach VF device %u", port_id);
+	hv->vf_port = port_id;
 	rte_smp_wmb();
-	*vf_dev = &rte_eth_devices[port_id];
+
 	return 0;
 }
@@ -97,10 +103,5 @@ int hn_vf_add(struct rte_eth_dev *dev, struct hn_data *hv)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	if (hv->vf_dev) {
-		PMD_DRV_LOG(ERR, "VF already attached");
-		err = -EBUSY;
-	} else {
-		err = hn_vf_attach(hv, port, &hv->vf_dev);
-	}
+	err = hn_vf_attach(hv, port);
 
 	if (err == 0) {
@@ -121,20 +122,20 @@ int hn_vf_add(struct rte_eth_dev *dev, struct hn_data *hv)
 static void hn_vf_remove(struct hn_data *hv)
 {
-	struct rte_eth_dev *vf_dev;
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
-	if (!vf_dev) {
+
+	if (!hn_vf_attached(hv)) {
 		PMD_DRV_LOG(ERR, "VF path not active");
-		rte_spinlock_unlock(&hv->vf_lock);
-		return;
+	} else {
+		/* Stop incoming packets from arriving on VF */
+		hn_nvs_set_datapath(hv, NVS_DATAPATH_SYNTHETIC);
+
+		/* Stop transmission over VF */
+		hv->vf_port = HN_INVALID_PORT;
+		rte_smp_wmb();
+
+		/* Give back ownership */
+		rte_eth_dev_owner_unset(hv->vf_port, hv->owner.id);
 	}
-
-	/* Stop incoming packets from arriving on VF */
-	hn_nvs_set_datapath(hv, NVS_DATAPATH_SYNTHETIC);
-	hv->vf_dev = NULL;
-
-	/* Give back ownership */
-	rte_eth_dev_owner_unset(vf_dev->data->port_id, hv->owner.id);
 	rte_spinlock_unlock(&hv->vf_lock);
 }
@@ -208,5 +209,5 @@ void hn_vf_info_get(struct hn_data *hv, struct rte_eth_dev_info *info)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		hn_vf_info_merge(vf_dev, info);
@@ -222,5 +223,5 @@ int hn_vf_link_update(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->link_update)
 		ret = (*vf_dev->dev_ops->link_update)(vf_dev, wait_to_complete);
@@ -250,11 +251,12 @@ static int hn_vf_lsc_event(uint16_t port_id __rte_unused,
 
 static int _hn_vf_configure(struct rte_eth_dev *dev,
-			    struct rte_eth_dev *vf_dev,
+			    uint16_t vf_port,
 			    const struct rte_eth_conf *dev_conf)
 {
 	struct rte_eth_conf vf_conf = *dev_conf;
-	uint16_t vf_port = vf_dev->data->port_id;
+	struct rte_eth_dev *vf_dev;
 	int ret;
 
+	vf_dev = &rte_eth_devices[vf_port];
 	if (dev_conf->intr_conf.lsc &&
 	    (vf_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)) {
@@ -295,11 +297,9 @@ int hn_vf_configure(struct rte_eth_dev *dev,
 {
 	struct hn_data *hv = dev->data->dev_private;
-	struct rte_eth_dev *vf_dev;
 	int ret = 0;
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
-	if (vf_dev)
-		ret = _hn_vf_configure(dev, vf_dev, dev_conf);
+	if (hv->vf_port != HN_INVALID_PORT)
+		ret = _hn_vf_configure(dev, hv->vf_port, dev_conf);
 	rte_spinlock_unlock(&hv->vf_lock);
 	return ret;
@@ -313,5 +313,5 @@ const uint32_t *hn_vf_supported_ptypes(struct rte_eth_dev *dev)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->dev_supported_ptypes_get)
 		ptypes = (*vf_dev->dev_ops->dev_supported_ptypes_get)(vf_dev);
@@ -328,5 +328,5 @@ int hn_vf_start(struct rte_eth_dev *dev)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		ret = rte_eth_dev_start(vf_dev->data->port_id);
@@ -341,5 +341,5 @@ void hn_vf_stop(struct rte_eth_dev *dev)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		rte_eth_dev_stop(vf_dev->data->port_id);
@@ -353,5 +353,5 @@ void hn_vf_stop(struct rte_eth_dev *dev)
 		struct rte_eth_dev *vf_dev;			\
 		rte_spinlock_lock(&hv->vf_lock);		\
-		vf_dev = hv->vf_dev;				\
+		vf_dev = hn_get_vf_dev(hv);			\
 		if (vf_dev)					\
 			func(vf_dev->data->port_id);		\
@@ -403,5 +403,5 @@ int hn_vf_mc_addr_list(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		ret = rte_eth_dev_set_mc_addr_list(vf_dev->data->port_id,
@@ -421,5 +421,5 @@ int hn_vf_tx_queue_setup(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		ret = rte_eth_tx_queue_setup(vf_dev->data->port_id,
@@ -435,5 +435,5 @@ void hn_vf_tx_queue_release(struct hn_data *hv, uint16_t queue_id)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->tx_queue_release) {
 		void *subq = vf_dev->data->tx_queues[queue_id];
@@ -456,5 +456,5 @@ int hn_vf_rx_queue_setup(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		ret = rte_eth_rx_queue_setup(vf_dev->data->port_id,
@@ -470,5 +470,5 @@ void hn_vf_rx_queue_release(struct hn_data *hv, uint16_t queue_id)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->rx_queue_release) {
 		void *subq = vf_dev->data->rx_queues[queue_id];
@@ -487,5 +487,5 @@ int hn_vf_stats_get(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev)
 		ret = rte_eth_stats_get(vf_dev->data->port_id, stats);
@@ -504,5 +504,5 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->xstats_get_names)
 		count = vf_dev->dev_ops->xstats_get_names(vf_dev, names, n);
@@ -529,5 +529,5 @@ int hn_vf_xstats_get(struct rte_eth_dev *dev,
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->xstats_get)
 		count = vf_dev->dev_ops->xstats_get(vf_dev, xstats, n);
@@ -543,5 +543,5 @@ void hn_vf_xstats_reset(struct rte_eth_dev *dev)
 
 	rte_spinlock_lock(&hv->vf_lock);
-	vf_dev = hv->vf_dev;
+	vf_dev = hn_get_vf_dev(hv);
 	if (vf_dev && vf_dev->dev_ops->xstats_reset)
 		vf_dev->dev_ops->xstats_reset(vf_dev);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.946037156 +0100
+++ 0004-net-netvsc-fix-VF-support-with-secondary-process.patch	2019-04-25 16:37:46.683296367 +0100
@@ -1 +1 @@
-From 4a9efcddaddd2477d370f3720bf93079717c6ddb Mon Sep 17 00:00:00 2001
+From 7d8bb5bf17ab230c58aad1e8a046e0514190442c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4a9efcddaddd2477d370f3720bf93079717c6ddb ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
- drivers/net/netvsc/hn_var.h    | 30 +++++++++++-
+ drivers/net/netvsc/hn_var.h    | 32 +++++++++++--
@@ -22 +23 @@
- 4 files changed, 76 insertions(+), 49 deletions(-)
+ 4 files changed, 77 insertions(+), 50 deletions(-)
@@ -25 +26 @@
-index 49b7ca7b2..407ee4849 100644
+index da76b0db6..fad209f21 100644
@@ -28 +29 @@
-@@ -736,4 +736,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
+@@ -734,4 +734,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
@@ -34 +35 @@
-@@ -789,5 +790,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
+@@ -787,5 +788,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
@@ -42 +43 @@
-index 6197118b0..fecd69887 100644
+index 487f76466..96b7f1855 100644
@@ -45 +46 @@
-@@ -1314,6 +1314,6 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -1306,6 +1306,6 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
@@ -54 +55 @@
-@@ -1405,6 +1405,6 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -1397,6 +1397,6 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -64 +65 @@
-index 7f3266c45..8383f3246 100644
+index a6516c1e6..b31563435 100644
@@ -67 +68 @@
-@@ -92,13 +92,17 @@ struct hn_rx_bufinfo {
+@@ -92,12 +92,16 @@ struct hn_rx_bufinfo {
@@ -78 +79,2 @@
--	uint8_t		closed;
+-	bool		closed;
+-	bool		vf_present;
@@ -81 +83 @@
- 	uint8_t		vf_present;
++	uint8_t		vf_present;
@@ -83 +84,0 @@
- 	uint8_t		vlan_strip;
@@ -87 +88 @@
-@@ -171,4 +175,26 @@ int	hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -170,4 +174,26 @@ int	hn_dev_rx_queue_setup(struct rte_eth_dev *dev,

[dpdk-stable] patch 'bus/vmbus: fix check for mmap 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From e25ef3d4192350b9ba7408b71c2f9f7f76ddd49d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Thu, 7 Feb 2019 19:44:03 -0800
Subject: [PATCH] bus/vmbus: fix check for mmap failure

[ upstream commit 3f9277031a2e0fc6e61503e55045bf41fc2bf171 ]

The code was testing the result of mmap incorrectly.
I.e the test that a local pointer is not MAP_FAILED would
always succeed and therefore hid any potential problems.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/bus/vmbus/linux/vmbus_uio.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index 38df4d724..7a3f3fda9 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -203,4 +203,5 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,
 	size_t file_size;
 	struct stat sb;
+	void *mapaddr;
 	int fd;
 
@@ -233,12 +234,14 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,
 	}
 
-	*ring_size = file_size / 2;
-	*ring_buf = vmbus_map_resource(vmbus_map_addr, fd,
-				       0, sb.st_size, 0);
+	mapaddr = vmbus_map_resource(vmbus_map_addr, fd,
+				     0, file_size, 0);
 	close(fd);
 
-	if (ring_buf == MAP_FAILED)
+	if (mapaddr == MAP_FAILED)
 		return -EIO;
 
+	*ring_size = file_size / 2;
+	*ring_buf = mapaddr;
+
 	vmbus_map_addr = RTE_PTR_ADD(ring_buf, file_size);
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.991235697 +0100
+++ 0005-bus-vmbus-fix-check-for-mmap-failure.patch	2019-04-25 16:37:46.684296345 +0100
@@ -1 +1 @@
-From 3f9277031a2e0fc6e61503e55045bf41fc2bf171 Mon Sep 17 00:00:00 2001
+From e25ef3d4192350b9ba7408b71c2f9f7f76ddd49d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f9277031a2e0fc6e61503e55045bf41fc2bf171 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 09f7efdca..8c6bc52fd 100644
+index 38df4d724..7a3f3fda9 100644

[dpdk-stable] patch 'bus/vmbus: stop mapping if empty resource found' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8d8ac27e478619ed54b899a09afd81939a2f7f94 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Thu, 7 Feb 2019 19:44:04 -0800
Subject: [PATCH] bus/vmbus: stop mapping if empty resource found

[ upstream commit 41a7f8cbeeaf8cbaf23af6ed57ef49a926a2bd16 ]

If vmbus is run on older kernel (without all the uio mappings),
then the bus driver should stop when it hits the missing mappings
rather than recording the empty values.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/bus/vmbus/vmbus_common_uio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c
index 46e233d9f..a6545b758 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -99,7 +99,7 @@ vmbus_uio_map_primary(struct rte_vmbus_device *dev)
 	/* Map the resources */
 	for (i = 0; i < VMBUS_MAX_RESOURCE; i++) {
-		/* skip empty BAR */
+		/* stop at empty BAR */
 		if (dev->resource[i].len == 0)
-			continue;
+			break;
 
 		ret = vmbus_uio_map_resource_by_index(dev, i, uio_res, 0);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.036149708 +0100
+++ 0006-bus-vmbus-stop-mapping-if-empty-resource-found.patch	2019-04-25 16:37:46.684296345 +0100
@@ -1 +1 @@
-From 41a7f8cbeeaf8cbaf23af6ed57ef49a926a2bd16 Mon Sep 17 00:00:00 2001
+From 8d8ac27e478619ed54b899a09afd81939a2f7f94 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 41a7f8cbeeaf8cbaf23af6ed57ef49a926a2bd16 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'bus/vmbus: map ring in 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From d96d210d1d4166b028594ae7adb496b760f573a2 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Thu, 7 Feb 2019 19:44:05 -0800
Subject: [PATCH] bus/vmbus: map ring in secondary process

[ upstream commit 2a28a502c6078ceb3e5b296b5f9cbb7e27ceedbd ]

Need to remember primary channel in secondary process.
Then use it to iterate over subchannels in secondary
process mapping setup.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/bus/vmbus/linux/vmbus_uio.c  | 43 ++++++++++++++++++++++++++++
 drivers/bus/vmbus/private.h          |  3 ++
 drivers/bus/vmbus/vmbus_channel.c    | 20 +++++++++++--
 drivers/bus/vmbus/vmbus_common_uio.c | 15 ++++++++++
 4 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index 7a3f3fda9..a6b3e9201 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -248,4 +248,47 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,
 }
 
+int
+vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,
+				const struct vmbus_channel *chan)
+{
+	const struct vmbus_br *br = &chan->txbr;
+	char ring_path[PATH_MAX];
+	void *mapaddr, *ring_buf;
+	uint32_t ring_size;
+	int fd;
+
+	snprintf(ring_path, sizeof(ring_path),
+		 "%s/%s/channels/%u/ring",
+		 SYSFS_VMBUS_DEVICES, dev->device.name,
+		 chan->relid);
+
+	ring_buf = br->vbr;
+	ring_size = br->dsize + sizeof(struct vmbus_bufring);
+	VMBUS_LOG(INFO, "secondary ring_buf %p size %u",
+		  ring_buf, ring_size);
+
+	fd = open(ring_path, O_RDWR);
+	if (fd < 0) {
+		VMBUS_LOG(ERR, "Cannot open %s: %s",
+			  ring_path, strerror(errno));
+		return -errno;
+	}
+
+	mapaddr = vmbus_map_resource(ring_buf, fd, 0, 2 * ring_size, 0);
+	close(fd);
+
+	if (mapaddr == ring_buf)
+		return 0;
+
+	if (mapaddr == MAP_FAILED)
+		VMBUS_LOG(ERR,
+			  "mmap subchan %u in secondary failed", chan->relid);
+	else
+		VMBUS_LOG(ERR,
+			  "mmap subchan %u in secondary address mismatch",
+			  chan->relid);
+	return -1;
+}
+
 int vmbus_uio_map_rings(struct vmbus_channel *chan)
 {
diff --git a/drivers/bus/vmbus/private.h b/drivers/bus/vmbus/private.h
index 211127dd8..f19b14e4a 100644
--- a/drivers/bus/vmbus/private.h
+++ b/drivers/bus/vmbus/private.h
@@ -46,4 +46,5 @@ struct mapped_vmbus_resource {
 	rte_uuid_t id;
 	int nb_maps;
+	struct vmbus_channel *primary;
 	struct vmbus_map maps[VMBUS_MAX_RESOURCE];
 	char path[PATH_MAX];
@@ -108,4 +109,6 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 			  struct vmbus_channel **subchan);
 int vmbus_uio_map_rings(struct vmbus_channel *chan);
+int vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,
+				    const struct vmbus_channel *chan);
 
 void vmbus_br_setup(struct vmbus_br *br, void *buf, unsigned int blen);
diff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c
index bd14c0662..46b3ba3f9 100644
--- a/drivers/bus/vmbus/vmbus_channel.c
+++ b/drivers/bus/vmbus/vmbus_channel.c
@@ -353,10 +353,19 @@ int rte_vmbus_chan_open(struct rte_vmbus_device *device,
 			struct vmbus_channel **new_chan)
 {
+	struct mapped_vmbus_resource *uio_res;
 	int err;
 
+	uio_res = vmbus_uio_find_resource(device);
+	if (!uio_res) {
+		VMBUS_LOG(ERR, "can't find uio resource");
+		return -EINVAL;
+	}
+
 	err = vmbus_chan_create(device, device->relid, 0,
 				device->monitor_id, new_chan);
-	if (!err)
+	if (!err) {
 		device->primary = *new_chan;
+		uio_res->primary = *new_chan;
+	}
 
 	return err;
@@ -397,9 +406,14 @@ void rte_vmbus_chan_close(struct vmbus_channel *chan)
 	struct vmbus_channel *primary = device->primary;
 
-	if (chan != primary)
+	/*
+	 * intentionally leak primary channel because
+	 * secondary may still reference it
+	 */
+	if (chan != primary) {
 		STAILQ_REMOVE(&primary->subchannel_list, chan,
 			      vmbus_channel, next);
+		rte_free(chan);
+	}
 
-	rte_free(chan);
 }
 
diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c
index a6545b758..9947f82ab 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -28,4 +28,5 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
 {
 	int fd, i;
+	struct vmbus_channel *chan;
 	struct mapped_vmbus_resource *uio_res;
 	struct mapped_vmbus_res_list *uio_res_list
@@ -77,4 +78,18 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
 		/* fd is not needed in slave process, close it */
 		close(fd);
+
+		dev->primary = uio_res->primary;
+		if (!dev->primary) {
+			VMBUS_LOG(ERR, "missing primary channel");
+			return -1;
+		}
+
+		STAILQ_FOREACH(chan, &dev->primary->subchannel_list, next) {
+			if (vmbus_uio_map_secondary_subchan(dev, chan) != 0) {
+				VMBUS_LOG(ERR, "cannot map secondary subchan");
+				return -1;
+			}
+		}
+
 		return 0;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.079589209 +0100
+++ 0007-bus-vmbus-map-ring-in-secondary-process.patch	2019-04-25 16:37:46.686296299 +0100
@@ -1 +1 @@
-From 2a28a502c6078ceb3e5b296b5f9cbb7e27ceedbd Mon Sep 17 00:00:00 2001
+From d96d210d1d4166b028594ae7adb496b760f573a2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a28a502c6078ceb3e5b296b5f9cbb7e27ceedbd ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 8c6bc52fd..fb60ee126 100644
+index 7a3f3fda9..a6b3e9201 100644

[dpdk-stable] patch 'bus/fslmc: decrease log level for unsupported devices' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From af32f5e208b2072df5e8384e5e635219f63dab8c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 12 Mar 2019 10:11:51 -0700
Subject: [PATCH] bus/fslmc: decrease log level for unsupported devices

[ upstream commit a6ffe11b7245ec12d4df4b8b0577291604b5e082 ]

When fslmc is built as part of a general distribution, the
bus code will log errors when other devices are present.

This could confuse users it is not an error.

Fixes: 50245be05d1a ("bus/fslmc: support device blacklisting")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Ilya Maximets <i.maximets@samsung.com>
---
 drivers/bus/fslmc/fslmc_bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 2dcdca01f..c719bf7f6 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -247,5 +247,5 @@ rte_fslmc_parse(const char *name, void *addr)
 	    strncmp("dpmcp", t_ptr, 5) &&
 	    strncmp("dpdmai", t_ptr, 6)) {
-		DPAA2_BUS_ERR("Unknown or unsupported device");
+		DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", name);
 		goto err_out;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.122033970 +0100
+++ 0008-bus-fslmc-decrease-log-level-for-unsupported-devices.patch	2019-04-25 16:37:46.687296276 +0100
@@ -1 +1 @@
-From a6ffe11b7245ec12d4df4b8b0577291604b5e082 Mon Sep 17 00:00:00 2001
+From af32f5e208b2072df5e8384e5e635219f63dab8c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a6ffe11b7245ec12d4df4b8b0577291604b5e082 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 44c0827ce..a2525780c 100644
+index 2dcdca01f..c719bf7f6 100644
@@ -25,3 +26,3 @@
-@@ -250,5 +250,5 @@ rte_fslmc_parse(const char *name, void *addr)
- 	    strncmp("dpdmai", t_ptr, 6) &&
- 	    strncmp("dpdmux", t_ptr, 6)) {
+@@ -247,5 +247,5 @@ rte_fslmc_parse(const char *name, void *addr)
+ 	    strncmp("dpmcp", t_ptr, 5) &&
+ 	    strncmp("dpdmai", t_ptr, 6)) {

[dpdk-stable] patch 'bus/dpaa: fix Rx discard register mask' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From e59521167f6da6d4dc29d67b7183aea3552605c9 Mon Sep 17 00:00:00 2001
From: Shreyansh Jain <shreyansh.jain@nxp.com>
Date: Fri, 22 Feb 2019 10:09:44 +0000
Subject: [PATCH] bus/dpaa: fix Rx discard register mask

[ upstream commit 6880caed6b33ef0a4e06ec4b3c41ab40a2b5c12a ]

Current value of 'fmbm_rfsdm' register (0x010CE3F0) doesn't include
the bit to drop colored (red) packets. New value (0x010EE3F0) fixes
this.
Check with 'fmbm_rffc' register of fm_port_bmi_regs.

Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations")

Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 drivers/bus/dpaa/base/fman/fman_hw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c
index 4ebbc3d34..9ab8e835d 100644
--- a/drivers/bus/dpaa/base/fman/fman_hw.c
+++ b/drivers/bus/dpaa/base/fman/fman_hw.c
@@ -604,8 +604,8 @@ fman_if_discard_rx_errors(struct fman_if *fm_if)
 
 	/* Configure the discard mask to discard the error packets which have
-	 * DMA errors, Frame size error, Header error etc. The mask 0x010CE3F0
+	 * DMA errors, Frame size error, Header error etc. The mask 0x010EE3F0
 	 * is to configured discard all the errors which come in the FD[STATUS]
 	 */
 	fmbm_rfsdm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rfsdm;
-	out_be32(fmbm_rfsdm, 0x010CE3F0);
+	out_be32(fmbm_rfsdm, 0x010EE3F0);
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.163040375 +0100
+++ 0009-bus-dpaa-fix-Rx-discard-register-mask.patch	2019-04-25 16:37:46.688296253 +0100
@@ -1 +1 @@
-From 6880caed6b33ef0a4e06ec4b3c41ab40a2b5c12a Mon Sep 17 00:00:00 2001
+From e59521167f6da6d4dc29d67b7183aea3552605c9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6880caed6b33ef0a4e06ec4b3c41ab40a2b5c12a ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'mem: warn user when running without NUMA support' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From e669bac4b0e5a411471d28b4ed10ad6cc50acdfc Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 29 Mar 2019 14:01:29 +0000
Subject: [PATCH] mem: warn user when running without NUMA support

[ upstream commit 23d5455517568966ca8cac216941128ed3d3a455 ]

Running in non-legacy mode on a NUMA-enabled system without libnuma
is unsupported, so explicitly print out a warning when trying to
do so.

Running in legacy mode without libnuma is still supported whether or
not we are running with libnuma support enabled, so also fix init to
allow that scenario.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/eal_options.h        |  2 ++
 lib/librte_eal/linuxapp/eal/eal_memalloc.c |  4 ++++
 lib/librte_eal/linuxapp/eal/eal_memory.c   | 14 ++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h
index 327c95e96..1623ae8cf 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -6,4 +6,6 @@
 #define EAL_OPTIONS_H
 
+#include "getopt.h"
+
 enum {
 	/* long options mapped to a short option */
diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index f63d9ca66..81b441a96 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -741,4 +741,8 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
 		goto mapped;
 	}
+#else
+	if (rte_socket_count() > 1)
+		RTE_LOG(DEBUG, EAL, "%s(): not checking hugepage NUMA node.\n",
+				__func__);
 #endif
 
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 7a4a9ed3c..788aed25d 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -47,4 +47,5 @@
 #include "eal_filesystem.h"
 #include "eal_hugepages.h"
+#include "eal_options.h"
 
 #define PFN_MASK_SIZE	8
@@ -2039,5 +2040,6 @@ memseg_primary_init_32(void)
 
 #ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
-		if (socket_id > 0)
+		/* we can still sort pages by socket in legacy mode */
+		if (!internal_config.legacy_mem && socket_id > 0)
 			break;
 #endif
@@ -2220,5 +2222,6 @@ memseg_primary_init(void)
 
 #ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
-			if (socket_id > 0)
+			/* we can still sort pages by socket in legacy mode */
+			if (!internal_config.legacy_mem && socket_id > 0)
 				break;
 #endif
@@ -2379,4 +2382,11 @@ rte_eal_memseg_init(void)
 		RTE_LOG(ERR, EAL, "Cannot get current resource limits\n");
 	}
+#ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
+	if (!internal_config.legacy_mem && rte_socket_count() > 1) {
+		RTE_LOG(WARNING, EAL, "DPDK is running on a NUMA system, but is compiled without NUMA support.\n");
+		RTE_LOG(WARNING, EAL, "This will have adverse consequences for performance and usability.\n");
+		RTE_LOG(WARNING, EAL, "Please use --"OPT_LEGACY_MEM" option, or recompile with NUMA support.\n");
+	}
+#endif
 
 	return rte_eal_process_type() == RTE_PROC_PRIMARY ?
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.206874908 +0100
+++ 0010-mem-warn-user-when-running-without-NUMA-support.patch	2019-04-25 16:37:46.694296116 +0100
@@ -1 +1 @@
-From 23d5455517568966ca8cac216941128ed3d3a455 Mon Sep 17 00:00:00 2001
+From e669bac4b0e5a411471d28b4ed10ad6cc50acdfc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 23d5455517568966ca8cac216941128ed3d3a455 ]
+
@@ -14,2 +15,0 @@
-Cc: stable@dpdk.org
-
@@ -18,3 +18,3 @@
- lib/librte_eal/common/eal_options.h     |  2 ++
- lib/librte_eal/linux/eal/eal_memalloc.c |  4 ++++
- lib/librte_eal/linux/eal/eal_memory.c   | 14 ++++++++++++--
+ lib/librte_eal/common/eal_options.h        |  2 ++
+ lib/librte_eal/linuxapp/eal/eal_memalloc.c |  4 ++++
+ lib/librte_eal/linuxapp/eal/eal_memory.c   | 14 ++++++++++++--
@@ -24 +24 @@
-index 58ee9ae33..9855429e5 100644
+index 327c95e96..1623ae8cf 100644
@@ -34,5 +34,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_memalloc.c b/lib/librte_eal/linux/eal/eal_memalloc.c
-index 14c3ea838..a965a9b65 100644
---- a/lib/librte_eal/linux/eal/eal_memalloc.c
-+++ b/lib/librte_eal/linux/eal/eal_memalloc.c
-@@ -726,4 +726,8 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+index f63d9ca66..81b441a96 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+@@ -741,4 +741,8 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
@@ -47,5 +47,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c
-index 23fe44127..39cd359a0 100644
---- a/lib/librte_eal/linux/eal/eal_memory.c
-+++ b/lib/librte_eal/linux/eal/eal_memory.c
-@@ -51,4 +51,5 @@
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
+index 7a4a9ed3c..788aed25d 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
+@@ -47,4 +47,5 @@
@@ -57 +57 @@
-@@ -2106,5 +2107,6 @@ memseg_primary_init_32(void)
+@@ -2039,5 +2040,6 @@ memseg_primary_init_32(void)
@@ -65 +65 @@
-@@ -2287,5 +2289,6 @@ memseg_primary_init(void)
+@@ -2220,5 +2222,6 @@ memseg_primary_init(void)
@@ -73 +73 @@
-@@ -2446,4 +2449,11 @@ rte_eal_memseg_init(void)
+@@ -2379,4 +2382,11 @@ rte_eal_memseg_init(void)

[dpdk-stable] patch 'eal/linux: remove thread ID from debug message' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 339f737749f8962a06d65b77dcd07128165635aa Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:57 +0100
Subject: [PATCH] eal/linux: remove thread ID from debug message

[ upstream commit c2d82896ac6d9ea02c76044a8d4a612023ccf571 ]

There is no guarantee that pthread_self() returns the thread ID or that
pthread_t is an integer. The thread ID is not that useful so simply
remove it.

This fixes the following warning when building with musl libc:

lib/librte_eal/linuxapp/eal/eal_dev.c: In function 'sigbus_handler':
lib/librte_eal/linuxapp/eal/eal_dev.c:70:3: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
   (int)pthread_self(), info->si_addr);
   ^

Fixes: 0fc54536b14a ("eal: add failure handling for hot-unplug")

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 lib/librte_eal/linuxapp/eal/eal_dev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_dev.c b/lib/librte_eal/linuxapp/eal/eal_dev.c
index 2830c8687..c41809380 100644
--- a/lib/librte_eal/linuxapp/eal/eal_dev.c
+++ b/lib/librte_eal/linuxapp/eal/eal_dev.c
@@ -67,6 +67,6 @@ static void sigbus_handler(int signum, siginfo_t *info,
 	int ret;
 
-	RTE_LOG(DEBUG, EAL, "Thread[%d] catch SIGBUS, fault address:%p\n",
-		(int)pthread_self(), info->si_addr);
+	RTE_LOG(DEBUG, EAL, "Thread catch SIGBUS, fault address:%p\n",
+		info->si_addr);
 
 	rte_spinlock_lock(&failure_handle_lock);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.252158662 +0100
+++ 0011-eal-linux-remove-thread-ID-from-debug-message.patch	2019-04-25 16:37:46.695296093 +0100
@@ -1 +1 @@
-From c2d82896ac6d9ea02c76044a8d4a612023ccf571 Mon Sep 17 00:00:00 2001
+From 339f737749f8962a06d65b77dcd07128165635aa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c2d82896ac6d9ea02c76044a8d4a612023ccf571 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
- lib/librte_eal/linux/eal/eal_dev.c | 4 ++--
+ lib/librte_eal/linuxapp/eal/eal_dev.c | 4 ++--
@@ -26 +27 @@
-diff --git a/lib/librte_eal/linux/eal/eal_dev.c b/lib/librte_eal/linux/eal/eal_dev.c
+diff --git a/lib/librte_eal/linuxapp/eal/eal_dev.c b/lib/librte_eal/linuxapp/eal/eal_dev.c
@@ -28,2 +29,2 @@
---- a/lib/librte_eal/linux/eal/eal_dev.c
-+++ b/lib/librte_eal/linux/eal/eal_dev.c
+--- a/lib/librte_eal/linuxapp/eal/eal_dev.c
++++ b/lib/librte_eal/linuxapp/eal/eal_dev.c

[dpdk-stable] patch 'bus/fslmc: remove unused include of error.h' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From cb5328a95338bf64c4235b22a5ebbaeda5010cf4 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:48 +0100
Subject: [PATCH] bus/fslmc: remove unused include of error.h

[ upstream commit 0ebe8561a1898db1fb881a9b3d2aa33822287e50 ]

Fixes following build error with musl libc:

In file included from drivers/bus/fslmc/qbman/qbman_debug.c:6:
drivers/bus/fslmc/qbman/include/compat.h:21:10: fatal error:
error.h: No such file or directory
 #include <error.h>
          ^~~~~~~~~

Apparently it is not used anywere in qbman so simply remove the include.

Fixes: 531b17a780dc ("bus/fslmc: add QBMAN driver to bus")

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 drivers/bus/fslmc/qbman/include/compat.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/bus/fslmc/qbman/include/compat.h b/drivers/bus/fslmc/qbman/include/compat.h
index 655bff4b6..e85a90ce7 100644
--- a/drivers/bus/fslmc/qbman/include/compat.h
+++ b/drivers/bus/fslmc/qbman/include/compat.h
@@ -18,5 +18,4 @@
 #include <malloc.h>
 #include <unistd.h>
-#include <error.h>
 #include <linux/types.h>
 #include <rte_atomic.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.295179517 +0100
+++ 0012-bus-fslmc-remove-unused-include-of-error.h.patch	2019-04-25 16:37:46.696296070 +0100
@@ -1 +1 @@
-From 0ebe8561a1898db1fb881a9b3d2aa33822287e50 Mon Sep 17 00:00:00 2001
+From cb5328a95338bf64c4235b22a5ebbaeda5010cf4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ebe8561a1898db1fb881a9b3d2aa33822287e50 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'bus/fslmc: fix build with musl libc' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 1824efcf1a10209f5e0417f742415f9c038dfaf0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:47 +0100
Subject: [PATCH] bus/fslmc: fix build with musl libc

[ upstream commit da1a31d92d65b88e068724da342ea46dfaa70036 ]

This fixes the following compile error with musl libc:

drivers/bus/fslmc/qbman/include/compat.h:41:10: error:
'stdout' undeclared (first use in this function)
   fflush(stdout); \
          ^~~~~~

Fixes: 531b17a780dc ("bus/fslmc: add QBMAN driver to bus")

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 drivers/bus/fslmc/qbman/include/compat.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/bus/fslmc/qbman/include/compat.h b/drivers/bus/fslmc/qbman/include/compat.h
index e85a90ce7..1ddd69e12 100644
--- a/drivers/bus/fslmc/qbman/include/compat.h
+++ b/drivers/bus/fslmc/qbman/include/compat.h
@@ -12,4 +12,5 @@
 #define _GNU_SOURCE
 #endif
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.335911715 +0100
+++ 0013-bus-fslmc-fix-build-with-musl-libc.patch	2019-04-25 16:37:46.696296070 +0100
@@ -1 +1 @@
-From da1a31d92d65b88e068724da342ea46dfaa70036 Mon Sep 17 00:00:00 2001
+From 1824efcf1a10209f5e0417f742415f9c038dfaf0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit da1a31d92d65b88e068724da342ea46dfaa70036 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/nfp: fix build with musl libc' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From b546b3d77fd76be59ce216cd7098f8b60a1b9ae8 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:49 +0100
Subject: [PATCH] net/nfp: fix build with musl libc

[ upstream commit bdbf45c24b07702fb69878b4b45db77db97bde6c ]

Fixes following build error on systems without execinfo.h:

drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c:19:10: fatal error:
execinfo.h: No such file or directory
 #include <execinfo.h>
          ^~~~~~~~~~~~

Fixes: c7e9729da6b5 ("net/nfp: support CPP")

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Acked-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
index c68d9400f..6dfa3e302 100644
--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
@@ -17,5 +17,7 @@
 #include <assert.h>
 #include <stdio.h>
+#if defined(RTE_BACKTRACE)
 #include <execinfo.h>
+#endif
 #include <stdlib.h>
 #include <unistd.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.375155392 +0100
+++ 0014-net-nfp-fix-build-with-musl-libc.patch	2019-04-25 16:37:46.697296047 +0100
@@ -1 +1 @@
-From bdbf45c24b07702fb69878b4b45db77db97bde6c Mon Sep 17 00:00:00 2001
+From b546b3d77fd76be59ce216cd7098f8b60a1b9ae8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bdbf45c24b07702fb69878b4b45db77db97bde6c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 39bd48a83..93ee310f5 100644
+index c68d9400f..6dfa3e302 100644

[dpdk-stable] patch 'net/netvsc: fix include of fcntl.h' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From fa1668ce4be40d1aef18d200f7aad9df898632a8 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:56 +0100
Subject: [PATCH] net/netvsc: fix include of fcntl.h

[ upstream commit f6d163a6dc39cdcc618f3e865658da508afeb527 ]

Fix the following warning when building with musl libc:

In file included from ../drivers/net/netvsc/hn_vf.c:14:
/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting
incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp]

Fixes: dc7680e8597c ("net/netvsc: support integrated VF")

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 drivers/net/netvsc/hn_vf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index de278eb7b..4127e411f 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -11,6 +11,6 @@
 #include <unistd.h>
 #include <dirent.h>
+#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/fcntl.h>
 #include <sys/uio.h>
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.417752629 +0100
+++ 0015-net-netvsc-fix-include-of-fcntl.h.patch	2019-04-25 16:37:46.698296024 +0100
@@ -1 +1 @@
-From f6d163a6dc39cdcc618f3e865658da508afeb527 Mon Sep 17 00:00:00 2001
+From fa1668ce4be40d1aef18d200f7aad9df898632a8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f6d163a6dc39cdcc618f3e865658da508afeb527 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index f68e1f9c5..883272ff4 100644
+index de278eb7b..4127e411f 100644

[dpdk-stable] patch 'app/test: fix flags with meson' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 7d914686241e661427d6c89e5e853ccc4d3efd03 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:51 +0100
Subject: [PATCH] app/test: fix flags with meson

in app/test/meson.build the default_cflag is never used so the
-D_GNU_SOURCE was never passed as intended.

Fixes the following build error with musl libc:

lib/librte_eal/common/include/rte_lcore.h:26:9: error:
unknown type name 'cpu_set_t'
 typedef cpu_set_t rte_cpuset_t;
         ^~~~~~~~~

The problem is that cpu_set_t is only defined when _GNU_SOURCE is set.

Fixes: 5d7b673d5fd6 ("mk: build with _GNU_SOURCE defined by default")
Cc: stable@dpdk.org

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 test/test/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/meson.build b/test/test/meson.build
index 5a4816fed..ace827352 100644
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -264,5 +264,5 @@ endif
 
 # specify -D_GNU_SOURCE unconditionally
-default_cflags += '-D_GNU_SOURCE'
+cflags += '-D_GNU_SOURCE'
 
 test_dep_objs = []
-- 
2.20.1

[dpdk-stable] patch 'app/test: fix build with musl libc' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 84692131b47ea049cdcc2cc3175a48894ebe9f2d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 Mar 2019 18:06:50 +0100
Subject: [PATCH] app/test: fix build with musl libc

[ upstream commit 816d76c53e246b97ee6dfc8343efa5959ea7270d ]

Fix following build error with musl libc:

app/test/test_eal_flags.c:152:55: error:
'O_RDONLY' undeclared (first use in this function)
      fd = openat(dirfd(hugepage_dir), dirent->d_name, O_RDONLY);
                                                       ^~~~~~~~

Fixes: 45f1b6e8680a ("app: add new tests on eal flags")

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 test/test/test_eal_flags.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c
index 81e345b87..775ccd3dd 100644
--- a/test/test/test_eal_flags.c
+++ b/test/test/test_eal_flags.c
@@ -18,4 +18,5 @@
 #include <sys/file.h>
 #include <limits.h>
+#include <fcntl.h>
 
 #include <rte_per_lcore.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.494212871 +0100
+++ 0017-app-test-fix-build-with-musl-libc.patch	2019-04-25 16:37:46.700295979 +0100
@@ -1 +1 @@
-From 816d76c53e246b97ee6dfc8343efa5959ea7270d Mon Sep 17 00:00:00 2001
+From 84692131b47ea049cdcc2cc3175a48894ebe9f2d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 816d76c53e246b97ee6dfc8343efa5959ea7270d ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- app/test/test_eal_flags.c | 1 +
+ test/test/test_eal_flags.c | 1 +
@@ -21,4 +22,4 @@
-diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
-index 1a64b0900..d626dd712 100644
---- a/app/test/test_eal_flags.c
-+++ b/app/test/test_eal_flags.c
+diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c
+index 81e345b87..775ccd3dd 100644
+--- a/test/test/test_eal_flags.c
++++ b/test/test/test_eal_flags.c

[dpdk-stable] patch 'net/vdev_netvsc: fix device cast' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From d540cf8d8cae4a4b37ec285f59f122d2492eae78 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 12 Mar 2019 19:12:53 -0700
Subject: [PATCH] net/vdev_netvsc: fix device cast

[ upstream commit cc7cd517b1a26f284112a5d6e5f40d6c63584930 ]

The return value from bus->find_device is a rte_device
which is not safe to cast to a rte_vdev_device structure.
It doesn't really matter since only being checked for NULL
but static checkers might find a bug here.

Fixes: 56252de779a6 ("net/vdev_netvsc: add automatic probing")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/vdev_netvsc/vdev_netvsc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index 16303ef5e..a5fd64e0c 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -812,5 +812,5 @@ static void
 vdev_netvsc_scan_callback(__rte_unused void *arg)
 {
-	struct rte_vdev_device *dev;
+	struct rte_device *dev;
 	struct rte_devargs *devargs;
 	struct rte_bus *vbus = rte_bus_find_by_name("vdev");
@@ -820,6 +820,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)
 			     VDEV_NETVSC_DRIVER_NAME_LEN))
 			return;
-	dev = (struct rte_vdev_device *)vbus->find_device(NULL,
-		vdev_netvsc_cmp_rte_device, VDEV_NETVSC_DRIVER_NAME);
+
+	dev = vbus->find_device(NULL, vdev_netvsc_cmp_rte_device,
+				VDEV_NETVSC_DRIVER_NAME);
 	if (dev)
 		return;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.536807149 +0100
+++ 0018-net-vdev_netvsc-fix-device-cast.patch	2019-04-25 16:37:46.701295956 +0100
@@ -1 +1 @@
-From cc7cd517b1a26f284112a5d6e5f40d6c63584930 Mon Sep 17 00:00:00 2001
+From d540cf8d8cae4a4b37ec285f59f122d2492eae78 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cc7cd517b1a26f284112a5d6e5f40d6c63584930 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index ba63fac2a..801f54c96 100644
+index 16303ef5e..a5fd64e0c 100644
@@ -24 +25 @@
-@@ -809,5 +809,5 @@ static void
+@@ -812,5 +812,5 @@ static void
@@ -31 +32 @@
-@@ -817,6 +817,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)
+@@ -820,6 +820,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)

[dpdk-stable] patch 'app/testpmd: add missing newline when showing statistics' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 9ee056a8e4fb55732341d96ffd68617b67e6f468 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 25 Mar 2019 09:51:43 +0100
Subject: [PATCH] app/testpmd: add missing newline when showing statistics

[ upstream commit 94d655468c795ff89ab184fef830638af8c795aa ]

Having the standard stats and the rx burst stats on the same line gives a
really long line and is not consistent with the rest.

Before:
iofwd engine
  RX-packets: 121811360      TX-packets: 121811392      TX-dropped: 0               RX-bursts : 3806605 [100% of 32 pkts]
  TX-bursts : 3806606 [100% of 32 pkts]

csum engine
  RX-packets: 5467488        TX-packets: 5467520        TX-dropped: 0               RX- bad IP checksum: 0               Rx- bad L4 checksum: 0              Rx- bad outer L4 checksum: 0
  RX-bursts : 170859 [100% of 32 pkts]
  TX-bursts : 170860 [100% of 32 pkts]

After:
iofwd engine
  RX-packets: 259770560      TX-packets: 259770592      TX-dropped: 0
  RX-bursts : 8117830 [100% of 32 pkts]
  TX-bursts : 8117831 [100% of 32 pkts]

csum engine
  RX-packets: 7834016        TX-packets: 7834048        TX-dropped: 0               RX- bad IP checksum: 0               Rx- bad L4 checksum: 0              Rx- bad outer L4 checksum: 0
  RX-bursts : 244813 [100% of 32 pkts]
  TX-bursts : 244814 [100% of 32 pkts]

Fixes: af75078fece3 ("first public release")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/testpmd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2fb5e15e7..c6c46cb67 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1481,4 +1481,6 @@ fwd_stream_stats_display(streamid_t stream_id)
 			fs->rx_bad_ip_csum, fs->rx_bad_l4_csum,
 			fs->rx_bad_outer_l4_csum);
+	} else {
+		printf("\n");
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.577896466 +0100
+++ 0019-app-testpmd-add-missing-newline-when-showing-statist.patch	2019-04-25 16:37:46.705295864 +0100
@@ -1 +1 @@
-From 94d655468c795ff89ab184fef830638af8c795aa Mon Sep 17 00:00:00 2001
+From 9ee056a8e4fb55732341d96ffd68617b67e6f468 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94d655468c795ff89ab184fef830638af8c795aa ]
+
@@ -31 +32,0 @@
-Cc: stable@dpdk.org
@@ -41 +42 @@
-index 216be47f9..771584455 100644
+index 2fb5e15e7..c6c46cb67 100644
@@ -44 +45 @@
-@@ -1469,4 +1469,6 @@ fwd_stream_stats_display(streamid_t stream_id)
+@@ -1481,4 +1481,6 @@ fwd_stream_stats_display(streamid_t stream_id)

[dpdk-stable] patch 'app/testpmd: extend forwarding statistics to 64 bits' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From aa28996c41d4e666a2ae48685c632ecd9f0a1819 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 25 Mar 2019 09:51:44 +0100
Subject: [PATCH] app/testpmd: extend forwarding statistics to 64 bits

[ upstream commit c185d42cb417bc4a51e9aa74f1d338fac2f1d1f0 ]

fwd engine statistics are stored as unsigned int (32bits) and can wrap
quite quickly.
Example: sending 7mpps for 614s gives us 4298000000 packets =>
0x1002e4680 larger than 32bits.

testpmd reports forwarding stats as:
RX-packets: 3500381        TX-packets: 3500010        TX-dropped: 371

While the port and accumulated stats are reported as 64bits:
RX-packets: 4298467677     RX-dropped: 0             RX-total: 4298467677
TX-packets: 4298467306     TX-dropped: 371           TX-total: 4298467677

Fixes: af75078fece3 ("first public release")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/testpmd.c | 49 ++++++++++++++----------------------------
 app/test-pmd/testpmd.h | 12 +++++------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index c6c46cb67..d62c1594d 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1472,11 +1472,13 @@ fwd_stream_stats_display(streamid_t stream_id)
 	       fwd_top_stats_border, fs->rx_port, fs->rx_queue,
 	       fs->tx_port, fs->tx_queue, fwd_top_stats_border);
-	printf("  RX-packets: %-14u TX-packets: %-14u TX-dropped: %-14u",
+	printf("  RX-packets: %-14"PRIu64" TX-packets: %-14"PRIu64
+	       " TX-dropped: %-14"PRIu64,
 	       fs->rx_packets, fs->tx_packets, fs->fwd_dropped);
 
 	/* if checksum mode */
 	if (cur_fwd_eng == &csum_fwd_engine) {
-	       printf("  RX- bad IP checksum: %-14u  Rx- bad L4 checksum: "
-			"%-14u Rx- bad outer L4 checksum: %-14u\n",
+		printf("  RX- bad IP checksum: %-14"PRIu64
+		       "  Rx- bad L4 checksum: %-14"PRIu64
+		       " Rx- bad outer L4 checksum: %-14"PRIu64"\n",
 			fs->rx_bad_ip_csum, fs->rx_bad_l4_csum,
 			fs->rx_bad_outer_l4_csum);
@@ -1758,7 +1760,4 @@ stop_packet_forwarding(void)
 	uint64_t total_tx_dropped;
 	uint64_t total_rx_nombuf;
-	uint64_t tx_dropped;
-	uint64_t rx_bad_ip_csum;
-	uint64_t rx_bad_l4_csum;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
 	uint64_t fwd_cycles;
@@ -1787,36 +1786,20 @@ stop_packet_forwarding(void)
 #endif
 	for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
+		struct fwd_stream *fs = fwd_streams[sm_id];
+
 		if (cur_fwd_config.nb_fwd_streams >
 		    cur_fwd_config.nb_fwd_ports) {
 			fwd_stream_stats_display(sm_id);
-			ports[fwd_streams[sm_id]->tx_port].tx_stream = NULL;
-			ports[fwd_streams[sm_id]->rx_port].rx_stream = NULL;
+			ports[fs->tx_port].tx_stream = NULL;
+			ports[fs->rx_port].rx_stream = NULL;
 		} else {
-			ports[fwd_streams[sm_id]->tx_port].tx_stream =
-				fwd_streams[sm_id];
-			ports[fwd_streams[sm_id]->rx_port].rx_stream =
-				fwd_streams[sm_id];
+			ports[fs->tx_port].tx_stream = fs;
+			ports[fs->rx_port].rx_stream = fs;
 		}
-		tx_dropped = ports[fwd_streams[sm_id]->tx_port].tx_dropped;
-		tx_dropped = (uint64_t) (tx_dropped +
-					 fwd_streams[sm_id]->fwd_dropped);
-		ports[fwd_streams[sm_id]->tx_port].tx_dropped = tx_dropped;
-
-		rx_bad_ip_csum =
-			ports[fwd_streams[sm_id]->rx_port].rx_bad_ip_csum;
-		rx_bad_ip_csum = (uint64_t) (rx_bad_ip_csum +
-					 fwd_streams[sm_id]->rx_bad_ip_csum);
-		ports[fwd_streams[sm_id]->rx_port].rx_bad_ip_csum =
-							rx_bad_ip_csum;
-
-		rx_bad_l4_csum =
-			ports[fwd_streams[sm_id]->rx_port].rx_bad_l4_csum;
-		rx_bad_l4_csum = (uint64_t) (rx_bad_l4_csum +
-					 fwd_streams[sm_id]->rx_bad_l4_csum);
-		ports[fwd_streams[sm_id]->rx_port].rx_bad_l4_csum =
-							rx_bad_l4_csum;
-
-		ports[fwd_streams[sm_id]->rx_port].rx_bad_outer_l4_csum +=
-				fwd_streams[sm_id]->rx_bad_outer_l4_csum;
+		ports[fs->tx_port].tx_dropped += fs->fwd_dropped;
+		ports[fs->rx_port].rx_bad_ip_csum += fs->rx_bad_ip_csum;
+		ports[fs->rx_port].rx_bad_l4_csum += fs->rx_bad_l4_csum;
+		ports[fs->rx_port].rx_bad_outer_l4_csum +=
+				fs->rx_bad_outer_l4_csum;
 
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index ed8f7b0b2..37d61b804 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -120,10 +120,10 @@ struct fwd_stream {
 
 	/* "read-write" results */
-	unsigned int rx_packets;  /**< received packets */
-	unsigned int tx_packets;  /**< received packets transmitted */
-	unsigned int fwd_dropped; /**< received packets not forwarded */
-	unsigned int rx_bad_ip_csum ; /**< received packets has bad ip checksum */
-	unsigned int rx_bad_l4_csum ; /**< received packets has bad l4 checksum */
-	unsigned int rx_bad_outer_l4_csum;
+	uint64_t rx_packets;  /**< received packets */
+	uint64_t tx_packets;  /**< received packets transmitted */
+	uint64_t fwd_dropped; /**< received packets not forwarded */
+	uint64_t rx_bad_ip_csum ; /**< received packets has bad ip checksum */
+	uint64_t rx_bad_l4_csum ; /**< received packets has bad l4 checksum */
+	uint64_t rx_bad_outer_l4_csum;
 	/**< received packets has bad outer l4 checksum */
 	unsigned int gro_times;	/**< GRO operation times */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.620535696 +0100
+++ 0020-app-testpmd-extend-forwarding-statistics-to-64-bits.patch	2019-04-25 16:37:46.710295750 +0100
@@ -1 +1 @@
-From c185d42cb417bc4a51e9aa74f1d338fac2f1d1f0 Mon Sep 17 00:00:00 2001
+From aa28996c41d4e666a2ae48685c632ecd9f0a1819 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c185d42cb417bc4a51e9aa74f1d338fac2f1d1f0 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 771584455..05a3dce49 100644
+index c6c46cb67..d62c1594d 100644
@@ -34 +35 @@
-@@ -1460,11 +1460,13 @@ fwd_stream_stats_display(streamid_t stream_id)
+@@ -1472,11 +1472,13 @@ fwd_stream_stats_display(streamid_t stream_id)
@@ -51 +52 @@
-@@ -1746,7 +1748,4 @@ stop_packet_forwarding(void)
+@@ -1758,7 +1760,4 @@ stop_packet_forwarding(void)
@@ -59 +60 @@
-@@ -1775,36 +1774,20 @@ stop_packet_forwarding(void)
+@@ -1787,36 +1786,20 @@ stop_packet_forwarding(void)
@@ -108 +109 @@
-index 85b791b6b..4f4a48ffa 100644
+index ed8f7b0b2..37d61b804 100644

[dpdk-stable] patch 'app/testpmd: remove useless casts on statistics' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 300a6ca3eb0ca922099b4d22d5f62053cfb71cb3 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 25 Mar 2019 09:51:45 +0100
Subject: [PATCH] app/testpmd: remove useless casts on statistics

[ upstream commit 7718296d06916d0b2029763913944f0067a2d0dd ]

Caught by code review while investigating the fwd stats display code.

Fixes: af75078fece3 ("first public release")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/testpmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index d62c1594d..55a4ee407 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1389,5 +1389,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		       "%-"PRIu64"\n",
 		       stats->ipackets, stats->imissed,
-		       (uint64_t) (stats->ipackets + stats->imissed));
+		       stats->ipackets + stats->imissed);
 
 		if (cur_fwd_eng == &csum_fwd_engine)
@@ -1403,5 +1403,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		       "%-"PRIu64"\n",
 		       stats->opackets, port->tx_dropped,
-		       (uint64_t) (stats->opackets + port->tx_dropped));
+		       stats->opackets + port->tx_dropped);
 	}
 	else {
@@ -1409,5 +1409,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		       "%14"PRIu64"\n",
 		       stats->ipackets, stats->imissed,
-		       (uint64_t) (stats->ipackets + stats->imissed));
+		       stats->ipackets + stats->imissed);
 
 		if (cur_fwd_eng == &csum_fwd_engine)
@@ -1424,5 +1424,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		       "%14"PRIu64"\n",
 		       stats->opackets, port->tx_dropped,
-		       (uint64_t) (stats->opackets + port->tx_dropped));
+		       stats->opackets + port->tx_dropped);
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.666183207 +0100
+++ 0021-app-testpmd-remove-useless-casts-on-statistics.patch	2019-04-25 16:37:46.713295681 +0100
@@ -1 +1 @@
-From 7718296d06916d0b2029763913944f0067a2d0dd Mon Sep 17 00:00:00 2001
+From 300a6ca3eb0ca922099b4d22d5f62053cfb71cb3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7718296d06916d0b2029763913944f0067a2d0dd ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 05a3dce49..c78d52457 100644
+index d62c1594d..55a4ee407 100644
@@ -23 +24 @@
-@@ -1377,5 +1377,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
+@@ -1389,5 +1389,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
@@ -30 +31 @@
-@@ -1391,5 +1391,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
+@@ -1403,5 +1403,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
@@ -37 +38 @@
-@@ -1397,5 +1397,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
+@@ -1409,5 +1409,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
@@ -44 +45 @@
-@@ -1412,5 +1412,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
+@@ -1424,5 +1424,5 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)

[dpdk-stable] patch 'ethdev: fix a typo' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 7550d9800c680072c927a39d60f7f8dc335727f0 Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Fri, 22 Mar 2019 17:17:53 +0200
Subject: [PATCH] ethdev: fix a typo

[ upstream commit a15b7a0e53d0764b36ac9d66949d7fc1bfaa2ef4 ]

This patch fixes a trivial typo in rte_ethdev.h.
retieve=>retrieve

Fixes: 80a1deb4c77a ("ethdev: add API to retrieve queue information")

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_ethdev/rte_ethdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index e32395346..070330192 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -1136,5 +1136,5 @@ struct rte_eth_dev_info {
 /**
  * Ethernet device RX queue information structure.
- * Used to retieve information about configured queue.
+ * Used to retrieve information about configured queue.
  */
 struct rte_eth_rxq_info {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.709009128 +0100
+++ 0022-ethdev-fix-a-typo.patch	2019-04-25 16:37:46.718295567 +0100
@@ -1 +1 @@
-From a15b7a0e53d0764b36ac9d66949d7fc1bfaa2ef4 Mon Sep 17 00:00:00 2001
+From 7550d9800c680072c927a39d60f7f8dc335727f0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a15b7a0e53d0764b36ac9d66949d7fc1bfaa2ef4 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 6b05dc6f6..2be9b4ba1 100644
+index e32395346..070330192 100644
@@ -22 +23 @@
-@@ -1138,5 +1138,5 @@ struct rte_eth_dev_info {
+@@ -1136,5 +1136,5 @@ struct rte_eth_dev_info {

[dpdk-stable] patch 'net/i40e: log when provided RSS key is not valid' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 49ce4e4bfc3db53aaa9e868e0bcad28ea38a87d5 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Tue, 26 Mar 2019 16:35:24 +0800
Subject: [PATCH] net/i40e: log when provided RSS key is not valid

[ upstream commit 7cb745230ffb39420387e612c79afa23e4d3b646 ]

A log message is required when provided RSS key is
not valid so that driver will use the default RSS key.

Fixes: ecad87d22383 ("net/i40e: move RSS to flow API")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Tested-by: Yuan Peng <yuan.peng@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 63ec8136d..3815aef6c 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -12746,4 +12746,6 @@ i40e_config_rss_filter(struct i40e_pf *pf,
 		rss_conf.rss_key_len = (I40E_PFQF_HKEY_MAX_INDEX + 1) *
 							sizeof(uint32_t);
+		PMD_DRV_LOG(INFO,
+			"No valid RSS key config for i40e, using default\n");
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.756402937 +0100
+++ 0023-net-i40e-log-when-provided-RSS-key-is-not-valid.patch	2019-04-25 16:37:46.728295338 +0100
@@ -1 +1 @@
-From 7cb745230ffb39420387e612c79afa23e4d3b646 Mon Sep 17 00:00:00 2001
+From 49ce4e4bfc3db53aaa9e868e0bcad28ea38a87d5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7cb745230ffb39420387e612c79afa23e4d3b646 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/bnxt: fix Rx VLAN offload flags' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 424ec1032035fd5be4d794dc832d5fdc5dbfe7f1 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Mon, 25 Mar 2019 14:27:54 -0700
Subject: [PATCH] net/bnxt: fix Rx VLAN offload flags

[ upstream commit 4339de851e55364d0f1f995babaa0006968870c0 ]

The bnxt driver is not correctly setting the receive VLAN offload
flags.  When VLAN is offloaded the driver must set the
PKT_RX_VLAN_STRIPPED flag.

Actually, several drivers have the same bug, only most of the
Intel drivers look right. Any driver that sets vlan_tci is probably
stripping the tag, and should be setting RX_VLAN_STRIPPED.

To quote rte_mbuf.h:

/**
 * The RX packet is a 802.1q VLAN packet, and the tci has been
 * saved in in mbuf->vlan_tci.
 * If the flag PKT_RX_VLAN_STRIPPED is also present, the VLAN
 * header has been stripped from mbuf data, else it is still
 * present.
 */

Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_rxr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 1bfc63d93..dc695e177 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -155,5 +155,5 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
 	    rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
 		mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
-		mbuf->ol_flags |= PKT_RX_VLAN;
+		mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 	}
 	if (likely(tpa_start1->flags2 &
@@ -438,5 +438,5 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 			RX_PKT_CMPL_METADATA_DE |
 			RX_PKT_CMPL_METADATA_PRI_MASK);
-		mbuf->ol_flags |= PKT_RX_VLAN;
+		mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.807394857 +0100
+++ 0024-net-bnxt-fix-Rx-VLAN-offload-flags.patch	2019-04-25 16:37:46.729295315 +0100
@@ -1 +1 @@
-From 4339de851e55364d0f1f995babaa0006968870c0 Mon Sep 17 00:00:00 2001
+From 424ec1032035fd5be4d794dc832d5fdc5dbfe7f1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4339de851e55364d0f1f995babaa0006968870c0 ]
+
@@ -25 +26,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/fm10k: fix VLAN strip offload flag' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 5bbbae2e6884136e6355660c69c0e4dd1044c82a Mon Sep 17 00:00:00 2001
From: Xiao Wang <xiao.w.wang@intel.com>
Date: Wed, 27 Mar 2019 13:09:03 +0800
Subject: [PATCH] net/fm10k: fix VLAN strip offload flag

[ upstream commit ae843c69aa55d25b1c0ef7984501b2356ed5fe88 ]

Since the VLAN header is stripped from mbuf data, PKT_RX_VLAN_STRIPPED
should be set in offload flag.

Fixes: 6b59a3bc82b1 ("fm10k: fix VLAN in Rx mbuf")
Fixes: 7092be8437bd ("fm10k: add vector Rx")

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
---
 drivers/net/fm10k/fm10k_rxtx.c     | 4 ++--
 drivers/net/fm10k/fm10k_rxtx_vec.c | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
index 1d0f09d25..fb02e1152 100644
--- a/drivers/net/fm10k/fm10k_rxtx.c
+++ b/drivers/net/fm10k/fm10k_rxtx.c
@@ -135,5 +135,5 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 		 * is valid for each RX packet's mbuf.
 		 */
-		mbuf->ol_flags |= PKT_RX_VLAN;
+		mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 		mbuf->vlan_tci = desc.w.vlan;
 		/**
@@ -296,5 +296,5 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 		 * is valid for each RX packet's mbuf.
 		 */
-		first_seg->ol_flags |= PKT_RX_VLAN;
+		first_seg->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 		first_seg->vlan_tci = desc.w.vlan;
 		/**
diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c
index 005fda630..96b46a2bd 100644
--- a/drivers/net/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c
@@ -53,6 +53,8 @@ fm10k_desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 	const __m128i pkttype_msk = _mm_set_epi16(
 			0x0000, 0x0000, 0x0000, 0x0000,
-			PKT_RX_VLAN, PKT_RX_VLAN,
-			PKT_RX_VLAN, PKT_RX_VLAN);
+			PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+			PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+			PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,
+			PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
 
 	/* mask everything except rss type */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.849899982 +0100
+++ 0025-net-fm10k-fix-VLAN-strip-offload-flag.patch	2019-04-25 16:37:46.731295270 +0100
@@ -1 +1 @@
-From ae843c69aa55d25b1c0ef7984501b2356ed5fe88 Mon Sep 17 00:00:00 2001
+From 5bbbae2e6884136e6355660c69c0e4dd1044c82a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ae843c69aa55d25b1c0ef7984501b2356ed5fe88 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/virtio: fix duplicate naming of include guard' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From e76de88781d680f19bf4ba4895db2bd4535b65bc Mon Sep 17 00:00:00 2001
From: Andrius Sirvys <andrius.sirvys@intel.com>
Date: Thu, 21 Mar 2019 10:09:53 +0000
Subject: [PATCH] net/virtio: fix duplicate naming of include guard

[ upstream commit 1708804ea977668f82a944b29399d376f8e50e9f ]

"The macro name '_VHOST_NET_USER_H' of this include guard is used
in 2 different header files."

lib/librte_vhost/vhost_user.h has the same include guard.
Renamed the include guard in vhost.h to differentiate.

Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")

Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_user/vhost.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
index 83a85cc6f..55f47036b 100644
--- a/drivers/net/virtio/virtio_user/vhost.h
+++ b/drivers/net/virtio/virtio_user/vhost.h
@@ -3,6 +3,6 @@
  */
 
-#ifndef _VHOST_NET_USER_H
-#define _VHOST_NET_USER_H
+#ifndef _VIRTIO_USER_VHOST_H
+#define _VIRTIO_USER_VHOST_H
 
 #include <stdint.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.891329521 +0100
+++ 0026-net-virtio-fix-duplicate-naming-of-include-guard.patch	2019-04-25 16:37:46.731295270 +0100
@@ -1 +1 @@
-From 1708804ea977668f82a944b29399d376f8e50e9f Mon Sep 17 00:00:00 2001
+From e76de88781d680f19bf4ba4895db2bd4535b65bc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1708804ea977668f82a944b29399d376f8e50e9f ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/virtio-user: fix multi-process support' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From d21964ea6b83ef0a060a628c044a3d35041ed373 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie@intel.com>
Date: Mon, 25 Mar 2019 12:12:15 +0800
Subject: [PATCH] net/virtio-user: fix multi-process support

[ upstream commit 1c8489da561be16ac73c6dab01db816af249713f ]

This patch fixes the multi-process support for virtio-user.
Currently virtio-user just provides some limited secondary
process supports. Only some basic operations can be done in
secondary process on virtio-user port, e.g. getting port stats.
Actions which will trigger the communication with vhost backend
can't be done in secondary process for now, as the fds are
not synced between processes. The processing of server mode
devargs is also moved into virtio_user_dev_init().

Fixes: cdb068f031c6 ("bus/vdev: scan by multi-process channel")
Fixes: ee27edbe0c10 ("drivers/net: share vdev data to secondary process")

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c            | 15 +++++
 drivers/net/virtio/virtio_ethdev.h            |  2 +
 .../net/virtio/virtio_user/virtio_user_dev.c  |  3 +-
 .../net/virtio/virtio_user/virtio_user_dev.h  |  2 +-
 drivers/net/virtio/virtio_user_ethdev.c       | 61 +++++++++++--------
 5 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 1767140b7..a1e3752a8 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -779,4 +779,19 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
 };
 
+/*
+ * dev_ops for virtio-user in secondary processes, as we just have
+ * some limited supports currently.
+ */
+const struct eth_dev_ops virtio_user_secondary_eth_dev_ops = {
+	.dev_infos_get           = virtio_dev_info_get,
+	.stats_get               = virtio_dev_stats_get,
+	.xstats_get              = virtio_dev_xstats_get,
+	.xstats_get_names        = virtio_dev_xstats_get_names,
+	.stats_reset             = virtio_dev_stats_reset,
+	.xstats_reset            = virtio_dev_stats_reset,
+	/* collect stats per queue */
+	.queue_stats_mapping_set = virtio_dev_queue_stats_mapping_set,
+};
+
 static void
 virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index e0f80e5a4..39a9f7b7d 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -46,4 +46,6 @@
 	 1u << VIRTIO_NET_F_HOST_TSO6)
 
+extern const struct eth_dev_ops virtio_user_secondary_eth_dev_ops;
+
 /*
  * CQ function prototype
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 9c8bcd2c6..f0051f887 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -413,5 +413,5 @@ int
 virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
 		     int cq, int queue_size, const char *mac, char **ifname,
-		     int mrg_rxbuf, int in_order)
+		     int server, int mrg_rxbuf, int in_order)
 {
 	pthread_mutex_init(&dev->mutex, NULL);
@@ -421,4 +421,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
 	dev->queue_pairs = 1; /* mq disabled by default */
 	dev->queue_size = queue_size;
+	dev->is_server = server;
 	dev->mac_specified = 0;
 	dev->frontend_features = 0;
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index c42ce5d4b..3e3a7b787 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -51,5 +51,5 @@ int virtio_user_stop_device(struct virtio_user_dev *dev);
 int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
 			 int cq, int queue_size, const char *mac, char **ifname,
-			 int mrg_rxbuf, int in_order);
+			 int server, int mrg_rxbuf, int in_order);
 void virtio_user_dev_uninit(struct virtio_user_dev *dev);
 void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx);
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index f8791391a..5781c0948 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -470,4 +470,24 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
 	int ret = -1;
 
+	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+		const char *name = rte_vdev_device_name(dev);
+		eth_dev = rte_eth_dev_attach_secondary(name);
+		if (!eth_dev) {
+			RTE_LOG(ERR, PMD, "Failed to probe %s\n", name);
+			return -1;
+		}
+
+		if (eth_virtio_dev_init(eth_dev) < 0) {
+			PMD_INIT_LOG(ERR, "eth_virtio_dev_init fails");
+			rte_eth_dev_release_port(eth_dev);
+			return -1;
+		}
+
+		eth_dev->dev_ops = &virtio_user_secondary_eth_dev_ops;
+		eth_dev->device = &dev->device;
+		rte_eth_dev_probing_finish(eth_dev);
+		return 0;
+	}
+
 	kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_args);
 	if (!kvlist) {
@@ -582,31 +602,17 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
 	}
 
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-		struct virtio_user_dev *vu_dev;
+	eth_dev = virtio_user_eth_dev_alloc(dev);
+	if (!eth_dev) {
+		PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
+		goto end;
+	}
 
-		eth_dev = virtio_user_eth_dev_alloc(dev);
-		if (!eth_dev) {
-			PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
-			goto end;
-		}
-
-		hw = eth_dev->data->dev_private;
-		vu_dev = virtio_user_get_dev(hw);
-		if (server_mode == 1)
-			vu_dev->is_server = true;
-		else
-			vu_dev->is_server = false;
-		if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-				 queue_size, mac_addr, &ifname, mrg_rxbuf,
-				 in_order) < 0) {
-			PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
-			virtio_user_eth_dev_free(eth_dev);
-			goto end;
-		}
-
-	} else {
-		eth_dev = rte_eth_dev_attach_secondary(rte_vdev_device_name(dev));
-		if (!eth_dev)
-			goto end;
+	hw = eth_dev->data->dev_private;
+	if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
+			 queue_size, mac_addr, &ifname, server_mode,
+			 mrg_rxbuf, in_order) < 0) {
+		PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
+		virtio_user_eth_dev_free(eth_dev);
+		goto end;
 	}
 
@@ -650,4 +656,7 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)
 		return -ENODEV;
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return rte_eth_dev_release_port(eth_dev);
+
 	/* make sure the device is stopped, queues freed */
 	rte_eth_dev_close(eth_dev->data->port_id);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.931380463 +0100
+++ 0027-net-virtio-user-fix-multi-process-support.patch	2019-04-25 16:37:46.735295178 +0100
@@ -1 +1 @@
-From 1c8489da561be16ac73c6dab01db816af249713f Mon Sep 17 00:00:00 2001
+From d21964ea6b83ef0a060a628c044a3d35041ed373 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c8489da561be16ac73c6dab01db816af249713f ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
- .../net/virtio/virtio_user/virtio_user_dev.h  |  3 +-
+ .../net/virtio/virtio_user/virtio_user_dev.h  |  2 +-
@@ -27 +28 @@
- 5 files changed, 56 insertions(+), 28 deletions(-)
+ 5 files changed, 55 insertions(+), 28 deletions(-)
@@ -30 +31 @@
-index 85b223451..310008757 100644
+index 1767140b7..a1e3752a8 100644
@@ -33 +34 @@
-@@ -908,4 +908,19 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
+@@ -779,4 +779,19 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
@@ -54 +55 @@
-index b8aab7da4..45e96f32b 100644
+index e0f80e5a4..39a9f7b7d 100644
@@ -57 +58 @@
-@@ -48,4 +48,6 @@
+@@ -46,4 +46,6 @@
@@ -65 +66 @@
-index 2dc8f2051..07aabb527 100644
+index 9c8bcd2c6..f0051f887 100644
@@ -68 +69 @@
-@@ -427,5 +427,5 @@ int
+@@ -413,5 +413,5 @@ int
@@ -71,2 +72,2 @@
--		     int mrg_rxbuf, int in_order, int packed_vq)
-+		     int server, int mrg_rxbuf, int in_order, int packed_vq)
+-		     int mrg_rxbuf, int in_order)
++		     int server, int mrg_rxbuf, int in_order)
@@ -75 +76 @@
-@@ -435,4 +435,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
+@@ -421,4 +421,5 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
@@ -82 +83 @@
-index c57b298a6..829ad4140 100644
+index c42ce5d4b..3e3a7b787 100644
@@ -85 +86 @@
-@@ -62,5 +62,6 @@ int virtio_user_stop_device(struct virtio_user_dev *dev);
+@@ -51,5 +51,5 @@ int virtio_user_stop_device(struct virtio_user_dev *dev);
@@ -88,3 +89,2 @@
--			 int mrg_rxbuf, int in_order, int packed_vq);
-+			 int server, int mrg_rxbuf, int in_order,
-+			 int packed_vq);
+-			 int mrg_rxbuf, int in_order);
++			 int server, int mrg_rxbuf, int in_order);
@@ -94 +94 @@
-index c5a76bd91..129c2b9ef 100644
+index f8791391a..5781c0948 100644
@@ -97 +97 @@
-@@ -515,4 +515,24 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
+@@ -470,4 +470,24 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
@@ -122 +122 @@
-@@ -636,31 +656,17 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
+@@ -582,31 +602,17 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
@@ -147 +147 @@
--				 in_order, packed_vq) < 0) {
+-				 in_order) < 0) {
@@ -160 +160 @@
-+			 mrg_rxbuf, in_order, packed_vq) < 0) {
++			 mrg_rxbuf, in_order) < 0) {
@@ -166 +166 @@
-@@ -704,4 +710,7 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)
+@@ -650,4 +656,7 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)

[dpdk-stable] patch 'vhost/crypto: fix parens' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 122f4fc54238905be2b86254a61536c710f04e87 Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang@intel.com>
Date: Mon, 25 Mar 2019 14:37:31 +0000
Subject: [PATCH] vhost/crypto: fix parens

[ upstream commit bc5560c15e74d66b019b4bbbd5573519b0a462c3 ]

Coverity issue: 277214, 277220, 277233, 277236
Fixes: cd1e8f03abf0 ("vhost/crypto: fix packet copy in chaining mode")

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost_crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index 0694c0a74..fc362ba98 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -1103,5 +1103,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op,
 		if (unlikely(copy_data(digest_addr, vc_req, &digest_desc,
 				chain->para.hash_result_len,
-				nb_descs, vq_size)) < 0) {
+				nb_descs, vq_size) < 0)) {
 			ret = VIRTIO_CRYPTO_BADMSG;
 			goto error_exit;
@@ -1618,5 +1618,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
 
 			if (unlikely(vhost_crypto_process_one_req(vcrypto, vq,
-					op, head, desc_idx)) < 0)
+					op, head, desc_idx) < 0))
 				break;
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.978277621 +0100
+++ 0028-vhost-crypto-fix-parens.patch	2019-04-25 16:37:46.737295132 +0100
@@ -1 +1 @@
-From bc5560c15e74d66b019b4bbbd5573519b0a462c3 Mon Sep 17 00:00:00 2001
+From 122f4fc54238905be2b86254a61536c710f04e87 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc5560c15e74d66b019b4bbbd5573519b0a462c3 ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index 9b4b850e8..0edf12d52 100644
+index 0694c0a74..fc362ba98 100644
@@ -20 +21 @@
-@@ -1110,5 +1110,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op,
+@@ -1103,5 +1103,5 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct rte_crypto_op *op,
@@ -27 +28 @@
-@@ -1628,5 +1628,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
+@@ -1618,5 +1618,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,

[dpdk-stable] patch 'raw/ifpga: modify log output' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 643d0011aae120bce895f4a7170f20663c6d94eb Mon Sep 17 00:00:00 2001
From: Andy Pei <andy.pei@intel.com>
Date: Wed, 27 Mar 2019 09:32:57 +0800
Subject: [PATCH] raw/ifpga: modify log output

[ upstream commit a3a6a3d94f7efd8fe5d4db97823085bf3a0b2ac5 ]

Print function name in ifpga log and a new line goes after
every IFPGA log.

Fixes: ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver")

Signed-off-by: Andy Pei <andy.pei@intel.com>
Reviewed-by: Rosen Xu <rosen.xu@intel.com>
---
 drivers/raw/ifpga_rawdev/ifpga_rawdev.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h b/drivers/raw/ifpga_rawdev/ifpga_rawdev.h
index c7759b8bd..234ce3642 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.h
@@ -9,6 +9,6 @@ extern int ifpga_rawdev_logtype;
 
 #define IFPGA_RAWDEV_PMD_LOG(level, fmt, args...) \
-	rte_log(RTE_LOG_ ## level, ifpga_rawdev_logtype, "ifgpa: " fmt, \
-		##args)
+	rte_log(RTE_LOG_ ## level, ifpga_rawdev_logtype, "%s(): " fmt "\n", \
+				__func__, ##args)
 
 #define IFPGA_RAWDEV_PMD_FUNC_TRACE() IFPGA_RAWDEV_PMD_LOG(DEBUG, ">>")
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.019041604 +0100
+++ 0029-raw-ifpga-modify-log-output.patch	2019-04-25 16:37:46.737295132 +0100
@@ -1 +1 @@
-From a3a6a3d94f7efd8fe5d4db97823085bf3a0b2ac5 Mon Sep 17 00:00:00 2001
+From 643d0011aae120bce895f4a7170f20663c6d94eb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a3a6a3d94f7efd8fe5d4db97823085bf3a0b2ac5 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/netvsc: remove useless condition' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From ce3001a82d0e596c2401f4780462e694e6aeacb4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Wed, 27 Mar 2019 14:08:42 -0700
Subject: [PATCH] net/netvsc: remove useless condition

[ upstream commit 204109c5d4a8bdd6787a43a113f7f987aae6623c ]

Since previous test is for mtu < 1519 the next else if
is always true. This causes the lgtm static tool to complain.
Not a real issue, just cosmetic.

Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
 drivers/net/netvsc/hn_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 96b7f1855..6b3768a54 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -124,5 +124,5 @@ hn_update_packet_stats(struct hn_stats *stats, const struct rte_mbuf *m)
 		else if (s < 1519)
 			stats->size_bins[6]++;
-		else if (s >= 1519)
+		else
 			stats->size_bins[7]++;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.059000366 +0100
+++ 0030-net-netvsc-remove-useless-condition.patch	2019-04-25 16:37:46.738295109 +0100
@@ -1 +1 @@
-From 204109c5d4a8bdd6787a43a113f7f987aae6623c Mon Sep 17 00:00:00 2001
+From ce3001a82d0e596c2401f4780462e694e6aeacb4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 204109c5d4a8bdd6787a43a113f7f987aae6623c ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index fecd69887..c67e9ae25 100644
+index 96b7f1855..6b3768a54 100644

[dpdk-stable] patch 'net/virtio: remove useless condition' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 450fb9794065874c32a0915a38a02094349adf09 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 27 Mar 2019 14:08:43 -0700
Subject: [PATCH] net/virtio: remove useless condition

[ upstream commit 5c67301273fff63d81c343cee164a3d87918b567 ]

Since previous test is for mtu < 1519 the next else if
is always true. This causes the lgtm static tool to complain.
Not a real issue, just cosmetic.

Fixes: 76d4c652e07d ("virtio: add extended stats")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rami Rosen <ramirose@gmail.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 606706e94..66b2f9f35 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -781,5 +781,5 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
 		else if (s < 1519)
 			stats->size_bins[6]++;
-		else if (s >= 1519)
+		else
 			stats->size_bins[7]++;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.102558738 +0100
+++ 0031-net-virtio-remove-useless-condition.patch	2019-04-25 16:37:46.740295064 +0100
@@ -1 +1 @@
-From 5c67301273fff63d81c343cee164a3d87918b567 Mon Sep 17 00:00:00 2001
+From 450fb9794065874c32a0915a38a02094349adf09 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c67301273fff63d81c343cee164a3d87918b567 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index ee30084e4..e6f3706d6 100644
+index 606706e94..66b2f9f35 100644
@@ -24 +25 @@
-@@ -1110,5 +1110,5 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
+@@ -781,5 +781,5 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)

[dpdk-stable] patch 'power: fix governor storage to trim newlines' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 0ab100f39c63fc7a88920f7df9a54659ebcb61f9 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt@intel.com>
Date: Fri, 29 Mar 2019 16:39:20 +0000
Subject: [PATCH] power: fix governor storage to trim newlines

[ upstream commit 08a710642d1d8bed831ecf2085e041213381fc68 ]

Currently the Power Libray stores the governor name with an embedded
newline read from the scaling_governor sysfs file. This patch strips
it out.

Fixes: 445c6528b55f ("power: common interface for guest and host")

Signed-off-by: David Hunt <david.hunt@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_power/power_acpi_cpufreq.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c
index cd5978d5b..7addde274 100644
--- a/lib/librte_power/power_acpi_cpufreq.c
+++ b/lib/librte_power/power_acpi_cpufreq.c
@@ -148,4 +148,6 @@ power_set_governor_userspace(struct rte_power_info *pi)
 	s = fgets(buf, sizeof(buf), f);
 	FOPS_OR_NULL_GOTO(s, out);
+	/* Strip off terminating '\n' */
+	strtok(buf, "\n");
 
 	/* Check if current governor is userspace */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.144056671 +0100
+++ 0032-power-fix-governor-storage-to-trim-newlines.patch	2019-04-25 16:37:46.741295041 +0100
@@ -1 +1 @@
-From 08a710642d1d8bed831ecf2085e041213381fc68 Mon Sep 17 00:00:00 2001
+From 0ab100f39c63fc7a88920f7df9a54659ebcb61f9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 08a710642d1d8bed831ecf2085e041213381fc68 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16,3 +17,2 @@
- lib/librte_power/power_acpi_cpufreq.c   | 2 ++
- lib/librte_power/power_pstate_cpufreq.c | 2 ++
- 2 files changed, 4 insertions(+)
+ lib/librte_power/power_acpi_cpufreq.c | 2 ++
+ 1 file changed, 2 insertions(+)
@@ -21 +21 @@
-index 534efe817..49325d0e0 100644
+index cd5978d5b..7addde274 100644
@@ -31,11 +30,0 @@
-diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
-index 9c1a1625f..3e04e8040 100644
---- a/lib/librte_power/power_pstate_cpufreq.c
-+++ b/lib/librte_power/power_pstate_cpufreq.c
-@@ -293,4 +293,6 @@ power_set_governor_performance(struct pstate_power_info *pi)
- 	s = fgets(buf, sizeof(buf), f);
- 	FOPS_OR_NULL_GOTO(s, out);
-+	/* Strip off terminating '\n' */
-+	strtok(buf, "\n");
- 
- 	/* Check if current governor is performance */

[dpdk-stable] patch 'telemetry: fix mapping of statistics' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 9c3a20924e62ad9b2eae25d784e64ce660a22a94 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 28 Mar 2019 15:30:45 +0000
Subject: [PATCH] telemetry: fix mapping of statistics

[ upstream commit c12cefa3795881be175e64bebc2798d1f77f9132 ]

If we have two NIC ports which have a different set of NIC stats we can
end up having two different stats registered with xstats with the same
name. [Since the stats are updated in bulk as a contiguous set, the
second driver re-using the registration of the first is not possible.]

This causes issues with the invalid stat for one driver being found due to
a lookup by name which is unnecessary. Instead of getting stat names
involved do the lookup by ID instead.

Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Kevin Laatz <kevin.laatz@intel.com>
---
 lib/librte_telemetry/rte_telemetry_parser.c | 26 +++++++++------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/lib/librte_telemetry/rte_telemetry_parser.c b/lib/librte_telemetry/rte_telemetry_parser.c
index 03a58a2fd..9bc16eef4 100644
--- a/lib/librte_telemetry/rte_telemetry_parser.c
+++ b/lib/librte_telemetry/rte_telemetry_parser.c
@@ -257,5 +257,5 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
 {
 	int ret, num_metrics, i, p;
-	struct rte_metric_name *names;
+	struct rte_metric_value *values;
 	uint64_t num_port_ids = 0;
 	uint32_t port_ids[RTE_MAX_ETHPORTS];
@@ -282,5 +282,5 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
 	}
 
-	num_metrics = rte_metrics_get_names(NULL, 0);
+	num_metrics = rte_metrics_get_values(0, NULL, 0);
 	if (num_metrics < 0) {
 		TELEMETRY_LOG_ERR("Cannot get metrics count");
@@ -301,6 +301,6 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
 	}
 
-	names = malloc(sizeof(struct rte_metric_name) * num_metrics);
-	if (names == NULL) {
+	values = malloc(sizeof(struct rte_metric_value) * num_metrics);
+	if (values == NULL) {
 		TELEMETRY_LOG_ERR("Cannot allocate memory");
 		ret = rte_telemetry_send_error_response(telemetry,
@@ -311,5 +311,4 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
 	}
 
-	const char *stat_names[num_metrics];
 	uint32_t stat_ids[num_metrics];
 
@@ -329,14 +328,11 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
 	}
 
-	ret = rte_metrics_get_names(names, num_metrics);
+	ret = rte_metrics_get_values(port_ids[0], values, num_metrics);
+	if (ret < 0) {
+		TELEMETRY_LOG_ERR("Could not get stat values");
+		goto fail;
+	}
 	for (i = 0; i < num_metrics; i++)
-		stat_names[i] = names[i].name;
-
-	ret = rte_telemetry_stat_names_to_ids(telemetry, stat_names, stat_ids,
-		num_metrics);
-	if (ret < 0) {
-		TELEMETRY_LOG_ERR("Could not convert stat names to IDs");
-		goto fail;
-	}
+		stat_ids[i] = values[i].key;
 
 	ret = rte_telemetry_send_ports_stats_values(stat_ids, num_metrics,
@@ -350,5 +346,5 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
 
 fail:
-	free(names);
+	free(values);
 	return -1;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.184962934 +0100
+++ 0033-telemetry-fix-mapping-of-statistics.patch	2019-04-25 16:37:46.741295041 +0100
@@ -1 +1 @@
-From c12cefa3795881be175e64bebc2798d1f77f9132 Mon Sep 17 00:00:00 2001
+From 9c3a20924e62ad9b2eae25d784e64ce660a22a94 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c12cefa3795881be175e64bebc2798d1f77f9132 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'app/test: fix sprintf with strlcat' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From d6afd41e9e475795a96408ca2cebe8f98b43b157 Mon Sep 17 00:00:00 2001
From: Pallantla Poornima <pallantlax.poornima@intel.com>
Date: Wed, 13 Mar 2019 11:07:23 +0000
Subject: [PATCH] app/test: fix sprintf with strlcat

[ upstream commit 323643727f4c5653d9a1ddc552d95bae2b2c2e5c ]

sprintf function is not secure as it doesn't check the length of string.
More secure function strlcat is used.

Fixes: 727909c592 ("app/test: introduce dynamic commands list")

Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
Reviewed-by: Aaron Conole <aconole@redhat.com>
---
 test/test/commands.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test/commands.c b/test/test/commands.c
index 94fbc310e..8d5a03a95 100644
--- a/test/test/commands.c
+++ b/test/test/commands.c
@@ -45,4 +45,5 @@
 #include <cmdline_parse_string.h>
 #include <cmdline.h>
+#include <rte_string_fns.h>
 
 #include "test.h"
@@ -366,5 +367,5 @@ int commands_init(void)
 {
 	struct test_command *t;
-	char *commands, *ptr;
+	char *commands;
 	int commands_len = 0;
 
@@ -373,14 +374,13 @@ int commands_init(void)
 	}
 
-	commands = malloc(commands_len + 1);
+	commands = (char *)calloc(commands_len, sizeof(char));
 	if (!commands)
 		return -1;
 
-	ptr = commands;
 	TAILQ_FOREACH(t, &commands_list, next) {
-		ptr += sprintf(ptr, "%s#", t->command);
+		strlcat(commands, t->command, commands_len);
+		if (TAILQ_NEXT(t, next) != NULL)
+			strlcat(commands, "#", commands_len);
 	}
-	ptr--;
-	ptr[0] = '\0';
 
 	cmd_autotest_autotest.string_data.str = commands;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.227801793 +0100
+++ 0034-app-test-fix-sprintf-with-strlcat.patch	2019-04-25 16:37:46.742295018 +0100
@@ -1 +1 @@
-From 323643727f4c5653d9a1ddc552d95bae2b2c2e5c Mon Sep 17 00:00:00 2001
+From d6afd41e9e475795a96408ca2cebe8f98b43b157 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 323643727f4c5653d9a1ddc552d95bae2b2c2e5c ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/commands.c | 12 ++++++------
+ test/test/commands.c | 12 ++++++------
@@ -18 +19 @@
-diff --git a/app/test/commands.c b/app/test/commands.c
+diff --git a/test/test/commands.c b/test/test/commands.c
@@ -20,2 +21,2 @@
---- a/app/test/commands.c
-+++ b/app/test/commands.c
+--- a/test/test/commands.c
++++ b/test/test/commands.c

[dpdk-stable] patch 'maintainers: update for IBM POWER' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 33b1f7255da1256479fdd3c27187b7a7cc54f483 Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Wed, 27 Mar 2019 15:31:39 -0700
Subject: [PATCH] maintainers: update for IBM POWER

[ upstream commit a9d64ecc4cc3ce1a48f96b06f24430900c15e728 ]

Succeed Chao Zhu as maintainer of EAL for IBM POWER.

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 71ba31208..af291f439 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -235,5 +235,5 @@ F: drivers/net/virtio/virtio_rxtx_simple_neon.c
 
 IBM POWER (alpha)
-M: Chao Zhu <chaozhu@linux.vnet.ibm.com>
+M: David Christensen <drc@linux.vnet.ibm.com>
 F: lib/librte_eal/common/arch/ppc_64/
 F: lib/librte_eal/common/include/arch/ppc_64/
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.267283503 +0100
+++ 0035-maintainers-update-for-IBM-POWER.patch	2019-04-25 16:37:46.743294995 +0100
@@ -1 +1 @@
-From a9d64ecc4cc3ce1a48f96b06f24430900c15e728 Mon Sep 17 00:00:00 2001
+From 33b1f7255da1256479fdd3c27187b7a7cc54f483 Mon Sep 17 00:00:00 2001
@@ -6 +6 @@
-Succeed Chao Zhu as maintainer of EAL for IBM POWER.
+[ upstream commit a9d64ecc4cc3ce1a48f96b06f24430900c15e728 ]
@@ -8 +8 @@
-Cc: stable@dpdk.org
+Succeed Chao Zhu as maintainer of EAL for IBM POWER.
@@ -17 +17 @@
-index 1783293c7..9f34f905f 100644
+index 71ba31208..af291f439 100644
@@ -20 +20 @@
-@@ -243,5 +243,5 @@ F: drivers/net/virtio/virtio_rxtx_simple_neon.c
+@@ -235,5 +235,5 @@ F: drivers/net/virtio/virtio_rxtx_simple_neon.c

[dpdk-stable] patch 'eal: initialize alarms early' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From bb5430fbb09c6ab37e187094bd2e64d250f2e101 Mon Sep 17 00:00:00 2001
From: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Date: Mon, 1 Apr 2019 16:18:14 +0200
Subject: [PATCH] eal: initialize alarms early

[ upstream commit ea4e3ab7bd37980f9745e1e63ac33390cc8bae10 ]

On Linux, we currently initialize rte_alarms after
starting to listen for IPC hotplug requests, which gives
us a data race window. Upon receiving such hotplug
request we always try to set an alarm and this obviously
doesn't work if the alarms weren't initialized yet.

To fix it, we initialize alarms before starting to
listen for IPC hotplug messages. Specifically, we move
rte_eal_alarm_init() right after rte_eal_intr_init() as
it makes some sense to keep those two close to each other.

We update the BSD code as well to keep the initialization
order the same in both EAL implementations.

Fixes: 244d5130719c ("eal: enable hotplug on multi-process")

Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 lib/librte_eal/bsdapp/eal/eal.c   | 12 ++++++------
 lib/librte_eal/linuxapp/eal/eal.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index f01495e33..26c31a236 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -663,4 +663,10 @@ rte_eal_init(int argc, char **argv)
 	}
 
+	if (rte_eal_alarm_init() < 0) {
+		rte_eal_init_alert("Cannot init interrupt-handling thread");
+		/* rte_eal_alarm_init sets rte_errno on failure. */
+		return -1;
+	}
+
 	/* Put mp channel init before bus scan so that we can init the vdev
 	 * bus through mp channel in the secondary process before the bus scan.
@@ -752,10 +758,4 @@ rte_eal_init(int argc, char **argv)
 	}
 
-	if (rte_eal_alarm_init() < 0) {
-		rte_eal_init_alert("Cannot init interrupt-handling thread");
-		/* rte_eal_alarm_init sets rte_errno on failure. */
-		return -1;
-	}
-
 	if (rte_eal_timer_init() < 0) {
 		rte_eal_init_alert("Cannot init HPET or TSC timers");
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 30138b638..479071260 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -1001,4 +1001,10 @@ rte_eal_init(int argc, char **argv)
 	}
 
+	if (rte_eal_alarm_init() < 0) {
+		rte_eal_init_alert("Cannot init interrupt-handling thread");
+		/* rte_eal_alarm_init sets rte_errno on failure. */
+		return -1;
+	}
+
 	/* Put mp channel init before bus scan so that we can init the vdev
 	 * bus through mp channel in the secondary process before the bus scan.
@@ -1121,10 +1127,4 @@ rte_eal_init(int argc, char **argv)
 	}
 
-	if (rte_eal_alarm_init() < 0) {
-		rte_eal_init_alert("Cannot init interrupt-handling thread");
-		/* rte_eal_alarm_init sets rte_errno on failure. */
-		return -1;
-	}
-
 	if (rte_eal_timer_init() < 0) {
 		rte_eal_init_alert("Cannot init HPET or TSC timers");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.308923416 +0100
+++ 0036-eal-initialize-alarms-early.patch	2019-04-25 16:37:46.746294926 +0100
@@ -1 +1 @@
-From ea4e3ab7bd37980f9745e1e63ac33390cc8bae10 Mon Sep 17 00:00:00 2001
+From bb5430fbb09c6ab37e187094bd2e64d250f2e101 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea4e3ab7bd37980f9745e1e63ac33390cc8bae10 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -25,2 +26,2 @@
- lib/librte_eal/freebsd/eal/eal.c | 12 ++++++------
- lib/librte_eal/linux/eal/eal.c   | 12 ++++++------
+ lib/librte_eal/bsdapp/eal/eal.c   | 12 ++++++------
+ lib/librte_eal/linuxapp/eal/eal.c | 12 ++++++------
@@ -29,4 +30,4 @@
-diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
-index 4e86b10b1..790c6afa7 100644
---- a/lib/librte_eal/freebsd/eal/eal.c
-+++ b/lib/librte_eal/freebsd/eal/eal.c
+diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
+index f01495e33..26c31a236 100644
+--- a/lib/librte_eal/bsdapp/eal/eal.c
++++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -55,5 +56,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
-index 13f401684..75ed0cf10 100644
---- a/lib/librte_eal/linux/eal/eal.c
-+++ b/lib/librte_eal/linux/eal/eal.c
-@@ -1006,4 +1006,10 @@ rte_eal_init(int argc, char **argv)
+diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
+index 30138b638..479071260 100644
+--- a/lib/librte_eal/linuxapp/eal/eal.c
++++ b/lib/librte_eal/linuxapp/eal/eal.c
+@@ -1001,4 +1001,10 @@ rte_eal_init(int argc, char **argv)
@@ -70 +71 @@
-@@ -1126,10 +1132,4 @@ rte_eal_init(int argc, char **argv)
+@@ -1121,10 +1127,4 @@ rte_eal_init(int argc, char **argv)

[dpdk-stable] patch 'ring: fix an error message' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 7837e3e8b704f7b5d1383497c63d871db345864c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 2 Apr 2019 08:30:26 -0700
Subject: [PATCH] ring: fix an error message

[ upstream commit c0c055f5f773adca467d256298d8e777024f085f ]

Log message should end with newline.

Fixes: 4e32101f9b01 ("ring: support freeing")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
---
 lib/librte_ring/rte_ring.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index d215acecc..550549db3 100644
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -190,5 +190,6 @@ rte_ring_free(struct rte_ring *r)
 	 */
 	if (r->memzone == NULL) {
-		RTE_LOG(ERR, RING, "Cannot free ring (not created with rte_ring_create()");
+		RTE_LOG(ERR, RING,
+			"Cannot free ring, not created with rte_ring_create()\n");
 		return;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.354963733 +0100
+++ 0037-ring-fix-an-error-message.patch	2019-04-25 16:37:46.746294926 +0100
@@ -1 +1 @@
-From c0c055f5f773adca467d256298d8e777024f085f Mon Sep 17 00:00:00 2001
+From 7837e3e8b704f7b5d1383497c63d871db345864c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,2 @@
+
+[ upstream commit c0c055f5f773adca467d256298d8e777024f085f ]

[dpdk-stable] patch 'mem: limit use of address hint' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 558509fbb2b0a0f5803f348634e4956ff8cb5214 Mon Sep 17 00:00:00 2001
From: Shahaf Shuler <shahafs@mellanox.com>
Date: Sun, 31 Mar 2019 11:43:48 +0300
Subject: [PATCH] mem: limit use of address hint

[ upstream commit 237060c4ad15b4ee9002be3c0e56ac3070eceb48 ]

The commit below added an address hint as starting address for 64-bit
systems in case an explicit base virtual address was not set by the user.

The justification for such hint was to help devices that work in VA
mode and has a address range limitation to work smoothly with the eal
memory subsystem.

While the base address value selected may work fine for the eal
initialization, it easily breaks when trying to register external memory
using rte_extmem_register API.

Trying to register anonymous memory on RH x86_64 machine took several
minutes, during them the function eal_get_virtual_area repeatedly
scanned for a good VA candidate.

The attempt to guess which VA address will be free for mapping will
always result in not portable, error prone code:
* different application may use different libraries along w/ DPDK. One
  can never guess which library was called first and how much virtual
  memory it consumed.
* external memory can be registered at any time in the application run
  time.

In order not to break the existing secondary process design, this patch
only limits the max number of tries that will be done with the
address hint.
When the number of tries exceeds the threshold the code
will use the suggested address from kernel.

Fixes: 1df21702873d ("mem: use address hint for mapping hugepages")

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Tested-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 lib/librte_eal/common/eal_common_memory.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 999ba24b4..e3ef3714e 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -56,4 +56,5 @@ static uint64_t baseaddr = 0x100000000;
 #endif
 
+#define MAX_MMAP_WITH_DEFINED_ADDR_TRIES 5
 void *
 eal_get_virtual_area(void *requested_addr, size_t *size,
@@ -63,4 +64,5 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
 	uint64_t map_sz;
 	void *mapped_addr, *aligned_addr;
+	uint8_t try = 0;
 
 	if (system_page_sz == 0)
@@ -118,9 +120,12 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
 		if (mapped_addr != MAP_FAILED && addr_is_hint &&
 		    mapped_addr != requested_addr) {
-			/* hint was not used. Try with another offset */
-			munmap(mapped_addr, map_sz);
-			mapped_addr = MAP_FAILED;
+			try++;
 			next_baseaddr = RTE_PTR_ADD(next_baseaddr, page_sz);
-			requested_addr = next_baseaddr;
+			if (try <= MAX_MMAP_WITH_DEFINED_ADDR_TRIES) {
+				/* hint was not used. Try with another offset */
+				munmap(mapped_addr, map_sz);
+				mapped_addr = MAP_FAILED;
+				requested_addr = next_baseaddr;
+			}
 		}
 	} while ((allow_shrink || addr_is_hint) &&
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.395043705 +0100
+++ 0038-mem-limit-use-of-address-hint.patch	2019-04-25 16:37:46.747294903 +0100
@@ -1 +1 @@
-From 237060c4ad15b4ee9002be3c0e56ac3070eceb48 Mon Sep 17 00:00:00 2001
+From 558509fbb2b0a0f5803f348634e4956ff8cb5214 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 237060c4ad15b4ee9002be3c0e56ac3070eceb48 ]
+
@@ -36 +37,0 @@
-Cc: stable@dpdk.org
@@ -46 +47 @@
-index c9da69b16..5ae8d0124 100644
+index 999ba24b4..e3ef3714e 100644
@@ -49 +50 @@
-@@ -57,4 +57,5 @@ static uint64_t baseaddr = 0x100000000;
+@@ -56,4 +56,5 @@ static uint64_t baseaddr = 0x100000000;
@@ -55 +56 @@
-@@ -64,4 +65,5 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
+@@ -63,4 +64,5 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
@@ -61 +62 @@
-@@ -119,9 +121,12 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
+@@ -118,9 +120,12 @@ eal_get_virtual_area(void *requested_addr, size_t *size,

[dpdk-stable] patch 'event/sw: fix enqueue checks in self-test' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 6edb65026561ffa27ba441f4c2d3e135124d5664 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harry.van.haaren@intel.com>
Date: Wed, 27 Mar 2019 18:45:46 +0000
Subject: [PATCH] event/sw: fix enqueue checks in self-test

[ upstream commit 1b03e2929114d4ebfc7a2159d0d45f0a3e9a7ba6 ]

This patch fixes a number of instances of the same return
value mis-check, where previously we checked for a negative
return value as error, however the API returns an unsigned
integer, so these return value checks are invalid.

The rte_event_enqueue_burst() API returns the number of
events enqueued, so in order to identify the error case,
we must check for != the number of intended enqueues.

Fixes: cd1a9e3eab55 ("test/eventdev: add SW tests for load balancing")

Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 drivers/event/sw/sw_evdev_selftest.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c
index d00d5de61..38c21fa0f 100644
--- a/drivers/event/sw/sw_evdev_selftest.c
+++ b/drivers/event/sw/sw_evdev_selftest.c
@@ -386,5 +386,5 @@ run_prio_packet_test(struct test *t)
 		};
 		err = rte_event_enqueue_burst(evdev, t->port[0], &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: error failed to enqueue\n", __LINE__);
 			return -1;
@@ -478,5 +478,5 @@ test_single_directed_packet(struct test *t)
 	/* generate pkt and enqueue */
 	err = rte_event_enqueue_burst(evdev, rx_enq, &ev, 1);
-	if (err < 0) {
+	if (err != 1) {
 		printf("%d: error failed to enqueue\n", __LINE__);
 		return -1;
@@ -547,5 +547,5 @@ test_directed_forward_credits(struct test *t)
 	for (i = 0; i < 1000; i++) {
 		err = rte_event_enqueue_burst(evdev, 0, &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: error failed to enqueue\n", __LINE__);
 			return -1;
@@ -708,5 +708,5 @@ burst_packets(struct test *t)
 		/* generate pkt and enqueue */
 		err = rte_event_enqueue_burst(evdev, t->port[rx_port], &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: Failed to enqueue\n", __LINE__);
 			return -1;
@@ -796,5 +796,5 @@ abuse_inflights(struct test *t)
 	/* Enqueue op only */
 	err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &release_ev, 1);
-	if (err < 0) {
+	if (err != 1) {
 		printf("%d: Failed to enqueue\n", __LINE__);
 		return -1;
@@ -2027,5 +2027,5 @@ load_balancing(struct test *t)
 		/* generate pkt and enqueue */
 		err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: Failed to enqueue\n", __LINE__);
 			return -1;
@@ -2126,5 +2126,5 @@ load_balancing_history(struct test *t)
 		arp->hash.rss = flows1[i];
 		err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: Failed to enqueue\n", __LINE__);
 			return -1;
@@ -2176,5 +2176,5 @@ load_balancing_history(struct test *t)
 
 		err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: Failed to enqueue\n", __LINE__);
 			return -1;
@@ -2286,5 +2286,5 @@ invalid_qid(struct test *t)
 		/* generate pkt and enqueue */
 		err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1);
-		if (err < 0) {
+		if (err != 1) {
 			printf("%d: Failed to enqueue\n", __LINE__);
 			return -1;
@@ -2373,5 +2373,5 @@ single_packet(struct test *t)
 
 	err = rte_event_enqueue_burst(evdev, t->port[rx_enq], &ev, 1);
-	if (err < 0) {
+	if (err != 1) {
 		printf("%d: Failed to enqueue\n", __LINE__);
 		return -1;
@@ -2417,5 +2417,5 @@ single_packet(struct test *t)
 	rte_pktmbuf_free(ev.mbuf);
 	err = rte_event_enqueue_burst(evdev, t->port[wrk_enq], &release_ev, 1);
-	if (err < 0) {
+	if (err != 1) {
 		printf("%d: Failed to enqueue\n", __LINE__);
 		return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.434918540 +0100
+++ 0039-event-sw-fix-enqueue-checks-in-self-test.patch	2019-04-25 16:37:46.749294858 +0100
@@ -1 +1 @@
-From 1b03e2929114d4ebfc7a2159d0d45f0a3e9a7ba6 Mon Sep 17 00:00:00 2001
+From 6edb65026561ffa27ba441f4c2d3e135124d5664 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1b03e2929114d4ebfc7a2159d0d45f0a3e9a7ba6 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'test/event: replace sprintf with snprintf' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From e4e2456fb034fe4fa81f5f8cc7881ee4fc49dc2d Mon Sep 17 00:00:00 2001
From: Pallantla Poornima <pallantlax.poornima@intel.com>
Date: Wed, 6 Feb 2019 10:43:42 +0000
Subject: [PATCH] test/event: replace sprintf with snprintf

[ upstream commit 64fc990877cdfe1973a18f47e6887e8a141a6efb ]

sprintf function is not secure as it doesn't check the length of string.
More secure function snprintf is used.

Fixes: 2a9c83ae3b ("test/eventdev: add multi-ports test")

Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
---
 test/test/test_event_eth_rx_adapter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test/test_event_eth_rx_adapter.c b/test/test/test_event_eth_rx_adapter.c
index 1d3be82b5..38f5c039f 100644
--- a/test/test/test_event_eth_rx_adapter.c
+++ b/test/test/test_event_eth_rx_adapter.c
@@ -480,5 +480,6 @@ adapter_multi_eth_add_del(void)
 	port_index = rte_eth_dev_count_total();
 	for (; port_index < RTE_MAX_ETHPORTS; port_index += 1) {
-		sprintf(driver_name, "%s%u", "net_null", drv_id);
+		snprintf(driver_name, sizeof(driver_name), "%s%u", "net_null",
+				drv_id);
 		err = rte_vdev_init(driver_name, NULL);
 		TEST_ASSERT(err == 0, "Failed driver %s got %d",
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.478599240 +0100
+++ 0040-test-event-replace-sprintf-with-snprintf.patch	2019-04-25 16:37:46.750294835 +0100
@@ -1 +1 @@
-From 64fc990877cdfe1973a18f47e6887e8a141a6efb Mon Sep 17 00:00:00 2001
+From e4e2456fb034fe4fa81f5f8cc7881ee4fc49dc2d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 64fc990877cdfe1973a18f47e6887e8a141a6efb ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14 +15 @@
- app/test/test_event_eth_rx_adapter.c | 3 ++-
+ test/test/test_event_eth_rx_adapter.c | 3 ++-
@@ -17 +18 @@
-diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c
+diff --git a/test/test/test_event_eth_rx_adapter.c b/test/test/test_event_eth_rx_adapter.c
@@ -19,2 +20,2 @@
---- a/app/test/test_event_eth_rx_adapter.c
-+++ b/app/test/test_event_eth_rx_adapter.c
+--- a/test/test/test_event_eth_rx_adapter.c
++++ b/test/test/test_event_eth_rx_adapter.c

[dpdk-stable] patch 'compress/isal: fix compression stream initialization' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 54d5a665231fe6290504e6107addbb8c1f6c6af6 Mon Sep 17 00:00:00 2001
From: Tomasz Cel <tomaszx.cel@intel.com>
Date: Thu, 28 Mar 2019 10:06:27 +0100
Subject: [PATCH] compress/isal: fix compression stream initialization

[ upstream commit ae1374e240ee3ad3392b0d798daec3ebf0b569e8 ]

This patch fixes ISAL internal state fields initialization.

Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")

Signed-off-by: Tomasz Cel <tomaszx.cel@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 drivers/compress/isal/isal_compress_pmd.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/compress/isal/isal_compress_pmd.c b/drivers/compress/isal/isal_compress_pmd.c
index 9f1e96888..f208b6501 100644
--- a/drivers/compress/isal/isal_compress_pmd.c
+++ b/drivers/compress/isal/isal_compress_pmd.c
@@ -373,5 +373,5 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
 
 	/* Initialize compression stream */
-	isal_deflate_stateless_init(qp->stream);
+	isal_deflate_init(qp->stream);
 
 	qp->stream->level_buf = temp_level_buf;
@@ -462,6 +462,4 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
 	op->consumed = qp->stream->total_in;
 	op->produced = qp->stream->total_out;
-	isal_deflate_reset(qp->stream);
-
 	return ret;
 }
@@ -539,5 +537,4 @@ process_isal_inflate(struct rte_comp_op *op, struct isal_comp_qp *qp)
 	}
 		op->produced = qp->state->total_out;
-	isal_inflate_reset(qp->state);
 
 	return ret;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.518859730 +0100
+++ 0041-compress-isal-fix-compression-stream-initialization.patch	2019-04-25 16:37:46.751294812 +0100
@@ -1 +1 @@
-From ae1374e240ee3ad3392b0d798daec3ebf0b569e8 Mon Sep 17 00:00:00 2001
+From 54d5a665231fe6290504e6107addbb8c1f6c6af6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ae1374e240ee3ad3392b0d798daec3ebf0b569e8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- drivers/compress/isal/isal_compress_pmd.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ drivers/compress/isal/isal_compress_pmd.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
@@ -18 +19 @@
-index 8879a42d8..ca1d70354 100644
+index 9f1e96888..f208b6501 100644
@@ -21 +22 @@
-@@ -413,5 +413,5 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
+@@ -373,5 +373,5 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
@@ -28,3 +29,3 @@
-@@ -515,6 +515,4 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
- 	}
- 
+@@ -462,6 +462,4 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
+ 	op->consumed = qp->stream->total_in;
+ 	op->produced = qp->stream->total_out;
@@ -35,3 +36,3 @@
-@@ -599,6 +597,4 @@ process_isal_inflate(struct rte_comp_op *op, struct isal_comp_qp *qp,
- 	op->output_chksum = qp->state->crc;
- 
+@@ -539,5 +537,4 @@ process_isal_inflate(struct rte_comp_op *op, struct isal_comp_qp *qp)
+ 	}
+ 		op->produced = qp->state->total_out;
@@ -39 +40 @@
--
+ 
@@ -41 +41,0 @@
- }

[dpdk-stable] patch 'crypto/dpaa2_sec: fix session clearing' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 764df58dfd0242fe83b87c26d51005a0e63248dc Mon Sep 17 00:00:00 2001
From: Akhil Goyal <akhil.goyal@nxp.com>
Date: Wed, 27 Mar 2019 11:53:30 +0000
Subject: [PATCH] crypto/dpaa2_sec: fix session clearing

[ upstream commit fd4f22fbd8f59b44e34badad09e3e55ff12184cd ]

private data should be cleared instead of the complete session

Fixes: 8d1f3a5d751b ("crypto/dpaa2_sec: support crypto operation")

Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 34c14f776..077194b6f 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -2914,5 +2914,5 @@ dpaa2_sec_sym_session_clear(struct rte_cryptodev *dev,
 		rte_free(s->cipher_key.data);
 		rte_free(s->auth_key.data);
-		memset(sess, 0, sizeof(dpaa2_sec_session));
+		memset(s, 0, sizeof(dpaa2_sec_session));
 		struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
 		set_sym_session_private_data(sess, index, NULL);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.559236057 +0100
+++ 0042-crypto-dpaa2_sec-fix-session-clearing.patch	2019-04-25 16:37:46.753294766 +0100
@@ -1 +1 @@
-From fd4f22fbd8f59b44e34badad09e3e55ff12184cd Mon Sep 17 00:00:00 2001
+From 764df58dfd0242fe83b87c26d51005a0e63248dc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fd4f22fbd8f59b44e34badad09e3e55ff12184cd ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index c2c22515d..d955ffc45 100644
+index 34c14f776..077194b6f 100644
@@ -20 +21 @@
-@@ -2913,5 +2913,5 @@ dpaa2_sec_sym_session_clear(struct rte_cryptodev *dev,
+@@ -2914,5 +2914,5 @@ dpaa2_sec_sym_session_clear(struct rte_cryptodev *dev,

[dpdk-stable] patch 'crypto/dpaa2_sec: fix offset calculation for GCM' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 783d160c0a4016253f03a444fae63e5af4a232e9 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <akhil.goyal@nxp.com>
Date: Wed, 27 Mar 2019 11:53:32 +0000
Subject: [PATCH] crypto/dpaa2_sec: fix offset calculation for GCM

[ upstream commit a5e05ab6431802f87b27a656d983226b86c307d7 ]

In case of gcm, output buffer should have aad space
before the actual buffer which needs to be written.
CAAM will not write into the aad anything, it will skip
auth_only_len (aad) and write the buffer afterwards.

Fixes: 37f96eb01bce ("crypto/dpaa2_sec: support scatter gather")

Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 077194b6f..ec3111b29 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -237,6 +237,6 @@ build_authenc_gcm_sg_fd(dpaa2_sec_session *sess,
 	/* Configure Output SGE for Encap/Decap */
 	DPAA2_SET_FLE_ADDR(sge, DPAA2_MBUF_VADDR_TO_IOVA(mbuf));
-	DPAA2_SET_FLE_OFFSET(sge, mbuf->data_off + sym_op->aead.data.offset -
-								auth_only_len);
+	DPAA2_SET_FLE_OFFSET(sge, mbuf->data_off +
+			RTE_ALIGN_CEIL(auth_only_len, 16) - auth_only_len);
 	sge->length = mbuf->data_len - sym_op->aead.data.offset + auth_only_len;
 
@@ -401,6 +401,6 @@ build_authenc_gcm_fd(dpaa2_sec_session *sess,
 	/* Configure Output SGE for Encap/Decap */
 	DPAA2_SET_FLE_ADDR(sge, DPAA2_MBUF_VADDR_TO_IOVA(dst));
-	DPAA2_SET_FLE_OFFSET(sge, sym_op->aead.data.offset +
-				dst->data_off - auth_only_len);
+	DPAA2_SET_FLE_OFFSET(sge, dst->data_off +
+			RTE_ALIGN_CEIL(auth_only_len, 16) - auth_only_len);
 	sge->length = sym_op->aead.data.length + auth_only_len;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.603947142 +0100
+++ 0043-crypto-dpaa2_sec-fix-offset-calculation-for-GCM.patch	2019-04-25 16:37:46.756294697 +0100
@@ -1 +1 @@
-From a5e05ab6431802f87b27a656d983226b86c307d7 Mon Sep 17 00:00:00 2001
+From 783d160c0a4016253f03a444fae63e5af4a232e9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a5e05ab6431802f87b27a656d983226b86c307d7 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index d955ffc45..7e762d4b8 100644
+index 077194b6f..ec3111b29 100644

[dpdk-stable] patch 'drivers/qat: fix queue pair NUMA node' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 43db0facdc4f211f1aee7667b73a6e921c0cd2cf Mon Sep 17 00:00:00 2001
From: Tomasz Jozwiak <tomaszx.jozwiak@intel.com>
Date: Tue, 26 Mar 2019 15:20:48 +0100
Subject: [PATCH] drivers/qat: fix queue pair NUMA node

[ upstream commit 1e796b11febb8fd3fa380f762aadadd6cc5a11e8 ]

This patch assigns QAT queue pair resources to the correct NUMA nodes.
Any DMA'able memory should use NUMA node of QAT device
rather than socket_id of the initializing process.

Fixes: 98c4a35c736f ("crypto/qat: move common qat files to common dir")
Fixes: a795248d740b ("compress/qat: add configure and clear functions")

Signed-off-by: Tomasz Jozwiak <tomaszx.jozwiak@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 drivers/common/qat/qat_qp.c         | 14 ++++++++------
 drivers/compress/qat/qat_comp_pmd.c |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index 4e66c583b..935ec3fb5 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -212,6 +212,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
 
 	/* Allocate the queue pair data structure. */
-	qp = rte_zmalloc("qat PMD qp metadata",
-			sizeof(*qp), RTE_CACHE_LINE_SIZE);
+	qp = rte_zmalloc_socket("qat PMD qp metadata",
+				sizeof(*qp), RTE_CACHE_LINE_SIZE,
+				qat_qp_conf->socket_id);
 	if (qp == NULL) {
 		QAT_LOG(ERR, "Failed to alloc mem for qp struct");
@@ -219,7 +220,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
 	}
 	qp->nb_descriptors = qat_qp_conf->nb_descriptors;
-	qp->op_cookies = rte_zmalloc("qat PMD op cookie pointer",
+	qp->op_cookies = rte_zmalloc_socket("qat PMD op cookie pointer",
 			qat_qp_conf->nb_descriptors * sizeof(*qp->op_cookies),
-			RTE_CACHE_LINE_SIZE);
+			RTE_CACHE_LINE_SIZE, qat_qp_conf->socket_id);
 	if (qp->op_cookies == NULL) {
 		QAT_LOG(ERR, "Failed to alloc mem for cookie");
@@ -261,5 +262,6 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
 				qp->nb_descriptors,
 				qat_qp_conf->cookie_size, 64, 0,
-				NULL, NULL, NULL, NULL, qat_qp_conf->socket_id,
+				NULL, NULL, NULL, NULL,
+				qat_dev->pci_dev->device.numa_node,
 				0);
 	if (!qp->op_cookie_pool) {
@@ -389,5 +391,5 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
 		queue->hw_bundle_number, queue->hw_queue_number);
 	qp_mz = queue_dma_zone_reserve(queue->memz_name, queue_size_bytes,
-			qp_conf->socket_id);
+			qat_dev->pci_dev->device.numa_node);
 	if (qp_mz == NULL) {
 		QAT_LOG(ERR, "Failed to allocate ring memzone");
diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c
index 9b7ae8de1..139298efe 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c
@@ -240,5 +240,6 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
 static struct rte_mempool *
 qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
-			      uint32_t num_elements)
+			   struct rte_compressdev_config *config,
+			   uint32_t num_elements)
 {
 	char xform_pool_name[RTE_MEMPOOL_NAMESIZE];
@@ -265,5 +266,5 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
 				num_elements,
 				qat_comp_xform_size(), 0, 0,
-				NULL, NULL, NULL, NULL, rte_socket_id(),
+				NULL, NULL, NULL, NULL, config->socket_id,
 				0);
 	if (mp == NULL) {
@@ -321,5 +322,5 @@ qat_comp_dev_config(struct rte_compressdev *dev,
 	}
 
-	comp_dev->xformpool = qat_comp_create_xform_pool(comp_dev,
+	comp_dev->xformpool = qat_comp_create_xform_pool(comp_dev, config,
 					config->max_nb_priv_xforms);
 	if (comp_dev->xformpool == NULL) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.646953017 +0100
+++ 0044-drivers-qat-fix-queue-pair-NUMA-node.patch	2019-04-25 16:37:46.758294652 +0100
@@ -1 +1 @@
-From 1e796b11febb8fd3fa380f762aadadd6cc5a11e8 Mon Sep 17 00:00:00 2001
+From 43db0facdc4f211f1aee7667b73a6e921c0cd2cf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1e796b11febb8fd3fa380f762aadadd6cc5a11e8 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index febc2efc4..131215296 100644
+index 4e66c583b..935ec3fb5 100644
@@ -25 +26 @@
-@@ -213,6 +213,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
+@@ -212,6 +212,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -35 +36 @@
-@@ -220,7 +221,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
+@@ -219,7 +220,7 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -45 +46 @@
-@@ -262,5 +263,6 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
+@@ -261,5 +262,6 @@ int qat_qp_setup(struct qat_pci_device *qat_dev,
@@ -53 +54 @@
-@@ -391,5 +393,5 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
+@@ -389,5 +391,5 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
@@ -61 +62 @@
-index cf7a9e884..1d9d72e8f 100644
+index 9b7ae8de1..139298efe 100644
@@ -64 +65 @@
-@@ -277,5 +277,6 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
+@@ -240,5 +240,6 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
@@ -72 +73 @@
-@@ -302,5 +303,5 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
+@@ -265,5 +266,5 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
@@ -79 +80 @@
-@@ -358,5 +359,5 @@ qat_comp_dev_config(struct rte_compressdev *dev,
+@@ -321,5 +322,5 @@ qat_comp_dev_config(struct rte_compressdev *dev,

[dpdk-stable] patch 'compress/isal: fix getting information about CPU' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 5f90208ac879367e413e70467c5b86f694fa54e3 Mon Sep 17 00:00:00 2001
From: Tomasz Cel <tomaszx.cel@intel.com>
Date: Thu, 7 Mar 2019 12:28:21 +0100
Subject: [PATCH] compress/isal: fix getting information about CPU

[ upstream commit bbbc39b2c2e5deb3eaa182c3ddb86aafc2ab962f ]

This patch adds query about CPU features

Fixes: 53a9baa98c36 ("compress/isal: add basic PMD ops")

Signed-off-by: Tomasz Cel <tomaszx.cel@intel.com>
Acked-by: Lee Daly <lee.daly@intel.com>
---
 drivers/compress/isal/isal_compress_pmd_ops.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c
index 41cade87e..472e54e8e 100644
--- a/drivers/compress/isal/isal_compress_pmd_ops.c
+++ b/drivers/compress/isal/isal_compress_pmd_ops.c
@@ -134,8 +134,16 @@ isal_comp_pmd_info_get(struct rte_compressdev *dev __rte_unused,
 	if (dev_info != NULL) {
 		dev_info->capabilities = isal_pmd_capabilities;
-		dev_info->feature_flags = RTE_COMPDEV_FF_CPU_AVX512 |
-				RTE_COMPDEV_FF_CPU_AVX2 |
-				RTE_COMPDEV_FF_CPU_AVX |
-				RTE_COMPDEV_FF_CPU_SSE;
+
+		/* Check CPU for supported vector instruction and set
+		 * feature_flags
+		 */
+		if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F))
+			dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_AVX512;
+		else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2))
+			dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_AVX2;
+		else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX))
+			dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_AVX;
+		else
+			dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_SSE;
 	}
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.689333393 +0100
+++ 0045-compress-isal-fix-getting-information-about-CPU.patch	2019-04-25 16:37:46.758294652 +0100
@@ -1 +1 @@
-From bbbc39b2c2e5deb3eaa182c3ddb86aafc2ab962f Mon Sep 17 00:00:00 2001
+From 5f90208ac879367e413e70467c5b86f694fa54e3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bbbc39b2c2e5deb3eaa182c3ddb86aafc2ab962f ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 7b9184922..fe9995992 100644
+index 41cade87e..472e54e8e 100644
@@ -21 +22 @@
-@@ -136,8 +136,16 @@ isal_comp_pmd_info_get(struct rte_compressdev *dev __rte_unused,
+@@ -134,8 +134,16 @@ isal_comp_pmd_info_get(struct rte_compressdev *dev __rte_unused,

[dpdk-stable] patch 'ring: fix namesize macro documentation block' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8babdafffcc0af5fac8f92590e5044f55707615c Mon Sep 17 00:00:00 2001
From: Gage Eads <gage.eads@intel.com>
Date: Thu, 4 Apr 2019 07:34:54 -0500
Subject: [PATCH] ring: fix namesize macro documentation block

[ upstream commit 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 ]

'/**<' style comments apply to the previous member, which caused doxygen to
emit the RTE_RING_NAMESIZE documentation for RTE_RING_MZ_PREFIX.

Fixes: 38c9817ee1d8 ("mempool: adjust name size in related data types")

Signed-off-by: Gage Eads <gage.eads@intel.com>
---
 lib/librte_ring/rte_ring.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index af5444a9f..83d0f6f83 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -58,5 +58,5 @@ enum rte_ring_queue_behavior {
 
 #define RTE_RING_MZ_PREFIX "RG_"
-/**< The maximum length of a ring name. */
+/** The maximum length of a ring name. */
 #define RTE_RING_NAMESIZE (RTE_MEMZONE_NAMESIZE - \
 			   sizeof(RTE_RING_MZ_PREFIX) + 1)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.733149407 +0100
+++ 0046-ring-fix-namesize-macro-documentation-block.patch	2019-04-25 16:37:46.759294629 +0100
@@ -1 +1 @@
-From 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 Mon Sep 17 00:00:00 2001
+From 8babdafffcc0af5fac8f92590e5044f55707615c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'eal: tighten permissions on shared memory files' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From a938ac708f813dd74a1e7db7c6b64479acabdc13 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 3 Apr 2019 17:00:34 +0100
Subject: [PATCH] eal: tighten permissions on shared memory files

[ upstream commit 70d284ab8262e81600d76456c7819af2913aa164 ]

When creating files on disk, e.g. for EAL configuration or shared memory
locks, etc., there is no need to grant any permissions on those files to
other users. All directories are already created with 0700 permissions, so
we should create all files with 0600 permissions.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/bsdapp/eal/eal.c                 | 2 +-
 lib/librte_eal/bsdapp/eal/eal_hugepage_info.c   | 2 +-
 lib/librte_eal/linuxapp/eal/eal.c               | 2 +-
 lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 2 +-
 lib/librte_eal/linuxapp/eal/eal_memory.c        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 26c31a236..bfac7fdc9 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -228,5 +228,5 @@ rte_eal_config_create(void)
 
 	if (mem_cfg_fd < 0){
-		mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660);
+		mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0600);
 		if (mem_cfg_fd < 0)
 			rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
index 1e8f5df23..32012e142 100644
--- a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -23,5 +23,5 @@ map_shared_memory(const char *filename, const size_t mem_size, int flags)
 {
 	void *retval;
-	int fd = open(filename, flags, 0666);
+	int fd = open(filename, flags, 0600);
 	if (fd < 0)
 		return NULL;
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 479071260..58124195b 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -321,5 +321,5 @@ rte_eal_config_create(void)
 
 	if (mem_cfg_fd < 0){
-		mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660);
+		mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0600);
 		if (mem_cfg_fd < 0)
 			rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 0eab1cf71..6e898c249 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -46,5 +46,5 @@ map_shared_memory(const char *filename, const size_t mem_size, int flags)
 {
 	void *retval;
-	int fd = open(filename, flags, 0666);
+	int fd = open(filename, flags, 0600);
 	if (fd < 0)
 		return NULL;
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 788aed25d..ee5f6613b 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -538,5 +538,5 @@ create_shared_memory(const char *filename, const size_t mem_size)
 	}
 
-	fd = open(filename, O_CREAT | O_RDWR, 0666);
+	fd = open(filename, O_CREAT | O_RDWR, 0600);
 	if (fd < 0)
 		return NULL;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.774071477 +0100
+++ 0047-eal-tighten-permissions-on-shared-memory-files.patch	2019-04-25 16:37:46.764294515 +0100
@@ -1 +1 @@
-From 70d284ab8262e81600d76456c7819af2913aa164 Mon Sep 17 00:00:00 2001
+From a938ac708f813dd74a1e7db7c6b64479acabdc13 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 70d284ab8262e81600d76456c7819af2913aa164 ]
+
@@ -11,2 +12,0 @@
-Cc: stable@dpdk.org
-
@@ -15,5 +15,5 @@
- lib/librte_eal/freebsd/eal/eal.c               | 2 +-
- lib/librte_eal/freebsd/eal/eal_hugepage_info.c | 2 +-
- lib/librte_eal/linux/eal/eal.c                 | 2 +-
- lib/librte_eal/linux/eal/eal_hugepage_info.c   | 2 +-
- lib/librte_eal/linux/eal/eal_memory.c          | 2 +-
+ lib/librte_eal/bsdapp/eal/eal.c                 | 2 +-
+ lib/librte_eal/bsdapp/eal/eal_hugepage_info.c   | 2 +-
+ lib/librte_eal/linuxapp/eal/eal.c               | 2 +-
+ lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 2 +-
+ lib/librte_eal/linuxapp/eal/eal_memory.c        | 2 +-
@@ -22,4 +22,4 @@
-diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
-index 790c6afa7..c6ac9028f 100644
---- a/lib/librte_eal/freebsd/eal/eal.c
-+++ b/lib/librte_eal/freebsd/eal/eal.c
+diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
+index 26c31a236..bfac7fdc9 100644
+--- a/lib/librte_eal/bsdapp/eal/eal.c
++++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -33 +33 @@
-diff --git a/lib/librte_eal/freebsd/eal/eal_hugepage_info.c b/lib/librte_eal/freebsd/eal/eal_hugepage_info.c
+diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -35,2 +35,2 @@
---- a/lib/librte_eal/freebsd/eal/eal_hugepage_info.c
-+++ b/lib/librte_eal/freebsd/eal/eal_hugepage_info.c
+--- a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
++++ b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -44,4 +44,4 @@
-diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
-index 75ed0cf10..f7ae62d7b 100644
---- a/lib/librte_eal/linux/eal/eal.c
-+++ b/lib/librte_eal/linux/eal/eal.c
+diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
+index 479071260..58124195b 100644
+--- a/lib/librte_eal/linuxapp/eal/eal.c
++++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -55,4 +55,4 @@
-diff --git a/lib/librte_eal/linux/eal/eal_hugepage_info.c b/lib/librte_eal/linux/eal/eal_hugepage_info.c
-index ce3e99256..91a4fede7 100644
---- a/lib/librte_eal/linux/eal/eal_hugepage_info.c
-+++ b/lib/librte_eal/linux/eal/eal_hugepage_info.c
+diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+index 0eab1cf71..6e898c249 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
++++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -66,5 +66,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c
-index 39cd359a0..319352521 100644
---- a/lib/librte_eal/linux/eal/eal_memory.c
-+++ b/lib/librte_eal/linux/eal/eal_memory.c
-@@ -542,5 +542,5 @@ create_shared_memory(const char *filename, const size_t mem_size)
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
+index 788aed25d..ee5f6613b 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
+@@ -538,5 +538,5 @@ create_shared_memory(const char *filename, const size_t mem_size)

[dpdk-stable] patch 'net/bonding: fix buffer length when printing strings' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From a955efbfbd6f65ce19026e6f597578affcf5df5b Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 3 Apr 2019 15:45:01 +0100
Subject: [PATCH] net/bonding: fix buffer length when printing strings

[ upstream commit f4206d16429cde8af71912be357bf3e1a3f2f315 ]

Using the size of the source string is incorrect when printing using
snprintf. Instead pass in the buffer size to be used appropriately.

Fixes: 457ecf2953fc ("bond: add debug info for mode 6")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 58b6e4344..154257ffe 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -490,33 +490,29 @@ uint32_t burstnumberTX;
 
 static void
-arp_op_name(uint16_t arp_op, char *buf)
+arp_op_name(uint16_t arp_op, char *buf, size_t buf_len)
 {
 	switch (arp_op) {
 	case ARP_OP_REQUEST:
-		snprintf(buf, sizeof("ARP Request"), "%s", "ARP Request");
+		snprintf(buf, buf_len, "%s", "ARP Request");
 		return;
 	case ARP_OP_REPLY:
-		snprintf(buf, sizeof("ARP Reply"), "%s", "ARP Reply");
+		snprintf(buf, buf_len, "%s", "ARP Reply");
 		return;
 	case ARP_OP_REVREQUEST:
-		snprintf(buf, sizeof("Reverse ARP Request"), "%s",
-				"Reverse ARP Request");
+		snprintf(buf, buf_len, "%s", "Reverse ARP Request");
 		return;
 	case ARP_OP_REVREPLY:
-		snprintf(buf, sizeof("Reverse ARP Reply"), "%s",
-				"Reverse ARP Reply");
+		snprintf(buf, buf_len, "%s", "Reverse ARP Reply");
 		return;
 	case ARP_OP_INVREQUEST:
-		snprintf(buf, sizeof("Peer Identify Request"), "%s",
-				"Peer Identify Request");
+		snprintf(buf, buf_len, "%s", "Peer Identify Request");
 		return;
 	case ARP_OP_INVREPLY:
-		snprintf(buf, sizeof("Peer Identify Reply"), "%s",
-				"Peer Identify Reply");
+		snprintf(buf, buf_len, "%s", "Peer Identify Reply");
 		return;
 	default:
 		break;
 	}
-	snprintf(buf, sizeof("Unknown"), "%s", "Unknown");
+	snprintf(buf, buf_len, "%s", "Unknown");
 	return;
 }
@@ -622,5 +618,6 @@ mode6_debug(const char __attribute__((unused)) *info, struct ether_hdr *eth_h,
 		ipv4_addr_to_dot(arp_h->arp_data.arp_sip, src_ip, MaxIPv4String);
 		ipv4_addr_to_dot(arp_h->arp_data.arp_tip, dst_ip, MaxIPv4String);
-		arp_op_name(rte_be_to_cpu_16(arp_h->arp_op), ArpOp);
+		arp_op_name(rte_be_to_cpu_16(arp_h->arp_op),
+				ArpOp, sizeof(ArpOp));
 		MODE6_DEBUG(buf, src_ip, dst_ip, eth_h, ArpOp, port, *burstnumber);
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.820253043 +0100
+++ 0048-net-bonding-fix-buffer-length-when-printing-strings.patch	2019-04-25 16:37:46.766294469 +0100
@@ -1 +1 @@
-From f4206d16429cde8af71912be357bf3e1a3f2f315 Mon Sep 17 00:00:00 2001
+From a955efbfbd6f65ce19026e6f597578affcf5df5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f4206d16429cde8af71912be357bf3e1a3f2f315 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'raw/dpaa2_qdma: fix to support multiprocess execution' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 09b9e2c56e7bca445e56eed98271db116a85c3e6 Mon Sep 17 00:00:00 2001
From: Shreyansh Jain <shreyansh.jain@nxp.com>
Date: Thu, 4 Apr 2019 11:50:21 +0000
Subject: [PATCH] raw/dpaa2_qdma: fix to support multiprocess execution

[ upstream commit 428fe6d4cb35f35d61d28bdaa0e87e8104691d87 ]

Fixes: c22fab9a6c34 ("raw/dpaa2_qdma: support configuration APIs")

Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
index 60621eb85..f8a1b0c40 100644
--- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
+++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018 NXP
+ * Copyright 2018-2019 NXP
  */
 
@@ -220,4 +220,5 @@ rte_qdma_configure(struct rte_qdma_config *qdma_config)
 {
 	int ret;
+	char fle_pool_name[32]; /* RTE_MEMZONE_NAMESIZE = 32 */
 
 	DPAA2_QDMA_FUNC_TRACE();
@@ -259,6 +260,10 @@ rte_qdma_configure(struct rte_qdma_config *qdma_config)
 	qdma_dev.max_vqs = qdma_config->max_vqs;
 
-	/* Allocate FLE pool */
-	qdma_dev.fle_pool = rte_mempool_create("qdma_fle_pool",
+	/* Allocate FLE pool; just append PID so that in case of
+	 * multiprocess, the pool's don't collide.
+	 */
+	snprintf(fle_pool_name, sizeof(fle_pool_name), "qdma_fle_pool%u",
+		 getpid());
+	qdma_dev.fle_pool = rte_mempool_create(fle_pool_name,
 			qdma_config->fle_pool_count, QDMA_FLE_POOL_SIZE,
 			QDMA_FLE_CACHE_SIZE(qdma_config->fle_pool_count), 0,
@@ -304,4 +309,5 @@ rte_qdma_vq_create(uint32_t lcore_id, uint32_t flags)
 	if (i == qdma_dev.max_vqs) {
 		rte_spinlock_unlock(&qdma_dev.lock);
+		DPAA2_QDMA_ERR("Unable to get lock on QDMA device");
 		return -ENODEV;
 	}
@@ -794,7 +800,4 @@ dpaa2_dpdmai_dev_uninit(struct rte_rawdev *rawdev)
 	DPAA2_QDMA_FUNC_TRACE();
 
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
 	/* Remove HW queues from global list */
 	remove_hw_queues_from_list(dpdmai_dev);
@@ -835,8 +838,4 @@ dpaa2_dpdmai_dev_init(struct rte_rawdev *rawdev, int dpdmai_id)
 	DPAA2_QDMA_FUNC_TRACE();
 
-	/* For secondary processes, the primary has done all the work */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
 	/* Open DPDMAI device */
 	dpdmai_dev->dpdmai_id = dpdmai_id;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.864421389 +0100
+++ 0049-raw-dpaa2_qdma-fix-to-support-multiprocess-execution.patch	2019-04-25 16:37:46.767294446 +0100
@@ -1 +1 @@
-From 428fe6d4cb35f35d61d28bdaa0e87e8104691d87 Mon Sep 17 00:00:00 2001
+From 09b9e2c56e7bca445e56eed98271db116a85c3e6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 428fe6d4cb35f35d61d28bdaa0e87e8104691d87 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
-index afa5e5a3d..88c11a3d2 100644
+index 60621eb85..f8a1b0c40 100644

[dpdk-stable] patch 'power: remove unused variable' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 1891f98ea693fc9e883fd631321e22dfb3adbee2 Mon Sep 17 00:00:00 2001
From: Pallantla Poornima <pallantlax.poornima@intel.com>
Date: Fri, 15 Feb 2019 10:28:44 +0000
Subject: [PATCH] power: remove unused variable

[ upstream commit 1ea7c4aefc1ae1a6dd163cca4931aafd6e121907 ]

Variable pfi_str is removed since it is unused.

Fixes: 450f0791312c ("power: add traffic pattern aware power control")

Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 lib/librte_power/rte_power_empty_poll.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/librte_power/rte_power_empty_poll.c b/lib/librte_power/rte_power_empty_poll.c
index e6145462f..15d4f0509 100644
--- a/lib/librte_power/rte_power_empty_poll.c
+++ b/lib/librte_power/rte_power_empty_poll.c
@@ -157,9 +157,6 @@ update_training_stats(struct priority_worker *poll_stats,
 	RTE_SET_USED(specific_freq);
 
-	char pfi_str[32];
 	uint64_t p0_empty_deq;
 
-	sprintf(pfi_str, "%02d", freq);
-
 	if (poll_stats->cur_freq == freq &&
 			poll_stats->thresh[freq].trained == false) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.905189697 +0100
+++ 0050-power-remove-unused-variable.patch	2019-04-25 16:37:46.768294423 +0100
@@ -1 +1 @@
-From 1ea7c4aefc1ae1a6dd163cca4931aafd6e121907 Mon Sep 17 00:00:00 2001
+From 1891f98ea693fc9e883fd631321e22dfb3adbee2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1ea7c4aefc1ae1a6dd163cca4931aafd6e121907 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'test/distributor: replace sprintf with strlcpy' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 3a88e8f3fbcd7ea4347dce8dabf677e99cc596fc Mon Sep 17 00:00:00 2001
From: Pallantla Poornima <pallantlax.poornima@intel.com>
Date: Thu, 14 Feb 2019 09:45:49 +0000
Subject: [PATCH] test/distributor: replace sprintf with strlcpy

[ upstream commit 7ab0770233ed5bb89845abf6b978ef15b2520bd8 ]

sprintf function is not secure as it doesn't check the length of string.
replaced sprintf with strlcpy.

Fixes: f74df2c57e ("test/distributor: test single and burst API")

Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 test/test/test_distributor.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c
index 98919ec0c..da3348fd1 100644
--- a/test/test/test_distributor.c
+++ b/test/test/test_distributor.c
@@ -12,4 +12,5 @@
 #include <rte_mbuf.h>
 #include <rte_distributor.h>
+#include <rte_string_fns.h>
 
 #define ITER_POWER 20 /* log 2 of how many iterations we do when timing. */
@@ -643,7 +644,9 @@ test_distributor(void)
 		worker_params.dist = dist[i];
 		if (i)
-			sprintf(worker_params.name, "burst");
+			strlcpy(worker_params.name, "burst",
+					sizeof(worker_params.name));
 		else
-			sprintf(worker_params.name, "single");
+			strlcpy(worker_params.name, "single",
+					sizeof(worker_params.name));
 
 		rte_eal_mp_remote_launch(handle_work,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.949462737 +0100
+++ 0051-test-distributor-replace-sprintf-with-strlcpy.patch	2019-04-25 16:37:46.768294423 +0100
@@ -1 +1 @@
-From 7ab0770233ed5bb89845abf6b978ef15b2520bd8 Mon Sep 17 00:00:00 2001
+From 3a88e8f3fbcd7ea4347dce8dabf677e99cc596fc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7ab0770233ed5bb89845abf6b978ef15b2520bd8 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/test_distributor.c | 7 +++++--
+ test/test/test_distributor.c | 7 +++++--
@@ -18 +19 @@
-diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
+diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c
@@ -20,2 +21,2 @@
---- a/app/test/test_distributor.c
-+++ b/app/test/test_distributor.c
+--- a/test/test/test_distributor.c
++++ b/test/test/test_distributor.c

[dpdk-stable] patch 'test/hash: replace sprintf with snprintf' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 994a1345da0b6c33dc0e4a3cd2b1d89c31d2e848 Mon Sep 17 00:00:00 2001
From: Pallantla Poornima <pallantlax.poornima@intel.com>
Date: Tue, 26 Mar 2019 10:27:23 +0000
Subject: [PATCH] test/hash: replace sprintf with snprintf

[ upstream commit 8766e2a4782aecb6d474697617055e281149cc02 ]

sprintf function is not secure as it doesn't check the length of string.
More secure function snprintf is used.

Fixes: 473d1bebce ("hash: allow to store data in hash table")

Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 test/test/test_hash_perf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/test/test_hash_perf.c b/test/test/test_hash_perf.c
index 525211180..5648fce02 100644
--- a/test/test/test_hash_perf.c
+++ b/test/test/test_hash_perf.c
@@ -86,7 +86,9 @@ create_table(unsigned int with_data, unsigned int table_index,
 	if (with_data)
 		/* Table will store 8-byte data */
-		sprintf(name, "test_hash%d_data", hashtest_key_lens[table_index]);
+		snprintf(name, sizeof(name), "test_hash%u_data",
+				hashtest_key_lens[table_index]);
 	else
-		sprintf(name, "test_hash%d", hashtest_key_lens[table_index]);
+		snprintf(name, sizeof(name), "test_hash%u",
+				hashtest_key_lens[table_index]);
 
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:48.990147635 +0100
+++ 0052-test-hash-replace-sprintf-with-snprintf.patch	2019-04-25 16:37:46.769294400 +0100
@@ -1 +1 @@
-From 8766e2a4782aecb6d474697617055e281149cc02 Mon Sep 17 00:00:00 2001
+From 994a1345da0b6c33dc0e4a3cd2b1d89c31d2e848 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8766e2a4782aecb6d474697617055e281149cc02 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/test_hash_perf.c | 6 ++++--
+ test/test/test_hash_perf.c | 6 ++++--
@@ -18 +19 @@
-diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
+diff --git a/test/test/test_hash_perf.c b/test/test/test_hash_perf.c
@@ -20,2 +21,2 @@
---- a/app/test/test_hash_perf.c
-+++ b/app/test/test_hash_perf.c
+--- a/test/test/test_hash_perf.c
++++ b/test/test/test_hash_perf.c

[dpdk-stable] patch 'eal: fix typo in comment of vector function' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From f8bc3dbb506f0cb9042a50b18fb24ef4905bf102 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Mon, 1 Apr 2019 14:06:20 +0300
Subject: [PATCH] eal: fix typo in comment of vector function

[ upstream commit f129008f5aa6c55327d75c9b42292bf70e4e1647 ]

Remove redundant item 'a4' in comment.

Fixes: 86c743cf9140 ("eal: define generic vector types")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
---
 lib/librte_eal/common/include/generic/rte_vect.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/include/generic/rte_vect.h b/lib/librte_eal/common/include/generic/rte_vect.h
index 11c6475b9..3fc47979f 100644
--- a/lib/librte_eal/common/include/generic/rte_vect.h
+++ b/lib/librte_eal/common/include/generic/rte_vect.h
@@ -56,5 +56,5 @@ typedef uint16_t rte_v128u16_t __attribute__((vector_size(16), aligned(16)));
  * 128 bits vector size to use with unsigned 32 bits elements.
  *
- * a = (rte_v128u32_t){ a0, a1, a2, a3, a4 }
+ * a = (rte_v128u32_t){ a0, a1, a2, a3 }
  */
 typedef uint32_t rte_v128u32_t __attribute__((vector_size(16), aligned(16)));
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.031629915 +0100
+++ 0053-eal-fix-typo-in-comment-of-vector-function.patch	2019-04-25 16:37:46.770294377 +0100
@@ -1 +1 @@
-From f129008f5aa6c55327d75c9b42292bf70e4e1647 Mon Sep 17 00:00:00 2001
+From f8bc3dbb506f0cb9042a50b18fb24ef4905bf102 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f129008f5aa6c55327d75c9b42292bf70e4e1647 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'doc: fix links to doxygen and sphinx sites' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 0702b4e40fbefadea2390c82a2042104ec5b1bcd Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Wed, 3 Apr 2019 14:04:11 +0300
Subject: [PATCH] doc: fix links to doxygen and sphinx sites

[ upstream commit 047b663a5935b701fbc739e5a3fb142539519378 ]

Update broken links, replace with valid links.

Fixes: 7798f17a0d62 ("doc: add documentation guidelines")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
---
 doc/guides/contributing/documentation.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index c72280a29..408859e2c 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -41,5 +41,5 @@ The main directories that contain files related to documentation are shown below
 
 
-The API documentation is built from `Doxygen <http://www.stack.nl/~dimitri/doxygen/>`_ comments in the header files.
+The API documentation is built from `Doxygen <http://www.doxygen.nl>`_ comments in the header files.
 These files are mainly in the ``lib/librte_*`` directories although some of the Poll Mode Drivers in ``drivers/net``
 are also documented with Doxygen.
@@ -48,5 +48,5 @@ The configuration files that are used to control the Doxygen output are in the `
 
 The user guides such as *The Programmers Guide* and the *FreeBSD* and *Linux Getting Started* Guides are generated
-from RST markup text files using the `Sphinx <http://sphinx-doc.org/index.html>`_ Documentation Generator.
+from RST markup text files using the `Sphinx <http://sphinx-doc.org>`_ Documentation Generator.
 
 These files are included in the ``doc/guides/`` directory.
@@ -175,5 +175,6 @@ For full support with figure and table captioning the latest version of Sphinx c
    sudo pip install --upgrade sphinx_rtd_theme
 
-For further information on getting started with Sphinx see the `Sphinx Tutorial <http://sphinx-doc.org/tutorial.html>`_.
+For further information on getting started with Sphinx see the
+`Sphinx Getting Started <http://www.sphinx-doc.org/en/master/usage/quickstart.html>`_.
 
 .. Note::
@@ -597,5 +598,5 @@ Doxygen Guidelines
 The DPDK API is documented using Doxygen comment annotations in the header files.
 Doxygen is a very powerful tool, it is extremely configurable and with a little effort can be used to create expressive documents.
-See the `Doxygen website <http://www.stack.nl/~dimitri/doxygen/>`_ for full details on how to use it.
+See the `Doxygen website <http://www.doxygen.nl>`_ for full details on how to use it.
 
 The following are some guidelines for use of Doxygen in the DPDK API documentation:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.075657108 +0100
+++ 0054-doc-fix-links-to-doxygen-and-sphinx-sites.patch	2019-04-25 16:37:46.770294377 +0100
@@ -1 +1 @@
-From 047b663a5935b701fbc739e5a3fb142539519378 Mon Sep 17 00:00:00 2001
+From 0702b4e40fbefadea2390c82a2042104ec5b1bcd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 047b663a5935b701fbc739e5a3fb142539519378 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index baf0921fb..9d381919b 100644
+index c72280a29..408859e2c 100644
@@ -20 +21 @@
-@@ -40,5 +40,5 @@ The main directories that contain files related to documentation are shown below
+@@ -41,5 +41,5 @@ The main directories that contain files related to documentation are shown below
@@ -27 +28 @@
-@@ -47,5 +47,5 @@ The configuration files that are used to control the Doxygen output are in the `
+@@ -48,5 +48,5 @@ The configuration files that are used to control the Doxygen output are in the `
@@ -34 +35 @@
-@@ -174,5 +174,6 @@ For full support with figure and table captioning the latest version of Sphinx c
+@@ -175,5 +175,6 @@ For full support with figure and table captioning the latest version of Sphinx c
@@ -42 +43 @@
-@@ -596,5 +597,5 @@ Doxygen Guidelines
+@@ -597,5 +598,5 @@ Doxygen Guidelines

[dpdk-stable] patch 'doc: fix two typos in contributing 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 490b1e4cd5456d9498b1a60097ebff0def6589dc Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Fri, 15 Mar 2019 11:19:00 +0200
Subject: [PATCH] doc: fix two typos in contributing guide

[ upstream commit eeafaf40c9b05f410991fe8302f2b64ce37af510 ]

This patch fixes two typos in the coding style part of
DPDK contributing guide:

- The header entry should have .h file instead of .c file.
- The will->This will

Fixes: 44a6dface13b ("doc: describe how to add new components")

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Marko Kovacevic <marko.kovacevic@intel.com>
---
 doc/guides/contributing/coding_style.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index d96698a73..656563dde 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -826,8 +826,8 @@ format.
 
 	sources = files('file1.c', ...)
-	headers = files('file1.c', ...)
+	headers = files('file1.h', ...)
 
 
-The will build based on a number of conventions and assumptions within the DPDK
+This will build based on a number of conventions and assumptions within the DPDK
 itself, for example, that the library name is the same as the directory name in
 which the files are stored.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.117484341 +0100
+++ 0055-doc-fix-two-typos-in-contributing-guide.patch	2019-04-25 16:37:46.771294354 +0100
@@ -1 +1 @@
-From eeafaf40c9b05f410991fe8302f2b64ce37af510 Mon Sep 17 00:00:00 2001
+From 490b1e4cd5456d9498b1a60097ebff0def6589dc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eeafaf40c9b05f410991fe8302f2b64ce37af510 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'doc: fix ABI check script examples' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 620972b4608ae388edde1deed5c9603958fb50fa Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 19 Mar 2019 15:05:18 +0100
Subject: [PATCH] doc: fix ABI check script examples

[ upstream commit 560a3580ba72c306f32168d29490f6f918090d76 ]

The doc examples are not aligned on the script following the
incriminated commit.

Fixes: c4a5fe3bf832 ("devtools: rework ABI checker script")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 doc/guides/contributing/versioning.rst | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst
index 01b36247e..fe17c7f13 100644
--- a/doc/guides/contributing/versioning.rst
+++ b/doc/guides/contributing/versioning.rst
@@ -549,25 +549,28 @@ utilities which can be installed via a package manager. For example::
 The syntax of the ``validate-abi.sh`` utility is::
 
-   ./devtools/validate-abi.sh <REV1> <REV2> <TARGET>
+   ./devtools/validate-abi.sh <REV1> <REV2>
 
 Where ``REV1`` and ``REV2`` are valid gitrevisions(7)
 https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
-on the local repo and target is the usual DPDK compilation target.
+on the local repo.
 
 For example::
 
    # Check between the previous and latest commit:
-   ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linuxapp-gcc
+   ./devtools/validate-abi.sh HEAD~1 HEAD
+
+   # Check on a specific compilation target:
+   ./devtools/validate-abi.sh -t x86_64-native-linux-gcc HEAD~1 HEAD
 
    # Check between two tags:
-   ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linuxapp-gcc
+   ./devtools/validate-abi.sh v2.0.0 v2.1.0
 
    # Check between git master and local topic-branch "vhost-hacking":
-   ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linuxapp-gcc
+   ./devtools/validate-abi.sh master vhost-hacking
 
 After the validation script completes (it can take a while since it need to
 compile both tags) it will create compatibility reports in the
-``./compat_report`` directory. Listed incompatibilities can be found as
-follows::
+``./abi-check/compat_report`` directory. Listed incompatibilities can be found
+as follows::
 
-  grep -lr Incompatible compat_reports/
+  grep -lr Incompatible abi-check/compat_reports/
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.157846299 +0100
+++ 0056-doc-fix-ABI-check-script-examples.patch	2019-04-25 16:37:46.772294332 +0100
@@ -1 +1 @@
-From 560a3580ba72c306f32168d29490f6f918090d76 Mon Sep 17 00:00:00 2001
+From 620972b4608ae388edde1deed5c9603958fb50fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 560a3580ba72c306f32168d29490f6f918090d76 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 988c1f628..5d93b1810 100644
+index 01b36247e..fe17c7f13 100644
@@ -22 +23 @@
-@@ -564,25 +564,28 @@ utilities which can be installed via a package manager. For example::
+@@ -549,25 +549,28 @@ utilities which can be installed via a package manager. For example::
@@ -36 +37 @@
--   ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linux-gcc
+-   ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linuxapp-gcc
@@ -43 +44 @@
--   ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linux-gcc
+-   ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linuxapp-gcc
@@ -47 +48 @@
--   ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linux-gcc
+-   ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linuxapp-gcc

[dpdk-stable] patch 'cfgfile: replace strcat with strlcat' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From a031751261104144cba886bf259fcaef0dcc8bbf Mon Sep 17 00:00:00 2001
From: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
Date: Fri, 8 Mar 2019 12:45:50 +0000
Subject: [PATCH] cfgfile: replace strcat with strlcat

[ upstream commit bb411b952d6c70dc93de22aa3d092e385239de6c ]

Replace strcat with strlcat to avoid buffer overflow.

Fixes: a6a47ac9c2 ("cfgfile: rework load function")

Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_cfgfile/rte_cfgfile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 7d8c941ea..614269634 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -8,4 +8,5 @@
 #include <ctype.h>
 #include <errno.h>
+#include <rte_string_fns.h>
 #include <rte_common.h>
 
@@ -225,8 +226,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
 			char *end = memchr(split[1], '\\', strlen(split[1]));
 
+			size_t split_len = strlen(split[1]) + 1;
 			while (end != NULL) {
 				if (*(end+1) == params->comment_character) {
 					*end = '\0';
-					strcat(split[1], end+1);
+					strlcat(split[1], end+1, split_len);
 				} else
 					end++;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.200880637 +0100
+++ 0057-cfgfile-replace-strcat-with-strlcat.patch	2019-04-25 16:37:46.773294309 +0100
@@ -1 +1 @@
-From bb411b952d6c70dc93de22aa3d092e385239de6c Mon Sep 17 00:00:00 2001
+From a031751261104144cba886bf259fcaef0dcc8bbf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bb411b952d6c70dc93de22aa3d092e385239de6c ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- lib/librte_cfgfile/rte_cfgfile.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ lib/librte_cfgfile/rte_cfgfile.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
@@ -18 +19 @@
-index 6110dba76..f8e7627a5 100644
+index 7d8c941ea..614269634 100644
@@ -21 +22,7 @@
-@@ -225,8 +225,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
+@@ -8,4 +8,5 @@
+ #include <ctype.h>
+ #include <errno.h>
++#include <rte_string_fns.h>
+ #include <rte_common.h>
+ 
+@@ -225,8 +226,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,

[dpdk-stable] patch 'net/mlx5: fix errno typos in comments' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 4c7720f50a1dabf2f370a63cc27a3a63de08446e Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Sun, 31 Mar 2019 12:02:41 +0300
Subject: [PATCH] net/mlx5: fix errno typos in comments

[ upstream commit de90612f4061a1bd538ad894f1ed18bcf11d335b ]

Correct typing mistake in several locations:
ernno ==> errno

Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c       | 14 +++++++-------
 drivers/net/mlx5/mlx5_flow_dv.c    |  6 +++---
 drivers/net/mlx5/mlx5_flow_verbs.c |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 5bf7d7ba4..15302533d 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -787,5 +787,5 @@ mlx5_flow_validate_action_mark(const struct rte_flow_action *action,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
@@ -830,5 +830,5 @@ mlx5_flow_validate_action_drop(uint64_t action_flags,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
@@ -880,5 +880,5 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
@@ -965,5 +965,5 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
@@ -1777,5 +1777,5 @@ flow_get_drv_type(struct rte_eth_dev *dev, const struct rte_flow_attr *attr)
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static inline int
@@ -1816,5 +1816,5 @@ flow_drv_validate(struct rte_eth_dev *dev,
  *
  * @return
- *   Pointer to device flow on success, otherwise NULL and rte_ernno is set.
+ *   Pointer to device flow on success, otherwise NULL and rte_errno is set.
  */
 static inline struct mlx5_flow *
@@ -1860,5 +1860,5 @@ flow_drv_prepare(const struct rte_flow *flow,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static inline int
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index be4578d21..d34c11152 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -765,5 +765,5 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
@@ -1044,5 +1044,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
  * @return
  *   Pointer to mlx5_flow object on success,
- *   otherwise NULL and rte_ernno is set.
+ *   otherwise NULL and rte_errno is set.
  */
 static struct mlx5_flow *
@@ -1874,5 +1874,5 @@ flow_dv_matcher_register(struct rte_eth_dev *dev,
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index a7b3f9342..aef855f24 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -1384,5 +1384,5 @@ flow_verbs_prepare(const struct rte_flow_attr *attr __rte_unused,
  *
  * @return
- *   0 on success, else a negative errno value otherwise and rte_ernno is set.
+ *   0 on success, else a negative errno value otherwise and rte_errno is set.
  */
 static int
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.241170879 +0100
+++ 0058-net-mlx5-fix-errno-typos-in-comments.patch	2019-04-25 16:37:46.779294171 +0100
@@ -1 +1 @@
-From de90612f4061a1bd538ad894f1ed18bcf11d335b Mon Sep 17 00:00:00 2001
+From 4c7720f50a1dabf2f370a63cc27a3a63de08446e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit de90612f4061a1bd538ad894f1ed18bcf11d335b ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index d09fdff4e..bc6a7c1eb 100644
+index 5bf7d7ba4..15302533d 100644
@@ -24 +25 @@
-@@ -789,5 +789,5 @@ mlx5_flow_validate_action_mark(const struct rte_flow_action *action,
+@@ -787,5 +787,5 @@ mlx5_flow_validate_action_mark(const struct rte_flow_action *action,
@@ -31 +32 @@
-@@ -832,5 +832,5 @@ mlx5_flow_validate_action_drop(uint64_t action_flags,
+@@ -830,5 +830,5 @@ mlx5_flow_validate_action_drop(uint64_t action_flags,
@@ -38 +39 @@
-@@ -886,5 +886,5 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action,
+@@ -880,5 +880,5 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action,
@@ -45 +46 @@
-@@ -979,5 +979,5 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
+@@ -965,5 +965,5 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
@@ -52 +53 @@
-@@ -1801,5 +1801,5 @@ flow_get_drv_type(struct rte_eth_dev *dev, const struct rte_flow_attr *attr)
+@@ -1777,5 +1777,5 @@ flow_get_drv_type(struct rte_eth_dev *dev, const struct rte_flow_attr *attr)
@@ -59 +60 @@
-@@ -1840,5 +1840,5 @@ flow_drv_validate(struct rte_eth_dev *dev,
+@@ -1816,5 +1816,5 @@ flow_drv_validate(struct rte_eth_dev *dev,
@@ -66 +67 @@
-@@ -1884,5 +1884,5 @@ flow_drv_prepare(const struct rte_flow *flow,
+@@ -1860,5 +1860,5 @@ flow_drv_prepare(const struct rte_flow *flow,
@@ -74 +75 @@
-index 57847fb8d..966dad983 100644
+index be4578d21..d34c11152 100644
@@ -77 +78 @@
-@@ -1632,5 +1632,5 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev,
+@@ -765,5 +765,5 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev,
@@ -84 +85 @@
-@@ -1992,5 +1992,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -1044,5 +1044,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -91 +92 @@
-@@ -2845,5 +2845,5 @@ flow_dv_translate_source_vport(void *matcher, void *key,
+@@ -1874,5 +1874,5 @@ flow_dv_matcher_register(struct rte_eth_dev *dev,
@@ -99 +100 @@
-index ef447528d..49dd13e6d 100644
+index a7b3f9342..aef855f24 100644
@@ -102 +103 @@
-@@ -1386,5 +1386,5 @@ flow_verbs_prepare(const struct rte_flow_attr *attr __rte_unused,
+@@ -1384,5 +1384,5 @@ flow_verbs_prepare(const struct rte_flow_attr *attr __rte_unused,

[dpdk-stable] patch 'doc: fix typos 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From abf54c2160ec7a8174fe960c7454d4cc76431a55 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Sun, 31 Mar 2019 13:12:09 +0300
Subject: [PATCH] doc: fix typos in mlx5 guide

[ upstream commit 3fdac78a2b144efe1d9b2430e3f1444f2519ea68 ]

Correct typing mistakes:
appiled ==> applied
tarffic ==> traffic

Fixes: 0280f2812284 ("doc: add mlx5 E-Switch VXLAN tunnels limitations")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 doc/guides/nics/mlx5.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 436898acd..2dd2b42ee 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -149,5 +149,5 @@ Limitations
 - E-Switch VXLAN decapsulation Flow:
 
-  - can be appiled to PF port only.
+  - can be applied to PF port only.
   - must specify VF port action (packet redirection from PF to VF).
   - must specify tunnel outer UDP local (destination) port, wildcards not allowed.
@@ -307,5 +307,5 @@ Run-time configuration
   packets on the buffer. A MPRQ buffer consists of multiple fixed-size strides
   and each stride receives one packet. MPRQ can improve throughput for
-  small-packet tarffic.
+  small-packet traffic.
 
   When MPRQ is enabled, max_rx_pkt_len can be larger than the size of
@@ -318,5 +318,5 @@ Run-time configuration
 
   Log 2 of the number of strides for Multi-Packet Rx queue. Configuring more
-  strides can reduce PCIe tarffic further. If configured value is not in the
+  strides can reduce PCIe traffic further. If configured value is not in the
   range of device capability, the default value will be set with a warning
   message. The default value is 4 which is 16 strides per a buffer, valid only
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.288402728 +0100
+++ 0059-doc-fix-typos-in-mlx5-guide.patch	2019-04-25 16:37:46.780294149 +0100
@@ -1 +1 @@
-From 3fdac78a2b144efe1d9b2430e3f1444f2519ea68 Mon Sep 17 00:00:00 2001
+From abf54c2160ec7a8174fe960c7454d4cc76431a55 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3fdac78a2b144efe1d9b2430e3f1444f2519ea68 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 020037300..f4db921f7 100644
+index 436898acd..2dd2b42ee 100644
@@ -23 +24 @@
-@@ -150,5 +150,5 @@ Limitations
+@@ -149,5 +149,5 @@ Limitations
@@ -30 +31 @@
-@@ -320,5 +320,5 @@ Run-time configuration
+@@ -307,5 +307,5 @@ Run-time configuration
@@ -37 +38 @@
-@@ -331,5 +331,5 @@ Run-time configuration
+@@ -318,5 +318,5 @@ Run-time configuration

[dpdk-stable] patch 'doc: fix typos in testpmd user 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 7230fafb7052bcb604d1be07b6400e32c01c45c1 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Sun, 31 Mar 2019 13:20:55 +0300
Subject: [PATCH] doc: fix typos in testpmd user guide

[ upstream commit 205d9d3cf8a8d6fa7a79b399315c61df859dd01d ]

Correct typing mistakes in several places.
1) "Those command will" ==> "These commands will"
2) icmp6_nd_opt_sla_eth ==> icmp6_nd_opt_tla_eth
   (change 's' to 't' for 'target' where applicable)

Fixes: 1960be7d32f8 ("app/testpmd: add VXLAN encap/decap")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 98be85219..d4e3fd8a5 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1584,5 +1584,5 @@ Configure the outer layer to encapsulate a packet inside a VXLAN tunnel::
  eth-src (eth-src) eth-dst (eth-dst)
 
-Those command will set an internal configuration inside testpmd, any following
+These commands will set an internal configuration inside testpmd, any following
 flow rule using the action vxlan_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
@@ -1599,5 +1599,5 @@ Configure the outer layer to encapsulate a packet inside a NVGRE tunnel::
         ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src) eth-dst (eth-dst)
 
-Those command will set an internal configuration inside testpmd, any following
+These commands will set an internal configuration inside testpmd, any following
 flow rule using the action nvgre_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
@@ -1642,5 +1642,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel::
         eth-src (eth-src) eth-dst (eth-dst)
 
-Those command will set an internal configuration inside testpmd, any following
+These commands will set an internal configuration inside testpmd, any following
 flow rule using the action mplsogre_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
@@ -1655,5 +1655,5 @@ Configure the outer layer to decapsulate MPLSoGRE packet::
  set mplsogre_decap-with-vlan ip-version (ipv4|ipv6)
 
-Those command will set an internal configuration inside testpmd, any following
+These commands will set an internal configuration inside testpmd, any following
 flow rule using the action mplsogre_decap will use the last configuration set.
 To have a different decapsulation header, one of those commands must be called
@@ -1672,5 +1672,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel::
         vlan-tci (vlan-tci) eth-src (eth-src) eth-dst (eth-dst)
 
-Those command will set an internal configuration inside testpmd, any following
+These commands will set an internal configuration inside testpmd, any following
 flow rule using the action mplsoudp_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
@@ -1685,5 +1685,5 @@ Configure the outer layer to decapsulate MPLSoUDP packet::
  set mplsoudp_decap-with-vlan ip-version (ipv4|ipv6)
 
-Those command will set an internal configuration inside testpmd, any following
+These commands will set an internal configuration inside testpmd, any following
 flow rule using the action mplsoudp_decap will use the last configuration set.
 To have a different decapsulation header, one of those commands must be called
@@ -3706,5 +3706,5 @@ This section lists supported pattern items and their attributes, if any.
   - ``sla {MAC-48}``: source Ethernet LLA.
 
-- ``icmp6_nd_opt_sla_eth``: match ICMPv6 neighbor discovery target Ethernet
+- ``icmp6_nd_opt_tla_eth``: match ICMPv6 neighbor discovery target Ethernet
   link-layer address option.
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.329358830 +0100
+++ 0060-doc-fix-typos-in-testpmd-user-guide.patch	2019-04-25 16:37:46.784294057 +0100
@@ -1 +1 @@
-From 205d9d3cf8a8d6fa7a79b399315c61df859dd01d Mon Sep 17 00:00:00 2001
+From 7230fafb7052bcb604d1be07b6400e32c01c45c1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 205d9d3cf8a8d6fa7a79b399315c61df859dd01d ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 06c8b2ac0..bcf1449a2 100644
+index 98be85219..d4e3fd8a5 100644
@@ -24,2 +25,2 @@
-@@ -1624,5 +1624,5 @@ Configure the outer layer to encapsulate a packet inside a VXLAN tunnel::
-  ip-dst (ip-dst) eth-src (eth-src) eth-dst (eth-dst)
+@@ -1584,5 +1584,5 @@ Configure the outer layer to encapsulate a packet inside a VXLAN tunnel::
+  eth-src (eth-src) eth-dst (eth-dst)
@@ -31 +32 @@
-@@ -1639,5 +1639,5 @@ Configure the outer layer to encapsulate a packet inside a NVGRE tunnel::
+@@ -1599,5 +1599,5 @@ Configure the outer layer to encapsulate a packet inside a NVGRE tunnel::
@@ -38 +39 @@
-@@ -1682,5 +1682,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel::
+@@ -1642,5 +1642,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel::
@@ -45 +46 @@
-@@ -1695,5 +1695,5 @@ Configure the outer layer to decapsulate MPLSoGRE packet::
+@@ -1655,5 +1655,5 @@ Configure the outer layer to decapsulate MPLSoGRE packet::
@@ -52 +53 @@
-@@ -1712,5 +1712,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel::
+@@ -1672,5 +1672,5 @@ Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel::
@@ -59 +60 @@
-@@ -1725,5 +1725,5 @@ Configure the outer layer to decapsulate MPLSoUDP packet::
+@@ -1685,5 +1685,5 @@ Configure the outer layer to decapsulate MPLSoUDP packet::
@@ -66 +67 @@
-@@ -3746,5 +3746,5 @@ This section lists supported pattern items and their attributes, if any.
+@@ -3706,5 +3706,5 @@ This section lists supported pattern items and their attributes, if any.

[dpdk-stable] patch 'app/testpmd: fix typo in comment' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 88962b091d11d79bf269f70f7337c7e893ff6e94 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Sun, 31 Mar 2019 13:36:11 +0300
Subject: [PATCH] app/testpmd: fix typo in comment

[ upstream commit 51db3a89b2da78af9ae95ca3d9a390bb07eda496 ]

Correct minor typing mistake:
then ==> the

Fixes: 79bec05b32b7 ("app/testpmd: add ability to split outgoing packets")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/csumonly.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index ffeee2051..f4f2a7b29 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -576,5 +576,5 @@ mbuf_copy_split(const struct rte_mbuf *ms, struct rte_mbuf *md[],
 /*
  * Allocate a new mbuf with up to tx_pkt_nb_segs segments.
- * Copy packet contents and offload information into then new segmented mbuf.
+ * Copy packet contents and offload information into the new segmented mbuf.
  */
 static struct rte_mbuf *
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.373029127 +0100
+++ 0061-app-testpmd-fix-typo-in-comment.patch	2019-04-25 16:37:46.785294034 +0100
@@ -1 +1 @@
-From 51db3a89b2da78af9ae95ca3d9a390bb07eda496 Mon Sep 17 00:00:00 2001
+From 88962b091d11d79bf269f70f7337c7e893ff6e94 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 51db3a89b2da78af9ae95ca3d9a390bb07eda496 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'ethdev: fix typo in error messages' 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/01/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 the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 786bd586bfdca0f03734af9f7492228ef60458ab Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp@mellanox.com>
Date: Sun, 31 Mar 2019 13:46:48 +0300
Subject: [PATCH] ethdev: fix typo in error messages

[ upstream commit 91e2710342abda64a8f92e8325ad58fa3216dabf ]

Correct minor typing mistake:
pre-queue ==> per-queue

Fixes: bea1e0c70cfc ("ethdev: convert static log type usage to dynamic")

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 lib/librte_ethdev/rte_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index e901ca3d1..191658da1 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1644,5 +1644,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 		RTE_ETHDEV_LOG(ERR,
 			"Ethdev port_id=%d rx_queue_id=%d, new added offloads 0x%"PRIx64" must be "
-			"within pre-queue offload capabilities 0x%"PRIx64" in %s()\n",
+			"within per-queue offload capabilities 0x%"PRIx64" in %s()\n",
 			port_id, rx_queue_id, local_conf.offloads,
 			dev_info.rx_queue_offload_capa,
@@ -1748,5 +1748,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
 		RTE_ETHDEV_LOG(ERR,
 			"Ethdev port_id=%d tx_queue_id=%d, new added offloads 0x%"PRIx64" must be "
-			"within pre-queue offload capabilities 0x%"PRIx64" in %s()\n",
+			"within per-queue offload capabilities 0x%"PRIx64" in %s()\n",
 			port_id, tx_queue_id, local_conf.offloads,
 			dev_info.tx_queue_offload_capa,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.416669530 +0100
+++ 0062-ethdev-fix-typo-in-error-messages.patch	2019-04-25 16:37:46.788293965 +0100
@@ -1 +1 @@
-From 91e2710342abda64a8f92e8325ad58fa3216dabf Mon Sep 17 00:00:00 2001
+From 786bd586bfdca0f03734af9f7492228ef60458ab Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 91e2710342abda64a8f92e8325ad58fa3216dabf ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 8b25c2adb..8032be92f 100644
+index e901ca3d1..191658da1 100644
@@ -22 +23 @@
-@@ -1652,5 +1652,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
+@@ -1644,5 +1644,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
@@ -29 +30 @@
-@@ -1756,5 +1756,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
+@@ -1748,5 +1748,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,

Re: [dpdk-stable] [EXT] patch 'bus/fslmc: decrease log level for unsupported devices' has been queued to LTS release 18.11.2

[Hemant Agrawal]

Patch looks ok.

> -----Original Message-----
> From: Kevin Traynor <ktraynor@redhat.com>
> Sent: Thursday, April 25, 2019 9:10 PM
> To: Stephen Hemminger <stephen@networkplumber.org>
> Cc: Hemant Agrawal <hemant.agrawal@nxp.com>; Ilya Maximets
> <i.maximets@samsung.com>; dpdk stable <stable@dpdk.org>
> Subject: [EXT] patch 'bus/fslmc: decrease log level for unsupported devices'
> has been queued to LTS release 18.11.2
> 
> Caution: EXT Email
> 
> Hi,
> 
> FYI, your patch has been queued to LTS release 18.11.2
> 
> Note it hasn't been pushed to
> https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.
> org%2Fbrowse%2Fdpdk-
> stable&amp;data=02%7C01%7Chemant.agrawal%40nxp.com%7Cdb4cec3eb6
> 4043e55bbd08d6c9946862%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C
> 0%7C636918036574404869&amp;sdata=2wVakqj5uT9h18aTh6OnCjft2JGm01p
> si3HDtUZ3upc%3D&amp;reserved=0 yet.
> It will be pushed if I get no objections before 05/01/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 the 18.11 branch at:
> 
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithu
> b.com%2Fkevintraynor%2Fdpdk-stable-
> queue.git&amp;data=02%7C01%7Chemant.agrawal%40nxp.com%7Cdb4cec3
> eb64043e55bbd08d6c9946862%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0
> %7C0%7C636918036574404869&amp;sdata=zhRf70LAaFkMp2d2vcDZr5KAN3
> GFkwPLAwqIQSPQ%2BII%3D&amp;reserved=0
> 
> Thanks.
> 
> Kevin Traynor
> 
> ---
> From af32f5e208b2072df5e8384e5e635219f63dab8c Mon Sep 17 00:00:00
> 2001
> From: Stephen Hemminger <stephen@networkplumber.org>
> Date: Tue, 12 Mar 2019 10:11:51 -0700
> Subject: [PATCH] bus/fslmc: decrease log level for unsupported devices
> 
> [ upstream commit a6ffe11b7245ec12d4df4b8b0577291604b5e082 ]
> 
> When fslmc is built as part of a general distribution, the bus code will log
> errors when other devices are present.
> 
> This could confuse users it is not an error.
> 
> Fixes: 50245be05d1a ("bus/fslmc: support device blacklisting")
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> Acked-by: Ilya Maximets <i.maximets@samsung.com>
> ---
>  drivers/bus/fslmc/fslmc_bus.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
> index 2dcdca01f..c719bf7f6 100644
> --- a/drivers/bus/fslmc/fslmc_bus.c
> +++ b/drivers/bus/fslmc/fslmc_bus.c
> @@ -247,5 +247,5 @@ rte_fslmc_parse(const char *name, void *addr)
>             strncmp("dpmcp", t_ptr, 5) &&
>             strncmp("dpdmai", t_ptr, 6)) {
> -               DPAA2_BUS_ERR("Unknown or unsupported device");
> +               DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)",
> + name);
>                 goto err_out;
>         }
> --
> 2.20.1
> 
> ---
>   Diff of the applied patch vs upstream commit (please double-check if non-
> empty:
> ---
> --- -   2019-04-25 16:37:47.122033970 +0100
> +++ 0008-bus-fslmc-decrease-log-level-for-unsupported-devices.patch
> 2019-04-25 16:37:46.687296276 +0100
> @@ -1 +1 @@
> -From a6ffe11b7245ec12d4df4b8b0577291604b5e082 Mon Sep 17 00:00:00
> 2001
> +From af32f5e208b2072df5e8384e5e635219f63dab8c Mon Sep 17 00:00:00
> 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit a6ffe11b7245ec12d4df4b8b0577291604b5e082 ]
> +
> @@ -12 +13,0 @@
> -Cc: stable@dpdk.org
> @@ -22 +23 @@
> -index 44c0827ce..a2525780c 100644
> +index 2dcdca01f..c719bf7f6 100644
> @@ -25,3 +26,3 @@
> -@@ -250,5 +250,5 @@ rte_fslmc_parse(const char *name, void *addr)
> -           strncmp("dpdmai", t_ptr, 6) &&
> -           strncmp("dpdmux", t_ptr, 6)) {
> +@@ -247,5 +247,5 @@ rte_fslmc_parse(const char *name, void *addr)
> +           strncmp("dpmcp", t_ptr, 5) &&
> +           strncmp("dpdmai", t_ptr, 6)) {