[dpdk-stable] patch 'net/bonding: fix socket ID check' has been queued to LTS release 18.11.10
Kevin Traynor
ktraynor at redhat.com
Thu Aug 20 17:33:30 CEST 2020
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 08/25/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/f3f75f632ac2175b103801d5ad238d0971573761
Thanks.
Kevin.
---
>From f3f75f632ac2175b103801d5ad238d0971573761 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 0beea19c47..a66a027545 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -959,5 +959,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
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();
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-08-20 16:26:16.730174530 +0100
+++ 0025-net-bonding-fix-socket-ID-check.patch 2020-08-20 16:26:15.810324197 +0100
@@ -1 +1 @@
-From 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 Mon Sep 17 00:00:00 2001
+From f3f75f632ac2175b103801d5ad238d0971573761 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index b77a37ddb3..b7ffa2f2cf 100644
+index 0beea19c47..a66a027545 100644
@@ -23 +24 @@
-@@ -1044,5 +1044,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
+@@ -959,5 +959,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
More information about the stable
mailing list