[dpdk-stable] patch 'net/bonding: fix socket ID check' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From 3e1f03cded0a2dc9a7fc14148c8295a08a822d2b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 16 Jun 2020 11:46:37 +0200
Subject: [PATCH] net/bonding: fix socket ID check

[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ]

Caught by code review, rte_eth_dev_socket_id() returns -1 on error.
The code should behave the same, but still, do not use LCORE_ID_ANY for
something that is not a lcore id.

Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown socket")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Chas Williams <chas3 at att.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index b77a37ddb..b7ffa2f2c 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1043,7 +1043,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
 	RTE_ASSERT(port->tx_ring == NULL);
 
 	socket_id = rte_eth_dev_socket_id(slave_id);
-	if (socket_id == (int)LCORE_ID_ANY)
+	if (socket_id == -1)
 		socket_id = rte_socket_id();
 
 	element_size = sizeof(struct slow_protocol_frame) +
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.612919377 +0100
+++ 0132-net-bonding-fix-socket-ID-check.patch	2020-07-24 12:53:48.427009068 +0100
@@ -1,14 +1,15 @@
-From 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 Mon Sep 17 00:00:00 2001
+From 3e1f03cded0a2dc9a7fc14148c8295a08a822d2b Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Tue, 16 Jun 2020 11:46:37 +0200
 Subject: [PATCH] net/bonding: fix socket ID check
 
+[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ]
+
 Caught by code review, rte_eth_dev_socket_id() returns -1 on error.
 The code should behave the same, but still, do not use LCORE_ID_ANY for
 something that is not a lcore id.
 
 Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown socket")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Acked-by: Chas Williams <chas3 at att.com>