[dpdk-stable] patch 'net/mvpp2: fix non-EAL thread support' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Jul 24 13:58:20 CEST 2020


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 c5c7ff58b62688907ae1962d7713c080e4a642fe Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 16 Jun 2020 11:47:00 +0200
Subject: [PATCH] net/mvpp2: fix non-EAL thread support

[ upstream commit b52d25ae4b1bbe9adba0d9276b7771ec27e3d151 ]

Caught by code inspection, for a non-EAL thread identified with
rte_lcore_id() == LCORE_ID_ANY, the code currently arbitrarily uses
lcore 0 while there is no guarantee this lcore is used.

Fixes: 3588aaa68eab ("net/mrvl: fix HIF objects allocation")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Liron Himi <lironh at marvell.com>
---
 drivers/net/mvpp2/mrvl_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index b98b1fd66..903727432 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -816,7 +816,7 @@ mrvl_flush_bpool(struct rte_eth_dev *dev)
 	unsigned int core_id = rte_lcore_id();
 
 	if (core_id == LCORE_ID_ANY)
-		core_id = 0;
+		core_id = rte_get_master_lcore();
 
 	hif = mrvl_get_hif(priv, core_id);
 
@@ -1620,7 +1620,7 @@ mrvl_fill_bpool(struct mrvl_rxq *rxq, int num)
 
 	core_id = rte_lcore_id();
 	if (core_id == LCORE_ID_ANY)
-		core_id = 0;
+		core_id = rte_get_master_lcore();
 
 	hif = mrvl_get_hif(rxq->priv, core_id);
 	if (!hif)
@@ -1770,7 +1770,7 @@ mrvl_rx_queue_release(void *rxq)
 	unsigned int core_id = rte_lcore_id();
 
 	if (core_id == LCORE_ID_ANY)
-		core_id = 0;
+		core_id = rte_get_master_lcore();
 
 	if (!q)
 		return;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.989532722 +0100
+++ 0062-net-mvpp2-fix-non-EAL-thread-support.patch	2020-07-24 12:53:48.287006460 +0100
@@ -1,14 +1,15 @@
-From b52d25ae4b1bbe9adba0d9276b7771ec27e3d151 Mon Sep 17 00:00:00 2001
+From c5c7ff58b62688907ae1962d7713c080e4a642fe Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Tue, 16 Jun 2020 11:47:00 +0200
 Subject: [PATCH] net/mvpp2: fix non-EAL thread support
 
+[ upstream commit b52d25ae4b1bbe9adba0d9276b7771ec27e3d151 ]
+
 Caught by code inspection, for a non-EAL thread identified with
 rte_lcore_id() == LCORE_ID_ANY, the code currently arbitrarily uses
 lcore 0 while there is no guarantee this lcore is used.
 
 Fixes: 3588aaa68eab ("net/mrvl: fix HIF objects allocation")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Acked-by: Liron Himi <lironh at marvell.com>


More information about the stable mailing list