[dpdk-stable] patch 'net/bonding: fix error code on device creation' has been queued to LTS release 18.11.10

[dpdk-stable] patch 'net/bonding: fix error code on device creation' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/97a442e1ae730f5b87c5b4b22fc9b81d30b69f29

Thanks.

Kevin.

---
From 97a442e1ae730f5b87c5b4b22fc9b81d30b69f29 Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
Date: Tue, 14 Jul 2020 16:19:43 +0800
Subject: [PATCH] net/bonding: fix error code on device creation

[ upstream commit 2dd4f08540cc32cc1a62579d66d055327638ac92 ]

Because the return value of rte_vdev_init() has multiple non-zero
values, when rte_vdev_init() return non-zero in the
rte_eth_bond_create() function, it should return the actual error code
rather than -ENOMEM.

Fixes: 68451eb6698c ("net/bonding: call through EAL on create/free")

Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index a23988dc79..e7cb086fb0 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -168,5 +168,5 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 	ret = rte_vdev_init(name, devargs);
 	if (ret)
-		return -ENOMEM;
+		return ret;
 
 	ret = rte_eth_dev_get_port_by_name(name, &port_id);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.014107232 +0100
+++ 0001-net-bonding-fix-error-code-on-device-creation.patch	2020-08-28 11:03:25.893955231 +0100
@@ -1 +1 @@
-From 2dd4f08540cc32cc1a62579d66d055327638ac92 Mon Sep 17 00:00:00 2001
+From 97a442e1ae730f5b87c5b4b22fc9b81d30b69f29 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2dd4f08540cc32cc1a62579d66d055327638ac92 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index f38eb3b47f..d77dc40963 100644
+index a23988dc79..e7cb086fb0 100644

[dpdk-stable] patch 'net/af_packet: fix check of file descriptors' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/2cea42a592e20072c337cbe9fc070dd57615fcb3

Thanks.

Kevin.

---
From 2cea42a592e20072c337cbe9fc070dd57615fcb3 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 6 Jul 2020 20:27:32 +0800
Subject: [PATCH] net/af_packet: fix check of file descriptors

[ upstream commit c6d1a552a8798df02bf85627c5d47a28ccdc62f8 ]

Zero is a valid fd. It will fail to check the fd if the fd is zero.

Fixes: 527740ccfaec ("af_packet: fix some leaks")

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

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 90e34c45ac..698197b552 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -589,4 +589,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 		(*internals)->rx_queue[q].map = MAP_FAILED;
 		(*internals)->tx_queue[q].map = MAP_FAILED;
+		(*internals)->rx_queue[q].sockfd = -1;
+		(*internals)->tx_queue[q].sockfd = -1;
 	}
 
@@ -796,5 +798,5 @@ error:
 		rte_free((*internals)->rx_queue[q].rd);
 		rte_free((*internals)->tx_queue[q].rd);
-		if (((*internals)->rx_queue[q].sockfd != 0) &&
+		if (((*internals)->rx_queue[q].sockfd >= 0) &&
 			((*internals)->rx_queue[q].sockfd != qsockfd))
 			close((*internals)->rx_queue[q].sockfd);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.033097369 +0100
+++ 0002-net-af_packet-fix-check-of-file-descriptors.patch	2020-08-28 11:03:25.894955238 +0100
@@ -1 +1 @@
-From c6d1a552a8798df02bf85627c5d47a28ccdc62f8 Mon Sep 17 00:00:00 2001
+From 2cea42a592e20072c337cbe9fc070dd57615fcb3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c6d1a552a8798df02bf85627c5d47a28ccdc62f8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index e1e7f3973b..db5de8e45e 100644
+index 90e34c45ac..698197b552 100644
@@ -21 +22 @@
-@@ -646,4 +646,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -589,4 +589,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -28 +29 @@
-@@ -849,5 +851,5 @@ error:
+@@ -796,5 +798,5 @@ error:

[dpdk-stable] patch 'net/af_packet: fix memory leak on init failure' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/055c2e6d1ad7da31e45e451204631652de5c7cf6

Thanks.

Kevin.

---
From 055c2e6d1ad7da31e45e451204631652de5c7cf6 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 6 Jul 2020 20:27:51 +0800
Subject: [PATCH] net/af_packet: fix memory leak on init failure

[ upstream commit 3400148949ea4edecba0256f4ab97e80f1d98474 ]

Add missing code to free memory when the device initialization fails.

Fixes: ccd37d341e8d ("net/af_packet: remove queue number limitation")
Fixes: 5f19dee604ed ("drivers/net: do not use private ethdev data")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 698197b552..bcbffe4caa 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -608,5 +608,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			"%s: I/F name too long (%s)",
 			name, pair->value);
-		return -1;
+		goto free_internals;
 	}
 	if (ioctl(sockfd, SIOCGIFINDEX, &ifr) == -1) {
@@ -614,9 +614,9 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			"%s: ioctl failed (SIOCGIFINDEX)",
 		        name);
-		return -1;
+		goto free_internals;
 	}
 	(*internals)->if_name = strdup(pair->value);
 	if ((*internals)->if_name == NULL)
-		return -1;
+		goto free_internals;
 	(*internals)->if_index = ifr.ifr_ifindex;
 
@@ -625,5 +625,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			"%s: ioctl failed (SIOCGIFHWADDR)",
 		        name);
-		return -1;
+		goto free_internals;
 	}
 	memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
@@ -649,5 +649,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 				"%s: could not open AF_PACKET socket",
 			        name);
-			return -1;
+			goto error;
 		}
 
@@ -802,4 +802,7 @@ error:
 			close((*internals)->rx_queue[q].sockfd);
 	}
+free_internals:
+	rte_free((*internals)->rx_queue);
+	rte_free((*internals)->tx_queue);
 	free((*internals)->if_name);
 	rte_free(*internals);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.052742747 +0100
+++ 0003-net-af_packet-fix-memory-leak-on-init-failure.patch	2020-08-28 11:03:25.895955246 +0100
@@ -1 +1 @@
-From 3400148949ea4edecba0256f4ab97e80f1d98474 Mon Sep 17 00:00:00 2001
+From 055c2e6d1ad7da31e45e451204631652de5c7cf6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3400148949ea4edecba0256f4ab97e80f1d98474 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15,2 +16,2 @@
- drivers/net/af_packet/rte_eth_af_packet.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
+ drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
@@ -19 +20 @@
-index db5de8e45e..62945fee20 100644
+index 698197b552..bcbffe4caa 100644
@@ -22,10 +23 @@
-@@ -638,7 +638,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
- 						0, numa_node);
- 	if (!(*internals)->rx_queue || !(*internals)->tx_queue) {
--		rte_free((*internals)->rx_queue);
--		rte_free((*internals)->tx_queue);
--		return -1;
-+		goto free_internals;
- 	}
- 
-@@ -665,18 +663,18 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -608,5 +608,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -38 +30,3 @@
- 		PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFINDEX)", name);
+@@ -614,9 +614,9 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+ 			"%s: ioctl failed (SIOCGIFINDEX)",
+ 		        name);
@@ -48,2 +42,3 @@
- 	if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) == -1) {
- 		PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFHWADDR)", name);
+@@ -625,5 +625,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+ 			"%s: ioctl failed (SIOCGIFHWADDR)",
+ 		        name);
@@ -54 +49 @@
-@@ -702,5 +700,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -649,5 +649,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -56 +51 @@
- 				name);
+ 			        name);
@@ -61 +56 @@
-@@ -855,4 +853,7 @@ error:
+@@ -802,4 +802,7 @@ error:

[dpdk-stable] patch 'net/af_packet: fix munmap on init failure' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/dba9120a2e05e60ae0e5ec23cb532eb3effcaaea

Thanks.

Kevin.

---
From dba9120a2e05e60ae0e5ec23cb532eb3effcaaea Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 6 Jul 2020 20:28:02 +0800
Subject: [PATCH] net/af_packet: fix munmap on init failure

[ upstream commit b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb ]

Add a missing available check and fix the wrong address passed
to munmap on init failure.

Fixes: dd6590fe2fd7 ("af_packet: fix possible memory leak")

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

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index bcbffe4caa..5eb71c9f5e 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -793,6 +793,7 @@ error:
 		close(qsockfd);
 	for (q = 0; q < nb_queues; q++) {
-		munmap((*internals)->rx_queue[q].map,
-		       2 * req->tp_block_size * req->tp_block_nr);
+		if ((*internals)->rx_queue[q].map != MAP_FAILED)
+			munmap((*internals)->rx_queue[q].map,
+			       2 * req->tp_block_size * req->tp_block_nr);
 
 		rte_free((*internals)->rx_queue[q].rd);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.073025998 +0100
+++ 0004-net-af_packet-fix-munmap-on-init-failure.patch	2020-08-28 11:03:25.896955253 +0100
@@ -1 +1 @@
-From b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb Mon Sep 17 00:00:00 2001
+From dba9120a2e05e60ae0e5ec23cb532eb3effcaaea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b02e1742ebb5a6c23bea05c4d66b1d380bcd00eb ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 62945fee20..b9723e9619 100644
+index bcbffe4caa..5eb71c9f5e 100644
@@ -22 +23 @@
-@@ -844,6 +844,7 @@ error:
+@@ -793,6 +793,7 @@ error:

[dpdk-stable] patch 'net/bonding: fix MAC address when switching active port' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/7d6cbe1df1614551e945ce8feb11313078ee6e2c

Thanks.

Kevin.

---
From 7d6cbe1df1614551e945ce8feb11313078ee6e2c Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
Date: Fri, 17 Apr 2020 16:19:17 +0800
Subject: [PATCH] net/bonding: fix MAC address when switching active port

[ upstream commit edf6489ea43ec9c27d54dbe9e94adcdc43b70e04 ]

Currently, based on a active-backup bond device, when the link status of
the primary port changes from up to down, one slave port changes to the
primary port, but the new primary port's MAC address cannot change to
the bond device's MAC address. And we can't continue receive packets
whose destination MAC addresses are the same as the bond devices's MAC
address.

The current bonding PMD driver call mac_address_slaves_update function
to modify the MAC address of all slaves devices: the primary port using
bond device's MAC address, and other slaves devices using the respective
MAC address. We found that one error using primary_port instead of
current_primary_port in mac_address_slaves_update function.

On the other hand, The current bonding PMD driver sets slave devices's
MAC address according to the variable named current_primary_port. The
variable named current_primary_port changes in the following scenario:
1. Add the slave devices to bond, the first slave port will be regarded
   as the current_primary_port. If changing the order of adding the
   slave devices, the value of the variable named current_primary_port
   will be different.
2. The upper application specifies primary_port via calling the
   rte_eth_bond_primary_set API function.
3. Delete the primary slave device.
4. The link status of the primary port changes from up to down.

We have tested the above 4 cases and found that there are problems that
the new primary port's MAC address didn't change to the bond device's
MAC address when running case 3 and 4. When current_primary_port
changes, the new primary port's MAC address should change at the same
time. We also need to call mac_address_slaves_update function to update
MAC addresses in case
3 and 4.

Bugzilla ID: 256
Fixes: 2efb58cbab6e ("bond: new link bonding library")

Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_api.c | 1 +
 drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index e7cb086fb0..7bbe9724a0 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -680,4 +680,5 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
 		else
 			internals->primary_port = 0;
+		mac_address_slaves_update(bonded_eth_dev);
 	}
 
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index c1cbf6258b..d7fb9db0cc 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1488,5 +1488,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 					internals->current_primary_port) {
 				if (rte_eth_dev_default_mac_addr_set(
-						internals->primary_port,
+						internals->current_primary_port,
 						bonded_eth_dev->data->mac_addrs)) {
 					RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address",
@@ -2609,4 +2609,5 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
 			else
 				internals->current_primary_port = internals->primary_port;
+			mac_address_slaves_update(bonded_eth_dev);
 		}
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.092949186 +0100
+++ 0005-net-bonding-fix-MAC-address-when-switching-active-po.patch	2020-08-28 11:03:25.899955276 +0100
@@ -1 +1 @@
-From edf6489ea43ec9c27d54dbe9e94adcdc43b70e04 Mon Sep 17 00:00:00 2001
+From 7d6cbe1df1614551e945ce8feb11313078ee6e2c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit edf6489ea43ec9c27d54dbe9e94adcdc43b70e04 ]
+
@@ -41 +42,0 @@
-Cc: stable@dpdk.org
@@ -51 +52 @@
-index d77dc40963..97c667e007 100644
+index e7cb086fb0..7bbe9724a0 100644
@@ -54 +55 @@
-@@ -699,4 +699,5 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
+@@ -680,4 +680,5 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
@@ -61 +62 @@
-index 044a1cfbc3..6f361c7b2c 100644
+index c1cbf6258b..d7fb9db0cc 100644
@@ -64 +65 @@
-@@ -1534,5 +1534,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
+@@ -1488,5 +1488,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
@@ -71 +72 @@
-@@ -2874,4 +2874,5 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
+@@ -2609,4 +2609,5 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,

[dpdk-stable] patch 'net/bonding: fix MAC address when one port resets' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/84c299a22d28f9e24afdb8d5f2ccea987b0f732e

Thanks.

Kevin.

---
From 84c299a22d28f9e24afdb8d5f2ccea987b0f732e Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
Date: Fri, 17 Apr 2020 16:19:18 +0800
Subject: [PATCH] net/bonding: fix MAC address when one port resets

[ upstream commit 2d944002762e85e351be7cea432919f159d2ecae ]

The current bonding PMD driver call mac_address_slaves_update function
to modify the MAC address of all slaves devices. In
mac_address_slaves_update function, the rte_eth_dev_default_mac_addr_set
API function is called to set the MAC address of the slave devices in
turn in the for loop statement.

When one port reset, calling rte_eth_dev_default_mac_addr_set API fails
because the firmware will not respond to the commands from the driver,
and exit the loop, so other slave devices cannot continue to update the
MAC address.

This patch fixes the issue by avoid exiting the loop when calling
rte_eth_dev_default_mac_addr_set fails.

Fixes: 2efb58cbab6e ("bond: new link bonding library")

Signed-off-by: Hongbo Zheng <zhenghongbo3@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
Signed-off-by: Xuan Li <lixuan47@hisilicon.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index d7fb9db0cc..8b410ff19b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1457,4 +1457,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 {
 	struct bond_dev_private *internals = bonded_eth_dev->data->dev_private;
+	bool set;
 	int i;
 
@@ -1484,4 +1485,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 	case BONDING_MODE_ALB:
 	default:
+		set = true;
 		for (i = 0; i < internals->slave_count; i++) {
 			if (internals->slaves[i].port_id ==
@@ -1492,5 +1494,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 					RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address",
 							internals->current_primary_port);
-					return -1;
+					set = false;
 				}
 			} else {
@@ -1500,8 +1502,9 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
 					RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address",
 							internals->slaves[i].port_id);
-					return -1;
 				}
 			}
 		}
+		if (!set)
+			return -1;
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.116365555 +0100
+++ 0006-net-bonding-fix-MAC-address-when-one-port-resets.patch	2020-08-28 11:03:25.902955299 +0100
@@ -1 +1 @@
-From 2d944002762e85e351be7cea432919f159d2ecae Mon Sep 17 00:00:00 2001
+From 84c299a22d28f9e24afdb8d5f2ccea987b0f732e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2d944002762e85e351be7cea432919f159d2ecae ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -32 +33 @@
-index 6f361c7b2c..116e2f29de 100644
+index d7fb9db0cc..8b410ff19b 100644
@@ -35 +36 @@
-@@ -1503,4 +1503,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
+@@ -1457,4 +1457,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
@@ -41 +42 @@
-@@ -1530,4 +1531,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
+@@ -1484,4 +1485,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
@@ -47 +48 @@
-@@ -1538,5 +1540,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
+@@ -1492,5 +1494,5 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
@@ -54 +55 @@
-@@ -1546,8 +1548,9 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
+@@ -1500,8 +1502,9 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)

[dpdk-stable] patch 'net/i40e: fix flow director Rx writeback packet' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/36020ac03f4597ce2f4f4d697940fce805b08cb0

Thanks.

Kevin.

---
From 36020ac03f4597ce2f4f4d697940fce805b08cb0 Mon Sep 17 00:00:00 2001
From: Chenmin Sun <chenmin.sun@intel.com>
Date: Fri, 17 Jul 2020 22:57:58 +0800
Subject: [PATCH] net/i40e: fix flow director Rx writeback packet

[ upstream commit ae6575409ff5609e44d53e1c3014ae77105e8610 ]

This patch fixes the fdir cannot receive rx writeback packet issue.
The root cause is FDIR interrupt is not correctly enabled.

Beside this, to make sure fdir programming works fine when the port
is stopped, move the fdir interrupt configure from start/stop to
setup/teardown.

Fixes: cfd662d22e7b ("net/i40e: fix interrupt throttling setting in PF")

Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 15 ++-------------
 drivers/net/i40e/i40e_ethdev.h |  2 ++
 drivers/net/i40e/i40e_fdir.c   | 11 +++++++++++
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 98c752bc4e..759fc76c85 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2046,5 +2046,5 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
 }
 
-static void
+void
 i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
 {
@@ -2073,5 +2073,5 @@ i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
 }
 
-static void
+void
 i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi)
 {
@@ -2298,11 +2298,4 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	}
 
-	/* enable FDIR MSIX interrupt */
-	if (pf->fdir.fdir_vsi) {
-		i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi,
-					  I40E_ITR_INDEX_NONE);
-		i40e_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
-	}
-
 	/* Enable all queues which have been configured */
 	for (nb_rxq = 0; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) {
@@ -2440,8 +2433,4 @@ i40e_dev_stop(struct rte_eth_dev *dev)
 	}
 
-	if (pf->fdir.fdir_vsi) {
-		i40e_vsi_queues_unbind_intr(pf->fdir.fdir_vsi);
-		i40e_vsi_disable_queues_intr(pf->fdir.fdir_vsi);
-	}
 	/* Clear all queues and release memory */
 	i40e_dev_clear_queues(dev);
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 930eb9abaf..2ebbe84782 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1140,4 +1140,5 @@ int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
 void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
 void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi);
+void i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi);
 int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi,
 			   struct i40e_vsi_vlan_pvid_info *info);
@@ -1149,4 +1150,5 @@ enum i40e_status_code i40e_fdir_setup_tx_resources(struct i40e_pf *pf);
 enum i40e_status_code i40e_fdir_setup_rx_resources(struct i40e_pf *pf);
 int i40e_fdir_setup(struct i40e_pf *pf);
+void i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi);
 const struct rte_memzone *i40e_memzone_reserve(const char *name,
 					uint32_t len,
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index d41601a176..35be846fbd 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -223,4 +223,9 @@ i40e_fdir_setup(struct i40e_pf *pf)
 	}
 
+	/* enable FDIR MSIX interrupt */
+	vsi->nb_used_qps = 1;
+	i40e_vsi_queues_bind_intr(vsi, I40E_ITR_INDEX_NONE);
+	i40e_vsi_enable_queues_intr(vsi);
+
 	/* reserve memory for the fdir programming packet */
 	snprintf(z_name, sizeof(z_name), "%s_%s_%d",
@@ -268,4 +273,9 @@ i40e_fdir_teardown(struct i40e_pf *pf)
 	if (!vsi)
 		return;
+
+	/* disable FDIR MSIX interrupt */
+	i40e_vsi_queues_unbind_intr(vsi);
+	i40e_vsi_disable_queues_intr(vsi);
+
 	int err = i40e_switch_tx_queue(hw, vsi->base_queue, FALSE);
 	if (err)
@@ -274,4 +284,5 @@ i40e_fdir_teardown(struct i40e_pf *pf)
 	if (err)
 		PMD_DRV_LOG(DEBUG, "Failed to do FDIR RX switch off");
+
 	i40e_dev_rx_queue_release(pf->fdir.rxq);
 	pf->fdir.rxq = NULL;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.138189213 +0100
+++ 0007-net-i40e-fix-flow-director-Rx-writeback-packet.patch	2020-08-28 11:03:25.916955405 +0100
@@ -1 +1 @@
-From ae6575409ff5609e44d53e1c3014ae77105e8610 Mon Sep 17 00:00:00 2001
+From 36020ac03f4597ce2f4f4d697940fce805b08cb0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ae6575409ff5609e44d53e1c3014ae77105e8610 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 6901643204..05d5f28615 100644
+index 98c752bc4e..759fc76c85 100644
@@ -28 +29 @@
-@@ -2185,5 +2185,5 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
+@@ -2046,5 +2046,5 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
@@ -35 +36 @@
-@@ -2212,5 +2212,5 @@ i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
+@@ -2073,5 +2073,5 @@ i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
@@ -42 +43 @@
-@@ -2434,11 +2434,4 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2298,11 +2298,4 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -54 +55 @@
-@@ -2576,8 +2569,4 @@ i40e_dev_stop(struct rte_eth_dev *dev)
+@@ -2440,8 +2433,4 @@ i40e_dev_stop(struct rte_eth_dev *dev)
@@ -64 +65 @@
-index d3bda02724..aef88abed0 100644
+index 930eb9abaf..2ebbe84782 100644
@@ -67 +68 @@
-@@ -1322,4 +1322,5 @@ int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
+@@ -1140,4 +1140,5 @@ int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
@@ -73 +74 @@
-@@ -1331,4 +1332,5 @@ enum i40e_status_code i40e_fdir_setup_tx_resources(struct i40e_pf *pf);
+@@ -1149,4 +1150,5 @@ enum i40e_status_code i40e_fdir_setup_tx_resources(struct i40e_pf *pf);
@@ -80 +81 @@
-index 9998e5d4f0..8e87b4a009 100644
+index d41601a176..35be846fbd 100644
@@ -83 +84 @@
-@@ -232,4 +232,9 @@ i40e_fdir_setup(struct i40e_pf *pf)
+@@ -223,4 +223,9 @@ i40e_fdir_setup(struct i40e_pf *pf)
@@ -93 +94 @@
-@@ -288,4 +293,9 @@ i40e_fdir_teardown(struct i40e_pf *pf)
+@@ -268,4 +273,9 @@ i40e_fdir_teardown(struct i40e_pf *pf)
@@ -103 +104 @@
-@@ -294,4 +304,5 @@ i40e_fdir_teardown(struct i40e_pf *pf)
+@@ -274,4 +284,5 @@ i40e_fdir_teardown(struct i40e_pf *pf)
@@ -108 +109 @@
- 	rte_eth_dma_zone_free(dev, "fdir_rx_ring", pf->fdir.rxq->queue_id);
+ 	pf->fdir.rxq = NULL;

[dpdk-stable] patch 'net/ixgbe: fix MAC control frame forward' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/a603d49d91b478515bcdaf8145bee16dfaa1b0cb

Thanks.

Kevin.

---
From a603d49d91b478515bcdaf8145bee16dfaa1b0cb Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Sat, 23 May 2020 05:22:38 +0000
Subject: [PATCH] net/ixgbe: fix MAC control frame forward

[ upstream commit 7b053b86d889acd7c3a02909774da08d3d90a4b0 ]

mac_ctrl_frame_fwd shouldn't be cleared when port stop,
otherwise it will be inconsistent with the actual status.
This patch fixes the issue.

Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting")

Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 01cedb45e8..c1170cedb7 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2967,6 +2967,4 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 
 	adapter->rss_reta_updated = 0;
-
-	adapter->mac_ctrl_frame_fwd = 0;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.171015194 +0100
+++ 0008-net-ixgbe-fix-MAC-control-frame-forward.patch	2020-08-28 11:03:25.924955466 +0100
@@ -1 +1 @@
-From 7b053b86d889acd7c3a02909774da08d3d90a4b0 Mon Sep 17 00:00:00 2001
+From a603d49d91b478515bcdaf8145bee16dfaa1b0cb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7b053b86d889acd7c3a02909774da08d3d90a4b0 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 095f1bde57..74c3c6b5db 100644
+index 01cedb45e8..c1170cedb7 100644
@@ -24,2 +25 @@
-@@ -2927,6 +2927,4 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
- 	adapter->rss_reta_updated = 0;
+@@ -2967,6 +2967,4 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
@@ -27 +27 @@
--	adapter->mac_ctrl_frame_fwd = 0;
+ 	adapter->rss_reta_updated = 0;
@@ -29 +29 @@
- 	hw->adapter_stopped = true;
+-	adapter->mac_ctrl_frame_fwd = 0;
@@ -30,0 +31 @@
+ 

[dpdk-stable] patch 'net/ixgbe: fix flow control status' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/f04772a299067ae8264ce42b754cfb22607fe33f

Thanks.

Kevin.

---
From f04772a299067ae8264ce42b754cfb22607fe33f Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Sat, 23 May 2020 05:22:39 +0000
Subject: [PATCH] net/ixgbe: fix flow control status

[ upstream commit c778b7a39f30ffbb8326f81389668dc5f6f30888 ]

mac_ctrl_frame_fwd assignment is missing, so
setting mac_ctrl_frame_fwd should be added in
ixgbe_flow_ctrl_get().
The patch fixes the issue.

Fixes: 56ea46a997b7 ("ethdev: retrieve flow control configuration")

Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Tested-by: Bo Chen <box.c.chen@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index c1170cedb7..0ef3e01165 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4658,4 +4658,9 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 	 */
 	mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+	if (mflcn_reg & IXGBE_MFLCN_PMCF)
+		fc_conf->mac_ctrl_frame_fwd = 1;
+	else
+		fc_conf->mac_ctrl_frame_fwd = 0;
+
 	if (mflcn_reg & (IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_RFCE))
 		rx_pause = 1;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.197183915 +0100
+++ 0009-net-ixgbe-fix-flow-control-status.patch	2020-08-28 11:03:25.933955534 +0100
@@ -1 +1 @@
-From c778b7a39f30ffbb8326f81389668dc5f6f30888 Mon Sep 17 00:00:00 2001
+From f04772a299067ae8264ce42b754cfb22607fe33f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c778b7a39f30ffbb8326f81389668dc5f6f30888 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 74c3c6b5db..fd0cb9b0e2 100644
+index c1170cedb7..0ef3e01165 100644
@@ -26 +27 @@
-@@ -4744,4 +4744,9 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -4658,4 +4658,9 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)

[dpdk-stable] patch 'net/bonding: delete redundant code' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/67e9387958dc50c6673a27e131979f625b4dab11

Thanks.

Kevin.

---
From 67e9387958dc50c6673a27e131979f625b4dab11 Mon Sep 17 00:00:00 2001
From: Dongyang Pan <197020236@qq.com>
Date: Sat, 4 Jul 2020 09:15:26 +0800
Subject: [PATCH] net/bonding: delete redundant code

[ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ]

The function valid_bonded_port_id() has already contains function
rte_eth_dev_is_valid_port(), so delete redundant check.

Fixes: 588ae95e7983 ("net/bonding: fix port ID check")

Signed-off-by: Dongyang Pan <197020236@qq.com>
Reviewed-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 99884c0049..b0f94d168b 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1590,7 +1590,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
 	internals = dev->data->dev_private;
 
-	if (check_for_bonded_ethdev(dev) != 0)
-		return -1;
-
 	if (bond_8023ad_slow_pkt_hw_filter_supported(port) != 0)
 		return -1;
@@ -1619,7 +1616,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
 	internals = dev->data->dev_private;
 
-	if (check_for_bonded_ethdev(dev) != 0)
-		return -1;
-
 	/* Device must be stopped to set up slow queue */
 	if (dev->data->dev_started)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.221819890 +0100
+++ 0010-net-bonding-delete-redundant-code.patch	2020-08-28 11:03:25.934955541 +0100
@@ -1 +1 @@
-From 2db4cf9d01c5920be0397e5c7aba61779c997753 Mon Sep 17 00:00:00 2001
+From 67e9387958dc50c6673a27e131979f625b4dab11 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 3991825ad9..b24a446862 100644
+index 99884c0049..b0f94d168b 100644
@@ -22 +23 @@
-@@ -1677,7 +1677,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
+@@ -1590,7 +1590,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
@@ -30 +31 @@
-@@ -1706,7 +1703,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
+@@ -1619,7 +1616,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)

[dpdk-stable] patch 'net/i40e: report VLAN filter capability' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/26cbfb53497730015a197893551627ce7d194c18

Thanks.

Kevin.

---
From 26cbfb53497730015a197893551627ce7d194c18 Mon Sep 17 00:00:00 2001
From: Zhihong Peng <zhihongx.peng@intel.com>
Date: Mon, 20 Jul 2020 22:45:28 -0400
Subject: [PATCH] net/i40e: report VLAN filter capability

[ upstream commit 664c253e7f9d4eab460fa61458e1640a1c1caea7 ]

The rte_eth_dev_set_vlan_offload function will check vlan rx offload
capability, the i40e vf has vlan filter feature but
DEV_RX_OFFLOAD_VLAN_FILTER is not set into the capability, that will
cause setting fail. So need to add this capability in
i40e_vf_representor_dev_infos_get function.

Fixes: e0cb96204b71 ("net/i40e: add support for representor ports")

Signed-off-by: Zhihong Peng <zhihongx.peng@intel.com>
Acked-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/i40e/i40e_vf_representor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_vf_representor.c b/drivers/net/i40e/i40e_vf_representor.c
index 45a15d3ab4..1dbf3f4677 100644
--- a/drivers/net/i40e/i40e_vf_representor.c
+++ b/drivers/net/i40e/i40e_vf_representor.c
@@ -47,5 +47,6 @@ i40e_vf_representor_dev_infos_get(struct rte_eth_dev *ethdev,
 		DEV_RX_OFFLOAD_IPV4_CKSUM |
 		DEV_RX_OFFLOAD_UDP_CKSUM |
-		DEV_RX_OFFLOAD_TCP_CKSUM;
+		DEV_RX_OFFLOAD_TCP_CKSUM |
+		DEV_RX_OFFLOAD_VLAN_FILTER;
 	dev_info->tx_offload_capa =
 		DEV_TX_OFFLOAD_MULTI_SEGS  |
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.242873980 +0100
+++ 0011-net-i40e-report-VLAN-filter-capability.patch	2020-08-28 11:03:25.935955549 +0100
@@ -1 +1 @@
-From 664c253e7f9d4eab460fa61458e1640a1c1caea7 Mon Sep 17 00:00:00 2001
+From 26cbfb53497730015a197893551627ce7d194c18 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 664c253e7f9d4eab460fa61458e1640a1c1caea7 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index b07b35c03f..083bc1a5f3 100644
+index 45a15d3ab4..1dbf3f4677 100644

[dpdk-stable] patch 'net/e1000: report VLAN extend capability' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/73571bbc3128689eef159341fcba7bddd1fa8a2a

Thanks.

Kevin.

---
From 73571bbc3128689eef159341fcba7bddd1fa8a2a Mon Sep 17 00:00:00 2001
From: Zhihong Peng <zhihongx.peng@intel.com>
Date: Mon, 20 Jul 2020 23:05:14 -0400
Subject: [PATCH] net/e1000: report VLAN extend capability

[ upstream commit 21f4a1fb30ffd566769f9a4be8775433c00c44d0 ]

The rte_eth_dev_set_vlan_offload function will check vlan rx offload
capability, the i350/i210/i211 nics have vlan extend feature but
DEV_RX_OFFLOAD_VLAN_EXTEND is not set into the capability, that will
cause setting fail. So need to add this capability in
igb_get_rx_port_offloads_capa function.

Fixes: ef990fb56e55 ("net/e1000: convert to new Rx offloads API")

Signed-off-by: Zhihong Peng <zhihongx.peng@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/e1000/igb_rxtx.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 28fff6ab41..54b38ad4db 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1635,6 +1635,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
 {
 	uint64_t rx_offload_capa;
+	struct e1000_hw *hw;
+
+	hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-	RTE_SET_USED(dev);
 	rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP  |
 			  DEV_RX_OFFLOAD_VLAN_FILTER |
@@ -1646,4 +1648,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
 			  DEV_RX_OFFLOAD_SCATTER;
 
+	if (hw->mac.type == e1000_i350 ||
+	    hw->mac.type == e1000_i210 ||
+	    hw->mac.type == e1000_i211)
+		rx_offload_capa |= DEV_RX_OFFLOAD_VLAN_EXTEND;
+
 	return rx_offload_capa;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.261893254 +0100
+++ 0012-net-e1000-report-VLAN-extend-capability.patch	2020-08-28 11:03:25.938955572 +0100
@@ -1 +1 @@
-From 21f4a1fb30ffd566769f9a4be8775433c00c44d0 Mon Sep 17 00:00:00 2001
+From 73571bbc3128689eef159341fcba7bddd1fa8a2a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21f4a1fb30ffd566769f9a4be8775433c00c44d0 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 5717cdb706..6411924e03 100644
+index 28fff6ab41..54b38ad4db 100644
@@ -25 +26 @@
-@@ -1638,6 +1638,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
+@@ -1635,6 +1635,8 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
@@ -35,2 +36,2 @@
-@@ -1650,4 +1652,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
- 			  DEV_RX_OFFLOAD_RSS_HASH;
+@@ -1646,4 +1648,9 @@ igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
+ 			  DEV_RX_OFFLOAD_SCATTER;

[dpdk-stable] patch 'net/e1000: fix crash on Tx done clean up' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/8df3f28ce362ad3ccd68af91e584971893c34005

Thanks.

Kevin.

---
From 8df3f28ce362ad3ccd68af91e584971893c34005 Mon Sep 17 00:00:00 2001
From: Jeff Guo <jia.guo@intel.com>
Date: Thu, 16 Jul 2020 17:24:38 +0800
Subject: [PATCH] net/e1000: fix crash on Tx done clean up

[ upstream commit 4237be2b9e250d431d465b81a0abbe5fb559d2c8 ]

As tx mbuf is not set for some advanced descriptors, if there is no
mbuf checking before rte_pktmbuf_free_seg() function be called on
the process of tx done clean up, that will cause a segfault. So add
a NULL pointer check to fix it.

Bugzilla ID: 501
Fixes: 8d907d2b79f7 ("net/igb: free consumed Tx buffers on demand")

Signed-off-by: Jeff Guo <jia.guo@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/e1000/igb_rxtx.c | 188 +++++++++++++++++------------------
 1 file changed, 91 insertions(+), 97 deletions(-)

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 54b38ad4db..86934836a8 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1293,111 +1293,105 @@ igb_tx_done_cleanup(struct igb_tx_queue *txq, uint32_t free_cnt)
 	uint16_t tx_last;  /* Last segment in the current packet. */
 	uint16_t tx_next;  /* First segment of the next packet. */
-	int count;
-
-	if (txq != NULL) {
-		count = 0;
-		sw_ring = txq->sw_ring;
-		txr = txq->tx_ring;
-
-		/*
-		 * tx_tail is the last sent packet on the sw_ring. Goto the end
-		 * of that packet (the last segment in the packet chain) and
-		 * then the next segment will be the start of the oldest segment
-		 * in the sw_ring. This is the first packet that will be
-		 * attempted to be freed.
-		 */
-
-		/* Get last segment in most recently added packet. */
-		tx_first = sw_ring[txq->tx_tail].last_id;
-
-		/* Get the next segment, which is the oldest segment in ring. */
-		tx_first = sw_ring[tx_first].next_id;
-
-		/* Set the current index to the first. */
-		tx_id = tx_first;
-
-		/*
-		 * Loop through each packet. For each packet, verify that an
-		 * mbuf exists and that the last segment is free. If so, free
-		 * it and move on.
-		 */
-		while (1) {
-			tx_last = sw_ring[tx_id].last_id;
-
-			if (sw_ring[tx_last].mbuf) {
-				if (txr[tx_last].wb.status &
-						E1000_TXD_STAT_DD) {
-					/*
-					 * Increment the number of packets
-					 * freed.
-					 */
-					count++;
-
-					/* Get the start of the next packet. */
-					tx_next = sw_ring[tx_last].next_id;
-
-					/*
-					 * Loop through all segments in a
-					 * packet.
-					 */
-					do {
-						rte_pktmbuf_free_seg(sw_ring[tx_id].mbuf);
+	int count = 0;
+
+	if (!txq)
+		return -ENODEV;
+
+	sw_ring = txq->sw_ring;
+	txr = txq->tx_ring;
+
+	/* tx_tail is the last sent packet on the sw_ring. Goto the end
+	 * of that packet (the last segment in the packet chain) and
+	 * then the next segment will be the start of the oldest segment
+	 * in the sw_ring. This is the first packet that will be
+	 * attempted to be freed.
+	 */
+
+	/* Get last segment in most recently added packet. */
+	tx_first = sw_ring[txq->tx_tail].last_id;
+
+	/* Get the next segment, which is the oldest segment in ring. */
+	tx_first = sw_ring[tx_first].next_id;
+
+	/* Set the current index to the first. */
+	tx_id = tx_first;
+
+	/* Loop through each packet. For each packet, verify that an
+	 * mbuf exists and that the last segment is free. If so, free
+	 * it and move on.
+	 */
+	while (1) {
+		tx_last = sw_ring[tx_id].last_id;
+
+		if (sw_ring[tx_last].mbuf) {
+			if (txr[tx_last].wb.status &
+			    E1000_TXD_STAT_DD) {
+				/* Increment the number of packets
+				 * freed.
+				 */
+				count++;
+
+				/* Get the start of the next packet. */
+				tx_next = sw_ring[tx_last].next_id;
+
+				/* Loop through all segments in a
+				 * packet.
+				 */
+				do {
+					if (sw_ring[tx_id].mbuf) {
+						rte_pktmbuf_free_seg(
+							sw_ring[tx_id].mbuf);
 						sw_ring[tx_id].mbuf = NULL;
 						sw_ring[tx_id].last_id = tx_id;
+					}
 
-						/* Move to next segemnt. */
-						tx_id = sw_ring[tx_id].next_id;
-
-					} while (tx_id != tx_next);
-
-					if (unlikely(count == (int)free_cnt))
-						break;
-				} else
-					/*
-					 * mbuf still in use, nothing left to
-					 * free.
-					 */
-					break;
-			} else {
-				/*
-				 * There are multiple reasons to be here:
-				 * 1) All the packets on the ring have been
-				 *    freed - tx_id is equal to tx_first
-				 *    and some packets have been freed.
-				 *    - Done, exit
-				 * 2) Interfaces has not sent a rings worth of
-				 *    packets yet, so the segment after tail is
-				 *    still empty. Or a previous call to this
-				 *    function freed some of the segments but
-				 *    not all so there is a hole in the list.
-				 *    Hopefully this is a rare case.
-				 *    - Walk the list and find the next mbuf. If
-				 *      there isn't one, then done.
-				 */
-				if (likely((tx_id == tx_first) && (count != 0)))
-					break;
-
-				/*
-				 * Walk the list and find the next mbuf, if any.
-				 */
-				do {
 					/* Move to next segemnt. */
 					tx_id = sw_ring[tx_id].next_id;
 
-					if (sw_ring[tx_id].mbuf)
-						break;
+				} while (tx_id != tx_next);
 
-				} while (tx_id != tx_first);
-
-				/*
-				 * Determine why previous loop bailed. If there
-				 * is not an mbuf, done.
+				if (unlikely(count == (int)free_cnt))
+					break;
+			} else {
+				/* mbuf still in use, nothing left to
+				 * free.
 				 */
-				if (sw_ring[tx_id].mbuf == NULL)
-					break;
+				break;
 			}
+		} else {
+			/* There are multiple reasons to be here:
+			 * 1) All the packets on the ring have been
+			 *    freed - tx_id is equal to tx_first
+			 *    and some packets have been freed.
+			 *    - Done, exit
+			 * 2) Interfaces has not sent a rings worth of
+			 *    packets yet, so the segment after tail is
+			 *    still empty. Or a previous call to this
+			 *    function freed some of the segments but
+			 *    not all so there is a hole in the list.
+			 *    Hopefully this is a rare case.
+			 *    - Walk the list and find the next mbuf. If
+			 *      there isn't one, then done.
+			 */
+			if (likely(tx_id == tx_first && count != 0))
+				break;
+
+			/* Walk the list and find the next mbuf, if any. */
+			do {
+				/* Move to next segemnt. */
+				tx_id = sw_ring[tx_id].next_id;
+
+				if (sw_ring[tx_id].mbuf)
+					break;
+
+			} while (tx_id != tx_first);
+
+			/* Determine why previous loop bailed. If there
+			 * is not an mbuf, done.
+			 */
+			if (!sw_ring[tx_id].mbuf)
+				break;
 		}
-	} else
-		count = -ENODEV;
+	}
 
 	return count;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.284609293 +0100
+++ 0013-net-e1000-fix-crash-on-Tx-done-clean-up.patch	2020-08-28 11:03:25.940955587 +0100
@@ -1 +1 @@
-From 4237be2b9e250d431d465b81a0abbe5fb559d2c8 Mon Sep 17 00:00:00 2001
+From 8df3f28ce362ad3ccd68af91e584971893c34005 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4237be2b9e250d431d465b81a0abbe5fb559d2c8 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 6411924e03..dd520cd82c 100644
+index 54b38ad4db..86934836a8 100644
@@ -25 +26 @@
-@@ -1296,111 +1296,105 @@ igb_tx_done_cleanup(struct igb_tx_queue *txq, uint32_t free_cnt)
+@@ -1293,111 +1293,105 @@ igb_tx_done_cleanup(struct igb_tx_queue *txq, uint32_t free_cnt)

[dpdk-stable] patch 'vhost: fix double-free with zero-copy' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/59b99c4c9c48e0c80c72bf105c7f7dbd7f35c040

Thanks.

Kevin.

---
From 59b99c4c9c48e0c80c72bf105c7f7dbd7f35c040 Mon Sep 17 00:00:00 2001
From: Patrick Fu <patrick.fu@intel.com>
Date: Tue, 21 Jul 2020 12:10:57 +0000
Subject: [PATCH] vhost: fix double-free with zero-copy

[ upstream commit a608436b635460c1be0d0d561838aa197cf32c87 ]

zmbufs should be set to NULL when getting freed to avoid double free on
the same buffer pointer

Fixes: b0a985d1f340 ("vhost: add dequeue zero copy")

Signed-off-by: Patrick Fu <patrick.fu@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost_user.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index c88275c24f..2a6a23c4b2 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1396,4 +1396,5 @@ free_zmbufs(struct vhost_virtqueue *vq)
 
 	rte_free(vq->zmbufs);
+	vq->zmbufs = NULL;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.304967569 +0100
+++ 0014-vhost-fix-double-free-with-zero-copy.patch	2020-08-28 11:03:25.942955602 +0100
@@ -1 +1 @@
-From a608436b635460c1be0d0d561838aa197cf32c87 Mon Sep 17 00:00:00 2001
+From 59b99c4c9c48e0c80c72bf105c7f7dbd7f35c040 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a608436b635460c1be0d0d561838aa197cf32c87 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index df0db8a07d..9ddeae3622 100644
+index c88275c24f..2a6a23c4b2 100644
@@ -22 +23 @@
-@@ -1935,4 +1935,5 @@ free_zmbufs(struct vhost_virtqueue *vq)
+@@ -1396,4 +1396,5 @@ free_zmbufs(struct vhost_virtqueue *vq)

[dpdk-stable] patch 'net: fix pedantic build' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/544af62d826c9ec383817c87df46bdf0e3a826ce

Thanks.

Kevin.

---
From 544af62d826c9ec383817c87df46bdf0e3a826ce Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland@mellanox.com>
Date: Tue, 21 Jul 2020 11:31:55 +0300
Subject: [PATCH] net: fix pedantic build

[ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ]

when trying to compile rte_mpls with pedantic enabled,
on old compilers like 4.8 it will complain about bit field definition.

error: type of bit-field 'bs' is a GCC extension [-Werror=pedantic]
error: type of bit-field 'tc' is a GCC extension [-Werror=pedantic]
error: type of bit-field 'tag_lsb' is a GCC extension [-Werror=pedantic]

This fixes the compilation error by adding extension to the header
definition.

Fixes: e480cf487a0d ("net: add MPLS header structure")

Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_net/rte_mpls.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h
index 11d26ba35d..dabec32446 100644
--- a/lib/librte_net/rte_mpls.h
+++ b/lib/librte_net/rte_mpls.h
@@ -22,4 +22,5 @@ extern "C" {
  * MPLS header.
  */
+__extension__
 struct mpls_hdr {
 	uint16_t tag_msb;   /**< Label(msb). */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.326443705 +0100
+++ 0015-net-fix-pedantic-build.patch	2020-08-28 11:03:25.943955610 +0100
@@ -1 +1 @@
-From e4f9eab7d948b952cc65e9e360576de3ff1f7a9e Mon Sep 17 00:00:00 2001
+From 544af62d826c9ec383817c87df46bdf0e3a826ce Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index db91707e67..3e8cb90ec3 100644
+index 11d26ba35d..dabec32446 100644
@@ -33 +34 @@
- struct rte_mpls_hdr {
+ struct mpls_hdr {

[dpdk-stable] patch 'doc: fix some typos in Linux guide' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/6d7f6d43d23a7fb07ef13d51fa35adadccb67020

Thanks.

Kevin.

---
From 6d7f6d43d23a7fb07ef13d51fa35adadccb67020 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Mon, 8 Jun 2020 16:52:07 -0500
Subject: [PATCH] doc: fix some typos in Linux guide

[ upstream commit 5b2b0bd084c4a7096c512465116c471018e4e42f ]

The display was not proper due to the missing space. Changed
arm64 to aarch64.

Fixes: 2eb7c526b929 ("doc: clarify IOMMU disabling for uio_pci_generic")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 doc/guides/linux_gsg/linux_drivers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst
index ef8f5040c7..7be3c43e4f 100644
--- a/doc/guides/linux_gsg/linux_drivers.rst
+++ b/doc/guides/linux_gsg/linux_drivers.rst
@@ -53,6 +53,6 @@ be loaded as shown below:
    If the devices used for DPDK are bound to the ``uio_pci_generic`` kernel module,
    please make sure that the IOMMU is disabled or passthrough. One can add
-   ``intel_iommu=off`` or ``amd_iommu=off`` or ``intel_iommu=on iommu=pt``in GRUB
-   command line on x86_64 systems, or add ``iommu.passthrough=1`` on arm64 system.
+   ``intel_iommu=off`` or ``amd_iommu=off`` or ``intel_iommu=on iommu=pt`` in GRUB
+   command line on x86_64 systems, or add ``iommu.passthrough=1`` on aarch64 system.
 
 Since DPDK release 1.7 onward provides VFIO support, use of UIO is optional
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.345055617 +0100
+++ 0016-doc-fix-some-typos-in-Linux-guide.patch	2020-08-28 11:03:25.943955610 +0100
@@ -1 +1 @@
-From 5b2b0bd084c4a7096c512465116c471018e4e42f Mon Sep 17 00:00:00 2001
+From 6d7f6d43d23a7fb07ef13d51fa35adadccb67020 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5b2b0bd084c4a7096c512465116c471018e4e42f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 4eda3d5bf4..185074013a 100644
+index ef8f5040c7..7be3c43e4f 100644
@@ -22 +23 @@
-@@ -59,6 +59,6 @@ be loaded as shown below:
+@@ -53,6 +53,6 @@ be loaded as shown below:

[dpdk-stable] patch 'doc: fix typo in bbdev test guide' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/6a8b3ed981e49877d24ae276817986f05287958c

Thanks.

Kevin.

---
From 6a8b3ed981e49877d24ae276817986f05287958c Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif@emumba.com>
Date: Tue, 16 Jun 2020 13:22:01 +0500
Subject: [PATCH] doc: fix typo in bbdev test guide

[ upstream commit d9f94a929572c0e965d2b9c169bb421e6f34e56a ]

fixed typing error in doc/guides/tools/testbbdev.rst

Fixes: f714a18885a6 ("app/testbbdev: add test application for bbdev")

Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com>
Acked-by: Nicolas Chautru <nicolas.chautru@intel.com>
---
 doc/guides/tools/testbbdev.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst
index 793ed5537a..6301f19a36 100644
--- a/doc/guides/tools/testbbdev.rst
+++ b/doc/guides/tools/testbbdev.rst
@@ -7,5 +7,5 @@ dpdk-test-bbdev Application
 The ``dpdk-test-bbdev`` tool is a Data Plane Development Kit (DPDK) utility that
 allows measuring performance parameters of PMDs available in the bbdev framework.
-Available tests available for execution are: latency, throughput, validation and
+Tests available for execution are: latency, throughput, validation and
 sanity tests. Execution of tests can be customized using various parameters
 passed to a python running script.
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.363752468 +0100
+++ 0017-doc-fix-typo-in-bbdev-test-guide.patch	2020-08-28 11:03:25.944955617 +0100
@@ -1 +1 @@
-From d9f94a929572c0e965d2b9c169bb421e6f34e56a Mon Sep 17 00:00:00 2001
+From 6a8b3ed981e49877d24ae276817986f05287958c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d9f94a929572c0e965d2b9c169bb421e6f34e56a ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 2798721393..393c3e9d0d 100644
+index 793ed5537a..6301f19a36 100644
@@ -24,4 +25,4 @@
--Available tests available for execution are: latency, throughput, validation,
-+Tests available for execution are: latency, throughput, validation,
- bler and sanity tests. Execution of tests can be customized using various
- parameters passed to a python running script.
+-Available tests available for execution are: latency, throughput, validation and
++Tests available for execution are: latency, throughput, validation and
+ sanity tests. Execution of tests can be customized using various parameters
+ passed to a python running script.

[dpdk-stable] patch 'bus/vdev: fix a typo in doxygen comment' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/c05cf600814d700aaf9f844a5121ad0b51c6f863

Thanks.

Kevin.

---
From c05cf600814d700aaf9f844a5121ad0b51c6f863 Mon Sep 17 00:00:00 2001
From: Muhammad Bilal <m.bilal@emumba.com>
Date: Tue, 23 Jun 2020 18:26:02 +0500
Subject: [PATCH] bus/vdev: fix a typo in doxygen comment

[ upstream commit 71ee0b90289a90218fa510908362392a393531b0 ]

While uninitalizing the driver, the comment was mentioning
initialized instead of uninitalized in description of parameter.

Fixes: 0fe11ec592b2 ("eal: add vdev init and uninit")

Signed-off-by: Muhammad Bilal <m.bilal@emumba.com>
---
 drivers/bus/vdev/rte_bus_vdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h
index 9ae3eaae30..f71a6de3e8 100644
--- a/drivers/bus/vdev/rte_bus_vdev.h
+++ b/drivers/bus/vdev/rte_bus_vdev.h
@@ -150,5 +150,5 @@ int rte_vdev_init(const char *name, const char *args);
  *
  * @param name
- *   The pointer to a driver name to be initialized.
+ *   The pointer to a driver name to be uninitialized.
  * @return
  *  0 on success, negative on error
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.381453544 +0100
+++ 0018-bus-vdev-fix-a-typo-in-doxygen-comment.patch	2020-08-28 11:03:25.944955617 +0100
@@ -1 +1 @@
-From 71ee0b90289a90218fa510908362392a393531b0 Mon Sep 17 00:00:00 2001
+From c05cf600814d700aaf9f844a5121ad0b51c6f863 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 71ee0b90289a90218fa510908362392a393531b0 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 2bc46530c9..78a032cea8 100644
+index 9ae3eaae30..f71a6de3e8 100644
@@ -21 +22 @@
-@@ -156,5 +156,5 @@ int rte_vdev_init(const char *name, const char *args);
+@@ -150,5 +150,5 @@ int rte_vdev_init(const char *name, const char *args);

[dpdk-stable] patch 'hash: fix out-of-memory handling in hash creation' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/d717370c7bbf06b251bf13882708d1c4df21df13

Thanks.

Kevin.

---
From d717370c7bbf06b251bf13882708d1c4df21df13 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Wed, 22 Jul 2020 11:58:58 +0800
Subject: [PATCH] hash: fix out-of-memory handling in hash creation

[ upstream commit a5f803c804c4f75ce7c736a143170c49bb7e72c9 ]

The function rte_zmalloc_socket() could return NULL, the return
value need to be checked.

Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")

Reported-by: Bin Huang <brian.huangbin@huawei.com>
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 lib/librte_hash/rte_cuckoo_hash.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index e76277167b..bd264b068e 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -142,4 +142,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
 	unsigned int no_free_on_del = 0;
 	uint32_t *tbl_chng_cnt = NULL;
+	struct lcore_cache *local_free_slots = NULL;
 	unsigned int readwrite_concur_lf_support = 0;
 
@@ -366,7 +367,11 @@ rte_hash_create(const struct rte_hash_parameters *params)
 
 	if (use_local_cache) {
-		h->local_free_slots = rte_zmalloc_socket(NULL,
+		local_free_slots = rte_zmalloc_socket(NULL,
 				sizeof(struct lcore_cache) * RTE_MAX_LCORE,
 				RTE_CACHE_LINE_SIZE, params->socket_id);
+		if (local_free_slots == NULL) {
+			RTE_LOG(ERR, HASH, "local free slots memory allocation failed\n");
+			goto err_unlock;
+		}
 	}
 
@@ -398,4 +403,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
 	h->hw_trans_mem_support = hw_trans_mem_support;
 	h->use_local_cache = use_local_cache;
+	h->local_free_slots = local_free_slots;
 	h->readwrite_concur_support = readwrite_concur_support;
 	h->ext_table_support = ext_table_support;
@@ -439,4 +445,5 @@ err:
 	rte_ring_free(r_ext);
 	rte_free(te);
+	rte_free(local_free_slots);
 	rte_free(h);
 	rte_free(buckets);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.401555412 +0100
+++ 0019-hash-fix-out-of-memory-handling-in-hash-creation.patch	2020-08-28 11:03:25.946955632 +0100
@@ -1 +1 @@
-From a5f803c804c4f75ce7c736a143170c49bb7e72c9 Mon Sep 17 00:00:00 2001
+From d717370c7bbf06b251bf13882708d1c4df21df13 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a5f803c804c4f75ce7c736a143170c49bb7e72c9 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 5f701d5792..0a6d474713 100644
+index e76277167b..bd264b068e 100644
@@ -24,2 +25,2 @@
-@@ -152,4 +152,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
- 	uint32_t *ext_bkt_to_free = NULL;
+@@ -142,4 +142,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
+ 	unsigned int no_free_on_del = 0;
@@ -29,2 +30,2 @@
- 	uint32_t i;
-@@ -384,7 +385,11 @@ rte_hash_create(const struct rte_hash_parameters *params)
+ 
+@@ -366,7 +367,11 @@ rte_hash_create(const struct rte_hash_parameters *params)
@@ -43 +44 @@
-@@ -417,4 +422,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
+@@ -398,4 +403,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
@@ -49 +50 @@
-@@ -462,4 +468,5 @@ err:
+@@ -439,4 +445,5 @@ err:

[dpdk-stable] patch 'test/cycles: restore default delay callback' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/cd89b1b7c32e558898bfb81af0f166ace3f01a6f

Thanks.

Kevin.

---
From cd89b1b7c32e558898bfb81af0f166ace3f01a6f Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang@arm.com>
Date: Mon, 27 Jul 2020 18:21:50 +0800
Subject: [PATCH] test/cycles: restore default delay callback

[ upstream commit ec0b862d5e52db12932c3125d06081307aea6af4 ]

test_delay_us_sleep registers sleep based delay for testing.
This changes the default delay function of testing environment.
It is not expected.

Restore default delay function after the test to fix the issue.

Fixes: a51639cc720a ("eal: add nanosleep based delay function")

Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
---
 test/test/test_cycles.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c
index c78e6a5b12..97d42f3032 100644
--- a/test/test/test_cycles.c
+++ b/test/test/test_cycles.c
@@ -80,6 +80,12 @@ static int
 test_delay_us_sleep(void)
 {
+	int rv;
+
 	rte_delay_us_callback_register(rte_delay_us_sleep);
-	return check_wait_one_second();
+	rv = check_wait_one_second();
+	/* restore original delay function */
+	rte_delay_us_callback_register(rte_delay_us_block);
+
+	return rv;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.423272735 +0100
+++ 0020-test-cycles-restore-default-delay-callback.patch	2020-08-28 11:03:25.946955632 +0100
@@ -1 +1 @@
-From ec0b862d5e52db12932c3125d06081307aea6af4 Mon Sep 17 00:00:00 2001
+From cd89b1b7c32e558898bfb81af0f166ace3f01a6f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ec0b862d5e52db12932c3125d06081307aea6af4 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- app/test/test_cycles.c | 8 +++++++-
+ test/test/test_cycles.c | 8 +++++++-
@@ -21 +22 @@
-diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c
+diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c
@@ -23,2 +24,2 @@
---- a/app/test/test_cycles.c
-+++ b/app/test/test_cycles.c
+--- a/test/test/test_cycles.c
++++ b/test/test/test_cycles.c

[dpdk-stable] patch 'event/dpaa: remove dead code' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/2915e71cb2b658f19aa75cf94d56471efa6bc1ff

Thanks.

Kevin.

---
From 2915e71cb2b658f19aa75cf94d56471efa6bc1ff Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Fri, 17 Jul 2020 19:31:52 +0800
Subject: [PATCH] event/dpaa: remove dead code

[ upstream commit fea678742606d794240bca2c15811c357bf0c298 ]

Fix logical dead code.

Coverity issue: 323495
Fixes: 77b5311d0ece ("event/dpaa: support select based event")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/event/dpaa/dpaa_eventdev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index 15707e22e6..5e6338e843 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -171,5 +171,5 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
 	u16 ch_id;
 	void *buffers[8];
-	u32 num_frames, i, irq = 0;
+	u32 num_frames, i;
 	uint64_t cur_ticks = 0, wait_time_ticks = 0;
 	struct dpaa_port *portal = (struct dpaa_port *)port;
@@ -220,6 +220,4 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
 		/* Lets dequeue the frames */
 		num_frames = qman_portal_dequeue(ev, nb_events, buffers);
-		if (irq)
-			irq = 0;
 		if (num_frames)
 			break;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.444916778 +0100
+++ 0021-event-dpaa-remove-dead-code.patch	2020-08-28 11:03:25.947955640 +0100
@@ -1 +1 @@
-From fea678742606d794240bca2c15811c357bf0c298 Mon Sep 17 00:00:00 2001
+From 2915e71cb2b658f19aa75cf94d56471efa6bc1ff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fea678742606d794240bca2c15811c357bf0c298 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index a3c138b7a0..b5ae87a4ea 100644
+index 15707e22e6..5e6338e843 100644
@@ -22 +23 @@
-@@ -175,5 +175,5 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
+@@ -171,5 +171,5 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
@@ -29 +30 @@
-@@ -224,6 +224,4 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
+@@ -220,6 +220,4 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],

[dpdk-stable] patch 'app/eventdev: fix capability check in pipeline ATQ test' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/f531ddbb6647ef257970f7dc96f886b04735031f

Thanks.

Kevin.

---
From f531ddbb6647ef257970f7dc96f886b04735031f Mon Sep 17 00:00:00 2001
From: Apeksha Gupta <apeksha.gupta@nxp.com>
Date: Thu, 23 Jul 2020 22:32:32 +0530
Subject: [PATCH] app/eventdev: fix capability check in pipeline ATQ test

[ upstream commit 179237727e91d8eb5ab2ce6fb78a1d380ae84401 ]

Add all type queue capability check before configuring event device
for pipeline atq test.

Fixes: 6bf570a9911 ("app/eventdev: add pipeline atq test")

Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
Acked-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 app/test-eventdev/test_pipeline_atq.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-eventdev/test_pipeline_atq.c b/app/test-eventdev/test_pipeline_atq.c
index fc4cb3bb74..306ed08693 100644
--- a/app/test-eventdev/test_pipeline_atq.c
+++ b/app/test-eventdev/test_pipeline_atq.c
@@ -505,4 +505,6 @@ pipeline_atq_capability_check(struct evt_options *opt)
 			dev_info.max_event_ports);
 	}
+	if (!evt_has_all_types_queue(opt->dev_id))
+		return false;
 
 	return true;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.465202049 +0100
+++ 0022-app-eventdev-fix-capability-check-in-pipeline-ATQ-te.patch	2020-08-28 11:03:25.947955640 +0100
@@ -1 +1 @@
-From 179237727e91d8eb5ab2ce6fb78a1d380ae84401 Mon Sep 17 00:00:00 2001
+From f531ddbb6647ef257970f7dc96f886b04735031f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 179237727e91d8eb5ab2ce6fb78a1d380ae84401 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 8e8686c145..0872b25b53 100644
+index fc4cb3bb74..306ed08693 100644
@@ -22 +23 @@
-@@ -496,4 +496,6 @@ pipeline_atq_capability_check(struct evt_options *opt)
+@@ -505,4 +505,6 @@ pipeline_atq_capability_check(struct evt_options *opt)

[dpdk-stable] patch 'event/dpaa2: add all-types queue capability flag' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/6097ef798f2b85e36b10c444f08e6440c1477046

Thanks.

Kevin.

---
From 6097ef798f2b85e36b10c444f08e6440c1477046 Mon Sep 17 00:00:00 2001
From: Apeksha Gupta <apeksha.gupta@nxp.com>
Date: Thu, 23 Jul 2020 22:34:25 +0530
Subject: [PATCH] event/dpaa2: add all-types queue capability flag

[ upstream commit b8d81e9cbf5e411133800da8fddc80a636e3555d ]

DPAA2 eventdev device is capable of all type queue feature.
Fix the capability flag to reflect the same.

Fixes: 8f4a294c23 ("event/dpaa2: apply new capability flags")

Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
Acked-by: Nipun Gupta <nipun.gupta@nxp.com>
---
 drivers/event/dpaa2/dpaa2_eventdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index 270ebbe850..f647430b26 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -392,5 +392,6 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
 		RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |
 		RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |
-		RTE_EVENT_DEV_CAP_NONSEQ_MODE;
+		RTE_EVENT_DEV_CAP_NONSEQ_MODE |
+		RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES;
 
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.485588626 +0100
+++ 0023-event-dpaa2-add-all-types-queue-capability-flag.patch	2020-08-28 11:03:25.948955648 +0100
@@ -1 +1 @@
-From b8d81e9cbf5e411133800da8fddc80a636e3555d Mon Sep 17 00:00:00 2001
+From 6097ef798f2b85e36b10c444f08e6440c1477046 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b8d81e9cbf5e411133800da8fddc80a636e3555d ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index a545baf34f..3ae4441ee3 100644
+index 270ebbe850..f647430b26 100644
@@ -22 +23 @@
-@@ -406,5 +406,6 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
+@@ -392,5 +392,6 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,

[dpdk-stable] patch 'common/qat: fix uninitialized variable' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/08eecae80f2df5f19017dcb0ca034a1bb30cdc96

Thanks.

Kevin.

---
From 08eecae80f2df5f19017dcb0ca034a1bb30cdc96 Mon Sep 17 00:00:00 2001
From: Adam Dybkowski <adamx.dybkowski@intel.com>
Date: Fri, 24 Jul 2020 11:40:10 +0200
Subject: [PATCH] common/qat: fix uninitialized variable

[ upstream commit c800c2e07f9644ee5473fffe30f2a07d97bb399b ]

This patch fixes the uninitialized variable bug in QAT PMD.

Fixes: 9f27a860dc16 ("crypto/qat: move generic qp function to qp file")

Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 drivers/common/qat/qat_qp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index 935ec3fb5a..b5296dd745 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -574,5 +574,5 @@ qat_enqueue_op_burst(void *qp, void **ops, uint16_t nb_ops)
 	struct qat_qp *tmp_qp = (struct qat_qp *)qp;
 	register uint32_t nb_ops_sent = 0;
-	register int ret;
+	register int ret = -1;
 	uint16_t nb_ops_possible = nb_ops;
 	register uint8_t *base_addr;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.503173356 +0100
+++ 0024-common-qat-fix-uninitialized-variable.patch	2020-08-28 11:03:25.949955655 +0100
@@ -1 +1 @@
-From c800c2e07f9644ee5473fffe30f2a07d97bb399b Mon Sep 17 00:00:00 2001
+From 08eecae80f2df5f19017dcb0ca034a1bb30cdc96 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c800c2e07f9644ee5473fffe30f2a07d97bb399b ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 567d55fd99..32d7401053 100644
+index 935ec3fb5a..b5296dd745 100644
@@ -21 +22 @@
-@@ -582,5 +582,5 @@ qat_enqueue_op_burst(void *qp, void **ops, uint16_t nb_ops)
+@@ -574,5 +574,5 @@ qat_enqueue_op_burst(void *qp, void **ops, uint16_t nb_ops)

[dpdk-stable] patch 'crypto/armv8: remove debug option' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/249035bb4843ea7d3b23ab931dd4ecb76d621b56

Thanks.

Kevin.

---
From 249035bb4843ea7d3b23ab931dd4ecb76d621b56 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang@arm.com>
Date: Tue, 28 Jul 2020 17:24:04 +0800
Subject: [PATCH] crypto/armv8: remove debug option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ]

Typo in debug log switch macro caused debug log cannot be enabled.
Since no log used in data path, remove the debug option entirely
and have logs always enabled.

Resolved compilation error when debug log is enabled:
rte_armv8_pmd.c: In function ‘process_armv8_chained_op’:
rte_armv8_pmd.c:633:22: error: expected ‘)’ before ‘crypto_func’
  ARMV8_CRYPTO_ASSERT(crypto_func != NULL);
                      ^

Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")

Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 config/common_base                           |  1 -
 drivers/crypto/armv8/rte_armv8_pmd_private.h | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/common_base b/config/common_base
index 6bce2c97ff..401388188c 100644
--- a/config/common_base
+++ b/config/common_base
@@ -503,5 +503,4 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64
 #
 CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n
-CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n
 
 #
diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
index 7feb021db5..04ce1cc0e4 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
+++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
@@ -14,5 +14,4 @@
 			__func__, __LINE__, ## args)
 
-#ifdef RTE_LIBRTE_ARMV8_CRYPTO_DEBUG
 #define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \
 	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
@@ -28,15 +27,9 @@
 do {								\
 	if (!(con)) {						\
-		rte_panic("%s(): "				\
-		    con "condition failed, line %u", __func__);	\
+		rte_panic("condition failed, line %u",		\
+			__LINE__);				\
 	}							\
 } while (0)
 
-#else
-#define ARMV8_CRYPTO_LOG_INFO(fmt, args...)
-#define ARMV8_CRYPTO_LOG_DBG(fmt, args...)
-#define ARMV8_CRYPTO_ASSERT(con)
-#endif
-
 #define NBBY		8		/* Number of bits in a byte */
 #define BYTE_LENGTH(x)	((x) / NBBY)	/* Number of bytes in x (round down) */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.522811579 +0100
+++ 0025-crypto-armv8-remove-debug-option.patch	2020-08-28 11:03:25.950955663 +0100
@@ -1 +1 @@
-From cc9035ffbb8a050780e202047500b1580abed0c9 Mon Sep 17 00:00:00 2001
+From 249035bb4843ea7d3b23ab931dd4ecb76d621b56 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -26,2 +27,2 @@
- config/common_base                       |  1 -
- drivers/crypto/armv8/armv8_pmd_private.h | 11 ++---------
+ config/common_base                           |  1 -
+ drivers/crypto/armv8/rte_armv8_pmd_private.h | 11 ++---------
@@ -31 +32 @@
-index f76585f165..c70b8f68bf 100644
+index 6bce2c97ff..401388188c 100644
@@ -34 +35 @@
-@@ -606,5 +606,4 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64
+@@ -503,5 +503,4 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64
@@ -40,5 +41,5 @@
-diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
-index e08d0df781..19940809bc 100644
---- a/drivers/crypto/armv8/armv8_pmd_private.h
-+++ b/drivers/crypto/armv8/armv8_pmd_private.h
-@@ -16,5 +16,4 @@
+diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
+index 7feb021db5..04ce1cc0e4 100644
+--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
++++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
+@@ -14,5 +14,4 @@
@@ -50 +51 @@
-@@ -30,15 +29,9 @@
+@@ -28,15 +27,9 @@

[dpdk-stable] patch 'crypto/armv8: use dedicated log type' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/16147e7969ad44f020c1ed320869866816c6453a

Thanks.

Kevin.

---
From 16147e7969ad44f020c1ed320869866816c6453a Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang@arm.com>
Date: Tue, 28 Jul 2020 17:24:05 +0800
Subject: [PATCH] crypto/armv8: use dedicated log type

[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ]

armv8 crypto PMD used CRYPTODEV general log type.
Create a dedicated log type for the PMD to not pollute CRYPTODEV log type.

Typo in crypto dev name macro caused unexpected device name in log.
Fixed the typo to log with correct device name.

Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")

Suggested-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/armv8/rte_armv8_pmd.c         |  2 ++
 drivers/crypto/armv8/rte_armv8_pmd_private.h | 23 ++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index efdde399de..440417c65f 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -851,4 +851,6 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
 static struct cryptodev_driver armv8_crypto_drv;
 
+RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
+
 RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
 RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);
diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
index 04ce1cc0e4..daad14b8da 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
+++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
@@ -9,17 +9,22 @@
 /**< ARMv8 Crypto PMD device name */
 
-#define ARMV8_CRYPTO_LOG_ERR(fmt, args...) \
-	RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+extern int crypto_armv8_log_type;
+
+#define ARMV8_CRYPTO_LOG_ERR(fmt, args...)			\
+	rte_log(RTE_LOG_ERR, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-#define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \
-	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+#define ARMV8_CRYPTO_LOG_INFO(fmt, args...)			\
+	rte_log(RTE_LOG_INFO, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-#define ARMV8_CRYPTO_LOG_DBG(fmt, args...) \
-	RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+#define ARMV8_CRYPTO_LOG_DBG(fmt, args...)			\
+	rte_log(RTE_LOG_DEBUG, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.544052543 +0100
+++ 0026-crypto-armv8-use-dedicated-log-type.patch	2020-08-28 11:03:25.951955670 +0100
@@ -1 +1 @@
-From 28b0514504cf0f71f822f0aed5aacc83eb8ada12 Mon Sep 17 00:00:00 2001
+From 16147e7969ad44f020c1ed320869866816c6453a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -19,2 +20,2 @@
- drivers/crypto/armv8/armv8_pmd_private.h | 23 ++++++++++++++---------
- drivers/crypto/armv8/rte_armv8_pmd.c     |  2 ++
+ drivers/crypto/armv8/rte_armv8_pmd.c         |  2 ++
+ drivers/crypto/armv8/rte_armv8_pmd_private.h | 23 ++++++++++++--------
@@ -23,5 +24,16 @@
-diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
-index 19940809bc..709b3d5360 100644
---- a/drivers/crypto/armv8/armv8_pmd_private.h
-+++ b/drivers/crypto/armv8/armv8_pmd_private.h
-@@ -11,17 +11,22 @@
+diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
+index efdde399de..440417c65f 100644
+--- a/drivers/crypto/armv8/rte_armv8_pmd.c
++++ b/drivers/crypto/armv8/rte_armv8_pmd.c
+@@ -851,4 +851,6 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
+ static struct cryptodev_driver armv8_crypto_drv;
+ 
++RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
++
+ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
+ RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);
+diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
+index 04ce1cc0e4..daad14b8da 100644
+--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
++++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
+@@ -9,17 +9,22 @@
@@ -59,11 +70,0 @@
-diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
-index 8b212772fa..a2b08d8180 100644
---- a/drivers/crypto/armv8/rte_armv8_pmd.c
-+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
-@@ -862,4 +862,6 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
- static struct cryptodev_driver armv8_crypto_drv;
- 
-+RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
-+
- RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
- RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);

[dpdk-stable] patch 'net/mlx5: fix flow items size calculation' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/e070c7603fcab00ade74e5e651fd3cb9b7f3c356

Thanks.

Kevin.

---
From e070c7603fcab00ade74e5e651fd3cb9b7f3c356 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland@mellanox.com>
Date: Thu, 16 Jul 2020 15:14:55 +0300
Subject: [PATCH] net/mlx5: fix flow items size calculation

[ upstream commit d13f9760866884d81563624fbf160f3054b70f19 ]

flow_dv_get_item_len returns the actual header size of
an rte_flow item.

Changing any of the structs for rte_flow items by adding
or removing some extra fields will break this function.

This fixes the behavior by returning the actual header size
of each item.

Fixes: 34d41b7aa3bf ("net/mlx5: add VXLAN encap action to Direct Verbs")

Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 460461ab0d..aa8f5977fa 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -27,4 +27,5 @@
 #include <rte_ip.h>
 #include <rte_gre.h>
+#include <rte_mpls.h>
 
 #include "mlx5.h"
@@ -350,5 +351,5 @@ flow_dv_encap_decap_resource_register
 
 /**
- * Get the size of specific rte_flow_item_type
+ * Get the size of specific rte_flow_item_type hdr size
  *
  * @param[in] item_type
@@ -359,5 +360,5 @@ flow_dv_encap_decap_resource_register
  */
 static size_t
-flow_dv_get_item_len(const enum rte_flow_item_type item_type)
+flow_dv_get_item_hdr_len(const enum rte_flow_item_type item_type)
 {
 	size_t retval;
@@ -365,35 +366,31 @@ flow_dv_get_item_len(const enum rte_flow_item_type item_type)
 	switch (item_type) {
 	case RTE_FLOW_ITEM_TYPE_ETH:
-		retval = sizeof(struct rte_flow_item_eth);
+		retval = sizeof(struct ether_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_VLAN:
-		retval = sizeof(struct rte_flow_item_vlan);
+		retval = sizeof(struct vlan_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_IPV4:
-		retval = sizeof(struct rte_flow_item_ipv4);
+		retval = sizeof(struct ipv4_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_IPV6:
-		retval = sizeof(struct rte_flow_item_ipv6);
+		retval = sizeof(struct ipv6_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_UDP:
-		retval = sizeof(struct rte_flow_item_udp);
+		retval = sizeof(struct udp_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_TCP:
-		retval = sizeof(struct rte_flow_item_tcp);
+		retval = sizeof(struct tcp_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_VXLAN:
-		retval = sizeof(struct rte_flow_item_vxlan);
+	case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
+		retval = sizeof(struct vxlan_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_GRE:
-		retval = sizeof(struct rte_flow_item_gre);
-		break;
 	case RTE_FLOW_ITEM_TYPE_NVGRE:
-		retval = sizeof(struct rte_flow_item_nvgre);
-		break;
-	case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
-		retval = sizeof(struct rte_flow_item_vxlan_gpe);
+		retval = sizeof(struct gre_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_MPLS:
-		retval = sizeof(struct rte_flow_item_mpls);
+		retval = sizeof(struct mpls_hdr);
 		break;
 	case RTE_FLOW_ITEM_TYPE_VOID: /* Fall through. */
@@ -448,5 +445,5 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
 					  NULL, "invalid empty data");
 	for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
-		len = flow_dv_get_item_len(items->type);
+		len = flow_dv_get_item_hdr_len(items->type);
 		if (len + temp_size > MLX5_ENCAP_MAX_LEN)
 			return rte_flow_error_set(error, EINVAL,
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.567266876 +0100
+++ 0027-net-mlx5-fix-flow-items-size-calculation.patch	2020-08-28 11:03:25.954955693 +0100
@@ -1 +1 @@
-From d13f9760866884d81563624fbf160f3054b70f19 Mon Sep 17 00:00:00 2001
+From e070c7603fcab00ade74e5e651fd3cb9b7f3c356 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d13f9760866884d81563624fbf160f3054b70f19 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index f0cc7ad1a4..e7f0a12ac1 100644
+index 460461ab0d..aa8f5977fa 100644
@@ -28,3 +29,3 @@
-@@ -21,4 +21,5 @@
- #include <rte_gtp.h>
- #include <rte_eal_paging.h>
+@@ -27,4 +27,5 @@
+ #include <rte_ip.h>
+ #include <rte_gre.h>
@@ -33,3 +34,3 @@
- #include <mlx5_glue.h>
-@@ -2867,5 +2868,5 @@ flow_dv_push_vlan_action_resource_register
- }
+ #include "mlx5.h"
+@@ -350,5 +351,5 @@ flow_dv_encap_decap_resource_register
+ 
@@ -41 +42 @@
-@@ -2876,5 +2877,5 @@ flow_dv_push_vlan_action_resource_register
+@@ -359,5 +360,5 @@ flow_dv_encap_decap_resource_register
@@ -48 +49 @@
-@@ -2882,35 +2883,31 @@ flow_dv_get_item_len(const enum rte_flow_item_type item_type)
+@@ -365,35 +366,31 @@ flow_dv_get_item_len(const enum rte_flow_item_type item_type)
@@ -52 +53 @@
-+		retval = sizeof(struct rte_ether_hdr);
++		retval = sizeof(struct ether_hdr);
@@ -56 +57 @@
-+		retval = sizeof(struct rte_vlan_hdr);
++		retval = sizeof(struct vlan_hdr);
@@ -60 +61 @@
-+		retval = sizeof(struct rte_ipv4_hdr);
++		retval = sizeof(struct ipv4_hdr);
@@ -64 +65 @@
-+		retval = sizeof(struct rte_ipv6_hdr);
++		retval = sizeof(struct ipv6_hdr);
@@ -68 +69 @@
-+		retval = sizeof(struct rte_udp_hdr);
++		retval = sizeof(struct udp_hdr);
@@ -72 +73 @@
-+		retval = sizeof(struct rte_tcp_hdr);
++		retval = sizeof(struct tcp_hdr);
@@ -77 +78 @@
-+		retval = sizeof(struct rte_vxlan_hdr);
++		retval = sizeof(struct vxlan_hdr);
@@ -87 +88 @@
-+		retval = sizeof(struct rte_gre_hdr);
++		retval = sizeof(struct gre_hdr);
@@ -91 +92 @@
-+		retval = sizeof(struct rte_mpls_hdr);
++		retval = sizeof(struct mpls_hdr);
@@ -94 +95 @@
-@@ -2965,5 +2962,5 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
+@@ -448,5 +445,5 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,

[dpdk-stable] patch 'net/mlx5: fix crash in NVGRE item translation' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/6c119752c93daeab97d82163fa5b184fd2da751c

Thanks.

Kevin.

---
From 6c119752c93daeab97d82163fa5b184fd2da751c Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@mellanox.com>
Date: Tue, 21 Jul 2020 11:59:04 +0000
Subject: [PATCH] net/mlx5: fix crash in NVGRE item translation

[ upstream commit e71e90938bef6012dea460d3d94fbd0ee643e132 ]

The flow_dv_translate_item_nvgre function add NVGRE item to matcher and
to the value.
It defines a pointer named nvrge_m that receives the item's mask into
it, and then copies some of it to the matcher.

Before copying, it checks for mask validation, and in case the mask is
NULL the function gives it a pointer to rte_flow_item_nvgre_mask.
However, the function calls from the vni mask's field before the check,
and if there is no mask, it actually does dereference to the NULL
pointer and indeed the program crashes with segfault.

Move the call from the vni field to post-validation.

Fixes: cd18e1b72f73 ("net/mlx5: fix build on Arm")

Signed-off-by: Michael Baum <michaelba@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index aa8f5977fa..aee0546b8e 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1611,6 +1611,6 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
 	void *misc_m = MLX5_ADDR_OF(fte_match_param, matcher, misc_parameters);
 	void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
-	const char *tni_flow_id_m = (const char *)nvgre_m->tni;
-	const char *tni_flow_id_v = (const char *)nvgre_v->tni;
+	const char *tni_flow_id_m;
+	const char *tni_flow_id_v;
 	char *gre_key_m;
 	char *gre_key_v;
@@ -1623,4 +1623,6 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
 	if (!nvgre_m)
 		nvgre_m = &rte_flow_item_nvgre_mask;
+	tni_flow_id_m = (const char *)nvgre_m->tni;
+	tni_flow_id_v = (const char *)nvgre_v->tni;
 	size = sizeof(nvgre_m->tni) + sizeof(nvgre_m->flow_id);
 	gre_key_m = MLX5_ADDR_OF(fte_match_set_misc, misc_m, gre_key_h);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.593294031 +0100
+++ 0028-net-mlx5-fix-crash-in-NVGRE-item-translation.patch	2020-08-28 11:03:25.956955708 +0100
@@ -1 +1 @@
-From e71e90938bef6012dea460d3d94fbd0ee643e132 Mon Sep 17 00:00:00 2001
+From 6c119752c93daeab97d82163fa5b184fd2da751c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e71e90938bef6012dea460d3d94fbd0ee643e132 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 0909cb6614..2ba320d2dd 100644
+index aa8f5977fa..aee0546b8e 100644
@@ -32 +33 @@
-@@ -6545,6 +6545,6 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
+@@ -1611,6 +1611,6 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
@@ -41 +42 @@
-@@ -6571,4 +6571,6 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
+@@ -1623,4 +1623,6 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,

[dpdk-stable] patch 'net/mlx4: optimize stack memory size in probe' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/a1801c7bb86a0b24d5538aabb6af36100c78976c

Thanks.

Kevin.

---
From a1801c7bb86a0b24d5538aabb6af36100c78976c Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@mellanox.com>
Date: Tue, 21 Jul 2020 12:01:09 +0000
Subject: [PATCH] net/mlx4: optimize stack memory size in probe

[ upstream commit 4a28e831c97cd02e1646337ea6391288f7e8db05 ]

The mlx4_pci_probe function sets a pointer to the mlx4_priv structure,
and during that function fills its fields one by one with relevant
values.

It wants to put a value in the intr_handle field that has all its fields
zero except 2. To do so, it initializes a local struct rte_intr_handle
type variable and updates it only 2 fields and assigns it into the
appropriate field. However, it initializes a very large structure on the
stack while not at all certain that this place exists and in any case it
is very wasteful.

Reset all fields directly to the pointer by memset, then format the 2
fields to the relevant values.

Fixes: 63c2f23c852a ("net/mlx4: use a single interrupt handle")

Signed-off-by: Michael Baum <michaelba@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx4/mlx4.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 5e22ee4381..58152bb97a 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -795,8 +795,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 		rte_eth_copy_pci_info(eth_dev, pci_dev);
 		/* Initialize local interrupt handle for current port. */
-		priv->intr_handle = (struct rte_intr_handle){
-			.fd = -1,
-			.type = RTE_INTR_HANDLE_EXT,
-		};
+		memset(&priv->intr_handle, 0, sizeof(struct rte_intr_handle));
+		priv->intr_handle.fd = -1;
+		priv->intr_handle.type = RTE_INTR_HANDLE_EXT;
 		/*
 		 * Override ethdev interrupt handle pointer with private
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.619864219 +0100
+++ 0029-net-mlx4-optimize-stack-memory-size-in-probe.patch	2020-08-28 11:03:25.957955716 +0100
@@ -1 +1 @@
-From 4a28e831c97cd02e1646337ea6391288f7e8db05 Mon Sep 17 00:00:00 2001
+From a1801c7bb86a0b24d5538aabb6af36100c78976c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4a28e831c97cd02e1646337ea6391288f7e8db05 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -30 +31 @@
-index e619a749d9..71061a720f 100644
+index 5e22ee4381..58152bb97a 100644
@@ -33 +34 @@
-@@ -1030,8 +1030,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+@@ -795,8 +795,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)

[dpdk-stable] patch 'net/i40e: fix binding interrupt without MSI-X vector' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/75d6efa0b1a246989bfa5e62cac477d70cfc93e6

Thanks.

Kevin.

---
From 75d6efa0b1a246989bfa5e62cac477d70cfc93e6 Mon Sep 17 00:00:00 2001
From: Mao Jiang <maox.jiang@intel.com>
Date: Thu, 23 Jul 2020 23:27:10 +0800
Subject: [PATCH] net/i40e: fix binding interrupt without MSI-X vector

[ upstream commit 6f1998a4f0411ea3b2bed7c05faa81243917a76e ]

The value of vsi->nb_msix shouldn't`t be zero, otherwise, all of
interrupts will be bind to vector 0.

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

Signed-off-by: Mao Jiang <maox.jiang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 25 +++++++++++++++++++------
 drivers/net/i40e/i40e_ethdev.h |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 759fc76c85..80410e89ea 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1979,5 +1979,5 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
 }
 
-void
+int
 i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
 {
@@ -1999,8 +1999,12 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
 	/* VF bind interrupt */
 	if (vsi->type == I40E_VSI_SRIOV) {
+		if (vsi->nb_msix == 0) {
+			PMD_DRV_LOG(ERR, "No msix resource");
+			return -EINVAL;
+		}
 		__vsi_queues_bind_intr(vsi, msix_vect,
 				       vsi->base_queue, vsi->nb_qps,
 				       itr_idx);
-		return;
+		return 0;
 	}
 
@@ -2019,5 +2023,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
 
 	for (i = 0; i < vsi->nb_used_qps; i++) {
-		if (nb_msix <= 1) {
+		if (vsi->nb_msix == 0) {
+			PMD_DRV_LOG(ERR, "No msix resource");
+			return -EINVAL;
+		} else if (nb_msix <= 1) {
 			if (!rte_intr_allow_others(intr_handle))
 				/* allow to share MISC_VEC_ID */
@@ -2044,4 +2051,6 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
 		nb_msix--;
 	}
+
+	return 0;
 }
 
@@ -2287,5 +2296,7 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	main_vsi->nb_used_qps = dev->data->nb_rx_queues -
 		pf->nb_cfg_vmdq_vsi * RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM;
-	i40e_vsi_queues_bind_intr(main_vsi, I40E_ITR_INDEX_DEFAULT);
+	ret = i40e_vsi_queues_bind_intr(main_vsi, I40E_ITR_INDEX_DEFAULT);
+	if (ret < 0)
+		return ret;
 	i40e_vsi_enable_queues_intr(main_vsi);
 
@@ -2293,6 +2304,8 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) {
 		pf->vmdq[i].vsi->nb_used_qps = RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM;
-		i40e_vsi_queues_bind_intr(pf->vmdq[i].vsi,
-					  I40E_ITR_INDEX_DEFAULT);
+		ret = i40e_vsi_queues_bind_intr(pf->vmdq[i].vsi,
+						I40E_ITR_INDEX_DEFAULT);
+		if (ret < 0)
+			return ret;
 		i40e_vsi_enable_queues_intr(pf->vmdq[i].vsi);
 	}
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 2ebbe84782..d224a35020 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1138,5 +1138,5 @@ void i40e_pf_disable_irq0(struct i40e_hw *hw);
 void i40e_pf_enable_irq0(struct i40e_hw *hw);
 int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
-void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
+int i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
 void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi);
 void i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.639284081 +0100
+++ 0030-net-i40e-fix-binding-interrupt-without-MSI-X-vector.patch	2020-08-28 11:03:25.970955814 +0100
@@ -1 +1 @@
-From 6f1998a4f0411ea3b2bed7c05faa81243917a76e Mon Sep 17 00:00:00 2001
+From 75d6efa0b1a246989bfa5e62cac477d70cfc93e6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6f1998a4f0411ea3b2bed7c05faa81243917a76e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 05d5f28615..0c32e451c5 100644
+index 759fc76c85..80410e89ea 100644
@@ -23 +24 @@
-@@ -2118,5 +2118,5 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
+@@ -1979,5 +1979,5 @@ __vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t msix_vect,
@@ -30 +31 @@
-@@ -2138,8 +2138,12 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
+@@ -1999,8 +1999,12 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
@@ -44 +45 @@
-@@ -2158,5 +2162,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
+@@ -2019,5 +2023,8 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
@@ -54 +55 @@
-@@ -2183,4 +2190,6 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
+@@ -2044,4 +2051,6 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
@@ -61 +62 @@
-@@ -2423,5 +2432,7 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2287,5 +2296,7 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -70 +71 @@
-@@ -2429,6 +2440,8 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2293,6 +2304,8 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -82 +83 @@
-index aef88abed0..19f821829a 100644
+index 2ebbe84782..d224a35020 100644
@@ -85 +86 @@
-@@ -1320,5 +1320,5 @@ void i40e_pf_disable_irq0(struct i40e_hw *hw);
+@@ -1138,5 +1138,5 @@ void i40e_pf_disable_irq0(struct i40e_hw *hw);

[dpdk-stable] patch 'net/i40e: fix flow director MSI-X resource allocation' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/b136a5c1488b398d75742cbf11ce2dac2f58c64d

Thanks.

Kevin.

---
From b136a5c1488b398d75742cbf11ce2dac2f58c64d Mon Sep 17 00:00:00 2001
From: Mao Jiang <maox.jiang@intel.com>
Date: Fri, 24 Jul 2020 00:11:52 +0800
Subject: [PATCH] net/i40e: fix flow director MSI-X resource allocation

[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ]

FDIR allocating msix resource is not strictly necessary, if no
resource left, jump the error.

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

Signed-off-by: Mao Jiang <maox.jiang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 80410e89ea..9aacb12293 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5607,8 +5607,12 @@ i40e_vsi_setup(struct i40e_pf *pf,
 		if (ret < 0) {
 			PMD_DRV_LOG(ERR, "VSI %d get heap failed %d", vsi->seid, ret);
-			goto fail_queue_alloc;
+			if (type != I40E_VSI_FDIR)
+				goto fail_queue_alloc;
+			vsi->msix_intr = 0;
+			vsi->nb_msix = 0;
+		} else {
+			vsi->msix_intr = ret;
+			vsi->nb_msix = 1;
 		}
-		vsi->msix_intr = ret;
-		vsi->nb_msix = 1;
 	} else {
 		vsi->msix_intr = 0;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.669203273 +0100
+++ 0031-net-i40e-fix-flow-director-MSI-X-resource-allocation.patch	2020-08-28 11:03:25.982955905 +0100
@@ -1 +1 @@
-From 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 Mon Sep 17 00:00:00 2001
+From b136a5c1488b398d75742cbf11ce2dac2f58c64d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0c32e451c5..f9a8e7132f 100644
+index 80410e89ea..9aacb12293 100644
@@ -22 +23 @@
-@@ -5840,8 +5840,12 @@ i40e_vsi_setup(struct i40e_pf *pf,
+@@ -5607,8 +5607,12 @@ i40e_vsi_setup(struct i40e_pf *pf,

[dpdk-stable] patch 'net/qede: remove dead code' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/3eccb8b4fb75988a0130a6eab6b5fc8d152d415c

Thanks.

Kevin.

---
From 3eccb8b4fb75988a0130a6eab6b5fc8d152d415c Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Fri, 17 Jul 2020 19:16:23 +0800
Subject: [PATCH] net/qede: remove dead code

[ upstream commit d123f83c43085d03e0c2e37f8174577189711fdb ]

This patch removes logically dead code reported by coverity.

Coverity issue: 261777, 261778
Fixes: dd28bc8c6ef4 ("net/qede: fix VF port creation sequence")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Rasesh Mody <rmody@marvell.com>
---
 drivers/net/qede/qede_rxtx.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index a72c9aa333..0ccfea4912 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -648,6 +648,4 @@ int qede_alloc_fp_resc(struct qede_dev *qdev)
 	for (sb_idx = 0; sb_idx < QEDE_RXTX_MAX(qdev); sb_idx++) {
 		fp = &qdev->fp_array[sb_idx];
-		if (!fp)
-			continue;
 		fp->sb_info = rte_calloc("sb", 1, sizeof(struct ecore_sb_info),
 				RTE_CACHE_LINE_SIZE);
@@ -679,6 +677,4 @@ 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];
-		if (!fp)
-			continue;
 		DP_INFO(edev, "Free sb_info index 0x%x\n",
 				fp->sb_info->igu_sb_id);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.698000089 +0100
+++ 0032-net-qede-remove-dead-code.patch	2020-08-28 11:03:25.984955920 +0100
@@ -1 +1 @@
-From d123f83c43085d03e0c2e37f8174577189711fdb Mon Sep 17 00:00:00 2001
+From 3eccb8b4fb75988a0130a6eab6b5fc8d152d415c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d123f83c43085d03e0c2e37f8174577189711fdb ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 9878ba50ea..ea264f59d7 100644
+index a72c9aa333..0ccfea4912 100644

[dpdk-stable] patch 'net/virtio-user: fix status management' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/c47cbdd54f381d1eede39fa29aa1adb695909dd2

Thanks.

Kevin.

---
From c47cbdd54f381d1eede39fa29aa1adb695909dd2 Mon Sep 17 00:00:00 2001
From: Xiao Wang <xiao.w.wang@intel.com>
Date: Tue, 28 Jul 2020 14:52:12 +0800
Subject: [PATCH] net/virtio-user: fix status management

[ upstream commit d0131e49c7fca45f4111eedab71f6dbd73bacd61 ]

Apart from the virtio status, there should be also a network related
status for link status management, current implementation mixes up these
two statuses.

One issue caused by this mixup is when virtio-user running in server mode
and vhost as a client connects to it, a RARP packet will be generated by
virtio-user due to VIRTIO_NET_S_ANNOUNCE bit is detected in the "status"
in interrupt handler.

VIRTIO_NET_S_LINK_UP and VIRTIO_NET_S_ANNOUNCE should be managed by a
separated field. This patch adds a "net_status" field for this purpose.

Fixes: e9efa4d93821 ("net/virtio-user: add new virtual PCI driver")

Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.h |  1 +
 drivers/net/virtio/virtio_user_ethdev.c          | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index d8a5070a28..098351d097 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -37,4 +37,5 @@ struct virtio_user_dev {
 	uint64_t	unsupported_features; /* unsupported features mask */
 	uint8_t		status;
+	uint16_t	net_status;
 	uint16_t	port_id;
 	uint8_t		mac_addr[ETHER_ADDR_LEN];
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 7c275c7397..5ac813e0d6 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -140,5 +140,5 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
 			r = recv(dev->vhostfd, buf, 128, MSG_PEEK);
 			if (r == 0 || (r < 0 && errno != EAGAIN)) {
-				dev->status &= (~VIRTIO_NET_S_LINK_UP);
+				dev->net_status &= (~VIRTIO_NET_S_LINK_UP);
 				PMD_DRV_LOG(ERR, "virtio-user port %u is down",
 					    hw->port_id);
@@ -152,5 +152,5 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
 						  (void *)hw);
 			} else {
-				dev->status |= VIRTIO_NET_S_LINK_UP;
+				dev->net_status |= VIRTIO_NET_S_LINK_UP;
 			}
 			if (fcntl(dev->vhostfd, F_SETFL,
@@ -160,10 +160,10 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
 			}
 		} else if (dev->is_server) {
-			dev->status &= (~VIRTIO_NET_S_LINK_UP);
+			dev->net_status &= (~VIRTIO_NET_S_LINK_UP);
 			if (virtio_user_server_reconnect(dev) >= 0)
-				dev->status |= VIRTIO_NET_S_LINK_UP;
+				dev->net_status |= VIRTIO_NET_S_LINK_UP;
 		}
 
-		*(uint16_t *)dst = dev->status;
+		*(uint16_t *)dst = dev->net_status;
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.719985549 +0100
+++ 0033-net-virtio-user-fix-status-management.patch	2020-08-28 11:03:25.985955928 +0100
@@ -1 +1 @@
-From d0131e49c7fca45f4111eedab71f6dbd73bacd61 Mon Sep 17 00:00:00 2001
+From c47cbdd54f381d1eede39fa29aa1adb695909dd2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d0131e49c7fca45f4111eedab71f6dbd73bacd61 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 56e638f8a6..554174e819 100644
+index d8a5070a28..098351d097 100644
@@ -34,2 +35,2 @@
-@@ -45,4 +45,5 @@ struct virtio_user_dev {
- 					    */
+@@ -37,4 +37,5 @@ struct virtio_user_dev {
+ 	uint64_t	unsupported_features; /* unsupported features mask */
@@ -39 +40 @@
- 	uint8_t		mac_addr[RTE_ETHER_ADDR_LEN];
+ 	uint8_t		mac_addr[ETHER_ADDR_LEN];
@@ -41 +42 @@
-index e51425c4f8..6003f6d50f 100644
+index 7c275c7397..5ac813e0d6 100644
@@ -44 +45 @@
-@@ -206,5 +206,5 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
+@@ -140,5 +140,5 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
@@ -51 +52 @@
-@@ -218,5 +218,5 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
+@@ -152,5 +152,5 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
@@ -58 +59 @@
-@@ -226,10 +226,10 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,
+@@ -160,10 +160,10 @@ virtio_user_read_dev_config(struct virtio_hw *hw, size_t offset,

[dpdk-stable] patch 'net/virtio-user: check tap system call setting' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/55ae014f27fedb44ce5cd05f0427a09fb93d96f3

Thanks.

Kevin.

---
From 55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia@intel.com>
Date: Wed, 29 Jul 2020 13:12:30 +0000
Subject: [PATCH] net/virtio-user: check tap system call setting

[ upstream commit 570ee25677d8634e99d2120b363f2dd4948d5bac ]

Setting the flags of tapfd may fail and the return value
should be checked.

Coverity issue: 140739
Fixes: e3b434818bbb ("net/virtio-user: support kernel vhost")

Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
index e95cd9da4c..cdfbd4be7a 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -129,5 +129,8 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
 	}
 
-	fcntl(tapfd, F_SETFL, O_NONBLOCK);
+	if (fcntl(tapfd, F_SETFL, O_NONBLOCK) < 0) {
+		PMD_DRV_LOG(ERR, "fcntl tapfd failed: %s", strerror(errno));
+		goto error;
+	}
 
 	if (ioctl(tapfd, TUNSETVNETHDRSZ, &hdr_size) < 0) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.741264575 +0100
+++ 0034-net-virtio-user-check-tap-system-call-setting.patch	2020-08-28 11:03:25.985955928 +0100
@@ -1 +1 @@
-From 570ee25677d8634e99d2120b363f2dd4948d5bac Mon Sep 17 00:00:00 2001
+From 55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 570ee25677d8634e99d2120b363f2dd4948d5bac ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 2fa4f0d661..acddefa33d 100644
+index e95cd9da4c..cdfbd4be7a 100644

[dpdk-stable] patch 'net/kni: set packet input port in Rx' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/15f7abe6a5ad64fc533cbf5ddd058b515ecdd27c

Thanks.

Kevin.

---
From 15f7abe6a5ad64fc533cbf5ddd058b515ecdd27c Mon Sep 17 00:00:00 2001
From: Jecky Pei <jpei@sonicwall.com>
Date: Fri, 24 Jul 2020 16:10:28 +0100
Subject: [PATCH] net/kni: set packet input port in Rx

[ upstream commit cb4a65de31eabcedaca09ba53f06944b87e281fc ]

Store port_id in pmd_internals when eth kni device is created.
Then set packet port of rte_mbuf in function eth_kni_rx.

Signed-off-by: Jecky Pei <jpei@sonicwall.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/kni/rte_eth_kni.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index 9879985ec0..28c88c7655 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -46,4 +46,5 @@ struct pmd_queue {
 struct pmd_internals {
 	struct rte_kni *kni;
+	uint16_t port_id;
 	int is_kni_started;
 
@@ -77,6 +78,9 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 	struct rte_kni *kni = kni_q->internals->kni;
 	uint16_t nb_pkts;
+	int i;
 
 	nb_pkts = rte_kni_rx_burst(kni, bufs, nb_bufs);
+	for (i = 0; i < nb_pkts; i++)
+		bufs[i]->port = kni_q->internals->port_id;
 
 	kni_q->rx.pkts += nb_pkts;
@@ -353,4 +357,5 @@ eth_kni_create(struct rte_vdev_device *vdev,
 
 	internals = eth_dev->data->dev_private;
+	internals->port_id = eth_dev->data->port_id;
 	data = eth_dev->data;
 	data->nb_rx_queues = 1;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.760156527 +0100
+++ 0035-net-kni-set-packet-input-port-in-Rx.patch	2020-08-28 11:03:25.986955936 +0100
@@ -1 +1 @@
-From cb4a65de31eabcedaca09ba53f06944b87e281fc Mon Sep 17 00:00:00 2001
+From 15f7abe6a5ad64fc533cbf5ddd058b515ecdd27c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb4a65de31eabcedaca09ba53f06944b87e281fc ]
+
@@ -9,2 +10,0 @@
-Cc: stable@dpdk.org
-
@@ -18 +18 @@
-index cde98f0bb2..831fe96c96 100644
+index 9879985ec0..28c88c7655 100644
@@ -21 +21 @@
-@@ -48,4 +48,5 @@ struct pmd_queue {
+@@ -46,4 +46,5 @@ struct pmd_queue {
@@ -27 +27 @@
-@@ -79,6 +80,9 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
+@@ -77,6 +78,9 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
@@ -37 +37 @@
-@@ -373,4 +377,5 @@ eth_kni_create(struct rte_vdev_device *vdev,
+@@ -353,4 +357,5 @@ eth_kni_create(struct rte_vdev_device *vdev,

[dpdk-stable] patch 'examples/packet_ordering: use proper exit method' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/08e79f9cf4c987b0cb6a94dcf398c538d084ef1a

Thanks.

Kevin.

---
From 08e79f9cf4c987b0cb6a94dcf398c538d084ef1a Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif@emumba.com>
Date: Fri, 5 Jun 2020 16:48:28 +0500
Subject: [PATCH] examples/packet_ordering: use proper exit method

[ upstream commit d74fab8e7cc36acaf2abf83888809fd1e40c932a ]

rte_exit should be called when the application exits due to
invalid EAL or application arguments.

Fixes: 850f3733f840 ("examples/packet_ordering: new sample app")

Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com>
---
 examples/packet_ordering/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c
index 149bfdd02c..df64158847 100644
--- a/examples/packet_ordering/main.c
+++ b/examples/packet_ordering/main.c
@@ -622,5 +622,5 @@ main(int argc, char **argv)
 	ret = rte_eal_init(argc, argv);
 	if (ret < 0)
-		return -1;
+		rte_exit(EXIT_FAILURE, "Invalid EAL arguments\n");
 
 	argc -= ret;
@@ -630,5 +630,5 @@ main(int argc, char **argv)
 	ret = parse_args(argc, argv);
 	if (ret < 0)
-		return -1;
+		rte_exit(EXIT_FAILURE, "Invalid packet_ordering arguments\n");
 
 	/* Check if we have enought cores */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.779969729 +0100
+++ 0036-examples-packet_ordering-use-proper-exit-method.patch	2020-08-28 11:03:25.987955943 +0100
@@ -1 +1 @@
-From d74fab8e7cc36acaf2abf83888809fd1e40c932a Mon Sep 17 00:00:00 2001
+From 08e79f9cf4c987b0cb6a94dcf398c538d084ef1a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d74fab8e7cc36acaf2abf83888809fd1e40c932a ]
+
@@ -17 +19 @@
-index 5c654c11c6..b5fc6c54be 100644
+index 149bfdd02c..df64158847 100644
@@ -20 +22 @@
-@@ -673,5 +673,5 @@ main(int argc, char **argv)
+@@ -622,5 +622,5 @@ main(int argc, char **argv)
@@ -27 +29 @@
-@@ -681,5 +681,5 @@ main(int argc, char **argv)
+@@ -630,5 +630,5 @@ main(int argc, char **argv)

[dpdk-stable] patch 'net/netvsc: fix crash during Tx' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/5b3a3277091dcf4869111fcc0835d7f553ee28ae

Thanks.

Kevin.

---
From 5b3a3277091dcf4869111fcc0835d7f553ee28ae Mon Sep 17 00:00:00 2001
From: Chas Williams <3chas3@gmail.com>
Date: Wed, 29 Jul 2020 09:58:44 -0400
Subject: [PATCH] net/netvsc: fix crash during Tx

[ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ]

Commit cc0251813277 ("net/netvsc: split send buffers from Tx
descriptors") changed the way that transmit descriptors are
allocated. They come from a single pool instead of being
individually attached to each mbuf. To find the IOVA, you need
to calculate the offset from the base of the pool.

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

Signed-off-by: Chas Williams <3chas3@gmail.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index d7940b8119..cdd44a76c3 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1317,9 +1317,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
 
 	/* pass IOVA of rndis header in first segment */
-	addr = rte_malloc_virt2iova(txd->rndis_pkt);
+	addr = rte_malloc_virt2iova(txq->tx_rndis);
 	if (unlikely(addr == RTE_BAD_IOVA)) {
 		PMD_DRV_LOG(ERR, "RNDIS transmit can not get iova");
 		return -EINVAL;
 	}
+	addr = addr + ((char *)txd->rndis_pkt - (char *)txq->tx_rndis);
 
 	sg[0].page = addr / PAGE_SIZE;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.798811284 +0100
+++ 0037-net-netvsc-fix-crash-during-Tx.patch	2020-08-28 11:03:25.988955951 +0100
@@ -1 +1 @@
-From aee76bb79b91e2f8bce0e9356bee23f6e52d0513 Mon Sep 17 00:00:00 2001
+From 5b3a3277091dcf4869111fcc0835d7f553ee28ae Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 86a4c0d741..0428c586a8 100644
+index d7940b8119..cdd44a76c3 100644
@@ -25 +26 @@
-@@ -1422,9 +1422,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
+@@ -1317,9 +1317,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,

[dpdk-stable] patch 'doc: fix ethtool app path' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/ac24befff36a25c93a60e56e067d36cced6848c6

Thanks.

Kevin.

---
From ac24befff36a25c93a60e56e067d36cced6848c6 Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif@emumba.com>
Date: Thu, 4 Jun 2020 14:59:31 +0500
Subject: [PATCH] doc: fix ethtool app path

[ upstream commit 4a560572e9a8cbb1c9e9610113619a5c2b76e12f ]

The path to the ethtool application was slightly incorrect in the
documentation. This patch corrects that path.

Fixes: bda68ab9d1e7 ("examples/ethtool: add user-space ethtool sample application")

Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com>
---
 doc/guides/sample_app_ug/ethtool.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst
index 8f7fc6ca66..253004dd00 100644
--- a/doc/guides/sample_app_ug/ethtool.rst
+++ b/doc/guides/sample_app_ug/ethtool.rst
@@ -25,5 +25,5 @@ The only available options are the standard ones for the EAL:
 .. code-block:: console
 
-    ./ethtool-app/ethtool-app/${RTE_TARGET}/ethtool [EAL options]
+    ./ethtool-app/${RTE_TARGET}/ethtool [EAL options]
 
 Refer to the *DPDK Getting Started Guide* for general information on
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.819295915 +0100
+++ 0038-doc-fix-ethtool-app-path.patch	2020-08-28 11:03:25.988955951 +0100
@@ -1 +1 @@
-From 4a560572e9a8cbb1c9e9610113619a5c2b76e12f Mon Sep 17 00:00:00 2001
+From ac24befff36a25c93a60e56e067d36cced6848c6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4a560572e9a8cbb1c9e9610113619a5c2b76e12f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/bonding: fix dead loop on RSS RETA update' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/6ae8b77e3ebb3a58d800abd994754713e8d00dd4

Thanks.

Kevin.

---
From 6ae8b77e3ebb3a58d800abd994754713e8d00dd4 Mon Sep 17 00:00:00 2001
From: Zhiguang He <hezhiguang3@huawei.com>
Date: Sun, 2 Aug 2020 20:27:27 +0800
Subject: [PATCH] net/bonding: fix dead loop on RSS RETA update

[ upstream commit eb8939538fddced05b906c34ba9f545bf6717ad2 ]

When parameter reta_size < RTE_RETA_GROUP_SIZE, reta_count will be 0.
Then this function will be deadloop.

Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")

Signed-off-by: Zhiguang He <hezhiguang3@huawei.com>
Acked-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 8b410ff19b..0189a3d446 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2671,5 +2671,6 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,
 
 	 /* Copy RETA table */
-	reta_count = reta_size / RTE_RETA_GROUP_SIZE;
+	reta_count = (reta_size + RTE_RETA_GROUP_SIZE - 1) /
+			RTE_RETA_GROUP_SIZE;
 
 	for (i = 0; i < reta_count; i++) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.837770642 +0100
+++ 0039-net-bonding-fix-dead-loop-on-RSS-RETA-update.patch	2020-08-28 11:03:25.991955973 +0100
@@ -1 +1 @@
-From eb8939538fddced05b906c34ba9f545bf6717ad2 Mon Sep 17 00:00:00 2001
+From 6ae8b77e3ebb3a58d800abd994754713e8d00dd4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eb8939538fddced05b906c34ba9f545bf6717ad2 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 116e2f29de..cdbd8151ed 100644
+index 8b410ff19b..0189a3d446 100644
@@ -22 +23 @@
-@@ -2936,5 +2936,6 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,
+@@ -2671,5 +2671,6 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,

[dpdk-stable] patch 'net/i40e: remove duplicate tunnel type check' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/bd8c8e83cc78d9d6a83577cbbf787abf12af9b19

Thanks.

Kevin.

---
From bd8c8e83cc78d9d6a83577cbbf787abf12af9b19 Mon Sep 17 00:00:00 2001
From: Gaurav Singh <gaurav1086@gmail.com>
Date: Fri, 31 Jul 2020 21:57:52 -0400
Subject: [PATCH] net/i40e: remove duplicate tunnel type check

[ upstream commit 8716f9942a408a79a114ac0496e4e7d55bc9944c ]

remove duplicate check

Fixes: 62e94f7f66fb ("net/i40e: configure packet type mapping")

Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/i40e/rte_pmd_i40e.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index f21c76089e..4c9c91c25d 100644
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -2169,5 +2169,4 @@ static int check_invalid_pkt_type(uint32_t pkt_type)
 	    tnl != RTE_PTYPE_TUNNEL_NVGRE &&
 	    tnl != RTE_PTYPE_TUNNEL_GENEVE &&
-	    tnl != RTE_PTYPE_TUNNEL_GRENAT &&
 	    tnl != RTE_PTYPE_TUNNEL_GTPC &&
 	    tnl != RTE_PTYPE_TUNNEL_GTPU &&
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.859684453 +0100
+++ 0040-net-i40e-remove-duplicate-tunnel-type-check.patch	2020-08-28 11:03:25.993955989 +0100
@@ -1 +1 @@
-From 8716f9942a408a79a114ac0496e4e7d55bc9944c Mon Sep 17 00:00:00 2001
+From bd8c8e83cc78d9d6a83577cbbf787abf12af9b19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8716f9942a408a79a114ac0496e4e7d55bc9944c ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index e216e67831..17938e7d30 100644
+index f21c76089e..4c9c91c25d 100644
@@ -21 +22 @@
-@@ -2170,5 +2170,4 @@ static int check_invalid_pkt_type(uint32_t pkt_type)
+@@ -2169,5 +2169,4 @@ static int check_invalid_pkt_type(uint32_t pkt_type)

[dpdk-stable] patch 'kni: fix reference to master/slave process' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/61a4229f8abd941982a7e3e489896826aabfa7f3

Thanks.

Kevin.

---
From 61a4229f8abd941982a7e3e489896826aabfa7f3 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 6 Aug 2020 10:19:43 -0700
Subject: [PATCH] kni: fix reference to master/slave process

[ upstream commit 95a2e18dfbd3468a0614d3ca207e086c0b0f822b ]

In DPDK, the correct terms for process are primary/secondary.
This is bugfix, not a change in terms for new release.

Fixes: f2e7592c474c ("kni: fix multi-process support")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 lib/librte_kni/rte_kni.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index d44496c712..ef14dc2a69 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -208,5 +208,5 @@ const char *rte_kni_get_name(const struct rte_kni *kni);
 /**
  * Register KNI request handling for a specified port,and it can
- * be called by master process or slave process.
+ * be called by primary process or secondary process.
  *
  * @param kni
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.880266638 +0100
+++ 0041-kni-fix-reference-to-master-slave-process.patch	2020-08-28 11:03:25.994955996 +0100
@@ -1 +1 @@
-From 95a2e18dfbd3468a0614d3ca207e086c0b0f822b Mon Sep 17 00:00:00 2001
+From 61a4229f8abd941982a7e3e489896826aabfa7f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 95a2e18dfbd3468a0614d3ca207e086c0b0f822b ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index f1bb782c68..855facd1a3 100644
+index d44496c712..ef14dc2a69 100644
@@ -23 +24 @@
-@@ -213,5 +213,5 @@ const char *rte_kni_get_name(const struct rte_kni *kni);
+@@ -208,5 +208,5 @@ const char *rte_kni_get_name(const struct rte_kni *kni);

[dpdk-stable] patch 'doc: fix reference to master process' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/e322d08813b41ab9554fde4d4771d68b1a4fcf25

Thanks.

Kevin.

---
From e322d08813b41ab9554fde4d4771d68b1a4fcf25 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 6 Aug 2020 10:19:44 -0700
Subject: [PATCH] doc: fix reference to master process

[ upstream commit ad18592bc0e064873265952805aaaf60af91cbe6 ]

Correct terminolgy here is primary process.
This is a bug in original doc.

Fixes: fc1f2750a3ec ("doc: programmers guide")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 doc/guides/prog_guide/thread_safety_dpdk_functions.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/prog_guide/thread_safety_dpdk_functions.rst b/doc/guides/prog_guide/thread_safety_dpdk_functions.rst
index 0f539db2b8..5618e25e47 100644
--- a/doc/guides/prog_guide/thread_safety_dpdk_functions.rst
+++ b/doc/guides/prog_guide/thread_safety_dpdk_functions.rst
@@ -62,6 +62,6 @@ However, the DPDK performs checks to ensure that libraries are only initialized
 If initialization is attempted more than once, an error is returned.
 
-In the multi-process case, the configuration information of shared memory will only be initialized by the master process.
-Thereafter, both master and secondary processes can allocate/release any objects of memory that finally rely on rte_malloc or memzones.
+In the multi-process case, the configuration information of shared memory will only be initialized by the primary process.
+Thereafter, both primary and secondary processes can allocate/release any objects of memory that finally rely on rte_malloc or memzones.
 
 Interrupt Thread
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.899751307 +0100
+++ 0042-doc-fix-reference-to-master-process.patch	2020-08-28 11:03:25.994955996 +0100
@@ -1 +1 @@
-From ad18592bc0e064873265952805aaaf60af91cbe6 Mon Sep 17 00:00:00 2001
+From e322d08813b41ab9554fde4d4771d68b1a4fcf25 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ad18592bc0e064873265952805aaaf60af91cbe6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org