patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11
@ 2020-11-05 12:39 Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/failsafe: fix double space in warning log' " Kevin Traynor
                   ` (66 more replies)
  0 siblings, 67 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: David Marchand; +Cc: Andrew Rybchenko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 5f9331ff0e72b4133361436d115477ae0049ebb2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Thu, 17 Sep 2020 13:28:23 +0200
Subject: [PATCH] bus/pci: remove duplicate declaration

[ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ]

This declaration is the same as the one a few lines before.

Fixes: 6844d146ff39 ("eal: add bus pointer in device structure")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/bus/pci/private.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index 22cefc8b93..9e1baf3efd 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -16,6 +16,4 @@ struct rte_pci_driver;
 struct rte_pci_device;
 
-extern struct rte_pci_bus rte_pci_bus;
-
 /**
  * Scan the content of the PCI bus, and the devices in the devices
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.296310124 +0000
+++ 0001-bus-pci-remove-duplicate-declaration.patch	2020-11-05 12:38:54.132895936 +0000
@@ -1 +1 @@
-From f252fe5e18e060e2b79f193d21d80e2dbbf743be Mon Sep 17 00:00:00 2001
+From 5f9331ff0e72b4133361436d115477ae0049ebb2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index fadc767236..16f997c701 100644
+index 22cefc8b93..9e1baf3efd 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/failsafe: fix double space in warning log' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix multiple channel Rx' " Kevin Traynor
                   ` (65 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: Gaetan Rivet, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From ecd5ec5a59a512964333d91ebf474dbd578f656a Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 14 Aug 2020 10:39:33 -0700
Subject: [PATCH] net/failsafe: fix double space in warning log

[ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ]

Already get a newline from WARN() macro call.

Fixes: 9dda3e3393c2 ("net/failsafe: add timestamp to stats snapshot")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Gaetan Rivet <grive@u256.net>
---
 drivers/net/failsafe/failsafe_ether.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 2ff234ea3a..3e1f65f09a 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -313,8 +313,8 @@ fs_dev_stats_save(struct sub_device *sdev)
 		uint64_t timestamp = sdev->stats_snapshot.timestamp;
 
-		WARN("Could not access latest statistics from sub-device %d.\n",
+		WARN("Could not access latest statistics from sub-device %d.",
 			 SUB_ID(sdev));
 		if (timestamp != 0)
-			WARN("Using latest snapshot taken before %"PRIu64" seconds.\n",
+			WARN("Using latest snapshot taken before %"PRIu64" seconds.",
 				 (rte_rdtsc() - timestamp) / rte_get_tsc_hz());
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.313628296 +0000
+++ 0002-net-failsafe-fix-double-space-in-warning-log.patch	2020-11-05 12:38:54.136895939 +0000
@@ -1 +1 @@
-From 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd Mon Sep 17 00:00:00 2001
+From ecd5ec5a59a512964333d91ebf474dbd578f656a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 09c00246e170fe6b15eeaf7c3d86f47fc02ef2bd ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 2b748bd8b4..70972d6717 100644
+index 2ff234ea3a..3e1f65f09a 100644
@@ -21 +22 @@
-@@ -323,8 +323,8 @@ fs_dev_stats_save(struct sub_device *sdev)
+@@ -313,8 +313,8 @@ fs_dev_stats_save(struct sub_device *sdev)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/netvsc: fix multiple channel Rx' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/failsafe: fix double space in warning log' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix stale value after free' " Kevin Traynor
                   ` (64 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Long Li; +Cc: Stephen Hemminger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 5c72d08cb81031f228851f5cf2e72d93022ed5de Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Mon, 10 Aug 2020 19:33:11 -0700
Subject: [PATCH] net/netvsc: fix multiple channel Rx

[ upstream commit ac837bdd22400b220d60336f22c18091a92a40c9 ]

netvsc uses rxbuf_info buffer to track received packets attached via
rte_pktmbuf_attach_extbuf() and ack the host based on usage count. It
uses the transaction_id in the VMBus packet to locate where to use
memory in the rxbuf_info.

This is not correct in multiple channel setup, as different channels may
return identical transaction_ids at a time, and may corrupt the
rxbuf_info buffer.

Fix this by defining rxbuf_info for each queue.

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

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_nvs.c  | 13 +++++++++----
 drivers/net/netvsc/hn_rxtx.c | 33 ++++++++++++++++++++++++++-------
 drivers/net/netvsc/hn_var.h  |  6 +++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c
index f97bb10846..78ebb954f4 100644
--- a/drivers/net/netvsc/hn_nvs.c
+++ b/drivers/net/netvsc/hn_nvs.c
@@ -224,7 +224,13 @@ hn_nvs_conn_rxbuf(struct hn_data *hv)
 	hv->rxbuf_section_cnt = resp.nvs_sect[0].slotcnt;
 
-	hv->rxbuf_info = rte_calloc("HN_RXBUF_INFO", hv->rxbuf_section_cnt,
-				    sizeof(*hv->rxbuf_info), RTE_CACHE_LINE_SIZE);
-	if (!hv->rxbuf_info) {
+	/*
+	 * Pimary queue's rxbuf_info is not allocated at creation time.
+	 * Now we can allocate it after we figure out the slotcnt.
+	 */
+	hv->primary->rxbuf_info = rte_calloc("HN_RXBUF_INFO",
+			hv->rxbuf_section_cnt,
+			sizeof(*hv->primary->rxbuf_info),
+			RTE_CACHE_LINE_SIZE);
+	if (!hv->primary->rxbuf_info) {
 		PMD_DRV_LOG(ERR,
 			    "could not allocate rxbuf info");
@@ -256,5 +262,4 @@ hn_nvs_disconn_rxbuf(struct hn_data *hv)
 	}
 
-	rte_free(hv->rxbuf_info);
 	/*
 	 * Linger long enough for NVS to disconnect RXBUF.
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index c6506e442d..5d580f6f7f 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -494,19 +494,19 @@ static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
 {
 	struct hn_rx_bufinfo *rxb = opaque;
-	struct hn_data *hv = rxb->hv;
+	struct hn_rx_queue *rxq = rxb->rxq;
 
-	rte_atomic32_dec(&hv->rxbuf_outstanding);
+	rte_atomic32_dec(&rxq->rxbuf_outstanding);
 	hn_nvs_ack_rxbuf(rxb->chan, rxb->xactid);
 }
 
-static struct hn_rx_bufinfo *hn_rx_buf_init(const struct hn_rx_queue *rxq,
+static struct hn_rx_bufinfo *hn_rx_buf_init(struct hn_rx_queue *rxq,
 					    const struct vmbus_chanpkt_rxbuf *pkt)
 {
 	struct hn_rx_bufinfo *rxb;
 
-	rxb = rxq->hv->rxbuf_info + pkt->hdr.xactid;
+	rxb = rxq->rxbuf_info + pkt->hdr.xactid;
 	rxb->chan = rxq->chan;
 	rxb->xactid = pkt->hdr.xactid;
-	rxb->hv = rxq->hv;
+	rxb->rxq = rxq;
 
 	rxb->shinfo.free_cb = hn_rx_buf_free_cb;
@@ -537,5 +537,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
 	 */
 	if (dlen >= HN_RXCOPY_THRESHOLD &&
-	    (uint32_t)rte_atomic32_read(&hv->rxbuf_outstanding) <
+	    (uint32_t)rte_atomic32_read(&rxq->rxbuf_outstanding) <
 			hv->rxbuf_section_cnt / 2) {
 		struct rte_mbuf_ext_shared_info *shinfo;
@@ -554,5 +554,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
 		/* shinfo is already set to 1 by the caller */
 		if (rte_mbuf_ext_refcnt_update(shinfo, 1) == 2)
-			rte_atomic32_inc(&hv->rxbuf_outstanding);
+			rte_atomic32_inc(&rxq->rxbuf_outstanding);
 
 		rte_pktmbuf_attach_extbuf(m, data, iova,
@@ -843,4 +843,21 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
 	}
 
+	/* setup rxbuf_info for non-primary queue */
+	if (queue_id) {
+		rxq->rxbuf_info = rte_calloc("HN_RXBUF_INFO",
+					hv->rxbuf_section_cnt,
+					sizeof(*rxq->rxbuf_info),
+					RTE_CACHE_LINE_SIZE);
+
+		if (!rxq->rxbuf_info) {
+			PMD_DRV_LOG(ERR,
+				"Could not allocate rxbuf info for queue %d\n",
+				queue_id);
+			rte_free(rxq->event_buf);
+			rte_free(rxq);
+			return NULL;
+		}
+	}
+
 	return rxq;
 }
@@ -897,4 +914,5 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
 fail:
 	rte_ring_free(rxq->rx_ring);
+	rte_free(rxq->rxbuf_info);
 	rte_free(rxq->event_buf);
 	rte_free(rxq);
@@ -920,4 +938,5 @@ hn_dev_rx_queue_release(void *arg)
 	/* Keep primary queue to allow for control operations */
 	if (rxq != rxq->hv->primary) {
+		rte_free(rxq->rxbuf_info);
 		rte_free(rxq->event_buf);
 		rte_free(rxq);
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index 34cd11d641..fceb345099 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -83,4 +83,6 @@ struct hn_rx_queue {
 
 	void *event_buf;
+	struct hn_rx_bufinfo *rxbuf_info;
+	rte_atomic32_t  rxbuf_outstanding;
 };
 
@@ -89,5 +91,5 @@ struct hn_rx_queue {
 struct hn_rx_bufinfo {
 	struct vmbus_channel *chan;
-	struct hn_data *hv;
+	struct hn_rx_queue *rxq;
 	uint64_t	xactid;
 	struct rte_mbuf_ext_shared_info shinfo;
@@ -110,7 +112,5 @@ struct hn_data {
 
 	struct rte_mem_resource *rxbuf_res;	/* UIO resource for Rx */
-	struct hn_rx_bufinfo *rxbuf_info;
 	uint32_t	rxbuf_section_cnt;	/* # of Rx sections */
-	rte_atomic32_t	rxbuf_outstanding;
 	uint16_t	max_queues;		/* Max available queues */
 	uint16_t	num_queues;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.331318590 +0000
+++ 0003-net-netvsc-fix-multiple-channel-Rx.patch	2020-11-05 12:38:54.143895944 +0000
@@ -1 +1 @@
-From ac837bdd22400b220d60336f22c18091a92a40c9 Mon Sep 17 00:00:00 2001
+From 5c72d08cb81031f228851f5cf2e72d93022ed5de Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac837bdd22400b220d60336f22c18091a92a40c9 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index f88854dafc..eeb82ab9ee 100644
+index f97bb10846..78ebb954f4 100644
@@ -56 +57 @@
-index 87b1184bc1..c8c4ee10c8 100644
+index c6506e442d..5d580f6f7f 100644
@@ -59 +60 @@
-@@ -525,19 +525,19 @@ static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
+@@ -494,19 +494,19 @@ static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
@@ -84 +85 @@
-@@ -569,5 +569,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -537,5 +537,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -91 +92 @@
-@@ -586,5 +586,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -554,5 +554,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -98 +99 @@
-@@ -889,4 +889,21 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
+@@ -843,4 +843,21 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
@@ -120 +121 @@
-@@ -954,4 +971,5 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -897,4 +914,5 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
@@ -126,6 +127,6 @@
-@@ -976,4 +994,5 @@ hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary)
- 		return;
- 
-+	rte_free(rxq->rxbuf_info);
- 	rte_free(rxq->event_buf);
- 	rte_free(rxq);
+@@ -920,4 +938,5 @@ hn_dev_rx_queue_release(void *arg)
+ 	/* Keep primary queue to allow for control operations */
+ 	if (rxq != rxq->hv->primary) {
++		rte_free(rxq->rxbuf_info);
+ 		rte_free(rxq->event_buf);
+ 		rte_free(rxq);
@@ -133 +134 @@
-index 7cb7713e93..4b63f87607 100644
+index 34cd11d641..fceb345099 100644
@@ -136 +137 @@
-@@ -84,4 +84,6 @@ struct hn_rx_queue {
+@@ -83,4 +83,6 @@ struct hn_rx_queue {
@@ -143 +144 @@
-@@ -90,5 +92,5 @@ struct hn_rx_queue {
+@@ -89,5 +91,5 @@ struct hn_rx_queue {
@@ -150 +151 @@
-@@ -112,7 +114,5 @@ struct hn_data {
+@@ -110,7 +112,5 @@ struct hn_data {


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/netvsc: fix stale value after free' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/failsafe: fix double space in warning log' " Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix multiple channel Rx' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: remove unused log macros' " Kevin Traynor
                   ` (63 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Long Li; +Cc: Stephen Hemminger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 510aa52a7861e0c6e6853efb40c2f42e7b85466f Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Mon, 10 Aug 2020 19:33:13 -0700
Subject: [PATCH] net/netvsc: fix stale value after free

[ upstream commit 0caf5621a4cdaadb40c7686d86bf58dd841057d3 ]

chim_index could potentially be used in other hn_txdesc when re-allocated.
Mark it as invalid to prevent stale value being used.

Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors")

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_rxtx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 5d580f6f7f..cc8bb7ed95 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -388,6 +388,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id,
 	}
 
-	if (txd->chim_index != NVS_CHIM_IDX_INVALID)
+	if (txd->chim_index != NVS_CHIM_IDX_INVALID) {
 		hn_chim_free(hv, txd->chim_index);
+		txd->chim_index = NVS_CHIM_IDX_INVALID;
+	}
 
 	rte_pktmbuf_free(txd->m);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.349028952 +0000
+++ 0004-net-netvsc-fix-stale-value-after-free.patch	2020-11-05 12:38:54.146895947 +0000
@@ -1 +1 @@
-From 0caf5621a4cdaadb40c7686d86bf58dd841057d3 Mon Sep 17 00:00:00 2001
+From 510aa52a7861e0c6e6853efb40c2f42e7b85466f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0caf5621a4cdaadb40c7686d86bf58dd841057d3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index c8c4ee10c8..a388ff2588 100644
+index 5d580f6f7f..cc8bb7ed95 100644
@@ -22 +23 @@
-@@ -420,6 +420,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id,
+@@ -388,6 +388,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/mlx5: remove unused log macros' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (2 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix stale value after free' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix endianness while setting L4 destination port' " Kevin Traynor
                   ` (62 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Ophir Munk; +Cc: Matan Azrad, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 7290fd3d51ba8bcc2324f0ca64198293a6e050fb Mon Sep 17 00:00:00 2001
From: Ophir Munk <ophirmu@mellanox.com>
Date: Tue, 25 Aug 2020 09:31:10 +0000
Subject: [PATCH] net/mlx5: remove unused log macros

[ upstream commit 079f1ae5acf591c52a19f4c5c7e30de5252176e6 ]

Remove utility macros INFO, WARN, ERROR. They are not in use and
conflict with identical definitions when compiled under Windows.

Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump")

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5_utils.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h
index fa495b3786..c8f74c1047 100644
--- a/drivers/net/mlx5/mlx5_utils.h
+++ b/drivers/net/mlx5/mlx5_utils.h
@@ -126,8 +126,4 @@ extern int mlx5_logtype;
 #endif /* NDEBUG */
 
-#define INFO(...) DRV_LOG(INFO, __VA_ARGS__)
-#define WARN(...) DRV_LOG(WARNING, __VA_ARGS__)
-#define ERROR(...) DRV_LOG(ERR, __VA_ARGS__)
-
 /* Convenience macros for accessing mbuf fields. */
 #define NEXT(m) ((m)->next)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.365837389 +0000
+++ 0005-net-mlx5-remove-unused-log-macros.patch	2020-11-05 12:38:54.147895947 +0000
@@ -1 +1 @@
-From 079f1ae5acf591c52a19f4c5c7e30de5252176e6 Mon Sep 17 00:00:00 2001
+From 7290fd3d51ba8bcc2324f0ca64198293a6e050fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 079f1ae5acf591c52a19f4c5c7e30de5252176e6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 97d931fcab..f078bdc65a 100644
+index fa495b3786..c8f74c1047 100644
@@ -22,2 +23,2 @@
-@@ -36,8 +36,4 @@ extern int mlx5_logtype;
- 		PMD_DRV_LOG_CPAREN)
+@@ -126,8 +126,4 @@ extern int mlx5_logtype;
+ #endif /* NDEBUG */


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/bnxt: fix endianness while setting L4 destination port' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (3 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: remove unused log macros' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/iavf: downgrade error log' " Kevin Traynor
                   ` (61 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Kalesh AP; +Cc: Ajit Khaparde, Somnath Kotur, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 9f2e84890ab2fa5af7a9a30d24b3d3dec8dc489c Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Date: Fri, 28 Aug 2020 10:31:07 +0530
Subject: [PATCH] net/bnxt: fix endianness while setting L4 destination port

[ upstream commit d51a43f4343d35d850e6173ca3770ab3ef117adb ]

Use "req.tunnel_dst_port_val" in bnxt_hwrm_tunnel_dst_port_alloc()
as big endian since hwrm spec mandates this field in network byte order.

Also, fixed the endianness while parsing the command output.

Fixes: 10d074b2022d ("net/bnxt: support tunneling")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 0f1f4d10d8..01ddf4443a 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2853,5 +2853,5 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
 	HWRM_PREP(req, TUNNEL_DST_PORT_ALLOC, BNXT_USE_CHIMP_MB);
 	req.tunnel_type = tunnel_type;
-	req.tunnel_dst_port_val = port;
+	req.tunnel_dst_port_val = rte_cpu_to_be_16(port);
 	rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 	HWRM_CHECK_RESULT();
@@ -2859,9 +2859,11 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
 	switch (tunnel_type) {
 	case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN:
-		bp->vxlan_fw_dst_port_id = resp->tunnel_dst_port_id;
+		bp->vxlan_fw_dst_port_id =
+			rte_le_to_cpu_16(resp->tunnel_dst_port_id);
 		bp->vxlan_port = port;
 		break;
 	case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_GENEVE:
-		bp->geneve_fw_dst_port_id = resp->tunnel_dst_port_id;
+		bp->geneve_fw_dst_port_id =
+			rte_le_to_cpu_16(resp->tunnel_dst_port_id);
 		bp->geneve_port = port;
 		break;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.383327092 +0000
+++ 0006-net-bnxt-fix-endianness-while-setting-L4-destination.patch	2020-11-05 12:38:54.153895952 +0000
@@ -1 +1 @@
-From d51a43f4343d35d850e6173ca3770ab3ef117adb Mon Sep 17 00:00:00 2001
+From 9f2e84890ab2fa5af7a9a30d24b3d3dec8dc489c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d51a43f4343d35d850e6173ca3770ab3ef117adb ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index f534f20159..c1af814040 100644
+index 0f1f4d10d8..01ddf4443a 100644
@@ -25,2 +26,2 @@
-@@ -3621,5 +3621,5 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
- 	HWRM_PREP(&req, HWRM_TUNNEL_DST_PORT_ALLOC, BNXT_USE_CHIMP_MB);
+@@ -2853,5 +2853,5 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
+ 	HWRM_PREP(req, TUNNEL_DST_PORT_ALLOC, BNXT_USE_CHIMP_MB);
@@ -32 +33 @@
-@@ -3627,9 +3627,11 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
+@@ -2859,9 +2859,11 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/iavf: downgrade error log' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (4 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix endianness while setting L4 destination port' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'ethdev: remove redundant license text' " Kevin Traynor
                   ` (60 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Steve Yang; +Cc: Beilei Xing, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 1437a6eace87b83e85105452132aa2c6342251b5 Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang@intel.com>
Date: Fri, 4 Sep 2020 07:29:07 +0000
Subject: [PATCH] net/iavf: downgrade error log

[ upstream commit ef30148ac281a5a415a3c332a30d2616056c329a ]

When receiving the unsupported AQ messages, it's taken as an
error. It's not appropriate and triggers too much unnecessary print.

Fixes: 22b123a36d07 ("net/avf: initialize PMD")

Signed-off-by: Steve Yang <stevex.yang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/avf/avf_vchnl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/avf/avf_vchnl.c b/drivers/net/avf/avf_vchnl.c
index 276b406f91..7806014e80 100644
--- a/drivers/net/avf/avf_vchnl.c
+++ b/drivers/net/avf/avf_vchnl.c
@@ -223,5 +223,5 @@ avf_handle_virtchnl_msg(struct rte_eth_dev *dev)
 			break;
 		default:
-			PMD_DRV_LOG(ERR, "Request %u is not supported yet",
+			PMD_DRV_LOG(DEBUG, "Request %u is not supported yet",
 				    aq_opc);
 			break;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.402233765 +0000
+++ 0007-net-iavf-downgrade-error-log.patch	2020-11-05 12:38:54.154895953 +0000
@@ -1 +1 @@
-From ef30148ac281a5a415a3c332a30d2616056c329a Mon Sep 17 00:00:00 2001
+From 1437a6eace87b83e85105452132aa2c6342251b5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ef30148ac281a5a415a3c332a30d2616056c329a ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- drivers/net/iavf/iavf_vchnl.c | 2 +-
+ drivers/net/avf/avf_vchnl.c | 2 +-
@@ -18,5 +19,5 @@
-diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
-index a163548645..ea9b53a592 100644
---- a/drivers/net/iavf/iavf_vchnl.c
-+++ b/drivers/net/iavf/iavf_vchnl.c
-@@ -269,5 +269,5 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
+diff --git a/drivers/net/avf/avf_vchnl.c b/drivers/net/avf/avf_vchnl.c
+index 276b406f91..7806014e80 100644
+--- a/drivers/net/avf/avf_vchnl.c
++++ b/drivers/net/avf/avf_vchnl.c
+@@ -223,5 +223,5 @@ avf_handle_virtchnl_msg(struct rte_eth_dev *dev)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'ethdev: remove redundant license text' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (5 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/iavf: downgrade error log' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix function header arguments' " Kevin Traynor
                   ` (59 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Stephen Hemminger, Andrew Rybchenko, Jan Blunck, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 7a1fbba865970b8e351c16e6e3fb9f22fba4ef46 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Thu, 10 Sep 2020 12:08:48 +0100
Subject: [PATCH] ethdev: remove redundant license text

[ upstream commit b895a521f96585e6fe42a248b89e38cc1da81596 ]

Redundant BSD-3 license text removed, the licensing already documented
by "SPDX-License-Identifier: BSD-3-Clause" SPDX tag.

Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 lib/librte_ethdev/rte_ethdev_pci.h  | 26 --------------------------
 lib/librte_ethdev/rte_ethdev_vdev.h | 26 --------------------------
 2 files changed, 52 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
index cca94ec864..d44a8e2a39 100644
--- a/lib/librte_ethdev/rte_ethdev_pci.h
+++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -4,30 +4,4 @@
  *   Copyright(c) 2017 Brocade Communications Systems, Inc.
  *   Author: Jan Blunck <jblunck@infradead.org>
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of the copyright holder nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h
index 259feda3f7..0abce0d21c 100644
--- a/lib/librte_ethdev/rte_ethdev_vdev.h
+++ b/lib/librte_ethdev/rte_ethdev_vdev.h
@@ -4,30 +4,4 @@
  *   Copyright(c) 2017 Brocade Communications Systems, Inc.
  *   Author: Jan Blunck <jblunck@infradead.org>
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of the copyright holder nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.420023267 +0000
+++ 0008-ethdev-remove-redundant-license-text.patch	2020-11-05 12:38:54.155895954 +0000
@@ -1 +1 @@
-From b895a521f96585e6fe42a248b89e38cc1da81596 Mon Sep 17 00:00:00 2001
+From 7a1fbba865970b8e351c16e6e3fb9f22fba4ef46 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b895a521f96585e6fe42a248b89e38cc1da81596 ]
+
@@ -9,2 +10,0 @@
-Cc: stable@dpdk.org
-
@@ -20 +20 @@
-index 6ac6ea41f5..9c483468ba 100644
+index cca94ec864..d44a8e2a39 100644
@@ -23,2 +23,2 @@
-@@ -2,30 +2,4 @@
-  * Copyright(c) 2017 Brocade Communications Systems, Inc.
+@@ -4,30 +4,4 @@
+  *   Copyright(c) 2017 Brocade Communications Systems, Inc.
@@ -55 +55 @@
-index 64fa689ed3..4ba3f28964 100644
+index 259feda3f7..0abce0d21c 100644
@@ -58,2 +58,2 @@
-@@ -2,30 +2,4 @@
-  * Copyright(c) 2017 Brocade Communications Systems, Inc.
+@@ -4,30 +4,4 @@
+  *   Copyright(c) 2017 Brocade Communications Systems, Inc.


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/i40e/base: fix function header arguments' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (6 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'ethdev: remove redundant license text' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix Rx only for unicast promisc on VLAN' " Kevin Traynor
                   ` (58 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Guinan Sun; +Cc: Jesse Brandeburg, Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From b6486a7c0836f233494165afcefdc14c2ee7c7c4 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Sat, 12 Sep 2020 03:00:34 +0000
Subject: [PATCH] net/i40e/base: fix function header arguments

[ upstream commit 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac ]

Fix them by adding the argument descriptions.

Fixes: 0d9d27bb8684 ("i40e/base: prepare local LLDP MIB in TLV")

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/base/i40e_dcb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c
index d99bd6e3f8..5a1f9903a5 100644
--- a/drivers/net/i40e/base/i40e_dcb.c
+++ b/drivers/net/i40e/base/i40e_dcb.c
@@ -1213,5 +1213,6 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw)
 /**
  * i40e_dcb_config_to_lldp - Convert Dcbconfig to MIB format
- * @hw: pointer to the hw struct
+ * @lldpmib: pointer to mib to be output
+ * @miblen: pointer to u16 for length of lldpmib
  * @dcbcfg: store for LLDPDU data
  *
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.436180044 +0000
+++ 0009-net-i40e-base-fix-function-header-arguments.patch	2020-11-05 12:38:54.157895955 +0000
@@ -1 +1 @@
-From 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac Mon Sep 17 00:00:00 2001
+From b6486a7c0836f233494165afcefdc14c2ee7c7c4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index a07c61e673..388af3d64d 100644
+index d99bd6e3f8..5a1f9903a5 100644
@@ -22 +23 @@
-@@ -1268,5 +1268,6 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw)
+@@ -1213,5 +1213,6 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/i40e/base: fix Rx only for unicast promisc on VLAN' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (7 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix function header arguments' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/tap: free mempool when closing' " Kevin Traynor
                   ` (57 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Guinan Sun; +Cc: Przemyslaw Patynowski, Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 63bc345e993ef8efbb9438e0bc5c079c6609fb0c Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Sat, 12 Sep 2020 03:00:36 +0000
Subject: [PATCH] net/i40e/base: fix Rx only for unicast promisc on VLAN

[ upstream commit 2972fc3f4000108cf48b49389851278abb35425a ]

Set promiscuous mode to rx traffic only if VSI has VLANs configured.
Rename misleading PROMISC_TX bit to proper name.
Added I40E_AQC_SET_VSI_PROMISC_RX_ONLY during VSI unicast promiscuous
mode configuration with port VLAN.
Aligned unicast promiscuous with VLAN to the one without VLAN.
Previously other VFs could listen to unicast tx traffic of other VFs.

Fixes: 8db9e2a1b232 ("i40e: base driver")

Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/base/i40e_adminq_cmd.h |  2 +-
 drivers/net/i40e/base/i40e_common.c     | 36 +++++++++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h b/drivers/net/i40e/base/i40e_adminq_cmd.h
index ec1ba7825b..20afe13169 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -1216,5 +1216,5 @@ struct i40e_aqc_set_vsi_promiscuous_modes {
 #define I40E_AQC_SET_VSI_DEFAULT		0x08
 #define I40E_AQC_SET_VSI_PROMISC_VLAN		0x10
-#define I40E_AQC_SET_VSI_PROMISC_TX		0x8000
+#define I40E_AQC_SET_VSI_PROMISC_RX_ONLY	0x8000
 	__le16	seid;
 #define I40E_AQC_VSI_PROM_CMD_SEID_MASK		0x3FF
diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index b256fb47d3..d22184daa6 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -2225,4 +2225,20 @@ enum i40e_status_code i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
 }
 
+/**
+ * i40e_hw_ver_ge
+ * @hw: pointer to the hw struct
+ * @maj: api major value
+ * @min: api minor value
+ *
+ * Assert whether current HW api version is greater/equal than provided.
+ **/
+static bool i40e_hw_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
+{
+	if (hw->aq.api_maj_ver > maj ||
+	    (hw->aq.api_maj_ver == maj && hw->aq.api_min_ver >= min))
+		return true;
+	return false;
+}
+
 /**
  * i40e_aq_add_vsi
@@ -2350,8 +2366,6 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
 	if (set) {
 		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;
-		if (rx_only_promisc &&
-		    (((hw->aq.api_maj_ver == 1) && (hw->aq.api_min_ver >= 5)) ||
-		     (hw->aq.api_maj_ver > 1)))
-			flags |= I40E_AQC_SET_VSI_PROMISC_TX;
+		if (rx_only_promisc && i40e_hw_ver_ge(hw, 1, 5))
+			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;
 	}
 
@@ -2359,7 +2373,7 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
 
 	cmd->valid_flags = CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_UNICAST);
-	if (((hw->aq.api_maj_ver >= 1) && (hw->aq.api_min_ver >= 5)) ||
-	     (hw->aq.api_maj_ver > 1))
-		cmd->valid_flags |= CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_TX);
+	if (i40e_hw_ver_ge(hw, 1, 5))
+		cmd->valid_flags |=
+			CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);
 
 	cmd->seid = CPU_TO_LE16(seid);
@@ -2493,9 +2507,15 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,
 					i40e_aqc_opc_set_vsi_promiscuous_modes);
 
-	if (enable)
+	if (enable) {
 		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;
+		if (i40e_hw_ver_ge(hw, 1, 5))
+			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;
+	}
 
 	cmd->promiscuous_flags = CPU_TO_LE16(flags);
 	cmd->valid_flags = CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_UNICAST);
+	if (i40e_hw_ver_ge(hw, 1, 5))
+		cmd->valid_flags |=
+			CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);
 	cmd->seid = CPU_TO_LE16(seid);
 	cmd->vlan_tag = CPU_TO_LE16(vid | I40E_AQC_SET_VSI_VLAN_VALID);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.453664822 +0000
+++ 0010-net-i40e-base-fix-Rx-only-for-unicast-promisc-on-VLA.patch	2020-11-05 12:38:54.168895964 +0000
@@ -1 +1 @@
-From 2972fc3f4000108cf48b49389851278abb35425a Mon Sep 17 00:00:00 2001
+From 63bc345e993ef8efbb9438e0bc5c079c6609fb0c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2972fc3f4000108cf48b49389851278abb35425a ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 65831ea7ab..2ca41db5d3 100644
+index ec1ba7825b..20afe13169 100644
@@ -28 +29 @@
-@@ -1223,5 +1223,5 @@ struct i40e_aqc_set_vsi_promiscuous_modes {
+@@ -1216,5 +1216,5 @@ struct i40e_aqc_set_vsi_promiscuous_modes {
@@ -36 +37 @@
-index 15f4e91a40..cd8b27e407 100644
+index b256fb47d3..d22184daa6 100644
@@ -39 +40 @@
-@@ -2271,4 +2271,20 @@ enum i40e_status_code i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
+@@ -2225,4 +2225,20 @@ enum i40e_status_code i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
@@ -60 +61 @@
-@@ -2396,8 +2412,6 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
+@@ -2350,8 +2366,6 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
@@ -71 +72 @@
-@@ -2405,7 +2419,7 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
+@@ -2359,7 +2373,7 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
@@ -82 +83 @@
-@@ -2539,9 +2553,15 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,
+@@ -2493,9 +2507,15 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/tap: free mempool when closing' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (8 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix Rx only for unicast promisc on VLAN' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/dpaa2: fix misuse of interface index' " Kevin Traynor
                   ` (56 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From b2089030c96abc063fc70fe9999b24dd3a003fdc Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Sat, 8 Aug 2020 17:58:43 +0800
Subject: [PATCH] net/tap: free mempool when closing

[ upstream commit 05a8e4a35d3ca9c1e5271917ad081ba78cd73fce ]

When setup tx queues, we will create a mempool for the 'gso_ctx'.
The mempool is not freed when closing tap device. If free the tap
device and create it with different name, it will create a new
mempool. This maybe cause an OOM.

The snprintf function return value is not checked and the mempool
name may be truncated. This patch also fix it.

Fixes: 050316a88313 ("net/tap: support TSO (TCP Segment Offload)")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/tap/rte_eth_tap.c | 43 +++++++++++++++++++++--------------
 drivers/net/tap/rte_eth_tap.h |  1 +
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 62fb542865..6fcdd9480c 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -1069,4 +1069,7 @@ tap_dev_close(struct rte_eth_dev *dev)
 	}
 
+	rte_mempool_free(internals->gso_ctx_mp);
+	internals->gso_ctx_mp = NULL;
+
 	if (internals->ka_fd != -1) {
 		close(internals->ka_fd);
@@ -1250,24 +1253,29 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
 	uint32_t gso_types;
 	char pool_name[64];
-
-	/*
-	 * Create private mbuf pool with TAP_GSO_MBUF_SEG_SIZE bytes
-	 * size per mbuf use this pool for both direct and indirect mbufs
-	 */
-
-	struct rte_mempool *mp;      /* Mempool for GSO packets */
+	struct pmd_internals *pmd = dev->data->dev_private;
+	int ret;
 
 	/* initialize GSO context */
 	gso_types = DEV_TX_OFFLOAD_TCP_TSO;
-	snprintf(pool_name, sizeof(pool_name), "mp_%s", dev->device->name);
-	mp = rte_mempool_lookup((const char *)pool_name);
-	if (!mp) {
-		mp = rte_pktmbuf_pool_create(pool_name, TAP_GSO_MBUFS_NUM,
-			TAP_GSO_MBUF_CACHE_SIZE, 0,
+	if (!pmd->gso_ctx_mp) {
+		/*
+		 * Create private mbuf pool with TAP_GSO_MBUF_SEG_SIZE
+		 * bytes size per mbuf use this pool for both direct and
+		 * indirect mbufs
+		 */
+		ret = snprintf(pool_name, sizeof(pool_name), "mp_%s",
+				dev->device->name);
+		if (ret < 0 || ret >= (int)sizeof(pool_name)) {
+			TAP_LOG(ERR,
+				"%s: failed to create mbuf pool name for device %s,"
+				"device name too long or output error, ret: %d\n",
+				pmd->name, dev->device->name, ret);
+			return -ENAMETOOLONG;
+		}
+		pmd->gso_ctx_mp = rte_pktmbuf_pool_create(pool_name,
+			TAP_GSO_MBUFS_NUM, TAP_GSO_MBUF_CACHE_SIZE, 0,
 			RTE_PKTMBUF_HEADROOM + TAP_GSO_MBUF_SEG_SIZE,
 			SOCKET_ID_ANY);
-		if (!mp) {
-			struct pmd_internals *pmd = dev->data->dev_private;
-
+		if (!pmd->gso_ctx_mp) {
 			TAP_LOG(ERR,
 				"%s: failed to create mbuf pool for device %s\n",
@@ -1277,6 +1285,6 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
 	}
 
-	gso_ctx->direct_pool = mp;
-	gso_ctx->indirect_pool = mp;
+	gso_ctx->direct_pool = pmd->gso_ctx_mp;
+	gso_ctx->indirect_pool = pmd->gso_ctx_mp;
 	gso_ctx->gso_types = gso_types;
 	gso_ctx->gso_size = 0; /* gso_size is set in tx_burst() per packet */
@@ -1771,4 +1779,5 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
 	pmd->ka_fd = -1;
 	pmd->nlsk_fd = -1;
+	pmd->gso_ctx_mp = NULL;
 
 	pmd->ioctl_sock = socket(AF_INET, SOCK_DGRAM, 0);
diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index dc3579ac0d..cb50745d79 100644
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -92,4 +92,5 @@ struct pmd_internals {
 	struct rte_intr_handle intr_handle;          /* LSC interrupt handle. */
 	int ka_fd;                        /* keep-alive file descriptor */
+	struct rte_mempool *gso_ctx_mp;     /* Mempool for GSO packets */
 };
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.476303685 +0000
+++ 0011-net-tap-free-mempool-when-closing.patch	2020-11-05 12:38:54.170895965 +0000
@@ -1 +1 @@
-From 05a8e4a35d3ca9c1e5271917ad081ba78cd73fce Mon Sep 17 00:00:00 2001
+From b2089030c96abc063fc70fe9999b24dd3a003fdc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05a8e4a35d3ca9c1e5271917ad081ba78cd73fce ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index b19e26ba0e..df16aa4ea7 100644
+index 62fb542865..6fcdd9480c 100644
@@ -28 +29 @@
-@@ -1106,4 +1106,7 @@ tap_dev_close(struct rte_eth_dev *dev)
+@@ -1069,4 +1069,7 @@ tap_dev_close(struct rte_eth_dev *dev)
@@ -36 +37 @@
-@@ -1353,24 +1356,29 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
+@@ -1250,24 +1253,29 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
@@ -81 +82 @@
-@@ -1380,6 +1388,6 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
+@@ -1277,6 +1285,6 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
@@ -90 +91 @@
-@@ -1878,4 +1886,5 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,
+@@ -1771,4 +1779,5 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
@@ -97 +98 @@
-index 8d6d53dc0a..ba45de8409 100644
+index dc3579ac0d..cb50745d79 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/dpaa2: fix misuse of interface index' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (9 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/tap: free mempool when closing' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' " Kevin Traynor
                   ` (55 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Sachin Saxena; +Cc: Stephen Hemminger, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 6e2c9c0d4d1d62b06f9b1647a07fc099aa19dccf Mon Sep 17 00:00:00 2001
From: Sachin Saxena <sachin.saxena@nxp.com>
Date: Mon, 14 Sep 2020 19:51:18 +0530
Subject: [PATCH] net/dpaa2: fix misuse of interface index

[ upstream commit 88e584a60d48b4416ad35649c2468656b514a449 ]

Dpaa2 pmd has no need to bound host interface
for which we require if_index field.
Setting it to 0 as unused.

Fixes: 3e5a335d3f88 ("net/dpaa2: add basic operations")

Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Sachin Saxena <sachin.saxena@nxp.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index c801d922cf..bea14ad6fd 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -193,6 +193,4 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 	PMD_INIT_FUNC_TRACE();
 
-	dev_info->if_index = priv->hw_id;
-
 	dev_info->max_mac_addrs = priv->max_mac_filters;
 	dev_info->max_rx_pktlen = DPAA2_MAX_RX_PKT_LEN;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.493981691 +0000
+++ 0012-net-dpaa2-fix-misuse-of-interface-index.patch	2020-11-05 12:38:54.171895966 +0000
@@ -1 +1 @@
-From 88e584a60d48b4416ad35649c2468656b514a449 Mon Sep 17 00:00:00 2001
+From 6e2c9c0d4d1d62b06f9b1647a07fc099aa19dccf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 88e584a60d48b4416ad35649c2468656b514a449 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 0e9f836e55..02daa4d250 100644
+index c801d922cf..bea14ad6fd 100644
@@ -24 +25 @@
-@@ -242,6 +242,4 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+@@ -193,6 +193,4 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (10 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/dpaa2: fix misuse of interface index' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/nfp: expand device info get' " Kevin Traynor
                   ` (54 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Karra Satwik; +Cc: Rahul Lakkireddy, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From ece6f09636f267b257613c19a3c5b96575f92b65 Mon Sep 17 00:00:00 2001
From: Karra Satwik <kaara.satwik@chelsio.com>
Date: Sat, 12 Sep 2020 05:17:51 +0530
Subject: [PATCH] net/cxgbe: fix duplicate MAC addresses in MPS TCAM

[ upstream commit 0dd95bc917e9a29065a8f73e13807492dca1e509 ]

During MAC address insertion to MPS TCAM, add a default mask when
the mask is not explicitly specified. Otherwise, driver misses the
mask comparison and ends up inserting duplicate entries in the
MPS TCAM.

Fixes: 6fda3f0ddda9 ("net/cxgbe: add API to program hardware MPS table")

Signed-off-by: Karra Satwik <kaara.satwik@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
 drivers/net/cxgbe/mps_tcam.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/cxgbe/mps_tcam.c b/drivers/net/cxgbe/mps_tcam.c
index 71c8070b3e..6e739445f4 100644
--- a/drivers/net/cxgbe/mps_tcam.c
+++ b/drivers/net/cxgbe/mps_tcam.c
@@ -141,4 +141,5 @@ int cxgbe_mpstcam_modify(struct port_info *pi, int idx, const u8 *addr)
 	entry = &mpstcam->entry[idx];
 	memcpy(entry->eth_addr, addr, ETHER_ADDR_LEN);
+	memset(entry->mask, ~0, ETHER_ADDR_LEN);
 	/* NOTE: we have considered the case that idx returned by t4_change_mac
 	 * will be different from the user provided value only if user
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.512353461 +0000
+++ 0013-net-cxgbe-fix-duplicate-MAC-addresses-in-MPS-TCAM.patch	2020-11-05 12:38:54.172895967 +0000
@@ -1 +1 @@
-From 0dd95bc917e9a29065a8f73e13807492dca1e509 Mon Sep 17 00:00:00 2001
+From ece6f09636f267b257613c19a3c5b96575f92b65 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0dd95bc917e9a29065a8f73e13807492dca1e509 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 5302d1343d..6e5fae9928 100644
+index 71c8070b3e..6e739445f4 100644
@@ -26,2 +27,2 @@
- 	memcpy(entry->eth_addr, addr, RTE_ETHER_ADDR_LEN);
-+	memset(entry->mask, ~0, RTE_ETHER_ADDR_LEN);
+ 	memcpy(entry->eth_addr, addr, ETHER_ADDR_LEN);
++	memset(entry->mask, ~0, ETHER_ADDR_LEN);


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/nfp: expand device info get' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (11 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' " Kevin Traynor
                   ` (53 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Heinrich Kuhn; +Cc: Simon Horman, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From edcfebc80660df852fabf7bb7ef62c10b87c7d49 Mon Sep 17 00:00:00 2001
From: Heinrich Kuhn <heinrich.kuhn@netronome.com>
Date: Wed, 2 Sep 2020 13:52:27 +0200
Subject: [PATCH] net/nfp: expand device info get

[ upstream commit 69a0f8750aa349ed27fa7b635e2b47f74f11431a ]

Report Rx and Tx descriptor related limitations in the nfp dev_info_get
callback function. This commit also adds NFP_ALIGN_RING_DESC to replace
a static integer value used during rx/tx queue setups to validate
descriptor alignment.

Signed-off-by: Heinrich Kuhn <heinrich.kuhn@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 drivers/net/nfp/nfp_net.c     | 30 ++++++++++++++++++++++++------
 drivers/net/nfp/nfp_net_pmd.h |  6 ++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index e1034b2f43..c126084728 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -1202,4 +1202,18 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 	};
 
+	dev_info->rx_desc_lim = (struct rte_eth_desc_lim) {
+		.nb_max = NFP_NET_MAX_RX_DESC,
+		.nb_min = NFP_NET_MIN_RX_DESC,
+		.nb_align = NFP_ALIGN_RING_DESC,
+	};
+
+	dev_info->tx_desc_lim = (struct rte_eth_desc_lim) {
+		.nb_max = NFP_NET_MAX_TX_DESC,
+		.nb_min = NFP_NET_MIN_TX_DESC,
+		.nb_align = NFP_ALIGN_RING_DESC,
+		.nb_seg_max = NFP_TX_MAX_SEG,
+		.nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG,
+	};
+
 	dev_info->flow_type_rss_offloads = ETH_RSS_IPV4 |
 					   ETH_RSS_NONFRAG_IPV4_TCP |
@@ -1463,4 +1477,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
 	struct nfp_net_rxq *rxq;
 	struct nfp_net_hw *hw;
+	uint32_t rx_desc_sz;
 
 	hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -1469,7 +1484,8 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
 
 	/* Validating number of descriptors */
-	if (((nb_desc * sizeof(struct nfp_net_rx_desc)) % 128) != 0 ||
-	    (nb_desc > NFP_NET_MAX_RX_DESC) ||
-	    (nb_desc < NFP_NET_MIN_RX_DESC)) {
+	rx_desc_sz = nb_desc * sizeof(struct nfp_net_rx_desc);
+	if (rx_desc_sz % NFP_ALIGN_RING_DESC != 0 ||
+	    nb_desc > NFP_NET_MAX_RX_DESC ||
+	    nb_desc < NFP_NET_MIN_RX_DESC) {
 		PMD_DRV_LOG(ERR, "Wrong nb_desc value");
 		return -EINVAL;
@@ -1610,4 +1626,5 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
 	uint16_t tx_free_thresh;
 	struct nfp_net_hw *hw;
+	uint32_t tx_desc_sz;
 
 	hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -1616,7 +1633,8 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
 
 	/* Validating number of descriptors */
-	if (((nb_desc * sizeof(struct nfp_net_tx_desc)) % 128) != 0 ||
-	    (nb_desc > NFP_NET_MAX_TX_DESC) ||
-	    (nb_desc < NFP_NET_MIN_TX_DESC)) {
+	tx_desc_sz = nb_desc * sizeof(struct nfp_net_tx_desc);
+	if (tx_desc_sz % NFP_ALIGN_RING_DESC != 0 ||
+	    nb_desc > NFP_NET_MAX_TX_DESC ||
+	    nb_desc < NFP_NET_MIN_TX_DESC) {
 		PMD_DRV_LOG(ERR, "Wrong nb_desc value");
 		return -EINVAL;
diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h
index d70cbc634c..c14da958c7 100644
--- a/drivers/net/nfp/nfp_net_pmd.h
+++ b/drivers/net/nfp/nfp_net_pmd.h
@@ -60,4 +60,10 @@ struct nfp_net_adapter;
 #define NFP_NET_MIN_RX_DESC 64
 
+/* Descriptor alignment */
+#define NFP_ALIGN_RING_DESC 128
+
+#define NFP_TX_MAX_SEG     UINT8_MAX
+#define NFP_TX_MAX_MTU_SEG 8
+
 /* Bar allocation */
 #define NFP_NET_CRTL_BAR        0
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.528401356 +0000
+++ 0014-net-nfp-expand-device-info-get.patch	2020-11-05 12:38:54.175895969 +0000
@@ -1 +1 @@
-From 69a0f8750aa349ed27fa7b635e2b47f74f11431a Mon Sep 17 00:00:00 2001
+From edcfebc80660df852fabf7bb7ef62c10b87c7d49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 69a0f8750aa349ed27fa7b635e2b47f74f11431a ]
+
@@ -11,2 +12,0 @@
-Cc: stable@dpdk.org
-
@@ -21 +21 @@
-index 2d20d4ce94..f5e4cd339d 100644
+index e1034b2f43..c126084728 100644
@@ -24 +24 @@
-@@ -1251,4 +1251,18 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+@@ -1202,4 +1202,18 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
@@ -43 +43 @@
-@@ -1514,4 +1528,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1463,4 +1477,5 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
@@ -49 +49 @@
-@@ -1520,7 +1535,8 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1469,7 +1484,8 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
@@ -61 +61 @@
-@@ -1661,4 +1677,5 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
+@@ -1610,4 +1626,5 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
@@ -67 +67 @@
-@@ -1667,7 +1684,8 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
+@@ -1616,7 +1633,8 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
@@ -80 +80 @@
-index cb2d19afe6..1295c5959e 100644
+index d70cbc634c..c14da958c7 100644
@@ -83 +83 @@
-@@ -34,4 +34,10 @@ struct nfp_net_adapter;
+@@ -60,4 +60,10 @@ struct nfp_net_adapter;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (12 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/nfp: expand device info get' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 13:22   ` David Marchand
  2020-11-05 12:39 ` [dpdk-stable] patch 'gso: fix payload unit size for UDP' " Kevin Traynor
                   ` (52 subsequent siblings)
  66 siblings, 1 reply; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Wei Ling, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 2 Sep 2020 17:24:27 +0100
Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build

[ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]

The bitrate library in DPDK is actually in a "bitratestats" directory,
so that is used by meson for the macro and library name.
Therefore, we need to update references to RTE_LIBRTE_BITRATE to
RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than
supporting both defines, since make is being removed, we can just
replace all instances of the former define with the latter.

To ensure testpmd links ok when this is done, we also need to add
bitratestats to the list of library dependencies.

Fixes: 5b9656b157d3 ("lib: build with meson")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Wei Ling <weix.ling@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/meson.build  |  3 +++
 app/test-pmd/parameters.c |  4 ++--
 app/test-pmd/testpmd.c    | 12 ++++++------
 app/test-pmd/testpmd.h    |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index adeeeeedba..9bac278594 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -31,4 +31,7 @@ sources = files('cmdline.c',
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
+if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS')
+	deps += 'bitratestats'
+endif
 if dpdk_conf.has('RTE_LIBRTE_PDUMP')
 	deps += 'pdump'
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 57028c313f..3be2993a7a 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -595,5 +595,5 @@ launch_args_parse(int argc, char** argv)
 		{ "latencystats",               1, 0, 0 },
 #endif
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 		{ "bitrate-stats",              1, 0, 0 },
 #endif
@@ -906,5 +906,5 @@ launch_args_parse(int argc, char** argv)
 			}
 #endif
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 			if (!strcmp(lgopts[opt_idx].name, "bitrate-stats")) {
 				n = atoi(optarg);
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 018bd32ec6..8ccbfe6c92 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -56,5 +56,5 @@
 #include <rte_flow.h>
 #include <rte_metrics.h>
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 #include <rte_bitrate.h>
 #endif
@@ -459,5 +459,5 @@ unsigned int num_sockets = 0;
 unsigned int socket_ids[RTE_MAX_NUMA_NODES];
 
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 /* Bitrate statistics */
 struct rte_stats_bitrates *bitrate_data;
@@ -1551,5 +1551,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
 	streamid_t nb_fs;
 	streamid_t sm_id;
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 	uint64_t tics_per_1sec;
 	uint64_t tics_datum;
@@ -1566,5 +1566,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
 		for (sm_id = 0; sm_id < nb_fs; sm_id++)
 			(*pkt_fwd)(fsm[sm_id]);
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 		if (bitrate_enabled != 0 &&
 				bitrate_lcore_id == rte_lcore_id()) {
@@ -3158,5 +3158,5 @@ main(int argc, char** argv)
 
 	/* Bitrate/latency stats disabled by default */
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 	bitrate_enabled = 0;
 #endif
@@ -3248,5 +3248,5 @@ main(int argc, char** argv)
 
 	/* Setup bitrate stats */
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 	if (bitrate_enabled != 0) {
 		bitrate_data = rte_stats_bitrate_create();
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 37d61b8040..cd68d6360e 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -417,5 +417,5 @@ extern lcoreid_t latencystats_lcore_id;
 #endif
 
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 extern lcoreid_t bitrate_lcore_id;
 extern uint8_t bitrate_enabled;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.547525796 +0000
+++ 0015-app-testpmd-fix-name-of-bitrate-library-in-meson-bui.patch	2020-11-05 12:38:54.179895972 +0000
@@ -1 +1 @@
-From 54f89e3df4b16e9079c9d343870d16757429b68b Mon Sep 17 00:00:00 2001
+From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -30 +31 @@
-index ea56e547bb..f52ab148f6 100644
+index adeeeeedba..9bac278594 100644
@@ -33 +34 @@
-@@ -26,4 +26,7 @@ sources = files('5tswap.c',
+@@ -31,4 +31,7 @@ sources = files('cmdline.c',
@@ -42 +43 @@
-index 784515314e..8c2aa13dd3 100644
+index 57028c313f..3be2993a7a 100644
@@ -45 +46 @@
-@@ -617,5 +617,5 @@ launch_args_parse(int argc, char** argv)
+@@ -595,5 +595,5 @@ launch_args_parse(int argc, char** argv)
@@ -52 +53 @@
-@@ -992,5 +992,5 @@ launch_args_parse(int argc, char** argv)
+@@ -906,5 +906,5 @@ launch_args_parse(int argc, char** argv)
@@ -60 +61 @@
-index fb286b86e5..ee3dd27d81 100644
+index 018bd32ec6..8ccbfe6c92 100644
@@ -63 +64 @@
-@@ -55,5 +55,5 @@
+@@ -56,5 +56,5 @@
@@ -70 +71 @@
-@@ -489,5 +489,5 @@ unsigned int num_sockets = 0;
+@@ -459,5 +459,5 @@ unsigned int num_sockets = 0;
@@ -77 +78 @@
-@@ -2065,5 +2065,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
+@@ -1551,5 +1551,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
@@ -84 +85 @@
-@@ -2080,5 +2080,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
+@@ -1566,5 +1566,5 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
@@ -91 +92 @@
-@@ -3708,5 +3708,5 @@ main(int argc, char** argv)
+@@ -3158,5 +3158,5 @@ main(int argc, char** argv)
@@ -98 +99 @@
-@@ -3802,5 +3802,5 @@ main(int argc, char** argv)
+@@ -3248,5 +3248,5 @@ main(int argc, char** argv)
@@ -106 +107 @@
-index a8ae5cceb1..f139fe7a0a 100644
+index 37d61b8040..cd68d6360e 100644
@@ -109 +110 @@
-@@ -404,5 +404,5 @@ extern lcoreid_t latencystats_lcore_id;
+@@ -417,5 +417,5 @@ extern lcoreid_t latencystats_lcore_id;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'gso: fix payload unit size for UDP' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (13 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'doc: improve multiport PF in nfp guide' " Kevin Traynor
                   ` (51 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yi Yang; +Cc: Jiayu Hu, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 0b1b80325e9cc6c7ddd1b2bba0001d2c351c5c8b Mon Sep 17 00:00:00 2001
From: Yi Yang <yangyi01@inspur.com>
Date: Thu, 17 Sep 2020 10:12:49 +0800
Subject: [PATCH] gso: fix payload unit size for UDP

[ upstream commit b9b75d9b5c9dbc71ee12f77e9abe089492708aae ]

Fragment offset of IPv4 header is measured in units of
8 bytes. Fragment offset of UDP fragments will be wrong
after GSO if pyld_unit_size isn't multiple of 8. Say
pyld_unit_size is 1500, fragment offset of the second
UDP fragment will be 187 (i.e. 1500 / 8), which means 1496,
and it will result in 4-byte data loss (1500 - 1496 = 4).
So UDP GRO will reassemble out a wrong packet.

Fixes: b166d4f30b66 ("gso: support UDP/IPv4 fragmentation")

Signed-off-by: Yi Yang <yangyi01@inspur.com>
Acked-by: Jiayu Hu <jiayu.hu@intel.com>
---
 lib/librte_gso/gso_udp4.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/librte_gso/gso_udp4.c b/lib/librte_gso/gso_udp4.c
index 927dee1213..a33b1f1c54 100644
--- a/lib/librte_gso/gso_udp4.c
+++ b/lib/librte_gso/gso_udp4.c
@@ -70,5 +70,8 @@ gso_udp4_segment(struct rte_mbuf *pkt,
 	}
 
-	pyld_unit_size = gso_size - hdr_offset;
+	/* pyld_unit_size must be a multiple of 8 because frag_off
+	 * uses 8 bytes as unit.
+	 */
+	pyld_unit_size = (gso_size - hdr_offset) & ~7U;
 
 	/* Segment the payload */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.566865691 +0000
+++ 0016-gso-fix-payload-unit-size-for-UDP.patch	2020-11-05 12:38:54.179895972 +0000
@@ -1 +1 @@
-From b9b75d9b5c9dbc71ee12f77e9abe089492708aae Mon Sep 17 00:00:00 2001
+From 0b1b80325e9cc6c7ddd1b2bba0001d2c351c5c8b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b9b75d9b5c9dbc71ee12f77e9abe089492708aae ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 21fea09273..6fa68f243a 100644
+index 927dee1213..a33b1f1c54 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'doc: improve multiport PF in nfp guide' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (14 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'gso: fix payload unit size for UDP' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' " Kevin Traynor
                   ` (50 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Heinrich Kuhn; +Cc: Simon Horman, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From be901baabdff54ccc044a4deb0b3b89564de5554 Mon Sep 17 00:00:00 2001
From: Heinrich Kuhn <heinrich.kuhn@netronome.com>
Date: Thu, 3 Sep 2020 13:23:51 +0200
Subject: [PATCH] doc: improve multiport PF in nfp guide

[ upstream commit 979f2bae0714c18899e5bbb3d472842b0ce20060 ]

The Agilio CX family of smartNIC's generally have a 1:many mapping of PF
to physical ports. Elaborate on this mapping in the PF multiport section
of the NFP PMD documentation.

Fixes: d625beafc8be ("doc: update NFP with PF support information")

Signed-off-by: Heinrich Kuhn <heinrich.kuhn@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 doc/guides/nics/nfp.rst | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst
index 927c03c63b..aff9d1553d 100644
--- a/doc/guides/nics/nfp.rst
+++ b/doc/guides/nics/nfp.rst
@@ -129,20 +129,37 @@ more than one SmartNIC, same type of SmartNIC or different ones, and to upload a
 different firmware to each SmartNIC.
 
+   .. Note::
+      Currently the NFP PMD supports using the PF with Agilio Basic Firmware. See
+      https://help.netronome.com/support/solutions for more information on the
+      various firmwares supported by the Netronome Agilio CX smartNIC.
 
 PF multiport support
 --------------------
 
-Some NFP cards support several physical ports with just one single PCI device.
-The DPDK core is designed with a 1:1 relationship between PCI devices and DPDK
-ports, so NFP PMD PF support requires handling the multiport case specifically.
-During NFP PF initialization, the PMD will extract the information about the
-number of PF ports from the firmware and will create as many DPDK ports as
-needed.
-
-Because the unusual relationship between a single PCI device and several DPDK
-ports, there are some limitations when using more than one PF DPDK port: there
-is no support for RX interrupts and it is not possible either to use those PF
-ports with the device hotplug functionality.
+The NFP PMD can work with up to 8 ports on the same PF device. The number of
+available ports is firmware and hardware dependent, and the driver looks for a
+firmware symbol during initialization to know how many can be used.
 
+DPDK apps work with ports, and a port is usually a PF or a VF PCI device.
+However, with the NFP PF multiport there is just one PF PCI device. Supporting
+this particular configuration requires the PMD to create ports in a special way,
+although once they are created, DPDK apps should be able to use them as normal
+PCI ports.
+
+NFP ports belonging to same PF can be seen inside PMD initialization with a
+suffix added to the PCI ID: wwww:xx:yy.z_port_n. For example, a PF with PCI ID
+0000:03:00.0 and four ports is seen by the PMD code as:
+
+   .. code-block:: console
+
+      0000:03:00.0_port_0
+      0000:03:00.0_port_1
+      0000:03:00.0_port_2
+      0000:03:00.0_port_3
+
+   .. Note::
+
+      There are some limitations with multiport support: RX interrupts and
+      device hot-plugging are not supported.
 
 System configuration
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.583868872 +0000
+++ 0017-doc-improve-multiport-PF-in-nfp-guide.patch	2020-11-05 12:38:54.180895973 +0000
@@ -1 +1 @@
-From 979f2bae0714c18899e5bbb3d472842b0ce20060 Mon Sep 17 00:00:00 2001
+From be901baabdff54ccc044a4deb0b3b89564de5554 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 979f2bae0714c18899e5bbb3d472842b0ce20060 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 5f2a0698f6..020e37d131 100644
+index 927c03c63b..aff9d1553d 100644
@@ -23 +24 @@
-@@ -103,20 +103,37 @@ more than one SmartNIC, same type of SmartNIC or different ones, and to upload a
+@@ -129,20 +129,37 @@ more than one SmartNIC, same type of SmartNIC or different ones, and to upload a
@@ -71 +72 @@
- PF multiprocess support
+ System configuration


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (15 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'doc: improve multiport PF in nfp guide' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' " Kevin Traynor
                   ` (49 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Igor Romanov; +Cc: Andrew Rybchenko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 4c73507f1a7e8a21e9c14e49a71bd099eca7b9fb Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 8 Sep 2020 10:20:22 +0100
Subject: [PATCH] net/sfc/base: fix tunnel configuration

[ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ]

Tunnel configuration may fail because of insufficient access rights
on a virtual function. Ignore the failure if a tunnel configuration
with empty UDP ports is requested.

Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/base/efx_tunnel.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/base/efx_tunnel.c b/drivers/net/sfc/base/efx_tunnel.c
index edb6be028f..c92c02cfa2 100644
--- a/drivers/net/sfc/base/efx_tunnel.c
+++ b/drivers/net/sfc/base/efx_tunnel.c
@@ -422,5 +422,5 @@ ef10_tunnel_reconfigure(
 	efx_tunnel_cfg_t *etcp = &enp->en_tunnel_cfg;
 	efx_rc_t rc;
-	boolean_t resetting;
+	boolean_t resetting = B_FALSE;
 	efsys_lock_state_t state;
 	efx_tunnel_cfg_t etc;
@@ -447,6 +447,12 @@ ef10_tunnel_reconfigure(
 		rc = efx_mcdi_set_tunnel_encap_udp_ports(enp, &etc, B_FALSE,
 		    &resetting);
-		if (rc != 0)
-			goto fail2;
+		if (rc != 0) {
+			/*
+			 * Do not fail if the access is denied when no
+			 * tunnel encap UDP ports are configured.
+			 */
+			if (rc != EACCES || etc.etc_udp_entries_num != 0)
+				goto fail2;
+		}
 
 		/*
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.600384130 +0000
+++ 0018-net-sfc-base-fix-tunnel-configuration.patch	2020-11-05 12:38:54.180895973 +0000
@@ -1 +1 @@
-From 33f4e56dda2764eb62970a2c83f224fef43456c1 Mon Sep 17 00:00:00 2001
+From 4c73507f1a7e8a21e9c14e49a71bd099eca7b9fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 3a034412cd..1cc072f0d9 100644
+index edb6be028f..c92c02cfa2 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (16 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' " Kevin Traynor
                   ` (48 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Eugenio Pérez; +Cc: Chenbo Xia, Maxime Coquelin, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From d50676330dde6f9cf1a6779f17774a43b8745222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
Date: Mon, 31 Aug 2020 09:59:22 +0200
Subject: [PATCH] vhost: fix IOTLB mempool single-consumer flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 46d3f57537059ef9ec497f97d98e57a1e5f2f417 ]

Control thread (which handles iotlb msg) and forwarding thread
both use iotlb to translate address. The former may modify the
same entry of mempool and may cause a loop in iotlb_pending_entries
list.

Bugzilla ID: 523
Fixes: d012d1f293f4 ("vhost: add IOTLB helper functions")

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/iotlb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index 3dfde94e80..23d5e11752 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -350,6 +350,5 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
 			0, 0, NULL, NULL, NULL, socket,
 			MEMPOOL_F_NO_CACHE_ALIGN |
-			MEMPOOL_F_SP_PUT |
-			MEMPOOL_F_SC_GET);
+			MEMPOOL_F_SP_PUT);
 	if (!vq->iotlb_pool) {
 		RTE_LOG(ERR, VHOST_CONFIG,
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.616495269 +0000
+++ 0019-vhost-fix-IOTLB-mempool-single-consumer-flag.patch	2020-11-05 12:38:54.180895973 +0000
@@ -1 +1 @@
-From 46d3f57537059ef9ec497f97d98e57a1e5f2f417 Mon Sep 17 00:00:00 2001
+From d50676330dde6f9cf1a6779f17774a43b8745222 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 46d3f57537059ef9ec497f97d98e57a1e5f2f417 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 5b3a0c090c..e0b67721b6 100644
+index 3dfde94e80..23d5e11752 100644
@@ -29 +30 @@
-@@ -322,6 +322,5 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
+@@ -350,6 +350,5 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
@@ -36 +37 @@
- 		VHOST_LOG_CONFIG(ERR,
+ 		RTE_LOG(ERR, VHOST_CONFIG,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (17 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' " Kevin Traynor
                   ` (47 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Devendra Singh Rawat; +Cc: Igor Russkikh, Rasesh Mody, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From fca5fea01594d379867068fe45924b092b9deed4 Mon Sep 17 00:00:00 2001
From: Devendra Singh Rawat <dsinghrawat@marvell.com>
Date: Mon, 27 Jul 2020 19:46:44 +0530
Subject: [PATCH] net/qede: fix milliseconds sleep macro

[ upstream commit 91979430089bf897881238a168b631f1a81c5477 ]

The macro defined for milliseconds sleep was not putting the thread
to sleep and was simply calling a delay routine. This fix redefines
the macro to call the correct rte sleep API.

Fixes: ec94dbc57362 ("qede: add base driver")

Signed-off-by: Devendra Singh Rawat <dsinghrawat@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: Rasesh Mody <rmody@marvell.com>
---
 drivers/net/qede/base/bcm_osal.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index 1abf44fa72..37b55244ae 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -82,7 +82,6 @@ typedef int bool;
 #define DELAY(x) rte_delay_us(x)
 #define usec_delay(x) DELAY(x)
-#define msec_delay(x) DELAY(1000 * (x))
 #define OSAL_UDELAY(time) usec_delay(time)
-#define OSAL_MSLEEP(time) msec_delay(time)
+#define OSAL_MSLEEP(time) rte_delay_us_sleep(1000 * (time))
 
 /* Memory allocations and deallocations */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.633976128 +0000
+++ 0020-net-qede-fix-milliseconds-sleep-macro.patch	2020-11-05 12:38:54.181895974 +0000
@@ -1 +1 @@
-From 91979430089bf897881238a168b631f1a81c5477 Mon Sep 17 00:00:00 2001
+From fca5fea01594d379867068fe45924b092b9deed4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 91979430089bf897881238a168b631f1a81c5477 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 5d4df5907a..ded4fb0f57 100644
+index 1abf44fa72..37b55244ae 100644
@@ -24 +25 @@
-@@ -82,7 +82,6 @@ typedef intptr_t osal_int_ptr_t;
+@@ -82,7 +82,6 @@ typedef int bool;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (18 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: specify delay operations' " Kevin Traynor
                   ` (46 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Michal Krawczyk; +Cc: Igor Chauskin, Guy Tzalik, Stephen Hemminger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From a06872eda4afa2edb994217df942053caf33290e Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk@semihalf.com>
Date: Thu, 17 Sep 2020 07:30:16 +0200
Subject: [PATCH] net/ena/base: use min/max macros with type conversion

[ upstream commit 8478f502f844ca0055a313609a58d80d30a0bdfd ]

Usage of RTE_MIN(MAX) in ENA_MIN32, ENA_MIN16, ENA_MIN8 (and same for
the MAX), was not enough, as the HAL code is assuming that those macros
will convert both arguments to the specified uintX_t type.

As RTE_MIN(MAX) is using 'typeof' operator, the behavior won't be the
same, especially if arguments has different types (and it could cause
compilation warnings).

To satisfy that, the ENA_MIN_T and ENA_MAX_T macros were added, which
are converting both arguments to the type which is being passed as an
argument.

Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")

Signed-off-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Igor Chauskin <igorch@amazon.com>
Reviewed-by: Guy Tzalik <gtzalik@amazon.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index 03ea2cd0dd..63d6db5b8a 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -82,10 +82,12 @@ typedef uint64_t dma_addr_t;
 #endif
 
-#define ENA_MAX32(x, y) RTE_MAX((x), (y))
-#define ENA_MAX16(x, y) RTE_MAX((x), (y))
-#define ENA_MAX8(x, y) RTE_MAX((x), (y))
-#define ENA_MIN32(x, y) RTE_MIN((x), (y))
-#define ENA_MIN16(x, y) RTE_MIN((x), (y))
-#define ENA_MIN8(x, y) RTE_MIN((x), (y))
+#define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y))
+#define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y))
+#define ENA_MAX16(x, y) ENA_MAX_T(uint16_t, (x), (y))
+#define ENA_MAX8(x, y) ENA_MAX_T(uint8_t, (x), (y))
+#define ENA_MIN_T(type, x, y) RTE_MIN((type)(x), (type)(y))
+#define ENA_MIN32(x, y) ENA_MIN_T(uint32_t, (x), (y))
+#define ENA_MIN16(x, y) ENA_MIN_T(uint16_t, (x), (y))
+#define ENA_MIN8(x, y) ENA_MIN_T(uint8_t, (x), (y))
 
 #define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * 8)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.650330649 +0000
+++ 0021-net-ena-base-use-min-max-macros-with-type-conversion.patch	2020-11-05 12:38:54.181895974 +0000
@@ -1 +1 @@
-From 8478f502f844ca0055a313609a58d80d30a0bdfd Mon Sep 17 00:00:00 2001
+From a06872eda4afa2edb994217df942053caf33290e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8478f502f844ca0055a313609a58d80d30a0bdfd ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -30 +31 @@
-index 595967e6e3..ba7a098f59 100644
+index 03ea2cd0dd..63d6db5b8a 100644
@@ -33 +34 @@
-@@ -87,10 +87,12 @@ extern int ena_logtype_com;
+@@ -82,10 +82,12 @@ typedef uint64_t dma_addr_t;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/ena/base: specify delay operations' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (19 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: fix release of wait event' " Kevin Traynor
                   ` (45 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Michal Krawczyk; +Cc: Igor Chauskin, Guy Tzalik, Stephen Hemminger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 89236a1daab1b6311c118855eb17e3e191186708 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk@semihalf.com>
Date: Thu, 17 Sep 2020 07:30:17 +0200
Subject: [PATCH] net/ena/base: specify delay operations

[ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ]

ENA_MSLEEP() and ENA_UDELAY() were expecting different behavior - the
first one is expecting driver to sleep, while the other, to busy wait.

For both cases, the rte_delay_(u|m)s() function was used, which could
be either sleep or block, depending on the configuration.

To make the macros valid, the operations should be specified directly.
Because of that, the rte_delay_us_sleep() and rte_delay_us_block() are
now being used.

Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")

Signed-off-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Igor Chauskin <igorch@amazon.com>
Reviewed-by: Guy Tzalik <gtzalik@amazon.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index 63d6db5b8a..7be9a254a1 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -55,6 +55,6 @@ typedef uint64_t dma_addr_t;
 #define ENA_ABORT() abort()
 
-#define ENA_MSLEEP(x) rte_delay_ms(x)
-#define ENA_UDELAY(x) rte_delay_us(x)
+#define ENA_MSLEEP(x) rte_delay_us_sleep(x * 1000)
+#define ENA_UDELAY(x) rte_delay_us_block(x)
 
 #define ENA_TOUCH(x) ((void)(x))
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.667220442 +0000
+++ 0022-net-ena-base-specify-delay-operations.patch	2020-11-05 12:38:54.182895975 +0000
@@ -1 +1 @@
-From 5ec22f97b6300ff65f89c8cb0fa072de139ac520 Mon Sep 17 00:00:00 2001
+From 89236a1daab1b6311c118855eb17e3e191186708 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index ba7a098f59..d9b728c4d6 100644
+index 63d6db5b8a..7be9a254a1 100644
@@ -31 +32 @@
-@@ -57,6 +57,6 @@ typedef uint64_t dma_addr_t;
+@@ -55,6 +55,6 @@ typedef uint64_t dma_addr_t;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/ena/base: fix release of wait event' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (20 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: specify delay operations' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e: fix byte counters' " Kevin Traynor
                   ` (44 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Michal Krawczyk; +Cc: Igor Chauskin, Guy Tzalik, Stephen Hemminger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From dfb132c50eee506eed2507611b08c7fef616f6e2 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk@semihalf.com>
Date: Thu, 17 Sep 2020 07:30:20 +0200
Subject: [PATCH] net/ena/base: fix release of wait event

[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ]

The wait event is being accessed without making sure it the completion
context exists. The check for that is just below, so it could be used
for releasing wait even safely.

Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")

Signed-off-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Igor Chauskin <igorch@amazon.com>
Reviewed-by: Guy Tzalik <gtzalik@amazon.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/ena/base/ena_com.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 19eec493ed..f7a6711d40 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -1483,7 +1483,9 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
 	u16 size;
 
-	ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
-	if (admin_queue->comp_ctx)
+	if (admin_queue->comp_ctx) {
+		ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
 		ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);
+	}
+
 	admin_queue->comp_ctx = NULL;
 	size = ADMIN_SQ_SIZE(admin_queue->q_depth);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.683715451 +0000
+++ 0023-net-ena-base-fix-release-of-wait-event.patch	2020-11-05 12:38:54.184895976 +0000
@@ -1 +1 @@
-From f034d4bb973a23e6dd2af8acdc3829b013962e47 Mon Sep 17 00:00:00 2001
+From dfb132c50eee506eed2507611b08c7fef616f6e2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index b4e54318c6..ce239ab164 100644
+index 19eec493ed..f7a6711d40 100644
@@ -25 +26 @@
-@@ -1656,9 +1656,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
+@@ -1483,7 +1483,9 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
@@ -32,3 +33 @@
- 		ENA_MEM_FREE(ena_dev->dmadev,
- 			     admin_queue->comp_ctx,
- 			     (admin_queue->q_depth * sizeof(struct ena_comp_ctx)));
+ 		ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/i40e: fix byte counters' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (21 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: fix release of wait event' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' " Kevin Traynor
                   ` (43 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Junyu Jiang; +Cc: Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From f494d5199c6978f98f889875f33c101d88e0c080 Mon Sep 17 00:00:00 2001
From: Junyu Jiang <junyux.jiang@intel.com>
Date: Tue, 22 Sep 2020 09:19:31 +0000
Subject: [PATCH] net/i40e: fix byte counters

[ upstream commit b96646187285b1b593b76af5dbcc365a99900377 ]

This patch fixed the issue that rx/tx bytes statistics counters
overflowed on 48 bit limitation by enlarging the limitation.

Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Junyu Jiang <junyux.jiang@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/nics/i40e.rst       |  9 +++++
 drivers/net/i40e/i40e_ethdev.c | 66 +++++++++++++++++++++-------------
 drivers/net/i40e/i40e_ethdev.h |  9 +++++
 3 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index 01fa817a6d..b8f0b8b2f1 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -558,4 +558,13 @@ However, the Rx statistics, when calling `rte_eth_stats_get` incorrectly
 shows it as received.
 
+RX/TX statistics may be incorrect when register overflowed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The rx_bytes/tx_bytes statistics register is 48 bit length.
+Although this limitation is enlarged to 64 bit length on the software side,
+but there is no way to detect if the overflow occurred more than once.
+So rx_bytes/tx_bytes statistics data is correct when statistics are
+updated at least once between two overflows.
+
 VF & TC max bandwidth setting
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 9aacb12293..bb750c0ccf 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2825,4 +2825,19 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
 }
 
+static void
+i40e_stat_update_48_in_64(struct i40e_hw *hw, uint32_t hireg,
+			  uint32_t loreg, bool offset_loaded, uint64_t *offset,
+			  uint64_t *stat, uint64_t *prev_stat)
+{
+	i40e_stat_update_48(hw, hireg, loreg, offset_loaded, offset, stat);
+	/* enlarge the limitation when statistics counters overflowed */
+	if (offset_loaded) {
+		if (I40E_RXTX_BYTES_L_48_BIT(*prev_stat) > *stat)
+			*stat += (uint64_t)1 << I40E_48_BIT_WIDTH;
+		*stat += I40E_RXTX_BYTES_H_16_BIT(*prev_stat);
+	}
+	*prev_stat = *stat;
+}
+
 /* Get all the statistics of a VSI */
 void
@@ -2834,7 +2849,7 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
 	int idx = rte_le_to_cpu_16(vsi->info.stat_counter_idx);
 
-	i40e_stat_update_48(hw, I40E_GLV_GORCH(idx), I40E_GLV_GORCL(idx),
-			    vsi->offset_loaded, &oes->rx_bytes,
-			    &nes->rx_bytes);
+	i40e_stat_update_48_in_64(hw, I40E_GLV_GORCH(idx), I40E_GLV_GORCL(idx),
+				  vsi->offset_loaded, &oes->rx_bytes,
+				  &nes->rx_bytes, &vsi->prev_rx_bytes);
 	i40e_stat_update_48(hw, I40E_GLV_UPRCH(idx), I40E_GLV_UPRCL(idx),
 			    vsi->offset_loaded, &oes->rx_unicast,
@@ -2857,7 +2872,7 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
 			    &oes->rx_unknown_protocol,
 			    &nes->rx_unknown_protocol);
-	i40e_stat_update_48(hw, I40E_GLV_GOTCH(idx), I40E_GLV_GOTCL(idx),
-			    vsi->offset_loaded, &oes->tx_bytes,
-			    &nes->tx_bytes);
+	i40e_stat_update_48_in_64(hw, I40E_GLV_GOTCH(idx), I40E_GLV_GOTCL(idx),
+				  vsi->offset_loaded, &oes->tx_bytes,
+				  &nes->tx_bytes, &vsi->prev_tx_bytes);
 	i40e_stat_update_48(hw, I40E_GLV_UPTCH(idx), I40E_GLV_UPTCL(idx),
 			    vsi->offset_loaded, &oes->tx_unicast,
@@ -2901,15 +2916,16 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
 
 	/* Get rx/tx bytes of internal transfer packets */
-	i40e_stat_update_48(hw, I40E_GLV_GORCH(hw->port),
-			I40E_GLV_GORCL(hw->port),
-			pf->offset_loaded,
-			&pf->internal_stats_offset.rx_bytes,
-			&pf->internal_stats.rx_bytes);
-
-	i40e_stat_update_48(hw, I40E_GLV_GOTCH(hw->port),
-			I40E_GLV_GOTCL(hw->port),
-			pf->offset_loaded,
-			&pf->internal_stats_offset.tx_bytes,
-			&pf->internal_stats.tx_bytes);
+	i40e_stat_update_48_in_64(hw, I40E_GLV_GORCH(hw->port),
+				  I40E_GLV_GORCL(hw->port),
+				  pf->offset_loaded,
+				  &pf->internal_stats_offset.rx_bytes,
+				  &pf->internal_stats.rx_bytes,
+				  &pf->internal_prev_rx_bytes);
+	i40e_stat_update_48_in_64(hw, I40E_GLV_GOTCH(hw->port),
+				  I40E_GLV_GOTCL(hw->port),
+				  pf->offset_loaded,
+				  &pf->internal_stats_offset.tx_bytes,
+				  &pf->internal_stats.tx_bytes,
+				  &pf->internal_prev_tx_bytes);
 	/* Get total internal rx packet count */
 	i40e_stat_update_48(hw, I40E_GLV_UPRCH(hw->port),
@@ -2951,8 +2967,8 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
 
 	/* Get statistics of struct i40e_eth_stats */
-	i40e_stat_update_48(hw, I40E_GLPRT_GORCH(hw->port),
-			    I40E_GLPRT_GORCL(hw->port),
-			    pf->offset_loaded, &os->eth.rx_bytes,
-			    &ns->eth.rx_bytes);
+	i40e_stat_update_48_in_64(hw, I40E_GLPRT_GORCH(hw->port),
+				  I40E_GLPRT_GORCL(hw->port),
+				  pf->offset_loaded, &os->eth.rx_bytes,
+				  &ns->eth.rx_bytes, &pf->prev_rx_bytes);
 	i40e_stat_update_48(hw, I40E_GLPRT_UPRCH(hw->port),
 			    I40E_GLPRT_UPRCL(hw->port),
@@ -3008,8 +3024,8 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
 			    &os->eth.rx_unknown_protocol,
 			    &ns->eth.rx_unknown_protocol);
-	i40e_stat_update_48(hw, I40E_GLPRT_GOTCH(hw->port),
-			    I40E_GLPRT_GOTCL(hw->port),
-			    pf->offset_loaded, &os->eth.tx_bytes,
-			    &ns->eth.tx_bytes);
+	i40e_stat_update_48_in_64(hw, I40E_GLPRT_GOTCH(hw->port),
+				  I40E_GLPRT_GOTCL(hw->port),
+				  pf->offset_loaded, &os->eth.tx_bytes,
+				  &ns->eth.tx_bytes, &pf->prev_tx_bytes);
 	i40e_stat_update_48(hw, I40E_GLPRT_UPTCH(hw->port),
 			    I40E_GLPRT_UPTCL(hw->port),
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index d224a35020..6cec6cf0c1 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -272,4 +272,7 @@ enum i40e_flxpld_layer_idx {
 	(ETHER_HDR_LEN + ETHER_CRC_LEN + I40E_VLAN_TAG_SIZE * 2)
 
+#define I40E_RXTX_BYTES_H_16_BIT(bytes) ((bytes) & ~I40E_48_BIT_MASK)
+#define I40E_RXTX_BYTES_L_48_BIT(bytes) ((bytes) & I40E_48_BIT_MASK)
+
 struct i40e_adapter;
 
@@ -388,4 +391,6 @@ struct i40e_vsi {
 	uint8_t vlan_filter_on; /* The VLAN filter enabled */
 	struct i40e_bw_info bw_info; /* VSI bandwidth information */
+	uint64_t prev_rx_bytes;
+	uint64_t prev_tx_bytes;
 };
 
@@ -976,4 +981,8 @@ struct i40e_pf {
 	/* Switch Domain Id */
 	uint16_t switch_domain_id;
+	uint64_t prev_rx_bytes;
+	uint64_t prev_tx_bytes;
+	uint64_t internal_prev_rx_bytes;
+	uint64_t internal_prev_tx_bytes;
 };
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.701434585 +0000
+++ 0024-net-i40e-fix-byte-counters.patch	2020-11-05 12:38:54.195895985 +0000
@@ -1 +1 @@
-From b96646187285b1b593b76af5dbcc365a99900377 Mon Sep 17 00:00:00 2001
+From f494d5199c6978f98f889875f33c101d88e0c080 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b96646187285b1b593b76af5dbcc365a99900377 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index b7430f6c4e..a0b81e6695 100644
+index 01fa817a6d..b8f0b8b2f1 100644
@@ -24 +25 @@
-@@ -671,4 +671,13 @@ However, the Rx statistics, when calling `rte_eth_stats_get` incorrectly
+@@ -558,4 +558,13 @@ However, the Rx statistics, when calling `rte_eth_stats_get` incorrectly
@@ -39 +40 @@
-index 563f21d9df..6439baf2f8 100644
+index 9aacb12293..bb750c0ccf 100644
@@ -42 +43 @@
-@@ -3053,4 +3053,19 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
+@@ -2825,4 +2825,19 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
@@ -62 +63 @@
-@@ -3062,7 +3077,7 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
+@@ -2834,7 +2849,7 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
@@ -73 +74 @@
-@@ -3085,7 +3100,7 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
+@@ -2857,7 +2872,7 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
@@ -84 +85 @@
-@@ -3129,15 +3144,16 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
+@@ -2901,15 +2916,16 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
@@ -112 +113 @@
-@@ -3179,8 +3195,8 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
+@@ -2951,8 +2967,8 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
@@ -125 +126 @@
-@@ -3237,8 +3253,8 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
+@@ -3008,8 +3024,8 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
@@ -139 +140 @@
-index 19f821829a..1466998aa1 100644
+index d224a35020..6cec6cf0c1 100644
@@ -142,2 +143,2 @@
-@@ -283,4 +283,7 @@ struct rte_flow {
- 	(RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + I40E_VLAN_TAG_SIZE * 2)
+@@ -272,4 +272,7 @@ enum i40e_flxpld_layer_idx {
+ 	(ETHER_HDR_LEN + ETHER_CRC_LEN + I40E_VLAN_TAG_SIZE * 2)
@@ -149,2 +150,2 @@
- struct rte_pci_driver;
-@@ -400,4 +403,6 @@ struct i40e_vsi {
+ 
+@@ -388,4 +391,6 @@ struct i40e_vsi {
@@ -157,3 +158,3 @@
-@@ -1157,4 +1162,8 @@ struct i40e_pf {
- 
- 	struct i40e_vf_msg_cfg vf_msg_cfg;
+@@ -976,4 +981,8 @@ struct i40e_pf {
+ 	/* Switch Domain Id */
+ 	uint16_t switch_domain_id;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (22 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e: fix byte counters' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix shift operation' " Kevin Traynor
                   ` (42 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Steve Yang; +Cc: Jeff Guo, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 74e62043df46239c96d67a7624ae6c58915374dd Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang@intel.com>
Date: Tue, 15 Sep 2020 06:46:22 +0000
Subject: [PATCH] net/ixgbe: fix VF reset HW error handling

[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ]

When start a VF with no initial MAC address assigned by the underlying
Host PF driver, just reuse the MAC address assigned when VF is
initializing.

Fixes: f69166c9a3c9 ("net/ixgbe: fix reset error handling")

Signed-off-by: Steve Yang <stevex.yang@intel.com>
Acked-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 0ef3e01165..ac6f5f7def 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -5233,8 +5233,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
 
 	err = hw->mac.ops.reset_hw(hw);
-	if (err) {
+
+	/**
+	 * In this case, reuses the MAC address assigned by VF
+	 * initialization.
+	 */
+	if (err != IXGBE_SUCCESS && err != IXGBE_ERR_INVALID_MAC_ADDR) {
 		PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err);
 		return err;
 	}
+
 	hw->mac.get_link_status = true;
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.727536381 +0000
+++ 0025-net-ixgbe-fix-VF-reset-HW-error-handling.patch	2020-11-05 12:38:54.202895990 +0000
@@ -1 +1 @@
-From 7c6e6aef870848cf887b2115d7c13bfcde6f4627 Mon Sep 17 00:00:00 2001
+From 74e62043df46239c96d67a7624ae6c58915374dd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c6e6aef870848cf887b2115d7c13bfcde6f4627 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index c74467e068..8da963a916 100644
+index 0ef3e01165..ac6f5f7def 100644
@@ -23 +24 @@
-@@ -5321,8 +5321,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
+@@ -5233,8 +5233,14 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/bnxt: fix shift operation' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (23 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix queue get info' " Kevin Traynor
                   ` (41 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Somnath Kotur; +Cc: Venkat Duvvuru, Ajit Khaparde, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 124b1ca01534fe197355c1aed55d694bf5dd747b Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur@broadcom.com>
Date: Tue, 22 Sep 2020 12:36:27 +0530
Subject: [PATCH] net/bnxt: fix shift operation

[ upstream commit affb4d5c212957f3844a7bbd00a5f2ba703b8a33 ]

In page_roundup() left shifting by more than 31 bits could have
undefined behavior as the return value is int and in page_getenum()
it is possible to return a value as high as 63.
Fix that to cap the return value to less than 32.

Coverity issue: 343463
Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF")

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 01ddf4443a..cf6f6d2923 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -53,5 +53,5 @@ static int page_getenum(size_t size)
 		return 30;
 	PMD_DRV_LOG(ERR, "Page size %zu out of range\n", size);
-	return sizeof(void *) * 8 - 1;
+	return sizeof(int) * 8 - 1;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.749421127 +0000
+++ 0026-net-bnxt-fix-shift-operation.patch	2020-11-05 12:38:54.205895993 +0000
@@ -1 +1 @@
-From affb4d5c212957f3844a7bbd00a5f2ba703b8a33 Mon Sep 17 00:00:00 2001
+From 124b1ca01534fe197355c1aed55d694bf5dd747b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit affb4d5c212957f3844a7bbd00a5f2ba703b8a33 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index d0b820f149..577c5d1352 100644
+index 01ddf4443a..cf6f6d2923 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/bnxt: fix queue get info' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (24 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix shift operation' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' " Kevin Traynor
                   ` (40 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Lance Richardson; +Cc: Somnath Kotur, Ajit Khaparde, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From ad7432468d2a86fcbe500b7249ff23ff4c14c73b Mon Sep 17 00:00:00 2001
From: Lance Richardson <lance.richardson@broadcom.com>
Date: Tue, 22 Sep 2020 13:30:35 -0400
Subject: [PATCH] net/bnxt: fix queue get info

[ upstream commit bd6345e4f48a737ec498d013953e785ab185e5f1 ]

Return current offloads in rxq_info_get()/txq_info_get().

Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information")

Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e0b4b4bd67..c17fd3c558 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1580,4 +1580,5 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 	qinfo->conf.rx_drop_en = 0;
 	qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
+	qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads;
 }
 
@@ -1599,4 +1600,5 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 	qinfo->conf.tx_rs_thresh = 0;
 	qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
+	qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.768397634 +0000
+++ 0027-net-bnxt-fix-queue-get-info.patch	2020-11-05 12:38:54.207895994 +0000
@@ -1 +1 @@
-From bd6345e4f48a737ec498d013953e785ab185e5f1 Mon Sep 17 00:00:00 2001
+From ad7432468d2a86fcbe500b7249ff23ff4c14c73b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bd6345e4f48a737ec498d013953e785ab185e5f1 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index d0d11a6d0e..bb6b25dff2 100644
+index e0b4b4bd67..c17fd3c558 100644
@@ -22,2 +23,2 @@
-@@ -2646,4 +2646,5 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
- 	qinfo->conf.rx_drop_en = rxq->drop_en;
+@@ -1580,4 +1580,5 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
+ 	qinfo->conf.rx_drop_en = 0;
@@ -28 +29 @@
-@@ -2669,4 +2670,5 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
+@@ -1599,4 +1600,5 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (25 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix queue get info' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' " Kevin Traynor
                   ` (39 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Pavan Nikhilesh; +Cc: Jerin Jacob, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From a5017329fdc4d0caea9eebdddb252c101d649405 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Wed, 29 Jul 2020 00:13:45 +0530
Subject: [PATCH] mempool/octeontx: fix aura to pool mapping

[ upstream commit e1712291b1fe834612403a086bbe6078e96748fb ]

When sending commands to Kernel FPA PF driver, it expects the
aura to be in the range of 0 to 16 for a given FPA pool.
In OCTEON TX we map a pool,aura pair as single mempool handle,
always set the aura id to 0 for a given FPA pool.

Fixes: 179c7e893f64 ("mempool/octeontx: fix pool to aura mapping")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 drivers/mempool/octeontx/octeontx_fpavf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c
index 4cf387e8fb..435e173429 100644
--- a/drivers/mempool/octeontx/octeontx_fpavf.c
+++ b/drivers/mempool/octeontx/octeontx_fpavf.c
@@ -242,5 +242,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
 		POOL_ENA;
 
-	cfg.aid = FPA_AURA_IDX(gpool);
+	cfg.aid = 0;
 	cfg.pool_cfg = reg;
 	cfg.pool_stack_base = phys_addr;
@@ -326,5 +326,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
 	hdr.res_code = 0;
 	memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg));
-	cfg.aid = FPA_AURA_IDX(gpool_index);
+	cfg.aid = 0;
 
 	ret = octeontx_mbox_send(&hdr, &cfg,
@@ -355,5 +355,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
 	}
 
-	cfg.aid = FPA_AURA_IDX(gpool_index);
+	cfg.aid = 0;
 	hdr.coproc = FPA_COPROC;
 	hdr.msg = FPA_DETACHAURA;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.788657899 +0000
+++ 0028-mempool-octeontx-fix-aura-to-pool-mapping.patch	2020-11-05 12:38:54.208895995 +0000
@@ -1 +1 @@
-From e1712291b1fe834612403a086bbe6078e96748fb Mon Sep 17 00:00:00 2001
+From a5017329fdc4d0caea9eebdddb252c101d649405 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e1712291b1fe834612403a086bbe6078e96748fb ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 339da7824f..94dc5cd815 100644
+index 4cf387e8fb..435e173429 100644
@@ -24 +25 @@
-@@ -260,5 +260,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
+@@ -242,5 +242,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
@@ -31 +32 @@
-@@ -346,5 +346,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
+@@ -326,5 +326,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
@@ -38 +39 @@
-@@ -375,5 +375,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
+@@ -355,5 +355,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (26 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix port id check in Tx VLAN command' " Kevin Traynor
                   ` (38 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 79591394238421d9ae03c2863f25872e0a465c23 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 28 Sep 2020 20:44:42 +0800
Subject: [PATCH] net/fm10k: fix memory leak when thresh check fails

[ upstream commit c87a6de2a130c436fcf73b27f829c48e8249bcc4 ]

In fm10k_rx_queue_setup(), we allocate memory for the queue
structure but not released when thresh check fails.

Fixes: 6cfe8969c969 ("fm10k: add Rx queue setup/release")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/fm10k/fm10k_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index f64d07bbad..4b57a96c8b 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1862,7 +1862,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
 		&((uint32_t *)hw->hw_addr)[FM10K_RDT(queue_id)];
 	q->offloads = offloads;
-	if (handle_rxconf(q, conf))
+	if (handle_rxconf(q, conf)) {
+		rte_free(q);
 		return -EINVAL;
-
+	}
 	/* allocate memory for the software ring */
 	q->sw_ring = rte_zmalloc_socket("fm10k sw ring",
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.807500839 +0000
+++ 0029-net-fm10k-fix-memory-leak-when-thresh-check-fails.patch	2020-11-05 12:38:54.210895996 +0000
@@ -1 +1 @@
-From c87a6de2a130c436fcf73b27f829c48e8249bcc4 Mon Sep 17 00:00:00 2001
+From 79591394238421d9ae03c2863f25872e0a465c23 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c87a6de2a130c436fcf73b27f829c48e8249bcc4 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 5771d83b55..98e396b8e7 100644
+index f64d07bbad..4b57a96c8b 100644
@@ -22 +23 @@
-@@ -1842,7 +1842,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
+@@ -1862,7 +1862,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix port id check in Tx VLAN command' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (27 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' " Kevin Traynor
                   ` (37 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Chengchang Tang; +Cc: Wei Hu, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 98c471996abf8216e760de3046fa1a867026ad05 Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang@huawei.com>
Date: Fri, 25 Sep 2020 20:47:14 +0800
Subject: [PATCH] app/testpmd: fix port id check in Tx VLAN command

[ upstream commit b428e71775e43acc7b074c82b0d9e08f401dde6b ]

To set Tx vlan offloads, it is required to stop port firstly. But before
checking whether the port is stopped, the port id entered by the user
is not checked for validity. When the port id is illegal, it would lead
to a segmentation fault since it attempts to access a member of
non-existent port.

This patch adds verification of port id in tx vlan offloads and remove
duplicated check.

Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API")

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/cmdline.c | 9 +++++++++
 app/test-pmd/config.c  | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index abf803418c..c8cd717992 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -4001,4 +4001,7 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
 	struct cmd_tx_vlan_set_result *res = parsed_result;
 
+	if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+		return;
+
 	if (!port_is_stopped(res->port_id)) {
 		printf("Please stop port %d first\n", res->port_id);
@@ -4055,4 +4058,7 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
 	struct cmd_tx_vlan_set_qinq_result *res = parsed_result;
 
+	if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+		return;
+
 	if (!port_is_stopped(res->port_id)) {
 		printf("Please stop port %d first\n", res->port_id);
@@ -4168,4 +4174,7 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
 	struct cmd_tx_vlan_reset_result *res = parsed_result;
 
+	if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+		return;
+
 	if (!port_is_stopped(res->port_id)) {
 		printf("Please stop port %d first\n", res->port_id);
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 3d854099d2..6c4a6423d5 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3013,6 +3013,4 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 	struct rte_eth_dev_info dev_info;
 
-	if (port_id_is_invalid(port_id, ENABLED_WARN))
-		return;
 	if (vlan_id_is_invalid(vlan_id))
 		return;
@@ -3040,6 +3038,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 	struct rte_eth_dev_info dev_info;
 
-	if (port_id_is_invalid(port_id, ENABLED_WARN))
-		return;
 	if (vlan_id_is_invalid(vlan_id))
 		return;
@@ -3064,6 +3060,4 @@ void
 tx_vlan_reset(portid_t port_id)
 {
-	if (port_id_is_invalid(port_id, ENABLED_WARN))
-		return;
 	ports[port_id].dev_conf.txmode.offloads &=
 				~(DEV_TX_OFFLOAD_VLAN_INSERT |
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.831287118 +0000
+++ 0030-app-testpmd-fix-port-id-check-in-Tx-VLAN-command.patch	2020-11-05 12:38:54.225896008 +0000
@@ -1 +1 @@
-From b428e71775e43acc7b074c82b0d9e08f401dde6b Mon Sep 17 00:00:00 2001
+From 98c471996abf8216e760de3046fa1a867026ad05 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b428e71775e43acc7b074c82b0d9e08f401dde6b ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 08e123fe69..524c75b267 100644
+index abf803418c..c8cd717992 100644
@@ -30 +31 @@
-@@ -4295,4 +4295,7 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
+@@ -4001,4 +4001,7 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
@@ -38 +39 @@
-@@ -4349,4 +4352,7 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
+@@ -4055,4 +4058,7 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
@@ -46 +47 @@
-@@ -4462,4 +4468,7 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
+@@ -4168,4 +4174,7 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
@@ -55 +56 @@
-index 17a6efed24..03bf26bc94 100644
+index 3d854099d2..6c4a6423d5 100644
@@ -58,2 +59,2 @@
-@@ -3665,6 +3665,4 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
- 	int ret;
+@@ -3013,6 +3013,4 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
+ 	struct rte_eth_dev_info dev_info;
@@ -65,2 +66,2 @@
-@@ -3697,6 +3695,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
- 	int ret;
+@@ -3040,6 +3038,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
+ 	struct rte_eth_dev_info dev_info;
@@ -72 +73 @@
-@@ -3724,6 +3720,4 @@ void
+@@ -3064,6 +3060,4 @@ void


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (28 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix port id check in Tx VLAN command' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: remove restriction on Tx segments set' " Kevin Traynor
                   ` (36 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Chengchang Tang; +Cc: Wei Hu, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 4d4942b0a24e17d3f662141f752fb814cd70ad77 Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang@huawei.com>
Date: Fri, 25 Sep 2020 20:47:15 +0800
Subject: [PATCH] app/testpmd: fix VLAN configuration on failure

[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ]

When failing to configure VLAN offloads after the port was started, there
is no need to update the port configuration. Currently, when user
configure an unsupported VLAN offloads and fails, and then restart the
port, it will fails since the configuration has been refreshed.

This patch makes the function return directly instead of refreshing the
configuration when execution fails.

Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration")

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 6c4a6423d5..e5945426fa 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2886,7 +2886,9 @@ vlan_extend_set(portid_t port_id, int on)
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_extend_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
@@ -2913,7 +2915,9 @@ rx_vlan_strip_set(portid_t port_id, int on)
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_strip_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
@@ -2954,7 +2958,9 @@ rx_vlan_filter_set(portid_t port_id, int on)
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_filter_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.860303505 +0000
+++ 0031-app-testpmd-fix-VLAN-configuration-on-failure.patch	2020-11-05 12:38:54.227896010 +0000
@@ -1 +1 @@
-From 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 Mon Sep 17 00:00:00 2001
+From 4d4942b0a24e17d3f662141f752fb814cd70ad77 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -21,2 +22,2 @@
- app/test-pmd/config.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
+ app/test-pmd/config.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
@@ -25 +26 @@
-index 03bf26bc94..0bec547f51 100644
+index 6c4a6423d5..e5945426fa 100644
@@ -28 +29 @@
-@@ -3510,7 +3510,9 @@ vlan_extend_set(portid_t port_id, int on)
+@@ -2886,7 +2886,9 @@ vlan_extend_set(portid_t port_id, int on)
@@ -39 +40 @@
-@@ -3537,7 +3539,9 @@ rx_vlan_strip_set(portid_t port_id, int on)
+@@ -2913,7 +2915,9 @@ rx_vlan_strip_set(portid_t port_id, int on)
@@ -50 +51 @@
-@@ -3578,7 +3582,9 @@ rx_vlan_filter_set(portid_t port_id, int on)
+@@ -2954,7 +2958,9 @@ rx_vlan_filter_set(portid_t port_id, int on)
@@ -57,11 +57,0 @@
-+		return;
-+	}
- 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
- }
-@@ -3605,7 +3611,9 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on)
- 
- 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
--	if (diag < 0)
-+	if (diag < 0) {
- 		printf("%s(port_pi=%d, on=%d) failed "
- 	       "diag=%d\n", __func__, port_id, on, diag);


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: remove restriction on Tx segments set' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (29 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix descriptor id check' " Kevin Traynor
                   ` (35 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Chengchang Tang; +Cc: Wei Hu, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 24bf628638382b2de987268da4b0528d1a94408e Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang@huawei.com>
Date: Fri, 25 Sep 2020 20:47:16 +0800
Subject: [PATCH] app/testpmd: remove restriction on Tx segments set

[ upstream commit 8dae835d88b745dee761771513095525adb9ed74 ]

Currently, if nb_txd is not set, the txpkts is not allowed to be set
because the nb_txd is used to avoid the number of segments exceed the Tx
ring size and the default value of nb_txd is 0. And there is a bug that
nb_txd is the global configuration for Tx ring size and the ring size
could be changed by some command per queue. So these valid check is
unreliable and introduced unnecessary constraints.

This patch adds a valid check function to use the real Tx ring size to
check the validity of txpkts.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c | 64 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e5945426fa..8636c02423 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1515,4 +1515,36 @@ tx_queue_id_is_invalid(queueid_t txq_id)
 }
 
+static int
+get_tx_ring_size(portid_t port_id, queueid_t txq_id, uint16_t *ring_size)
+{
+	struct rte_port *port = &ports[port_id];
+	struct rte_eth_txq_info tx_qinfo;
+	int ret;
+
+	ret = rte_eth_tx_queue_info_get(port_id, txq_id, &tx_qinfo);
+	if (ret == 0) {
+		*ring_size = tx_qinfo.nb_desc;
+		return ret;
+	}
+
+	if (ret != -ENOTSUP)
+		return ret;
+	/*
+	 * If the rte_eth_tx_queue_info_get is not support for this PMD,
+	 * ring_size stored in testpmd will be used for validity verification.
+	 * When configure the txq by rte_eth_tx_queue_setup with nb_tx_desc
+	 * being 0, it will use a default value provided by PMDs to setup this
+	 * txq. If the default value is 0, it will use the
+	 * RTE_ETH_DEV_FALLBACK_TX_RINGSIZE to setup this txq.
+	 */
+	if (port->nb_tx_desc[txq_id])
+		*ring_size = port->nb_tx_desc[txq_id];
+	else if (port->dev_info.default_txportconf.ring_size)
+		*ring_size = port->dev_info.default_txportconf.ring_size;
+	else
+		*ring_size = RTE_ETH_DEV_FALLBACK_TX_RINGSIZE;
+	return 0;
+}
+
 static int
 rx_desc_id_is_invalid(uint16_t rxdesc_id)
@@ -2552,4 +2584,31 @@ show_tx_pkt_segments(void)
 }
 
+static bool
+nb_segs_is_invalid(unsigned int nb_segs)
+{
+	uint16_t ring_size;
+	uint16_t queue_id;
+	uint16_t port_id;
+	int ret;
+
+	RTE_ETH_FOREACH_DEV(port_id) {
+		for (queue_id = 0; queue_id < nb_txq; queue_id++) {
+			ret = get_tx_ring_size(port_id, queue_id, &ring_size);
+
+			if (ret)
+				return true;
+
+			if (ring_size < nb_segs) {
+				printf("nb segments per TX packets=%u >= "
+				       "TX queue(%u) ring_size=%u - ignored\n",
+				       nb_segs, queue_id, ring_size);
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
 void
 set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
@@ -2558,9 +2617,6 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
 	unsigned i;
 
-	if (nb_segs >= (unsigned) nb_txd) {
-		printf("nb segments per TX packets=%u >= nb_txd=%u - ignored\n",
-		       nb_segs, (unsigned int) nb_txd);
+	if (nb_segs_is_invalid(nb_segs))
 		return;
-	}
 
 	/*
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.879854266 +0000
+++ 0032-app-testpmd-remove-restriction-on-Tx-segments-set.patch	2020-11-05 12:38:54.230896012 +0000
@@ -1 +1 @@
-From 8dae835d88b745dee761771513095525adb9ed74 Mon Sep 17 00:00:00 2001
+From 24bf628638382b2de987268da4b0528d1a94408e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8dae835d88b745dee761771513095525adb9ed74 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 0bec547f51..8f63b4ea40 100644
+index e5945426fa..8636c02423 100644
@@ -30 +31 @@
-@@ -2010,4 +2010,36 @@ tx_queue_id_is_invalid(queueid_t txq_id)
+@@ -1515,4 +1515,36 @@ tx_queue_id_is_invalid(queueid_t txq_id)
@@ -67 +68 @@
-@@ -3104,4 +3136,31 @@ show_tx_pkt_segments(void)
+@@ -2552,4 +2584,31 @@ show_tx_pkt_segments(void)
@@ -99 +100 @@
-@@ -3110,9 +3169,6 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
+@@ -2558,9 +2617,6 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix descriptor id check' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (30 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: remove restriction on Tx segments set' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix displaying Rx/Tx queues information' " Kevin Traynor
                   ` (34 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Chengchang Tang; +Cc: Wei Hu, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From ec1022d0c2daa63a53a6e8c77dd893c338cd16d4 Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang@huawei.com>
Date: Fri, 25 Sep 2020 20:47:18 +0800
Subject: [PATCH] app/testpmd: fix descriptor id check

[ upstream commit 25340d5342a1f0c34c7e9c1fb8c2becc7e70fa31 ]

The number of desc is a per queue configuration. But in the check
function, nb_txd & nb_rxd are used to check whether the desc_id is
valid. nb_txd & nb_rxd are the global configuration of number of desc.
If the queue configuration is changed by cmdline liks: "port config xx
txq xx ring_size xxx", the real value will be changed.

This patch use the real value to check whether the desc_id is valid.
And if these are not configured by user. It will use the default value
to check it, since the rte_eth_rx_queue_setup & rte_eth_tx_queue_setup
will use a default value to configure the queue if nb_rx_desc or
nb_tx_desc is zero.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c | 76 +++++++++++++++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 8636c02423..bce37a423f 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1515,4 +1515,36 @@ tx_queue_id_is_invalid(queueid_t txq_id)
 }
 
+static int
+get_rx_ring_size(portid_t port_id, queueid_t rxq_id, uint16_t *ring_size)
+{
+	struct rte_port *port = &ports[port_id];
+	struct rte_eth_rxq_info rx_qinfo;
+	int ret;
+
+	ret = rte_eth_rx_queue_info_get(port_id, rxq_id, &rx_qinfo);
+	if (ret == 0) {
+		*ring_size = rx_qinfo.nb_desc;
+		return ret;
+	}
+
+	if (ret != -ENOTSUP)
+		return ret;
+	/*
+	 * If the rte_eth_rx_queue_info_get is not support for this PMD,
+	 * ring_size stored in testpmd will be used for validity verification.
+	 * When configure the rxq by rte_eth_rx_queue_setup with nb_rx_desc
+	 * being 0, it will use a default value provided by PMDs to setup this
+	 * rxq. If the default value is 0, it will use the
+	 * RTE_ETH_DEV_FALLBACK_RX_RINGSIZE to setup this rxq.
+	 */
+	if (port->nb_rx_desc[rxq_id])
+		*ring_size = port->nb_rx_desc[rxq_id];
+	else if (port->dev_info.default_rxportconf.ring_size)
+		*ring_size = port->dev_info.default_rxportconf.ring_size;
+	else
+		*ring_size = RTE_ETH_DEV_FALLBACK_RX_RINGSIZE;
+	return 0;
+}
+
 static int
 get_tx_ring_size(portid_t port_id, queueid_t txq_id, uint16_t *ring_size)
@@ -1548,20 +1580,36 @@ get_tx_ring_size(portid_t port_id, queueid_t txq_id, uint16_t *ring_size)
 
 static int
-rx_desc_id_is_invalid(uint16_t rxdesc_id)
+rx_desc_id_is_invalid(portid_t port_id, queueid_t rxq_id, uint16_t rxdesc_id)
 {
-	if (rxdesc_id < nb_rxd)
+	uint16_t ring_size;
+	int ret;
+
+	ret = get_rx_ring_size(port_id, rxq_id, &ring_size);
+	if (ret)
+		return 1;
+
+	if (rxdesc_id < ring_size)
 		return 0;
-	printf("Invalid RX descriptor %d (must be < nb_rxd=%d)\n",
-	       rxdesc_id, nb_rxd);
+
+	printf("Invalid RX descriptor %u (must be < ring_size=%u)\n",
+	       rxdesc_id, ring_size);
 	return 1;
 }
 
 static int
-tx_desc_id_is_invalid(uint16_t txdesc_id)
+tx_desc_id_is_invalid(portid_t port_id, queueid_t txq_id, uint16_t txdesc_id)
 {
-	if (txdesc_id < nb_txd)
+	uint16_t ring_size;
+	int ret;
+
+	ret = get_tx_ring_size(port_id, txq_id, &ring_size);
+	if (ret)
+		return 1;
+
+	if (txdesc_id < ring_size)
 		return 0;
-	printf("Invalid TX descriptor %d (must be < nb_txd=%d)\n",
-	       txdesc_id, nb_txd);
+
+	printf("Invalid TX descriptor %u (must be < ring_size=%u)\n",
+	       txdesc_id, ring_size);
 	return 1;
 }
@@ -1680,9 +1728,5 @@ rx_ring_desc_display(portid_t port_id, queueid_t rxq_id, uint16_t rxd_id)
 	const struct rte_memzone *rx_mz;
 
-	if (port_id_is_invalid(port_id, ENABLED_WARN))
-		return;
-	if (rx_queue_id_is_invalid(rxq_id))
-		return;
-	if (rx_desc_id_is_invalid(rxd_id))
+	if (rx_desc_id_is_invalid(port_id, rxq_id, rxd_id))
 		return;
 	rx_mz = ring_dma_zone_lookup("rx_ring", port_id, rxq_id);
@@ -1697,9 +1741,5 @@ tx_ring_desc_display(portid_t port_id, queueid_t txq_id, uint16_t txd_id)
 	const struct rte_memzone *tx_mz;
 
-	if (port_id_is_invalid(port_id, ENABLED_WARN))
-		return;
-	if (tx_queue_id_is_invalid(txq_id))
-		return;
-	if (tx_desc_id_is_invalid(txd_id))
+	if (tx_desc_id_is_invalid(port_id, txq_id, txd_id))
 		return;
 	tx_mz = ring_dma_zone_lookup("tx_ring", port_id, txq_id);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.898471150 +0000
+++ 0033-app-testpmd-fix-descriptor-id-check.patch	2020-11-05 12:38:54.232896013 +0000
@@ -1 +1 @@
-From 25340d5342a1f0c34c7e9c1fb8c2becc7e70fa31 Mon Sep 17 00:00:00 2001
+From ec1022d0c2daa63a53a6e8c77dd893c338cd16d4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 25340d5342a1f0c34c7e9c1fb8c2becc7e70fa31 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 8f63b4ea40..0b655368b8 100644
+index 8636c02423..bce37a423f 100644
@@ -32 +33 @@
-@@ -2010,4 +2010,36 @@ tx_queue_id_is_invalid(queueid_t txq_id)
+@@ -1515,4 +1515,36 @@ tx_queue_id_is_invalid(queueid_t txq_id)
@@ -69 +70 @@
-@@ -2043,20 +2075,36 @@ get_tx_ring_size(portid_t port_id, queueid_t txq_id, uint16_t *ring_size)
+@@ -1548,20 +1580,36 @@ get_tx_ring_size(portid_t port_id, queueid_t txq_id, uint16_t *ring_size)
@@ -114 +115 @@
-@@ -2179,9 +2227,5 @@ rx_ring_desc_display(portid_t port_id, queueid_t rxq_id, uint16_t rxd_id)
+@@ -1680,9 +1728,5 @@ rx_ring_desc_display(portid_t port_id, queueid_t rxq_id, uint16_t rxd_id)
@@ -125 +126 @@
-@@ -2196,9 +2240,5 @@ tx_ring_desc_display(portid_t port_id, queueid_t txq_id, uint16_t txd_id)
+@@ -1697,9 +1741,5 @@ tx_ring_desc_display(portid_t port_id, queueid_t txq_id, uint16_t txd_id)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix displaying Rx/Tx queues information' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (31 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix descriptor id check' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix dereference before null check' " Kevin Traynor
                   ` (33 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Huisong Li; +Cc: Wei Hu, Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From f461ce273ed7005da20c84b7ab4dd3ac50e95ae5 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Fri, 25 Sep 2020 20:47:19 +0800
Subject: [PATCH] app/testpmd: fix displaying Rx/Tx queues information

[ upstream commit 700ded7aa15f5ecc5b68d12fcb6fd3bfe06e599d ]

Currently, the information of Rx/Tx queues from PMD driver is not
displayed exactly in the rxtx_config_display function. Because
"ports[pid].rx_conf" and "ports[pid].tx_conf" maintained in testpmd
application may be not the value actually used by PMD driver. For
instance, user does not set a field, but PMD driver has to use the
default value.

This patch fixes rxtx_config_display so that the information of Rx/Tx
queues can be really displayed for the PMD driver that implement
.rxq_info_get and .txq_info_get ops callback function.

Fixes: 75c530c1bd53 ("app/testpmd: fix port configuration print")
Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c | 64 +++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index bce37a423f..4ffda33f39 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1782,8 +1782,15 @@ rxtx_config_display(void)
 		uint16_t *nb_rx_desc = &ports[pid].nb_rx_desc[0];
 		uint16_t *nb_tx_desc = &ports[pid].nb_tx_desc[0];
-		uint16_t nb_rx_desc_tmp;
-		uint16_t nb_tx_desc_tmp;
 		struct rte_eth_rxq_info rx_qinfo;
 		struct rte_eth_txq_info tx_qinfo;
+		uint16_t rx_free_thresh_tmp;
+		uint16_t tx_free_thresh_tmp;
+		uint16_t tx_rs_thresh_tmp;
+		uint16_t nb_rx_desc_tmp;
+		uint16_t nb_tx_desc_tmp;
+		uint64_t offloads_tmp;
+		uint8_t pthresh_tmp;
+		uint8_t hthresh_tmp;
+		uint8_t wthresh_tmp;
 		int32_t rc;
 
@@ -1799,19 +1806,29 @@ rxtx_config_display(void)
 		for (qid = 0; qid < 1; qid++) {
 			rc = rte_eth_rx_queue_info_get(pid, qid, &rx_qinfo);
-			if (rc)
+			if (rc) {
 				nb_rx_desc_tmp = nb_rx_desc[qid];
-			else
+				rx_free_thresh_tmp =
+					rx_conf[qid].rx_free_thresh;
+				pthresh_tmp = rx_conf[qid].rx_thresh.pthresh;
+				hthresh_tmp = rx_conf[qid].rx_thresh.hthresh;
+				wthresh_tmp = rx_conf[qid].rx_thresh.wthresh;
+				offloads_tmp = rx_conf[qid].offloads;
+			} else {
 				nb_rx_desc_tmp = rx_qinfo.nb_desc;
+				rx_free_thresh_tmp =
+						rx_qinfo.conf.rx_free_thresh;
+				pthresh_tmp = rx_qinfo.conf.rx_thresh.pthresh;
+				hthresh_tmp = rx_qinfo.conf.rx_thresh.hthresh;
+				wthresh_tmp = rx_qinfo.conf.rx_thresh.wthresh;
+				offloads_tmp = rx_qinfo.conf.offloads;
+			}
 
 			printf("    RX queue: %d\n", qid);
 			printf("      RX desc=%d - RX free threshold=%d\n",
-				nb_rx_desc_tmp, rx_conf[qid].rx_free_thresh);
+				nb_rx_desc_tmp, rx_free_thresh_tmp);
 			printf("      RX threshold registers: pthresh=%d hthresh=%d "
 				" wthresh=%d\n",
-				rx_conf[qid].rx_thresh.pthresh,
-				rx_conf[qid].rx_thresh.hthresh,
-				rx_conf[qid].rx_thresh.wthresh);
-			printf("      RX Offloads=0x%"PRIx64"\n",
-				rx_conf[qid].offloads);
+				pthresh_tmp, hthresh_tmp, wthresh_tmp);
+			printf("      RX Offloads=0x%"PRIx64"\n", offloads_tmp);
 		}
 
@@ -1819,19 +1836,32 @@ rxtx_config_display(void)
 		for (qid = 0; qid < 1; qid++) {
 			rc = rte_eth_tx_queue_info_get(pid, qid, &tx_qinfo);
-			if (rc)
+			if (rc) {
 				nb_tx_desc_tmp = nb_tx_desc[qid];
-			else
+				tx_free_thresh_tmp =
+					tx_conf[qid].tx_free_thresh;
+				pthresh_tmp = tx_conf[qid].tx_thresh.pthresh;
+				hthresh_tmp = tx_conf[qid].tx_thresh.hthresh;
+				wthresh_tmp = tx_conf[qid].tx_thresh.wthresh;
+				offloads_tmp = tx_conf[qid].offloads;
+				tx_rs_thresh_tmp = tx_conf[qid].tx_rs_thresh;
+			} else {
 				nb_tx_desc_tmp = tx_qinfo.nb_desc;
+				tx_free_thresh_tmp =
+						tx_qinfo.conf.tx_free_thresh;
+				pthresh_tmp = tx_qinfo.conf.tx_thresh.pthresh;
+				hthresh_tmp = tx_qinfo.conf.tx_thresh.hthresh;
+				wthresh_tmp = tx_qinfo.conf.tx_thresh.wthresh;
+				offloads_tmp = tx_qinfo.conf.offloads;
+				tx_rs_thresh_tmp = tx_qinfo.conf.tx_rs_thresh;
+			}
 
 			printf("    TX queue: %d\n", qid);
 			printf("      TX desc=%d - TX free threshold=%d\n",
-				nb_tx_desc_tmp, tx_conf[qid].tx_free_thresh);
+				nb_tx_desc_tmp, tx_free_thresh_tmp);
 			printf("      TX threshold registers: pthresh=%d hthresh=%d "
 				" wthresh=%d\n",
-				tx_conf[qid].tx_thresh.pthresh,
-				tx_conf[qid].tx_thresh.hthresh,
-				tx_conf[qid].tx_thresh.wthresh);
+				pthresh_tmp, hthresh_tmp, wthresh_tmp);
 			printf("      TX offloads=0x%"PRIx64" - TX RS bit threshold=%d\n",
-				tx_conf[qid].offloads, tx_conf->tx_rs_thresh);
+				offloads_tmp, tx_rs_thresh_tmp);
 		}
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.918199327 +0000
+++ 0034-app-testpmd-fix-displaying-Rx-Tx-queues-information.patch	2020-11-05 12:38:54.235896016 +0000
@@ -1 +1 @@
-From 700ded7aa15f5ecc5b68d12fcb6fd3bfe06e599d Mon Sep 17 00:00:00 2001
+From f461ce273ed7005da20c84b7ab4dd3ac50e95ae5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 700ded7aa15f5ecc5b68d12fcb6fd3bfe06e599d ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 0b655368b8..470c68567a 100644
+index bce37a423f..4ffda33f39 100644
@@ -32 +33 @@
-@@ -2281,8 +2281,15 @@ rxtx_config_display(void)
+@@ -1782,8 +1782,15 @@ rxtx_config_display(void)
@@ -50 +51 @@
-@@ -2298,19 +2305,29 @@ rxtx_config_display(void)
+@@ -1799,19 +1806,29 @@ rxtx_config_display(void)
@@ -88 +89 @@
-@@ -2318,19 +2335,32 @@ rxtx_config_display(void)
+@@ -1819,19 +1836,32 @@ rxtx_config_display(void)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/qede: fix dereference before null check' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (32 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix displaying Rx/Tx queues information' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app: fix ethdev port id size' " Kevin Traynor
                   ` (32 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 6d382f6a1c2a2d5209a4427e20c5d65432e7714b Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 24 Aug 2020 19:46:53 +0800
Subject: [PATCH] net/qede: fix dereference before null check

[ upstream commit b5c2f5a0ba7b2f7c21be167d5ea418c46552a299 ]

Coverity flags that 'fp->sb_info' variable is used before
it's checked for NULL. This patch fixes this issue.

Coverity issue: 260413
Fixes: 4c4bdadfa9e7 ("net/qede: refactoring multi-queue implementation")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/qede/qede_rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 0ccfea4912..f62b2ef583 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -677,7 +677,7 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev)
 	for (sb_idx = 0; sb_idx < QEDE_RXTX_MAX(qdev); sb_idx++) {
 		fp = &qdev->fp_array[sb_idx];
-		DP_INFO(edev, "Free sb_info index 0x%x\n",
-				fp->sb_info->igu_sb_id);
 		if (fp->sb_info) {
+			DP_INFO(edev, "Free sb_info index 0x%x\n",
+					fp->sb_info->igu_sb_id);
 			OSAL_DMA_FREE_COHERENT(edev, fp->sb_info->sb_virt,
 				fp->sb_info->sb_phys,
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.936688940 +0000
+++ 0035-net-qede-fix-dereference-before-null-check.patch	2020-11-05 12:38:54.237896017 +0000
@@ -1 +1 @@
-From b5c2f5a0ba7b2f7c21be167d5ea418c46552a299 Mon Sep 17 00:00:00 2001
+From 6d382f6a1c2a2d5209a4427e20c5d65432e7714b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b5c2f5a0ba7b2f7c21be167d5ea418c46552a299 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index ea264f59d7..75d78cebb5 100644
+index 0ccfea4912..f62b2ef583 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app: fix ethdev port id size' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (33 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix dereference before null check' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'doc: " Kevin Traynor
                   ` (31 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Chenbo Xia; +Cc: Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 88adb8f6874b9f07dfd5a77274628fe3f20db9a6 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia@intel.com>
Date: Wed, 30 Sep 2020 12:23:27 +0800
Subject: [PATCH] app: fix ethdev port id size

[ upstream commit 9b539662437c0bbd385329bf077224cbb83d0c48 ]

The ethdev port id should be 16 bits now. This patch changes the
variable size of port id in applications from 8 bits to 16 bits.

Fixes: e977e4199a8d ("app/testpmd: add commands to load/unload BPF filters")
Fixes: 46cf97e4bbfa ("eventdev: add test for eth Tx adapter")

Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/bpf_cmd.c                | 4 ++--
 test/test/test_event_eth_tx_adapter.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c
index 830bfc13a5..d2deadd4e6 100644
--- a/app/test-pmd/bpf_cmd.c
+++ b/app/test-pmd/bpf_cmd.c
@@ -56,5 +56,5 @@ struct cmd_bpf_ld_result {
 	cmdline_fixed_string_t bpf;
 	cmdline_fixed_string_t dir;
-	uint8_t port;
+	uint16_t port;
 	uint16_t queue;
 	cmdline_fixed_string_t op;
@@ -154,5 +154,5 @@ struct cmd_bpf_unld_result {
 	cmdline_fixed_string_t bpf;
 	cmdline_fixed_string_t dir;
-	uint8_t port;
+	uint16_t port;
 	uint16_t queue;
 };
diff --git a/test/test/test_event_eth_tx_adapter.c b/test/test/test_event_eth_tx_adapter.c
index c26c5152c2..476c588a2c 100644
--- a/test/test/test_event_eth_tx_adapter.c
+++ b/test/test/test_event_eth_tx_adapter.c
@@ -46,5 +46,5 @@ static uint32_t tid;
 
 static inline int
-port_init_common(uint8_t port, const struct rte_eth_conf *port_conf,
+port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
 		struct rte_mempool *mp)
 {
@@ -101,5 +101,5 @@ port_init_common(uint8_t port, const struct rte_eth_conf *port_conf,
 
 static inline int
-port_init(uint8_t port, struct rte_mempool *mp)
+port_init(uint16_t port, struct rte_mempool *mp)
 {
 	struct rte_eth_conf conf = { 0 };
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.954912253 +0000
+++ 0036-app-fix-ethdev-port-id-size.patch	2020-11-05 12:38:54.237896017 +0000
@@ -1 +1 @@
-From 9b539662437c0bbd385329bf077224cbb83d0c48 Mon Sep 17 00:00:00 2001
+From 88adb8f6874b9f07dfd5a77274628fe3f20db9a6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9b539662437c0bbd385329bf077224cbb83d0c48 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16,2 +17,2 @@
- app/test-pmd/bpf_cmd.c               | 4 ++--
- app/test/test_event_eth_tx_adapter.c | 4 ++--
+ app/test-pmd/bpf_cmd.c                | 4 ++--
+ test/test/test_event_eth_tx_adapter.c | 4 ++--
@@ -21 +22 @@
-index 0f984ccf4a..16e3c3b3b3 100644
+index 830bfc13a5..d2deadd4e6 100644
@@ -38,4 +39,4 @@
-diff --git a/app/test/test_event_eth_tx_adapter.c b/app/test/test_event_eth_tx_adapter.c
-index 3af749280a..7073030902 100644
---- a/app/test/test_event_eth_tx_adapter.c
-+++ b/app/test/test_event_eth_tx_adapter.c
+diff --git a/test/test/test_event_eth_tx_adapter.c b/test/test/test_event_eth_tx_adapter.c
+index c26c5152c2..476c588a2c 100644
+--- a/test/test/test_event_eth_tx_adapter.c
++++ b/test/test/test_event_eth_tx_adapter.c
@@ -49 +50 @@
-@@ -105,5 +105,5 @@ port_init_common(uint8_t port, const struct rte_eth_conf *port_conf,
+@@ -101,5 +101,5 @@ port_init_common(uint8_t port, const struct rte_eth_conf *port_conf,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'doc: fix ethdev port id size' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (34 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app: fix ethdev port id size' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' " Kevin Traynor
                   ` (30 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Chenbo Xia; +Cc: Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 414f36aefbaaa2fed3f14b31190aa5f4d316bfd5 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia@intel.com>
Date: Wed, 30 Sep 2020 12:23:28 +0800
Subject: [PATCH] doc: fix ethdev port id size

[ upstream commit ea87c337e59c855f5949029f7f9259329824d515 ]

The ethdev port id should be 16 bits now. This patch changes the
variable size of port id in docs from 8 bits to 16 bits.

Fixes: fdec9301f52d ("doc: add flow classify guides")
Fixes: 4a3ef59a10c8 ("examples/flow_filtering: add simple demo of flow API")

Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/sample_app_ug/flow_classify.rst  | 2 +-
 doc/guides/sample_app_ug/flow_filtering.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst
index 003ed03562..a014b7f67a 100644
--- a/doc/guides/sample_app_ug/flow_classify.rst
+++ b/doc/guides/sample_app_ug/flow_classify.rst
@@ -272,5 +272,5 @@ Forwarding application is shown below:
 
     static inline int
-    port_init(uint8_t port, struct rte_mempool *mbuf_pool)
+    port_init(uint16_t port, struct rte_mempool *mbuf_pool)
     {
         struct rte_eth_conf port_conf = port_conf_default;
diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst
index 9dba85acff..d2a02e3b22 100644
--- a/doc/guides/sample_app_ug/flow_filtering.rst
+++ b/doc/guides/sample_app_ug/flow_filtering.rst
@@ -374,5 +374,5 @@ This function is located in the ``flow_blocks.c`` file.
 
    static struct rte_flow *
-   generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
+   generate_ipv4_flow(uint16_t port_id, uint16_t rx_q,
                    uint32_t src_ip, uint32_t src_mask,
                    uint32_t dest_ip, uint32_t dest_mask,
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.972016396 +0000
+++ 0037-doc-fix-ethdev-port-id-size.patch	2020-11-05 12:38:54.238896018 +0000
@@ -1 +1 @@
-From ea87c337e59c855f5949029f7f9259329824d515 Mon Sep 17 00:00:00 2001
+From 414f36aefbaaa2fed3f14b31190aa5f4d316bfd5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea87c337e59c855f5949029f7f9259329824d515 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index dc40b4d6f9..31175cff0a 100644
+index 003ed03562..a014b7f67a 100644
@@ -32 +33 @@
-index 5e5a6cd8a0..d3653e57b2 100644
+index 9dba85acff..d2a02e3b22 100644
@@ -35 +36 @@
-@@ -385,5 +385,5 @@ This function is located in the ``flow_blocks.c`` file.
+@@ -374,5 +374,5 @@ This function is located in the ``flow_blocks.c`` file.


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (35 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'doc: " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'vfio: fix group descriptor check' " Kevin Traynor
                   ` (29 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Brandon Lo, David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 88cf9e5af41f75146f31ae32f0c9cda0bd1416b8 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Fri, 2 Oct 2020 09:54:00 +0200
Subject: [PATCH] vdpa/ifc: fix build with recent kernels

[ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ]

VIRTIO_F_IOMMU_PLATFORM is now defined in recent kernel
headers, causing build issue.

Let's define it in the IFC vDPA driver only if it wasn't already.

Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")

Reported-by: Brandon Lo <blo@iol.unh.edu>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/ifc/base/ifcvf.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h
index c15c691078..c6636a897a 100644
--- a/drivers/net/ifc/base/ifcvf.h
+++ b/drivers/net/ifc/base/ifcvf.h
@@ -14,5 +14,8 @@
 
 #define IFCVF_MAX_QUEUES		1
+
+#ifndef VIRTIO_F_IOMMU_PLATFORM
 #define VIRTIO_F_IOMMU_PLATFORM		33
+#endif
 
 /* Common configuration */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.988449137 +0000
+++ 0038-vdpa-ifc-fix-build-with-recent-kernels.patch	2020-11-05 12:38:54.239896019 +0000
@@ -1 +1 @@
-From 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a Mon Sep 17 00:00:00 2001
+From 88cf9e5af41f75146f31ae32f0c9cda0bd1416b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- drivers/vdpa/ifc/base/ifcvf.h | 3 +++
+ drivers/net/ifc/base/ifcvf.h | 3 +++
@@ -21,4 +22,4 @@
-diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
-index a288ce57dc..573a35ffb4 100644
---- a/drivers/vdpa/ifc/base/ifcvf.h
-+++ b/drivers/vdpa/ifc/base/ifcvf.h
+diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h
+index c15c691078..c6636a897a 100644
+--- a/drivers/net/ifc/base/ifcvf.h
++++ b/drivers/net/ifc/base/ifcvf.h


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'vfio: fix group descriptor check' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (36 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' " Kevin Traynor
                   ` (28 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 8cba350de777b2cdf703cb742ff05afcbcc8ea88 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Tue, 19 May 2020 11:42:00 +0800
Subject: [PATCH] vfio: fix group descriptor check

[ upstream commit 1f16fa99aa36e043e395184d6ad37a348eafeba7 ]

The issue is that a file descriptor at 0 is a valid one. Currently
the file not found, the return value will be set to 0. As a result,
it is impossible to distinguish between a correct descriptor and a
failed return value. Fix it to return -ENOENT instead of 0.

Fixes: b758423bc4fe ("vfio: fix race condition with sysfs")
Fixes: ff0b67d1c868 ("vfio: DMA mapping")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_vfio.c        | 23 +++++++++++--------
 .../linuxapp/eal/eal_vfio_mp_sync.c           |  4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c
index be969bbaac..7c4bd68732 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
@@ -293,5 +293,5 @@ vfio_open_group_fd(int iommu_group_num)
 					return -1;
 				}
-				return 0;
+				return -ENOENT;
 			}
 			/* noiommu group found */
@@ -318,10 +318,10 @@ vfio_open_group_fd(int iommu_group_num)
 		} else if (p->result == SOCKET_NO_FD) {
 			RTE_LOG(ERR, EAL, "  bad VFIO group fd\n");
-			vfio_group_fd = 0;
+			vfio_group_fd = -ENOENT;
 		}
 	}
 
 	free(mp_reply.msgs);
-	if (vfio_group_fd < 0)
+	if (vfio_group_fd < 0 && vfio_group_fd != -ENOENT)
 		RTE_LOG(ERR, EAL, "  cannot request group fd\n");
 	return vfio_group_fd;
@@ -379,7 +379,7 @@ vfio_get_group_fd(struct vfio_config *vfio_cfg,
 
 	vfio_group_fd = vfio_open_group_fd(iommu_group_num);
-	if (vfio_group_fd <= 0) {
+	if (vfio_group_fd < 0) {
 		RTE_LOG(ERR, EAL, "Failed to open group %d\n", iommu_group_num);
-		return -1;
+		return vfio_group_fd;
 	}
 
@@ -705,9 +705,12 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
 	/* get the actual group fd */
 	vfio_group_fd = rte_vfio_get_group_fd(iommu_group_num);
-	if (vfio_group_fd < 0)
+	if (vfio_group_fd < 0 && vfio_group_fd != -ENOENT)
 		return -1;
 
-	/* if group_fd == 0, that means the device isn't managed by VFIO */
-	if (vfio_group_fd == 0) {
+	/*
+	 * if vfio_group_fd == -ENOENT, that means the device
+	 * isn't managed by VFIO
+	 */
+	if (vfio_group_fd == -ENOENT) {
 		RTE_LOG(WARNING, EAL, " %s not managed by VFIO driver, skipping\n",
 				dev_addr);
@@ -929,8 +932,8 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,
 	/* get the actual group fd */
 	vfio_group_fd = rte_vfio_get_group_fd(iommu_group_num);
-	if (vfio_group_fd <= 0) {
+	if (vfio_group_fd < 0) {
 		RTE_LOG(INFO, EAL, "rte_vfio_get_group_fd failed for %s\n",
 				   dev_addr);
-		ret = -1;
+		ret = vfio_group_fd;
 		goto out;
 	}
diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
index 2a47f29d5a..126b568c16 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
@@ -44,7 +44,7 @@ vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)
 		r->group_num = m->group_num;
 		fd = rte_vfio_get_group_fd(m->group_num);
-		if (fd < 0)
+		if (fd < 0 && fd != -ENOENT)
 			r->result = SOCKET_ERR;
-		else if (fd == 0)
+		else if (fd == -ENOENT)
 			/* if VFIO group exists but isn't bound to VFIO driver */
 			r->result = SOCKET_NO_FD;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.005221269 +0000
+++ 0039-vfio-fix-group-descriptor-check.patch	2020-11-05 12:38:54.240896020 +0000
@@ -1 +1 @@
-From 1f16fa99aa36e043e395184d6ad37a348eafeba7 Mon Sep 17 00:00:00 2001
+From 8cba350de777b2cdf703cb742ff05afcbcc8ea88 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1f16fa99aa36e043e395184d6ad37a348eafeba7 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- lib/librte_eal/linux/eal_vfio.c         | 23 +++++++++++++----------
- lib/librte_eal/linux/eal_vfio_mp_sync.c |  4 ++--
+ lib/librte_eal/linuxapp/eal/eal_vfio.c        | 23 +++++++++++--------
+ .../linuxapp/eal/eal_vfio_mp_sync.c           |  4 ++--
@@ -22,5 +23,5 @@
-diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c
-index e07979936e..380f2f44aa 100644
---- a/lib/librte_eal/linux/eal_vfio.c
-+++ b/lib/librte_eal/linux/eal_vfio.c
-@@ -296,5 +296,5 @@ vfio_open_group_fd(int iommu_group_num)
+diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c
+index be969bbaac..7c4bd68732 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
++++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
+@@ -293,5 +293,5 @@ vfio_open_group_fd(int iommu_group_num)
@@ -33 +34 @@
-@@ -321,10 +321,10 @@ vfio_open_group_fd(int iommu_group_num)
+@@ -318,10 +318,10 @@ vfio_open_group_fd(int iommu_group_num)
@@ -46 +47 @@
-@@ -382,7 +382,7 @@ vfio_get_group_fd(struct vfio_config *vfio_cfg,
+@@ -379,7 +379,7 @@ vfio_get_group_fd(struct vfio_config *vfio_cfg,
@@ -56 +57 @@
-@@ -734,9 +734,12 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
+@@ -705,9 +705,12 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
@@ -72 +73 @@
-@@ -976,8 +979,8 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,
+@@ -929,8 +932,8 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,
@@ -83,5 +84,5 @@
-diff --git a/lib/librte_eal/linux/eal_vfio_mp_sync.c b/lib/librte_eal/linux/eal_vfio_mp_sync.c
-index 5f2a5fc1d9..6254696ae5 100644
---- a/lib/librte_eal/linux/eal_vfio_mp_sync.c
-+++ b/lib/librte_eal/linux/eal_vfio_mp_sync.c
-@@ -45,7 +45,7 @@ vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)
+diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
+index 2a47f29d5a..126b568c16 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
++++ b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
+@@ -44,7 +44,7 @@ vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (37 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'vfio: fix group descriptor check' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' " Kevin Traynor
                   ` (27 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From b27a0f085a793a178d054d01740d1fbe2720ce86 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Fri, 11 Sep 2020 18:57:42 +0800
Subject: [PATCH] bus/pci: fix memory leak when unmapping VFIO resource

[ upstream commit e34a43a6729dd33e430e1815a395893fe1c643d6 ]

The 'vfio_res' is not freed when unmapping resource by primary process.
This leads to memory leak.

Fixes: ab53203e194b ("vfio: enable unmapping resource for secondary")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/bus/pci/linux/pci_vfio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index cf61032a5d..44a7c764ce 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -987,5 +987,5 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)
 
 	TAILQ_REMOVE(vfio_res_list, vfio_res, next);
-
+	rte_free(vfio_res);
 	return 0;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.022956248 +0000
+++ 0040-bus-pci-fix-memory-leak-when-unmapping-VFIO-resource.patch	2020-11-05 12:38:54.241896020 +0000
@@ -1 +1 @@
-From e34a43a6729dd33e430e1815a395893fe1c643d6 Mon Sep 17 00:00:00 2001
+From b27a0f085a793a178d054d01740d1fbe2720ce86 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e34a43a6729dd33e430e1815a395893fe1c643d6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index d2073994fa..940ebc1e35 100644
+index cf61032a5d..44a7c764ce 100644
@@ -22 +23 @@
-@@ -1016,5 +1016,5 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)
+@@ -987,5 +987,5 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (38 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' " Kevin Traynor
                   ` (26 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 6be24aa7c852d8f31d28f119eefccdea30fa30a1 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Fri, 11 Sep 2020 19:08:04 +0800
Subject: [PATCH] bus/pci: fix leak on VFIO mapping error

[ upstream commit 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 ]

Currently, only the 'vfio_dev_fd' is closed in failure path, so
some resources are not released(such as 'vfio_group_fd'). The
rte_vfio_release_device() should be used to avoid this problem.

Fixes: 33604c31354a ("vfio: refactor PCI BAR mapping")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/bus/pci/linux/pci_vfio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 44a7c764ce..0a4dc41cf3 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -810,5 +810,6 @@ err_vfio_res:
 	rte_free(vfio_res);
 err_vfio_dev_fd:
-	close(vfio_dev_fd);
+	rte_vfio_release_device(rte_pci_get_sysfs_path(),
+			pci_addr, vfio_dev_fd);
 	return -1;
 }
@@ -878,5 +879,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
 	return 0;
 err_vfio_dev_fd:
-	close(vfio_dev_fd);
+	rte_vfio_release_device(rte_pci_get_sysfs_path(),
+			pci_addr, vfio_dev_fd);
 	return -1;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.040781220 +0000
+++ 0041-bus-pci-fix-leak-on-VFIO-mapping-error.patch	2020-11-05 12:38:54.242896021 +0000
@@ -1 +1 @@
-From 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 Mon Sep 17 00:00:00 2001
+From 6be24aa7c852d8f31d28f119eefccdea30fa30a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a089d2d52f45bca6f179345fa3f3abe1a0e2ea9 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 940ebc1e35..ef4f72017f 100644
+index 44a7c764ce..0a4dc41cf3 100644
@@ -23 +24 @@
-@@ -839,5 +839,6 @@ err_vfio_res:
+@@ -810,5 +810,6 @@ err_vfio_res:
@@ -31 +32 @@
-@@ -907,5 +908,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
+@@ -878,5 +879,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (39 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'mem: fix allocation in container with SELinux' " Kevin Traynor
                   ` (25 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: John McNamara, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From fb7bce81c5dbb7366764588d25130ac3f88a6f6c Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 3 Sep 2020 15:00:33 +0100
Subject: [PATCH] doc: fix formatting of notes in meson guide

[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]

The "note" callouts in the chapter describing the meson build were
incorrectly formatted, so adjust to use the correct markdown syntax.

Fixes: 9c3adc289c5e ("doc: add instructions on build using meson")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 doc/build-sdk-meson.txt | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 29a8bd387f..057734795e 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -98,9 +98,11 @@ Examples of setting the same options using meson configure::
 	meson configure -Dmax_lcores=8
 
-NOTE: once meson has been run to configure a build in a directory, it
-cannot be run again on the same directory. Instead ``meson configure``
-should be used to change the build settings within the directory, and when
-``ninja`` is called to do the build itself, it will trigger the necessary
-re-scan from meson.
+.. note::
+
+        once meson has been run to configure a build in a directory, it
+        cannot be run again on the same directory. Instead ``meson configure``
+        should be used to change the build settings within the directory, and when
+        ``ninja`` is called to do the build itself, it will trigger the necessary
+        re-scan from meson.
 
 As well as those settings taken from ``meson configure``, other options
@@ -110,7 +112,9 @@ example::
 	CC=clang meson clang-build
 
-NOTE: for more comprehensive overriding of compilers or other environment
-settings, the tools for cross-compilation may be considered. However, for
-basic overriding of the compiler etc., the above form works as expected.
+.. note::
+
+        for more comprehensive overriding of compilers or other environment
+        settings, the tools for cross-compilation may be considered. However, for
+        basic overriding of the compiler etc., the above form works as expected.
 
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.057244546 +0000
+++ 0042-doc-fix-formatting-of-notes-in-meson-guide.patch	2020-11-05 12:38:54.242896021 +0000
@@ -1 +1 @@
-From 1509ef9350671ee13381ce8e3c1741c2effc28b1 Mon Sep 17 00:00:00 2001
+From fb7bce81c5dbb7366764588d25130ac3f88a6f6c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15,2 +16,2 @@
- doc/guides/prog_guide/build-sdk-meson.rst | 25 ++++++++++++++---------
- 1 file changed, 15 insertions(+), 10 deletions(-)
+ doc/build-sdk-meson.txt | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
@@ -18,6 +19,6 @@
-diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
-index 44d1cafdf0..d621bea565 100644
---- a/doc/guides/prog_guide/build-sdk-meson.rst
-+++ b/doc/guides/prog_guide/build-sdk-meson.rst
-@@ -103,12 +103,15 @@ Examples of setting some of the same options using meson configure::
- 	meson configure -Denable_trace_fp=true
+diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
+index 29a8bd387f..057734795e 100644
+--- a/doc/build-sdk-meson.txt
++++ b/doc/build-sdk-meson.txt
+@@ -98,9 +98,11 @@ Examples of setting the same options using meson configure::
+ 	meson configure -Dmax_lcores=8
@@ -31,3 +32 @@
- 
--NOTE: machine=default uses a config that works on all supported architectures
--regardless of the capabilities of the machine where the build is happening.
++
@@ -39,4 +37,0 @@
-+
-+.. note::
-+        machine=default uses a config that works on all supported architectures
-+        regardless of the capabilities of the machine where the build is happening.
@@ -45 +40 @@
-@@ -118,7 +121,9 @@ example::
+@@ -110,7 +112,9 @@ example::


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'mem: fix allocation in container with SELinux' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (40 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'bus/fslmc: fix dpio close' " Kevin Traynor
                   ` (24 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: David Marchand; +Cc: Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 2a3e5d6205c2087e1879dceb1bd573bccab4469a Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Thu, 10 Sep 2020 18:24:07 +0200
Subject: [PATCH] mem: fix allocation in container with SELinux

[ upstream commit aa48ddf4f0d2a9f90cd9247ac779ced55588c27a ]

This is something we encountered while working in an OpenShift
environment with SELinux enabled.
In this environment, a DPDK application could create/write to hugepage
files but removing them was refused.
This resulted in dirty files being reused when starting a new DPDK
application and triggered random crashes / erratic behavior.

Getting a SELinux setup can be a challenge, and even more if you add
containers to the picture :-).
So here is a reproducer for the interested testers:

  # cat >wrap.c <<EOF
  #define _GNU_SOURCE
  #include <dlfcn.h>
  #include <errno.h>
  #include <stdio.h>
  #include <string.h>
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>

  int unlink(const char *pathname)
  {
  	static int (*orig)(const char *pathname) = NULL;
  	struct stat st;

  	if (orig == NULL)
  		orig = dlsym(RTLD_NEXT, "unlink");
  	if (strstr(pathname, "rtemap_") != NULL &&
			stat(pathname, &st) == 0) {
  		fprintf(stderr, "### refused unlink for %s\n",
  			pathname);
  		errno = EACCES;
  		return -1;
  	}
  	fprintf(stderr, "### called unlink for %s\n", pathname);
  	return orig(pathname);
  }

  int unlinkat(int dirfd, const char *pathname, int flags)
  {
  	static int (*orig)(int dirfd, const char *pathname, int flags) =
  		NULL;
  	struct stat st;

  	if (orig == NULL)
  		orig = dlsym(RTLD_NEXT, "unlinkat");
  	if (strstr(pathname, "rtemap_") != NULL &&
  			fstatat(dirfd, pathname, &st, flags) == 0) {
  		fprintf(stderr, "### refused unlinkat for %s\n",
  			pathname);
  		errno = EACCES;
  		return -1;
  	}
  	fprintf(stderr, "### called unlinkat for %s\n", pathname);
  	return orig(dirfd, pathname, flags);
  }
  EOF

  # gcc -fPIC -shared  -o libwrap.so wrap.c -ldl
  # \rm /dev/hugepages/rtemap*

  # # First run is fine
  # LD_PRELOAD=libwrap.so dpdk-testpmd -w 0000:01:00.0 -- -i
  [...]
  Configuring Port 0 (socket 0)
  Port 0: 24:6E:96:3C:52:D8
  Checking link statuses...
  Done
  testpmd>

  # # Second run we have dirty memory
  # LD_PRELOAD=libwrap.so dpdk-testpmd -w 0000:01:00.0 -- -i
  [...]
  ### refused unlinkat for rtemap_0
  [...]
  Port 0 is now not stopped
  Please stop the ports first
  Done
  testpmd>

Removing hugepage files is done in multiple places and the memory
allocation code is complex.
This fix tries to do the minimum and avoids touching other paths.

If trying to remove the hugepage file before allocating a page fails,
the error is reported to the caller and the user will see a memory
allocation error log.

Fixes: 582bed1e1d1d ("mem: support mapping hugepages at runtime")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memalloc.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index 518314d89c..dea2b5ec93 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -420,4 +420,19 @@ get_seg_fd(char *path, int buflen, struct hugepage_info *hi,
 
 		if (fd < 0) {
+			/* A primary process is the only one creating these
+			 * files. If there is a leftover that was not cleaned
+			 * by clear_hugedir(), we must *now* make sure to drop
+			 * the file or we will remap old stuff while the rest
+			 * of the code is built on the assumption that a new
+			 * page is clean.
+			 */
+			if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
+					unlink(path) == -1 &&
+					errno != ENOENT) {
+				RTE_LOG(DEBUG, EAL, "%s(): could not remove '%s': %s\n",
+					__func__, path, strerror(errno));
+				return -1;
+			}
+
 			fd = open(path, O_CREAT | O_RDWR, 0600);
 			if (fd < 0) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.073275999 +0000
+++ 0043-mem-fix-allocation-in-container-with-SELinux.patch	2020-11-05 12:38:54.244896023 +0000
@@ -1 +1 @@
-From aa48ddf4f0d2a9f90cd9247ac779ced55588c27a Mon Sep 17 00:00:00 2001
+From 2a3e5d6205c2087e1879dceb1bd573bccab4469a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aa48ddf4f0d2a9f90cd9247ac779ced55588c27a ]
+
@@ -96 +97,0 @@
-Cc: stable@dpdk.org
@@ -101 +102 @@
- lib/librte_eal/linux/eal_memalloc.c | 15 +++++++++++++++
+ lib/librte_eal/linuxapp/eal/eal_memalloc.c | 15 +++++++++++++++
@@ -104,5 +105,5 @@
-diff --git a/lib/librte_eal/linux/eal_memalloc.c b/lib/librte_eal/linux/eal_memalloc.c
-index db60e79975..40a5c4aa1d 100644
---- a/lib/librte_eal/linux/eal_memalloc.c
-+++ b/lib/librte_eal/linux/eal_memalloc.c
-@@ -330,4 +330,19 @@ get_seg_fd(char *path, int buflen, struct hugepage_info *hi,
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+index 518314d89c..dea2b5ec93 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+@@ -420,4 +420,19 @@ get_seg_fd(char *path, int buflen, struct hugepage_info *hi,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'bus/fslmc: fix dpio close' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (41 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'mem: fix allocation in container with SELinux' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: reset test statistics' " Kevin Traynor
                   ` (23 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Rohit Raj; +Cc: Sachin Saxena, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 426ccf271cd9611ef997b2da8760f8a82a3db7d0 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@nxp.com>
Date: Tue, 28 Jul 2020 21:54:59 +0530
Subject: [PATCH] bus/fslmc: fix dpio close

[ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ]

The current state of the DPIO object should be checked
before trying to close/disable the object.

Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")

Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
Acked-by: Sachin Saxena <sachin.saxena@oss.nxp.com>
---
 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index ba2e28ce1f..ab0eee0e82 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -532,6 +532,11 @@ dpaa2_create_dpio_device(int vdev_fd,
 err:
 	if (dpio_dev->dpio) {
-		dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token);
-		dpio_close(dpio_dev->dpio, CMD_PRI_LOW,  dpio_dev->token);
+		if (dpio_dev->token) {
+			dpio_disable(dpio_dev->dpio, CMD_PRI_LOW,
+				     dpio_dev->token);
+			dpio_close(dpio_dev->dpio, CMD_PRI_LOW,
+				   dpio_dev->token);
+		}
+
 		free(dpio_dev->dpio);
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.091360064 +0000
+++ 0044-bus-fslmc-fix-dpio-close.patch	2020-11-05 12:38:54.244896023 +0000
@@ -1 +1 @@
-From ba156cdf70f20ec5321592fe4595ab8f9ae343ec Mon Sep 17 00:00:00 2001
+From 426ccf271cd9611ef997b2da8760f8a82a3db7d0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 97be761164..b0055b1644 100644
+index ba2e28ce1f..ab0eee0e82 100644
@@ -22 +23 @@
-@@ -529,6 +529,11 @@ dpaa2_create_dpio_device(int vdev_fd,
+@@ -532,6 +532,11 @@ dpaa2_create_dpio_device(int vdev_fd,
@@ -34,2 +35,2 @@
- 		rte_free(dpio_dev->eqresp);
- 		rte_free(dpio_dev->dpio);
+ 		free(dpio_dev->dpio);
+ 	}


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'raw/skeleton: reset test statistics' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (42 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'bus/fslmc: fix dpio close' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' " Kevin Traynor
                   ` (22 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Lukasz Wojciechowski; +Cc: Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From cfbb220c7aca38d80fe678dbfdf741d573ed624a Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Date: Mon, 21 Sep 2020 23:44:19 +0200
Subject: [PATCH] raw/skeleton: reset test statistics

[ upstream commit 22b5c63ed13fbae5934a312cba657ec1901f7539 ]

Statistics: passed, failed, unsupported and total are kept
in global static variables. As global variables they are initiated
with zeroes. However running test multiple times cumulates results
from previous calls.

This patch resets statistics with zeroes in testsuite_setup().

To reproduce issue fixed by this patch, run rawdev_autotest command
in dpdk-test app multiple times.

Fixes: 55ca1b0f2151 ("raw/skeleton: add test cases")

Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
index 3250c2296e..22b62506d5 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
@@ -42,4 +42,10 @@ testsuite_setup(void)
 {
 	uint8_t count;
+
+	total = 0;
+	passed = 0;
+	failed = 0;
+	unsupported = 0;
+
 	count = rte_rawdev_count();
 	if (!count) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.107549970 +0000
+++ 0045-raw-skeleton-reset-test-statistics.patch	2020-11-05 12:38:54.245896024 +0000
@@ -1 +1 @@
-From 22b5c63ed13fbae5934a312cba657ec1901f7539 Mon Sep 17 00:00:00 2001
+From cfbb220c7aca38d80fe678dbfdf741d573ed624a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 22b5c63ed13fbae5934a312cba657ec1901f7539 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
- drivers/raw/skeleton/skeleton_rawdev_test.c | 6 ++++++
+ drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c | 6 ++++++
@@ -25,5 +26,5 @@
-diff --git a/drivers/raw/skeleton/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c
-index bb4b6efe40..1405df080d 100644
---- a/drivers/raw/skeleton/skeleton_rawdev_test.c
-+++ b/drivers/raw/skeleton/skeleton_rawdev_test.c
-@@ -43,4 +43,10 @@ testsuite_setup(void)
+diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
+index 3250c2296e..22b62506d5 100644
+--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
++++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
+@@ -42,4 +42,10 @@ testsuite_setup(void)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (43 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: reset test statistics' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'port: remove useless assignment' " Kevin Traynor
                   ` (21 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Lukasz Wojciechowski; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 21e209841c900a4ca532830df84cb357a152d582 Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Date: Mon, 21 Sep 2020 23:44:20 +0200
Subject: [PATCH] raw/skeleton: allow closing already closed device

[ upstream commit e640362b34e868b82bfb047761e05056ba77e58e ]

This patch return OK code (0) from skeleton_rawdev_close function
if firmware is in SKELETON_FW_READY state. Formerly it returned
-EINVAL error code.

Returning an error here is troublesome as it disallows proper release
of the rawdev. The rte_rawdev_pmd_release function from librte_rawdev
library calls drivers' rawdev_close handler and continues execution
only in case of errorless call.
(see lib/librte_rawdev/rte_rawdev.c:540)

The SKELETON_FW_READY state is reached after creation, reset, unload
or close of the device. The device should be ok to be released in
such situations.

To reproduce issue fixed by this patch, call rawdev_autotest
from dpdk-test app for few times. As the device is not properly
released, the next calls will fail.

Fixes: 61c592a8d035 ("raw/skeleton: introduce skeleton rawdev driver")

Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
---
 drivers/raw/skeleton_rawdev/skeleton_rawdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
index 6eabd97ee2..78815b056c 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
+++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
@@ -190,7 +190,9 @@ static int skeleton_rawdev_close(struct rte_rawdev *dev)
 		break;
 	case SKELETON_FW_READY:
+		SKELETON_PMD_DEBUG("Device already in stopped state");
+		break;
 	case SKELETON_FW_ERROR:
 	default:
-		SKELETON_PMD_DEBUG("Device already in stopped state");
+		SKELETON_PMD_DEBUG("Device in impossible state");
 		ret = -EINVAL;
 		break;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.124556575 +0000
+++ 0046-raw-skeleton-allow-closing-already-closed-device.patch	2020-11-05 12:38:54.245896024 +0000
@@ -1 +1 @@
-From e640362b34e868b82bfb047761e05056ba77e58e Mon Sep 17 00:00:00 2001
+From 21e209841c900a4ca532830df84cb357a152d582 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e640362b34e868b82bfb047761e05056ba77e58e ]
+
@@ -25 +26,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
- drivers/raw/skeleton/skeleton_rawdev.c | 4 +++-
+ drivers/raw/skeleton_rawdev/skeleton_rawdev.c | 4 +++-
@@ -32,5 +33,5 @@
-diff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c
-index f8b47a391a..aa3beaad18 100644
---- a/drivers/raw/skeleton/skeleton_rawdev.c
-+++ b/drivers/raw/skeleton/skeleton_rawdev.c
-@@ -191,7 +191,9 @@ static int skeleton_rawdev_close(struct rte_rawdev *dev)
+diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
+index 6eabd97ee2..78815b056c 100644
+--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
++++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
+@@ -190,7 +190,9 @@ static int skeleton_rawdev_close(struct rte_rawdev *dev)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'port: remove useless assignment' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (44 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'timer: add limitation note for sync stop and reset' " Kevin Traynor
                   ` (20 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Fan Zhang; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 720f9bc1894ed204659cfdf6d190265c627ad07b Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang@intel.com>
Date: Fri, 18 Sep 2020 09:23:10 +0100
Subject: [PATCH] port: remove useless assignment

[ upstream commit 9ef2627cf64d4316224ca2de983fc32db9ed23c4 ]

This patch fixes an unused value in pcap source port by
removing the setting to the value.

Coverity issue: 362020
Fixes: d4b42133d85b ("port: add pcap file source")

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
 lib/librte_port/rte_port_source_sink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c
index 54045f9520..fe7ea8b893 100644
--- a/lib/librte_port/rte_port_source_sink.c
+++ b/lib/librte_port/rte_port_source_sink.c
@@ -117,5 +117,5 @@ pcap_source_load(struct rte_port_source *port,
 
 	for (i = 0; i < n_pkts; i++) {
-		pkt = pcap_next(pcap_handle, &pcap_hdr);
+		pcap_next(pcap_handle, &pcap_hdr);
 		port->pkt_len[i] = RTE_MIN(max_len, pcap_hdr.len);
 		pkt_len_aligns[i] = RTE_CACHE_LINE_ROUNDUP(
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.141103537 +0000
+++ 0047-port-remove-useless-assignment.patch	2020-11-05 12:38:54.246896024 +0000
@@ -1 +1 @@
-From 9ef2627cf64d4316224ca2de983fc32db9ed23c4 Mon Sep 17 00:00:00 2001
+From 720f9bc1894ed204659cfdf6d190265c627ad07b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9ef2627cf64d4316224ca2de983fc32db9ed23c4 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 74b7385a28..68575c9833 100644
+index 54045f9520..fe7ea8b893 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'timer: add limitation note for sync stop and reset' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (45 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'port: remove useless assignment' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix build with gcc 11' " Kevin Traynor
                   ` (19 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Erik Gabriel Carrillo; +Cc: Honnappa Nagarahalli, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 71605786253853b3363e181c780e35a3744e0f5d Mon Sep 17 00:00:00 2001
From: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Date: Wed, 9 Sep 2020 09:41:14 -0500
Subject: [PATCH] timer: add limitation note for sync stop and reset

[ upstream commit 0875ec4dd55a548a1f8a27674b1c136c0800d73d ]

If a timer's callback function calls rte_timer_reset_sync() or
rte_timer_stop_sync() on another timer that is in the RUNNING state and
owned by the current lcore, the *_sync() calls will loop indefinitely.

Relatedly, if a timer's callback function calls *_sync() on another
timer that is in the RUNNING state and is owned by a different lcore,
but a timer callback function runs on that different lcore and calls
*_sync() on a timer that is in the RUNNING state and owned by the
current lcore, the two lcores will loop indefinitely.

Add a note in the rte_timer_stop_sync and rte_timer_reset_sync
documentation that indicates that these APIs should not be used inside
timer callback functions in order to avoid the hangs described above,
and suggests an alternative.

Bugzilla ID: 491

Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
---
 lib/librte_timer/rte_timer.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h
index 9b95cd2c98..d3b06bc8e8 100644
--- a/lib/librte_timer/rte_timer.h
+++ b/lib/librte_timer/rte_timer.h
@@ -224,4 +224,10 @@ int rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
  * @param arg
  *   The user argument of the callback function.
+ *
+ * @note
+ *   This API should not be called inside a timer's callback function to
+ *   reset another timer; doing so could hang in certain scenarios. Instead,
+ *   the rte_timer_reset() API can be called directly and its return code
+ *   can be checked for success or failure.
  */
 void
@@ -264,4 +270,10 @@ int rte_timer_stop(struct rte_timer *tim);
  * @param tim
  *   The timer handle.
+ *
+ * @note
+ *   This API should not be called inside a timer's callback function to
+ *   stop another timer; doing so could hang in certain scenarios. Instead, the
+ *   rte_timer_stop() API can be called directly and its return code can
+ *   be checked for success or failure.
  */
 void rte_timer_stop_sync(struct rte_timer *tim);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.157265677 +0000
+++ 0048-timer-add-limitation-note-for-sync-stop-and-reset.patch	2020-11-05 12:38:54.246896024 +0000
@@ -1 +1 @@
-From 0875ec4dd55a548a1f8a27674b1c136c0800d73d Mon Sep 17 00:00:00 2001
+From 71605786253853b3363e181c780e35a3744e0f5d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0875ec4dd55a548a1f8a27674b1c136c0800d73d ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 7af83783b0..22a27aa08d 100644
+index 9b95cd2c98..d3b06bc8e8 100644
@@ -34 +35 @@
-@@ -263,4 +263,10 @@ int rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
+@@ -224,4 +224,10 @@ int rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
@@ -45 +46 @@
-@@ -302,4 +308,10 @@ int rte_timer_stop(struct rte_timer *tim);
+@@ -264,4 +270,10 @@ int rte_timer_stop(struct rte_timer *tim);


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix build with gcc 11' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (46 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'timer: add limitation note for sync stop and reset' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'pmdinfogen: " Kevin Traynor
                   ` (18 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: David Marchand, Phil Yang, Asaf Penso, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From e79c01e4a4a759fd5612b1619db6ceda6f785096 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Mon, 21 Sep 2020 14:38:29 +0100
Subject: [PATCH] app/testpmd: fix build with gcc 11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 62aa0e8c6693bb5656b5a9ad5c5248fce9150ee3 ]

Error observed with gcc 11 under development
gcc (GCC) 11.0.0 20200920 (experimental)

../app/test-pmd/config.c:1777:61:
	warning: argument 3 of type ‘const uint32_t[n]’
	{aka ‘const unsigned int[n]’} declared as a variable length
	array [-Wvla-parameter]
 1777 | port_flow_list(portid_t port_id, uint32_t n,
 			const uint32_t group[n])
      |                 ~~~~~~~~~~~~~~~^~~~~~~~
In file included from ../app/test-pmd/config.c:53:
../app/test-pmd/testpmd.h:764:67:
	note: previously declared as a pointer ‘const uint32_t *’
	{aka ‘const unsigned int *’}
  764 | void port_flow_list(portid_t port_id, uint32_t n,
  				const uint32_t *group);
      |                         ~~~~~~~~~~~~~~~~^~~~~

Fixes: 938a184a1870 ("app/testpmd: implement basic support for flow API")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Asaf Penso <asafp@nvidia.com>
---
 app/test-pmd/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 4ffda33f39..e60f5db33b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1399,5 +1399,5 @@ port_flow_query(portid_t port_id, uint32_t rule,
 /** List flow rules. */
 void
-port_flow_list(portid_t port_id, uint32_t n, const uint32_t group[n])
+port_flow_list(portid_t port_id, uint32_t n, const uint32_t *group)
 {
 	struct rte_port *port;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.174355031 +0000
+++ 0049-app-testpmd-fix-build-with-gcc-11.patch	2020-11-05 12:38:54.249896027 +0000
@@ -1 +1 @@
-From 62aa0e8c6693bb5656b5a9ad5c5248fce9150ee3 Mon Sep 17 00:00:00 2001
+From e79c01e4a4a759fd5612b1619db6ceda6f785096 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 62aa0e8c6693bb5656b5a9ad5c5248fce9150ee3 ]
+
@@ -28 +29,0 @@
-Cc: stable@dpdk.org
@@ -39 +40 @@
-index 418ea6dda4..e73dc66c8d 100644
+index 4ffda33f39..e60f5db33b 100644
@@ -42 +43 @@
-@@ -1897,5 +1897,5 @@ port_flow_aged(portid_t port_id, uint8_t destroy)
+@@ -1399,5 +1399,5 @@ port_flow_query(portid_t port_id, uint32_t rule,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'pmdinfogen: fix build with gcc 11' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (47 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix build with gcc 11' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
                   ` (17 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 3a822363a4f7beb5450f43e7a33fb67698eabbd4 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Mon, 21 Sep 2020 14:38:30 +0100
Subject: [PATCH] pmdinfogen: fix build with gcc 11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 5a75cc3c88143496030b5bed76bd031ddbe9e355 ]

Error observed with gcc 11 under development
gcc (GCC) 11.0.0 20200920 (experimental)

build error:
In file included from ../buildtools/pmdinfogen/pmdinfogen.c:17:
../buildtools/pmdinfogen/pmdinfogen.c: In function ‘parse_elf’:
../buildtools/pmdinfogen/pmdinfogen.h:78:1:
	warning: this ‘else’ clause does not guard...
	[-Wmisleading-indentation]
   78 | else \
      | ^~~~
../buildtools/pmdinfogen/pmdinfogen.h:83:35:
	note: in expansion of macro ‘CONVERT_NATIVE’
   83 | #define TO_NATIVE(fend, width, x) CONVERT_NATIVE(fend, width, x)
      |                                   ^~~~~~~~~~~~~~
../buildtools/pmdinfogen/pmdinfogen.c:152:28:
	note: in expansion of macro ‘TO_NATIVE’
  152 |         hdr->e_type      = TO_NATIVE(endian, 16, hdr->e_type);
      |                            ^~~~~~~~~
../buildtools/pmdinfogen/pmdinfogen.h:80:9:
	note: ...this statement, but the latter is misleadingly indented
	as if it were guarded by the ‘else’
   80 |         ___x; \
      |         ^~~~

Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 buildtools/pmdinfogen/pmdinfogen.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/pmdinfogen/pmdinfogen.h b/buildtools/pmdinfogen/pmdinfogen.h
index 27bab30e5e..b398e99ab7 100644
--- a/buildtools/pmdinfogen/pmdinfogen.h
+++ b/buildtools/pmdinfogen/pmdinfogen.h
@@ -83,5 +83,5 @@ if ((fend) == ELFDATA2LSB) \
 else \
 	___x = be##width##toh(x); \
-	___x; \
+___x; \
 })
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.193232857 +0000
+++ 0050-pmdinfogen-fix-build-with-gcc-11.patch	2020-11-05 12:38:54.249896027 +0000
@@ -1 +1 @@
-From 5a75cc3c88143496030b5bed76bd031ddbe9e355 Mon Sep 17 00:00:00 2001
+From 3a822363a4f7beb5450f43e7a33fb67698eabbd4 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 5a75cc3c88143496030b5bed76bd031ddbe9e355 ]
+
@@ -35 +36,0 @@
-Cc: stable@dpdk.org
@@ -44 +45 @@
-index 93930e4543..38fd3ddcc3 100644
+index 27bab30e5e..b398e99ab7 100644
@@ -47 +48 @@
-@@ -78,5 +78,5 @@ if ((fend) == ELFDATA2LSB) \
+@@ -83,5 +83,5 @@ if ((fend) == ELFDATA2LSB) \


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (48 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'pmdinfogen: " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix getting link details' " Kevin Traynor
                   ` (16 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Alexander Kozyrev; +Cc: Viacheslav Ovsiienko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@nvidia.com>
Date: Tue, 29 Sep 2020 18:36:23 +0000
Subject: [PATCH] net/mlx5: fix Rx queue count calculation

[ upstream commit d2d57605522d4a43be17e22e649e54033f6d8835 ]

There are a few discrepancies in the Rx queue count calculation.

The wrong index is used to calculate the number of used descriptors
in an Rx queue in case of the compressed CQE processing. The global
CQ index is used while we really need an internal index in a single
compressed session to get the right number of elements processed.

The total number of CQs should be used instead of the number of mbufs
to find out about the maximum number of Rx descriptors. These numbers
are not equal for the Multi-Packet Rx queue.

Allow the Rx queue count calculation for all possible Rx bursts since
CQ handling is the same for regular, vectorized, and multi-packet Rx
queues.

Fixes: 26f04883441a ("net/mlx5: support Rx queue count API")

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 38ce0e29a2..2896a9b4ef 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -431,17 +431,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 	struct rxq_zip *zip = &rxq->zip;
 	volatile struct mlx5_cqe *cqe;
+	unsigned int cq_ci = rxq->cq_ci;
 	const unsigned int cqe_n = (1 << rxq->cqe_n);
 	const unsigned int cqe_cnt = cqe_n - 1;
-	unsigned int cq_ci;
-	unsigned int used;
+	unsigned int used = 0;
 
-	/* if we are processing a compressed cqe */
-	if (zip->ai) {
-		used = zip->cqe_cnt - zip->ca;
-		cq_ci = zip->cq_ci;
-	} else {
-		used = 0;
-		cq_ci = rxq->cq_ci;
-	}
 	cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
@@ -451,5 +443,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		op_own = cqe->op_own;
 		if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED)
-			n = rte_be_to_cpu_32(cqe->byte_cnt);
+			if (unlikely(zip->ai))
+				n = zip->cqe_cnt - zip->ai;
+			else
+				n = rte_be_to_cpu_32(cqe->byte_cnt);
 		else
 			n = 1;
@@ -458,5 +453,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	}
-	used = RTE_MIN(used, (1U << rxq->elts_n) - 1);
+	used = RTE_MIN(used, cqe_n);
 	return used;
 }
@@ -481,9 +476,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
 	struct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv);
 
-	if (dev->rx_pkt_burst != mlx5_rx_burst) {
+	if (dev->rx_pkt_burst == NULL ||
+	    dev->rx_pkt_burst == removed_rx_burst) {
 		rte_errno = ENOTSUP;
 		return -rte_errno;
 	}
-	if (offset >= (1 << rxq->elts_n)) {
+	if (offset >= (1 << rxq->cqe_n)) {
 		rte_errno = EINVAL;
 		return -rte_errno;
@@ -513,5 +509,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 	struct mlx5_rxq_data *rxq;
 
-	if (dev->rx_pkt_burst != mlx5_rx_burst) {
+	if (dev->rx_pkt_burst == NULL ||
+	    dev->rx_pkt_burst == removed_rx_burst) {
 		rte_errno = ENOTSUP;
 		return -rte_errno;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.210327070 +0000
+++ 0051-net-mlx5-fix-Rx-queue-count-calculation.patch	2020-11-05 12:38:54.251896028 +0000
@@ -1 +1 @@
-From d2d57605522d4a43be17e22e649e54033f6d8835 Mon Sep 17 00:00:00 2001
+From e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d2d57605522d4a43be17e22e649e54033f6d8835 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 0b87be15b4..2422a4d6ca 100644
+index 38ce0e29a2..2896a9b4ef 100644
@@ -34 +35 @@
-@@ -466,17 +466,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -431,17 +431,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -53,2 +54,2 @@
- 	while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) {
-@@ -486,5 +478,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+ 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
+@@ -451,5 +443,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -64 +65 @@
-@@ -493,5 +488,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -458,5 +453,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -71 +72 @@
-@@ -516,9 +511,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
+@@ -481,9 +476,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
@@ -84 +85 @@
-@@ -631,5 +627,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+@@ -513,5 +509,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/qede: fix getting link details' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (49 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' " Kevin Traynor
                   ` (15 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Rasesh Mody; +Cc: Ferruh Yigit, Igor Russkikh, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From b4fa19fc18cd83aad28df7bb973c28a4918ee694 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody@marvell.com>
Date: Fri, 2 Oct 2020 12:59:45 -0700
Subject: [PATCH] net/qede: fix getting link details

[ upstream commit effb1d0b9527815a7cd5422bce5defbc0884cea0 ]

This patch fixes get current link details, without this change the link
details can be inaccurate if proper lock is not acquired.

Fixes: 739a5b2f2b49 ("net/qede/base: use passed ptt handler")

Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: Rasesh Mody <rmody@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
 drivers/net/qede/qede_main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index 0ac4300465..c124b2532b 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -576,11 +576,10 @@ qed_get_current_link(struct ecore_dev *edev, struct qed_link_output *if_link)
 	if (IS_PF(edev)) {
 		ptt = ecore_ptt_acquire(hwfn);
-		if (!ptt)
-			DP_NOTICE(hwfn, true, "Failed to fill link; No PTT\n");
-
+		if (ptt) {
 			qed_fill_link(hwfn, ptt, if_link);
-
-		if (ptt)
 			ecore_ptt_release(hwfn, ptt);
+		} else {
+			DP_NOTICE(hwfn, true, "Failed to fill link; No PTT\n");
+		}
 	} else {
 		qed_fill_link(hwfn, NULL, if_link);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.230290183 +0000
+++ 0052-net-qede-fix-getting-link-details.patch	2020-11-05 12:38:54.251896028 +0000
@@ -1 +1 @@
-From effb1d0b9527815a7cd5422bce5defbc0884cea0 Mon Sep 17 00:00:00 2001
+From b4fa19fc18cd83aad28df7bb973c28a4918ee694 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit effb1d0b9527815a7cd5422bce5defbc0884cea0 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 0d3cea6e42..caa9d1d4f6 100644
+index 0ac4300465..c124b2532b 100644
@@ -23 +24 @@
-@@ -588,11 +588,10 @@ qed_get_current_link(struct ecore_dev *edev, struct qed_link_output *if_link)
+@@ -576,11 +576,10 @@ qed_get_current_link(struct ecore_dev *edev, struct qed_link_output *if_link)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (50 preceding siblings ...)
  2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix getting link details' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'raw/dpaa2_qdma: fix reset' " Kevin Traynor
                   ` (14 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Xiao Wang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 906e74e7c669decc8ef33f546156096cd090a4a8 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Wed, 7 Oct 2020 15:36:46 +0800
Subject: [PATCH] net/fm10k: fix memory leak when Tx thresh check fails

[ upstream commit 9e4f075bc500dafe4568edf99b9a1161b554316e ]

In fm10k_tx_queue_setup(), we allocate memory for the queue
structure but not released when Tx thresh check fails.

Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Xiao Wang <xiao.w.wang@intel.com>
---
 drivers/net/fm10k/fm10k_ethdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 4b57a96c8b..71a3ebed9a 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -2045,6 +2045,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
 	q->tail_ptr = (volatile uint32_t *)
 		&((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];
-	if (handle_txconf(q, conf))
+	if (handle_txconf(q, conf)) {
+		rte_free(q);
 		return -EINVAL;
+	}
 
 	/* allocate memory for the software ring */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.247358338 +0000
+++ 0053-net-fm10k-fix-memory-leak-when-Tx-thresh-check-fails.patch	2020-11-05 12:38:54.254896031 +0000
@@ -1 +1 @@
-From 9e4f075bc500dafe4568edf99b9a1161b554316e Mon Sep 17 00:00:00 2001
+From 906e74e7c669decc8ef33f546156096cd090a4a8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9e4f075bc500dafe4568edf99b9a1161b554316e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 3096370718..c4a6fdf7f0 100644
+index 4b57a96c8b..71a3ebed9a 100644
@@ -22 +23 @@
-@@ -2025,6 +2025,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
+@@ -2045,6 +2045,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'raw/dpaa2_qdma: fix reset' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (51 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' " Kevin Traynor
                   ` (13 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Nipun Gupta, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From c10a21e71aa381ddb59c600b2c26522866ae1728 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Wed, 9 Sep 2020 09:11:46 +0800
Subject: [PATCH] raw/dpaa2_qdma: fix reset

[ upstream commit f4eb44f81d8c47d157523f893fbab9baeb38f9c1 ]

This issue detected by coverity, CID#279443(Structurally dead code).

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

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Nipun Gupta <nipun.gupta@nxp.com>
---
 drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
index 55f32a596a..ee90ca5ad2 100644
--- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
+++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c
@@ -180,7 +180,8 @@ rte_qdma_reset(void)
 	for (i = 0; i < qdma_dev.max_vqs; i++) {
 		if (qdma_vqs[i].in_use && (qdma_vqs[i].num_enqueues !=
-		    qdma_vqs[i].num_dequeues))
+		    qdma_vqs[i].num_dequeues)) {
 			DPAA2_QDMA_ERR("Jobs are still pending on VQ: %d", i);
 			return -EBUSY;
+		}
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.265199151 +0000
+++ 0054-raw-dpaa2_qdma-fix-reset.patch	2020-11-05 12:38:54.255896031 +0000
@@ -1 +1 @@
-From f4eb44f81d8c47d157523f893fbab9baeb38f9c1 Mon Sep 17 00:00:00 2001
+From c10a21e71aa381ddb59c600b2c26522866ae1728 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f4eb44f81d8c47d157523f893fbab9baeb38f9c1 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0b9c4e3d72..4b8474951e 100644
+index 55f32a596a..ee90ca5ad2 100644
@@ -22 +23 @@
-@@ -453,7 +453,8 @@ rte_qdma_reset(void)
+@@ -180,7 +180,8 @@ rte_qdma_reset(void)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (52 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'raw/dpaa2_qdma: fix reset' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' " Kevin Traynor
                   ` (12 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: David Marchand; +Cc: Thomas Monjalon, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 1854fc6fee339fd00078fa4d591c3aefac9f7c7e Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 9 Oct 2020 09:15:54 +0200
Subject: [PATCH] eal: fix doxygen for EAL cleanup

[ upstream commit 1a11380bf45be83d66493819f3a6e8c9868869be ]

Align rte_eal_cleanup return codes description to the rest of dpdk.

Fixes: aec9c13c5257 ("eal: add function to release internal resources")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
 lib/librte_eal/common/include/rte_eal.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 595efdca50..94912a8afa 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -185,6 +185,7 @@ int rte_eal_init(int argc, char **argv);
  * just before terminating the process.
  *
- * @return 0 Successfully released all internal EAL resources
- * @return -EFAULT There was an error in releasing all resources.
+ * @return
+ *  - 0 Successfully released all internal EAL resources.
+ *  - -EFAULT There was an error in releasing all resources.
  */
 int __rte_experimental rte_eal_cleanup(void);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.317970459 +0000
+++ 0055-eal-fix-doxygen-for-EAL-cleanup.patch	2020-11-05 12:38:54.255896031 +0000
@@ -1 +1 @@
-From 1a11380bf45be83d66493819f3a6e8c9868869be Mon Sep 17 00:00:00 2001
+From 1854fc6fee339fd00078fa4d591c3aefac9f7c7e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1a11380bf45be83d66493819f3a6e8c9868869be ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14 +15 @@
- lib/librte_eal/include/rte_eal.h | 5 +++--
+ lib/librte_eal/common/include/rte_eal.h | 5 +++--
@@ -17,5 +18,5 @@
-diff --git a/lib/librte_eal/include/rte_eal.h b/lib/librte_eal/include/rte_eal.h
-index ddcf6a2e7a..e3c2ef185e 100644
---- a/lib/librte_eal/include/rte_eal.h
-+++ b/lib/librte_eal/include/rte_eal.h
-@@ -131,6 +131,7 @@ int rte_eal_init(int argc, char **argv);
+diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
+index 595efdca50..94912a8afa 100644
+--- a/lib/librte_eal/common/include/rte_eal.h
++++ b/lib/librte_eal/common/include/rte_eal.h
+@@ -185,6 +185,7 @@ int rte_eal_init(int argc, char **argv);
@@ -30 +31 @@
- int rte_eal_cleanup(void);
+ int __rte_experimental rte_eal_cleanup(void);


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (53 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' " Kevin Traynor
                   ` (11 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Luca Boccassi, David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 6a3788ef9de98a10758a80e451325b581edee5ca Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 9 Oct 2020 15:19:14 +0100
Subject: [PATCH] build: skip detecting libpcap via pcap-config

[ upstream commit cce5aecf3c3ce30724e4686bf867f146dd2fb625 ]

When compiling for a slightly different architecture, e.g. 32-bit on 64-bit
systems using CFLAGS rather than a cross-file, the pcap-config utility can
often return parameters that are unusable for the build in question, i.e.
providing the native 64-bit library paths rather than checking for 32-bit
equivalent.

Since many distros now include a version of libpcap with a
pkg-config file, and for those that don't find-library should work ok as a
fallback, we can explicitly just use pkg-config in the dependency search,
causing meson to skip trying to use pcap-config.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Luca Boccassi <bluca@debian.org>
Tested-by: David Marchand <david.marchand@redhat.com>
---
 config/meson.build | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index 3b7fad67d7..28a87c5394 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -91,9 +91,7 @@ endif
 
 # check for pcap
-pcap_dep = dependency('pcap', required: false)
-if pcap_dep.found()
-	# pcap got a pkg-config file only in 1.9.0 and before that meson uses
-	# an internal pcap-config finder, which is not compatible with
-	# cross-compilation, so try to fallback to find_library
+pcap_dep = dependency('libpcap', required: false, method: 'pkg-config')
+if not pcap_dep.found()
+	# pcap got a pkg-config file only in 1.9.0
 	pcap_dep = cc.find_library('pcap', required: false)
 endif
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.396171679 +0000
+++ 0056-build-skip-detecting-libpcap-via-pcap-config.patch	2020-11-05 12:38:54.255896031 +0000
@@ -1 +1 @@
-From cce5aecf3c3ce30724e4686bf867f146dd2fb625 Mon Sep 17 00:00:00 2001
+From 6a3788ef9de98a10758a80e451325b581edee5ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cce5aecf3c3ce30724e4686bf867f146dd2fb625 ]
+
@@ -17,2 +18,0 @@
-Cc: stable@dpdk.org
-
@@ -27 +27 @@
-index 69f2aeb605..9fb903c9ba 100644
+index 3b7fad67d7..28a87c5394 100644
@@ -30 +30 @@
-@@ -164,9 +164,7 @@ endif
+@@ -91,9 +91,7 @@ endif


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (54 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' " Kevin Traynor
                   ` (10 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Sachin Saxena; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From cbc5a413261c200a190a66763e446ff936647c6b Mon Sep 17 00:00:00 2001
From: Sachin Saxena <sachin.saxena@oss.nxp.com>
Date: Thu, 8 Oct 2020 08:43:57 +0530
Subject: [PATCH] doc: fix diagram in dpaa2 guide

[ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ]

The diagram to show dpaa2 drivers brief
was missing in dpaa2.html file.

fix a typo in encoding for a literal block
to make it visible in generated doc file.

Fixes: 846a8305f277 ("doc: add DPAA2 NIC details")

Signed-off-by: Sachin Saxena <sachin.saxena@oss.nxp.com>
---
 doc/guides/nics/dpaa2.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
index 04370e4cd5..78a8ae589b 100644
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -1,4 +1,4 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright 2016 NXP
+    Copyright 2016,2020 NXP
 
 
@@ -301,5 +301,5 @@ scenario and the objects bound to each driver.  A brief description
 of each driver follows.
 
-.. code-block: console
+.. code-block:: console
 
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.458371149 +0000
+++ 0057-doc-fix-diagram-in-dpaa2-guide.patch	2020-11-05 12:38:54.256896032 +0000
@@ -1 +1 @@
-From 1736219b3c5737c943620c22121b361e35b18d0d Mon Sep 17 00:00:00 2001
+From cbc5a413261c200a190a66763e446ff936647c6b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index d656b7f7a5..ca6ba5b5e2 100644
+index 04370e4cd5..78a8ae589b 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (55 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/virtio: check raw checksum failure' " Kevin Traynor
                   ` (9 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Chas Williams; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From b3aabfa59d6e71962b72892e7e704f661d7d01e3 Mon Sep 17 00:00:00 2001
From: Chas Williams <3chas3@gmail.com>
Date: Thu, 1 Oct 2020 06:22:44 -0400
Subject: [PATCH] net: check segment pointer in raw checksum processing

[ upstream commit d98b0fc1af6c3c752304f3910da1d97a57ddd53b ]

If the overall pkt_len and segment lengths are out of agreement,
it is possible for the seg to be NULL after the loop. Add assert
to check this condition in debug builds. Otherwise, return failure.

Fixes: c442fed81bb9 ("net: add function to calculate checksum in mbuf")

Signed-off-by: Chas Williams <3chas3@gmail.com>
---
 lib/librte_net/rte_ip.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index a589a702af..0370b4be60 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -218,4 +218,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,
 		off -= seglen;
 	}
+	RTE_ASSERT(seg != NULL);
+	if (seg == NULL)
+		return -1;
 	seglen -= off;
 	buf = rte_pktmbuf_mtod_offset(seg, const char *, off);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.510488177 +0000
+++ 0058-net-check-segment-pointer-in-raw-checksum-processing.patch	2020-11-05 12:38:54.257896033 +0000
@@ -1 +1 @@
-From d98b0fc1af6c3c752304f3910da1d97a57ddd53b Mon Sep 17 00:00:00 2001
+From b3aabfa59d6e71962b72892e7e704f661d7d01e3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d98b0fc1af6c3c752304f3910da1d97a57ddd53b ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index bb55ebb6fa..8382d0fac7 100644
+index a589a702af..0370b4be60 100644
@@ -22 +23 @@
-@@ -226,4 +226,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,
+@@ -218,4 +218,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/virtio: check raw checksum failure' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (56 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'mem: fix allocation failure on non-NUMA kernel' " Kevin Traynor
                   ` (8 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Chas Williams; +Cc: Maxime Coquelin, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 2f9caa3cdcfc8d4e9465429e92befb6753ef2e1e Mon Sep 17 00:00:00 2001
From: Chas Williams <3chas3@gmail.com>
Date: Thu, 1 Oct 2020 06:22:45 -0400
Subject: [PATCH] net/virtio: check raw checksum failure

[ upstream commit dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 ]

rte_raw_cksum_mbuf can fail, so we should check to see if it
has. If so, return with an error.

Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")

Signed-off-by: Chas Williams <3chas3@gmail.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_rxtx.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 8ce5c33940..ccf03fc774 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -844,7 +844,8 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)
 			uint16_t csum = 0, off;
 
-			rte_raw_cksum_mbuf(m, hdr->csum_start,
+			if (rte_raw_cksum_mbuf(m, hdr->csum_start,
 				rte_pktmbuf_pkt_len(m) - hdr->csum_start,
-				&csum);
+				&csum) < 0)
+				return -EINVAL;
 			if (likely(csum != 0xffff))
 				csum = ~csum;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.563353252 +0000
+++ 0059-net-virtio-check-raw-checksum-failure.patch	2020-11-05 12:38:54.258896034 +0000
@@ -1 +1 @@
-From dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 Mon Sep 17 00:00:00 2001
+From 2f9caa3cdcfc8d4e9465429e92befb6753ef2e1e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15,3 +16,2 @@
- drivers/net/virtio/virtio_rxtx.c            | 5 +++--
- drivers/net/virtio/virtio_rxtx_packed_avx.c | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
+ drivers/net/virtio/virtio_rxtx.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
@@ -20 +20 @@
-index 88c03bf40e..77934e8c58 100644
+index 8ce5c33940..ccf03fc774 100644
@@ -23 +23 @@
-@@ -911,7 +911,8 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)
+@@ -844,7 +844,8 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)
@@ -32,15 +31,0 @@
- 			if (likely(csum != 0xffff))
- 				csum = ~csum;
-diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.c b/drivers/net/virtio/virtio_rxtx_packed_avx.c
-index ce035b5747..9bc62719ee 100644
---- a/drivers/net/virtio/virtio_rxtx_packed_avx.c
-+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.c
-@@ -337,7 +337,8 @@ virtio_vec_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)
- 			uint16_t csum = 0, off;
- 
--			rte_raw_cksum_mbuf(m, hdr->csum_start,
-+			if (rte_raw_cksum_mbuf(m, hdr->csum_start,
- 				rte_pktmbuf_pkt_len(m) - hdr->csum_start,
--				&csum);
-+				&csum) < 0)
-+				return -1;


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'mem: fix allocation failure on non-NUMA kernel' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (57 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/virtio: check raw checksum failure' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix missing classify methods in ACL guide' " Kevin Traynor
                   ` (7 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Nick Connolly; +Cc: Nicolas Dichtel, Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 22e149b2dd88359e1543ae1581d13cabe4e47889 Mon Sep 17 00:00:00 2001
From: Nick Connolly <nick.connolly@mayadata.io>
Date: Mon, 12 Oct 2020 20:28:03 +0100
Subject: [PATCH] mem: fix allocation failure on non-NUMA kernel

[ upstream commit 9d42642e866ea100b190ad8de4c8b27d1b310a13 ]

Running dpdk-helloworld on Linux with lib numa present, but no kernel
support for NUMA (CONFIG_NUMA=n) causes rte_service_init() to fail with
EAL: error allocating rte services array.

alloc_seg() calls get_mempolicy to verify that the allocation
has happened on the correct socket, but receives ENOSYS from
the kernel and fails the allocation.

The allocated socket should only be verified if check_numa() is true.

Fixes: 2a96c88be83e ("mem: ease init in a docker container")

Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
Reviewed-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memalloc.c | 30 ++++++++++++++--------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index dea2b5ec93..1a86dfdfb9 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -747,15 +747,23 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
 
 #ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES
-	ret = get_mempolicy(&cur_socket_id, NULL, 0, addr,
-			    MPOL_F_NODE | MPOL_F_ADDR);
-	if (ret < 0) {
-		RTE_LOG(DEBUG, EAL, "%s(): get_mempolicy: %s\n",
-			__func__, strerror(errno));
-		goto mapped;
-	} else if (cur_socket_id != socket_id) {
-		RTE_LOG(DEBUG, EAL,
-				"%s(): allocation happened on wrong socket (wanted %d, got %d)\n",
-			__func__, socket_id, cur_socket_id);
-		goto mapped;
+	/*
+	 * If the kernel has been built without NUMA support, get_mempolicy()
+	 * will return an error. If check_numa() returns false, memory
+	 * allocation is not NUMA aware and the socket_id should not be
+	 * checked.
+	 */
+	if (check_numa()) {
+		ret = get_mempolicy(&cur_socket_id, NULL, 0, addr,
+					MPOL_F_NODE | MPOL_F_ADDR);
+		if (ret < 0) {
+			RTE_LOG(DEBUG, EAL, "%s(): get_mempolicy: %s\n",
+				__func__, strerror(errno));
+			goto mapped;
+		} else if (cur_socket_id != socket_id) {
+			RTE_LOG(DEBUG, EAL,
+					"%s(): allocation happened on wrong socket (wanted %d, got %d)\n",
+				__func__, socket_id, cur_socket_id);
+			goto mapped;
+		}
 	}
 #else
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.614507939 +0000
+++ 0060-mem-fix-allocation-failure-on-non-NUMA-kernel.patch	2020-11-05 12:38:54.259896034 +0000
@@ -1 +1 @@
-From 9d42642e866ea100b190ad8de4c8b27d1b310a13 Mon Sep 17 00:00:00 2001
+From 22e149b2dd88359e1543ae1581d13cabe4e47889 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9d42642e866ea100b190ad8de4c8b27d1b310a13 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
- lib/librte_eal/linux/eal_memalloc.c | 30 ++++++++++++++++++-----------
+ lib/librte_eal/linuxapp/eal/eal_memalloc.c | 30 ++++++++++++++--------
@@ -26,5 +27,5 @@
-diff --git a/lib/librte_eal/linux/eal_memalloc.c b/lib/librte_eal/linux/eal_memalloc.c
-index 40a5c4aa1d..6dc1b2baec 100644
---- a/lib/librte_eal/linux/eal_memalloc.c
-+++ b/lib/librte_eal/linux/eal_memalloc.c
-@@ -626,15 +626,23 @@ 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 dea2b5ec93..1a86dfdfb9 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+@@ -747,15 +747,23 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'doc: fix missing classify methods in ACL guide' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (58 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'mem: fix allocation failure on non-NUMA kernel' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'table: fix hash for 32-bit' " Kevin Traynor
                   ` (6 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Konstantin Ananyev; +Cc: David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 8747a53fb94bb303650bbb7b33a6927e7e7740df Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Tue, 6 Oct 2020 16:03:04 +0100
Subject: [PATCH] doc: fix missing classify methods in ACL guide

[ upstream commit 28377e37ecdbdcd99218e33c53d3a06cc87726c9 ]

Add brief description for missing ACL classify algorithms:
RTE_ACL_CLASSIFY_NEON and RTE_ACL_CLASSIFY_ALTIVEC.

Fixes: 34fa6c27c156 ("acl: add NEON optimization for ARMv8")
Fixes: 1d73135f9f1c ("acl: add AltiVec for ppc64")

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 doc/guides/prog_guide/packet_classif_access_ctrl.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/guides/prog_guide/packet_classif_access_ctrl.rst b/doc/guides/prog_guide/packet_classif_access_ctrl.rst
index 9e08a8e3f5..57e3c6fddb 100644
--- a/doc/guides/prog_guide/packet_classif_access_ctrl.rst
+++ b/doc/guides/prog_guide/packet_classif_access_ctrl.rst
@@ -374,4 +374,10 @@ There are several implementations of classify algorithm:
 *   **RTE_ACL_CLASSIFY_AVX2**: vector implementation, can process up to 16 flows in parallel. Requires AVX2 support.
 
+*   **RTE_ACL_CLASSIFY_NEON**: vector implementation, can process up to 8 flows
+    in parallel. Requires NEON support.
+
+*   **RTE_ACL_CLASSIFY_ALTIVEC**: vector implementation, can process up to 8
+    flows in parallel. Requires ALTIVEC support.
+
 It is purely a runtime decision which method to choose, there is no build-time difference.
 All implementations operates over the same internal RT structures and use similar principles. The main difference is that vector implementations can manually exploit IA SIMD instructions and process several input data flows in parallel.
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.643481624 +0000
+++ 0061-doc-fix-missing-classify-methods-in-ACL-guide.patch	2020-11-05 12:38:54.259896034 +0000
@@ -1 +1 @@
-From 28377e37ecdbdcd99218e33c53d3a06cc87726c9 Mon Sep 17 00:00:00 2001
+From 8747a53fb94bb303650bbb7b33a6927e7e7740df Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28377e37ecdbdcd99218e33c53d3a06cc87726c9 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 0345512b9e..daf03e6d7a 100644
+index 9e08a8e3f5..57e3c6fddb 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'table: fix hash for 32-bit' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (59 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix missing classify methods in ACL guide' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix device number' " Kevin Traynor
                   ` (5 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Ting Xu; +Cc: Cristian Dumitrescu, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 1cf178210b226de4415713f9eb60a1626604c5a4 Mon Sep 17 00:00:00 2001
From: Ting Xu <ting.xu@intel.com>
Date: Wed, 22 Jul 2020 10:16:28 +0800
Subject: [PATCH] table: fix hash for 32-bit

[ upstream commit 99541c3028d741a09fe5dca95e79d8d020130173 ]

When create softnic hash table with 16 keys, it failed on 32-bit
environment, because the pointer field in structure rte_bucket_4_16
is only 32 bits. Add a padding field in 32-bit environment to keep
the structure to a multiple of 64 bytes. Apply this to 8-byte and
32-byte key hash function as well.

Fixes: 8aa327214c ("table: hash")

Signed-off-by: Ting Xu <ting.xu@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 lib/librte_table/rte_table_hash_key16.c | 17 +++++++++++++++++
 lib/librte_table/rte_table_hash_key32.c | 17 +++++++++++++++++
 lib/librte_table/rte_table_hash_key8.c  | 16 ++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c
index 2cca1c924a..c4384b114d 100644
--- a/lib/librte_table/rte_table_hash_key16.c
+++ b/lib/librte_table/rte_table_hash_key16.c
@@ -34,4 +34,5 @@
 #endif
 
+#ifdef RTE_ARCH_64
 struct rte_bucket_4_16 {
 	/* Cache line 0 */
@@ -47,4 +48,20 @@ struct rte_bucket_4_16 {
 	uint8_t data[0];
 };
+#else
+struct rte_bucket_4_16 {
+	/* Cache line 0 */
+	uint64_t signature[4 + 1];
+	uint64_t lru_list;
+	struct rte_bucket_4_16 *next;
+	uint32_t pad;
+	uint64_t next_valid;
+
+	/* Cache line 1 */
+	uint64_t key[4][2];
+
+	/* Cache line 2 */
+	uint8_t data[0];
+};
+#endif
 
 struct rte_table_hash {
diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/librte_table/rte_table_hash_key32.c
index a137c50284..3e0031fe1e 100644
--- a/lib/librte_table/rte_table_hash_key32.c
+++ b/lib/librte_table/rte_table_hash_key32.c
@@ -34,4 +34,5 @@
 #endif
 
+#ifdef RTE_ARCH_64
 struct rte_bucket_4_32 {
 	/* Cache line 0 */
@@ -47,4 +48,20 @@ struct rte_bucket_4_32 {
 	uint8_t data[0];
 };
+#else
+struct rte_bucket_4_32 {
+	/* Cache line 0 */
+	uint64_t signature[4 + 1];
+	uint64_t lru_list;
+	struct rte_bucket_4_32 *next;
+	uint32_t pad;
+	uint64_t next_valid;
+
+	/* Cache lines 1 and 2 */
+	uint64_t key[4][4];
+
+	/* Cache line 3 */
+	uint8_t data[0];
+};
+#endif
 
 struct rte_table_hash {
diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c
index 1811ad8d05..34e3ed1af9 100644
--- a/lib/librte_table/rte_table_hash_key8.c
+++ b/lib/librte_table/rte_table_hash_key8.c
@@ -32,4 +32,5 @@
 #endif
 
+#ifdef RTE_ARCH_64
 struct rte_bucket_4_8 {
 	/* Cache line 0 */
@@ -44,4 +45,19 @@ struct rte_bucket_4_8 {
 	uint8_t data[0];
 };
+#else
+struct rte_bucket_4_8 {
+	/* Cache line 0 */
+	uint64_t signature;
+	uint64_t lru_list;
+	struct rte_bucket_4_8 *next;
+	uint32_t pad;
+	uint64_t next_valid;
+
+	uint64_t key[4];
+
+	/* Cache line 1 */
+	uint8_t data[0];
+};
+#endif
 
 struct rte_table_hash {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.670762856 +0000
+++ 0062-table-fix-hash-for-32-bit.patch	2020-11-05 12:38:54.261896036 +0000
@@ -1 +1 @@
-From 99541c3028d741a09fe5dca95e79d8d020130173 Mon Sep 17 00:00:00 2001
+From 1cf178210b226de4415713f9eb60a1626604c5a4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 99541c3028d741a09fe5dca95e79d8d020130173 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'test/crypto: fix device number' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (60 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'table: fix hash for 32-bit' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix stats test' " Kevin Traynor
                   ` (4 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Ankur Dwivedi; +Cc: Fan Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 067c9dc1c177df625547465e619eaa4472f40a7a Mon Sep 17 00:00:00 2001
From: Ankur Dwivedi <adwivedi@marvell.com>
Date: Thu, 30 Jul 2020 16:50:17 +0530
Subject: [PATCH] test/crypto: fix device number

[ upstream commit ff56727b4fae5841ec0c214223e71e78511b5687 ]

In testsuite_setup(), ts_params is configured for first valid device.
The same device should be used as valid device in
test_device_configure_invalid_dev_id test case.

Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
---
 test/test/test_cryptodev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index e13c454a43..210507eb8a 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -598,5 +598,5 @@ test_device_configure_invalid_dev_id(void)
 
 	/* valid dev_id values */
-	dev_id = ts_params->valid_devs[ts_params->valid_dev_count - 1];
+	dev_id = ts_params->valid_devs[0];
 
 	/* Stop the device in case it's started so it can be configured */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.699547467 +0000
+++ 0063-test-crypto-fix-device-number.patch	2020-11-05 12:38:54.268896041 +0000
@@ -1 +1 @@
-From ff56727b4fae5841ec0c214223e71e78511b5687 Mon Sep 17 00:00:00 2001
+From 067c9dc1c177df625547465e619eaa4472f40a7a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff56727b4fae5841ec0c214223e71e78511b5687 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- app/test/test_cryptodev.c | 2 +-
+ test/test/test_cryptodev.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
-index 153d001194..162c21dd88 100644
---- a/app/test/test_cryptodev.c
-+++ b/app/test/test_cryptodev.c
-@@ -756,5 +756,5 @@ test_device_configure_invalid_dev_id(void)
+diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
+index e13c454a43..210507eb8a 100644
+--- a/test/test/test_cryptodev.c
++++ b/test/test/test_cryptodev.c
+@@ -598,5 +598,5 @@ test_device_configure_invalid_dev_id(void)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'test/crypto: fix stats test' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (61 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix device number' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'cryptodev: fix parameter parsing' " Kevin Traynor
                   ` (3 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Ruifeng Wang; +Cc: Adam Dybkowski, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 52d2001b4edc3c92018349718f961a0c6168bcb4 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang@arm.com>
Date: Mon, 31 Aug 2020 16:51:43 +0800
Subject: [PATCH] test/crypto: fix stats test

[ upstream commit b450503612eebc59de96aa3f20ec5ea0e3ceb400 ]

ut_setup / ut_teardown are invoked for each test case by test framework.
The call inside test_stats is unnecessary and even incorrect.
This caused double free of objects such as crypto operation structure.
Trapped the issue when RTE_LIBRTE_MEMPOOL_DEBUG was enabled.
Fix issue by removing ut_setup / ut_teardown from test case implementation.

Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")

Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Tested-by: Adam Dybkowski <adamx.dybkowski@intel.com>
---
 test/test/test_cryptodev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 210507eb8a..021fc099b3 100644
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -6509,7 +6509,5 @@ test_stats(void)
 
 	/* Test expected values */
-	ut_setup();
 	test_AES_CBC_HMAC_SHA1_encrypt_digest();
-	ut_teardown();
 	TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
 			&stats),
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.737527335 +0000
+++ 0064-test-crypto-fix-stats-test.patch	2020-11-05 12:38:54.275896047 +0000
@@ -1 +1 @@
-From b450503612eebc59de96aa3f20ec5ea0e3ceb400 Mon Sep 17 00:00:00 2001
+From 52d2001b4edc3c92018349718f961a0c6168bcb4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b450503612eebc59de96aa3f20ec5ea0e3ceb400 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- app/test/test_cryptodev.c | 2 --
+ test/test/test_cryptodev.c | 2 --
@@ -21,5 +22,5 @@
-diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
-index 704aa7c414..d702cb91a3 100644
---- a/app/test/test_cryptodev.c
-+++ b/app/test/test_cryptodev.c
-@@ -9327,7 +9327,5 @@ test_stats(void)
+diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
+index 210507eb8a..021fc099b3 100644
+--- a/test/test/test_cryptodev.c
++++ b/test/test/test_cryptodev.c
+@@ -6509,7 +6509,5 @@ test_stats(void)


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'cryptodev: fix parameter parsing' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (62 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix stats test' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' " Kevin Traynor
                   ` (2 subsequent siblings)
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Haggai Eran; +Cc: Akhil Goyal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From e9e725d903f2ac1759223d472849a44765d0f0ca Mon Sep 17 00:00:00 2001
From: Haggai Eran <haggaie@nvidia.com>
Date: Thu, 8 Oct 2020 22:42:14 +0300
Subject: [PATCH] cryptodev: fix parameter parsing

[ upstream commit 784fb396f72d98070f3afaf309a7addb4c0d8da1 ]

The rte_cryptodev_pmd_parse_input_args function crashes with a
segmentation fault when passing a non-empty argument string.

The function passes cryptodev_pmd_valid_params to rte_kvargs_parse,
which accepts a NULL-terminated list of valid keys, yet
cryptodev_pmd_valid_params does not end with NULL. The patch adds the
missing NULL pointer.

Fixes: 9e6edea41805 ("cryptodev: add APIs to assist PMD initialisation")

Signed-off-by: Haggai Eran <haggaie@nvidia.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 lib/librte_cryptodev/rte_cryptodev_pmd.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h
index 5297912265..0fa11582d8 100644
--- a/lib/librte_cryptodev/rte_cryptodev_pmd.h
+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h
@@ -42,5 +42,6 @@ static const char * const cryptodev_pmd_valid_params[] = {
 	RTE_CRYPTODEV_PMD_NAME_ARG,
 	RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG,
-	RTE_CRYPTODEV_PMD_SOCKET_ID_ARG
+	RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+	NULL
 };
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.774862437 +0000
+++ 0065-cryptodev-fix-parameter-parsing.patch	2020-11-05 12:38:54.275896047 +0000
@@ -1 +1 @@
-From 784fb396f72d98070f3afaf309a7addb4c0d8da1 Mon Sep 17 00:00:00 2001
+From e9e725d903f2ac1759223d472849a44765d0f0ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 784fb396f72d98070f3afaf309a7addb4c0d8da1 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 81975d72b4..1367222f73 100644
+index 5297912265..0fa11582d8 100644


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (63 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'cryptodev: fix parameter parsing' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' " Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix iterator for RSS LUT' " Kevin Traynor
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Hemant Agrawal; +Cc: Akhil Goyal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 303642f06bdd3643a12bd0ffea0c70be21be9c53 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal@nxp.com>
Date: Thu, 3 Sep 2020 22:47:44 +0530
Subject: [PATCH] crypto/dpaa2_sec: fix stats query without queue pair

[ upstream commit 356bcac8f11ef916f47be74b295c36755d8165cf ]

dpdk-procinfo calls the crypto stats API, which results segmentation
fault on DPAA2_SEC.
The queue pair array will be NULL, when it is used without
configuring the SEC device.

Fixes: 02f35eee264b ("crypto/dpaa2_sec: support statistics")

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-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 db8a6b0ee3..0db5b4e6d9 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -3067,5 +3067,5 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,
 	}
 	for (i = 0; i < dev->data->nb_queue_pairs; i++) {
-		if (qp[i] == NULL) {
+		if (qp == NULL || qp[i] == NULL) {
 			DPAA2_SEC_DEBUG("Uninitialised queue pair");
 			continue;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.801917573 +0000
+++ 0066-crypto-dpaa2_sec-fix-stats-query-without-queue-pair.patch	2020-11-05 12:38:54.278896049 +0000
@@ -1 +1 @@
-From 356bcac8f11ef916f47be74b295c36755d8165cf Mon Sep 17 00:00:00 2001
+From 303642f06bdd3643a12bd0ffea0c70be21be9c53 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 356bcac8f11ef916f47be74b295c36755d8165cf ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 109e61ae16..f480aafd01 100644
+index db8a6b0ee3..0db5b4e6d9 100644
@@ -24 +25 @@
-@@ -3502,5 +3502,5 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,
+@@ -3067,5 +3067,5 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (64 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix iterator for RSS LUT' " Kevin Traynor
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Steve Yang; +Cc: Beilei Xing, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From aa377726851d1cbef236e78c951406ee844ea28d Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang@intel.com>
Date: Wed, 4 Nov 2020 17:49:58 +0000
Subject: [PATCH] net/avf: fix scattered Rx enabling

[ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ]

No need to add additional vlan tag size for max packet size,
the queue's Rx Max Frame Size (rxq->max_pkt_len) already
includes the vlan header size in iavf.

Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")

Signed-off-by: Steve Yang <stevex.yang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/avf/avf_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
index 5dc543e16b..d1cfdeb357 100644
--- a/drivers/net/avf/avf_ethdev.c
+++ b/drivers/net/avf/avf_ethdev.c
@@ -254,5 +254,5 @@ avf_init_rxq(struct rte_eth_dev *dev, struct avf_rx_queue *rxq)
 	rxq->max_pkt_len = max_pkt_len;
 	if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||
-	    (rxq->max_pkt_len + 2 * AVF_VLAN_TAG_SIZE) > buf_size) {
+	    rxq->max_pkt_len > buf_size) {
 		dev_data->scattered_rx = 1;
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.832369646 +0000
+++ 0067-net-avf-fix-scattered-Rx-enabling.patch	2020-11-05 12:38:54.279896050 +0000
@@ -1 +1 @@
-From 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d Mon Sep 17 00:00:00 2001
+From aa377726851d1cbef236e78c951406ee844ea28d Mon Sep 17 00:00:00 2001
@@ -3,2 +3,4 @@
-Date: Fri, 4 Sep 2020 07:29:02 +0000
-Subject: [PATCH] net/iavf: fix scattered Rx enabling
+Date: Wed, 4 Nov 2020 17:49:58 +0000
+Subject: [PATCH] net/avf: fix scattered Rx enabling
+
+[ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ]
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- drivers/net/iavf/iavf_ethdev.c | 2 +-
+ drivers/net/avf/avf_ethdev.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
-index 28ca3fa8f7..ec4b1a1487 100644
---- a/drivers/net/iavf/iavf_ethdev.c
-+++ b/drivers/net/iavf/iavf_ethdev.c
-@@ -287,5 +287,5 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
+diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
+index 5dc543e16b..d1cfdeb357 100644
+--- a/drivers/net/avf/avf_ethdev.c
++++ b/drivers/net/avf/avf_ethdev.c
+@@ -254,5 +254,5 @@ avf_init_rxq(struct rte_eth_dev *dev, struct avf_rx_queue *rxq)
@@ -26 +27 @@
--	    (rxq->max_pkt_len + 2 * IAVF_VLAN_TAG_SIZE) > buf_size) {
+-	    (rxq->max_pkt_len + 2 * AVF_VLAN_TAG_SIZE) > buf_size) {


^ permalink raw reply	[flat|nested] 72+ messages in thread

* [dpdk-stable] patch 'net/avf: fix iterator for RSS LUT' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (65 preceding siblings ...)
  2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' " Kevin Traynor
@ 2020-11-05 12:40 ` Kevin Traynor
  66 siblings, 0 replies; 72+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:40 UTC (permalink / raw)
  To: Qi Zhang; +Cc: Ting Xu, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

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

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

Thanks.

Kevin.

---
From 53047d6b31473fb55b6f55827424744a5c1dd8dd Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Wed, 4 Nov 2020 17:53:29 +0000
Subject: [PATCH] net/avf: fix iterator for RSS LUT

[ upstream commit 6faf884136f302b3bf0d2f984090b6c3816c7062 ]

Change RSS LUT iterator from uint8_t to uint16_t since the
RSS LUT size could exceed 255.

Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Ting Xu <ting.xu@intel.com>
---
 drivers/net/avf/avf_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
index d1cfdeb357..1a1d10e79f 100644
--- a/drivers/net/avf/avf_ethdev.c
+++ b/drivers/net/avf/avf_ethdev.c
@@ -126,5 +126,5 @@ avf_init_rss(struct avf_adapter *adapter)
 	struct avf_info *vf =  AVF_DEV_PRIVATE_TO_VF(adapter);
 	struct rte_eth_rss_conf *rss_conf;
-	uint8_t i, j, nb_q;
+	uint16_t i, j, nb_q;
 	int ret;
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.859480559 +0000
+++ 0068-net-avf-fix-iterator-for-RSS-LUT.patch	2020-11-05 12:38:54.280896051 +0000
@@ -1 +1 @@
-From 6faf884136f302b3bf0d2f984090b6c3816c7062 Mon Sep 17 00:00:00 2001
+From 53047d6b31473fb55b6f55827424744a5c1dd8dd Mon Sep 17 00:00:00 2001
@@ -3,2 +3,4 @@
-Date: Mon, 21 Sep 2020 16:30:58 +0800
-Subject: [PATCH] net/iavf: fix iterator for RSS LUT
+Date: Wed, 4 Nov 2020 17:53:29 +0000
+Subject: [PATCH] net/avf: fix iterator for RSS LUT
+
+[ upstream commit 6faf884136f302b3bf0d2f984090b6c3816c7062 ]
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- drivers/net/iavf/iavf_ethdev.c | 2 +-
+ drivers/net/avf/avf_ethdev.c | 2 +-
@@ -18,6 +19,6 @@
-diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
-index 6bb915d816..440da7d76a 100644
---- a/drivers/net/iavf/iavf_ethdev.c
-+++ b/drivers/net/iavf/iavf_ethdev.c
-@@ -158,5 +158,5 @@ iavf_init_rss(struct iavf_adapter *adapter)
- 	struct iavf_info *vf =  IAVF_DEV_PRIVATE_TO_VF(adapter);
+diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
+index d1cfdeb357..1a1d10e79f 100644
+--- a/drivers/net/avf/avf_ethdev.c
++++ b/drivers/net/avf/avf_ethdev.c
+@@ -126,5 +126,5 @@ avf_init_rss(struct avf_adapter *adapter)
+ 	struct avf_info *vf =  AVF_DEV_PRIVATE_TO_VF(adapter);


^ permalink raw reply	[flat|nested] 72+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to LTS release 18.11.11
  2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' " Kevin Traynor
@ 2020-11-05 13:22   ` David Marchand
  2020-11-11 10:44     ` Kevin Traynor
  0 siblings, 1 reply; 72+ messages in thread
From: David Marchand @ 2020-11-05 13:22 UTC (permalink / raw)
  To: Kevin Traynor, Bruce Richardson; +Cc: Wei Ling, Ferruh Yigit, dpdk stable

On Thu, Nov 5, 2020 at 1:41 PM Kevin Traynor <ktraynor@redhat.com> wrote:
> From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001
> From: Bruce Richardson <bruce.richardson@intel.com>
> Date: Wed, 2 Sep 2020 17:24:27 +0100
> Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build
>
> [ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]
>
> The bitrate library in DPDK is actually in a "bitratestats" directory,
> so that is used by meson for the macro and library name.
> Therefore, we need to update references to RTE_LIBRTE_BITRATE to
> RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than
> supporting both defines, since make is being removed, we can just
> replace all instances of the former define with the latter.
>
> To ensure testpmd links ok when this is done, we also need to add
> bitratestats to the list of library dependencies.

This backport will fix meson builds, but it will drop bitratestats
support in testpmd built with make.


-- 
David Marchand


^ permalink raw reply	[flat|nested] 72+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to LTS release 18.11.11
  2020-11-05 13:22   ` David Marchand
@ 2020-11-11 10:44     ` Kevin Traynor
  2020-11-11 10:50       ` Kevin Traynor
  0 siblings, 1 reply; 72+ messages in thread
From: Kevin Traynor @ 2020-11-11 10:44 UTC (permalink / raw)
  To: David Marchand, Bruce Richardson; +Cc: Wei Ling, Ferruh Yigit, dpdk stable

On 05/11/2020 13:22, David Marchand wrote:
> On Thu, Nov 5, 2020 at 1:41 PM Kevin Traynor <ktraynor@redhat.com> wrote:
>> From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001
>> From: Bruce Richardson <bruce.richardson@intel.com>
>> Date: Wed, 2 Sep 2020 17:24:27 +0100
>> Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build
>>
>> [ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]
>>
>> The bitrate library in DPDK is actually in a "bitratestats" directory,
>> so that is used by meson for the macro and library name.
>> Therefore, we need to update references to RTE_LIBRTE_BITRATE to
>> RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than
>> supporting both defines, since make is being removed, we can just
>> replace all instances of the former define with the latter.
>>
>> To ensure testpmd links ok when this is done, we also need to add
>> bitratestats to the list of library dependencies.
> 
> This backport will fix meson builds, but it will drop bitratestats
> support in testpmd built with make.
> 
> 

Thanks David. That would be a user visible regression, so we can't do
that. I will drop the patch for now and we can discuss after 20.11 when
everyone is less busy.


^ permalink raw reply	[flat|nested] 72+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to LTS release 18.11.11
  2020-11-11 10:44     ` Kevin Traynor
@ 2020-11-11 10:50       ` Kevin Traynor
  2020-11-11 11:51         ` Luca Boccassi
  0 siblings, 1 reply; 72+ messages in thread
From: Kevin Traynor @ 2020-11-11 10:50 UTC (permalink / raw)
  To: David Marchand, Luca Boccassi, Bruce Richardson
  Cc: Wei Ling, Ferruh Yigit, dpdk stable

On 11/11/2020 10:44, Kevin Traynor wrote:
> On 05/11/2020 13:22, David Marchand wrote:
>> On Thu, Nov 5, 2020 at 1:41 PM Kevin Traynor <ktraynor@redhat.com> wrote:
>>> From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001
>>> From: Bruce Richardson <bruce.richardson@intel.com>
>>> Date: Wed, 2 Sep 2020 17:24:27 +0100
>>> Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build
>>>
>>> [ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]
>>>
>>> The bitrate library in DPDK is actually in a "bitratestats" directory,
>>> so that is used by meson for the macro and library name.
>>> Therefore, we need to update references to RTE_LIBRTE_BITRATE to
>>> RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than
>>> supporting both defines, since make is being removed, we can just
>>> replace all instances of the former define with the latter.
>>>
>>> To ensure testpmd links ok when this is done, we also need to add
>>> bitratestats to the list of library dependencies.
>>
>> This backport will fix meson builds, but it will drop bitratestats
>> support in testpmd built with make.
>>
>>
> 
> Thanks David. That would be a user visible regression, so we can't do
> that. I will drop the patch for now and we can discuss after 20.11 when
> everyone is less busy.
> 

+Luca, fyi, this patch is in 19.11 tree.


^ permalink raw reply	[flat|nested] 72+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to LTS release 18.11.11
  2020-11-11 10:50       ` Kevin Traynor
@ 2020-11-11 11:51         ` Luca Boccassi
  0 siblings, 0 replies; 72+ messages in thread
From: Luca Boccassi @ 2020-11-11 11:51 UTC (permalink / raw)
  To: Kevin Traynor, David Marchand, Bruce Richardson
  Cc: Wei Ling, Ferruh Yigit, dpdk stable

On Wed, 2020-11-11 at 10:50 +0000, Kevin Traynor wrote:
> On 11/11/2020 10:44, Kevin Traynor wrote:
> > On 05/11/2020 13:22, David Marchand wrote:
> > > On Thu, Nov 5, 2020 at 1:41 PM Kevin Traynor <ktraynor@redhat.com> wrote:
> > > > From 1bde6247b23c54adb47fa48a5373270ca05a32b4 Mon Sep 17 00:00:00 2001
> > > > From: Bruce Richardson <bruce.richardson@intel.com>
> > > > Date: Wed, 2 Sep 2020 17:24:27 +0100
> > > > Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build
> > > > 
> > > > [ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]
> > > > 
> > > > The bitrate library in DPDK is actually in a "bitratestats" directory,
> > > > so that is used by meson for the macro and library name.
> > > > Therefore, we need to update references to RTE_LIBRTE_BITRATE to
> > > > RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than
> > > > supporting both defines, since make is being removed, we can just
> > > > replace all instances of the former define with the latter.
> > > > 
> > > > To ensure testpmd links ok when this is done, we also need to add
> > > > bitratestats to the list of library dependencies.
> > > 
> > > This backport will fix meson builds, but it will drop bitratestats
> > > support in testpmd built with make.
> > > 
> > > 
> > 
> > Thanks David. That would be a user visible regression, so we can't do
> > that. I will drop the patch for now and we can discuss after 20.11 when
> > everyone is less busy.
> > 
> 
> +Luca, fyi, this patch is in 19.11 tree.

Thanks for the heads-up, I'll revert it for now.

-- 
Kind regards,
Luca Boccassi

^ permalink raw reply	[flat|nested] 72+ messages in thread

end of thread, other threads:[~2020-11-11 11:51 UTC | newest]

Thread overview: 72+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/failsafe: fix double space in warning log' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix multiple channel Rx' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix stale value after free' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: remove unused log macros' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix endianness while setting L4 destination port' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/iavf: downgrade error log' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'ethdev: remove redundant license text' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix function header arguments' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix Rx only for unicast promisc on VLAN' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/tap: free mempool when closing' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/dpaa2: fix misuse of interface index' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/nfp: expand device info get' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' " Kevin Traynor
2020-11-05 13:22   ` David Marchand
2020-11-11 10:44     ` Kevin Traynor
2020-11-11 10:50       ` Kevin Traynor
2020-11-11 11:51         ` Luca Boccassi
2020-11-05 12:39 ` [dpdk-stable] patch 'gso: fix payload unit size for UDP' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: improve multiport PF in nfp guide' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: specify delay operations' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: fix release of wait event' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e: fix byte counters' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix shift operation' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix queue get info' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix port id check in Tx VLAN command' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: remove restriction on Tx segments set' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix descriptor id check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix displaying Rx/Tx queues information' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix dereference before null check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app: fix ethdev port id size' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vfio: fix group descriptor check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'mem: fix allocation in container with SELinux' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/fslmc: fix dpio close' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: reset test statistics' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'port: remove useless assignment' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'timer: add limitation note for sync stop and reset' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix build with gcc 11' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'pmdinfogen: " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix getting link details' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'raw/dpaa2_qdma: fix reset' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/virtio: check raw checksum failure' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'mem: fix allocation failure on non-NUMA kernel' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix missing classify methods in ACL guide' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'table: fix hash for 32-bit' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix device number' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix stats test' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'cryptodev: fix parameter parsing' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix iterator for RSS LUT' " Kevin Traynor

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git