diff mbox series

eal: return -1 if rte_lcore_index called from non-DPDK thread

Message ID 20200408202419.16471-1-stephen@networkplumber.org (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series eal: return -1 if rte_lcore_index called from non-DPDK thread |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK

Commit Message

Stephen Hemminger April 8, 2020, 8:24 p.m. UTC 
  If rte_lcore_index() is asked to give the index of the
current lcore (argument -1) and is called from a non-DPDK thread
then it would invalid result. The result would come
lcore_config[-1].core_index which is some other data in the
per-thread area.

The resolution is to return -1 which is what rte_lcore_index()
returns if handed an invalid lcore.

Same issue existed with rte_lcore_to_cpu_id().

Bugzilla ID: 446
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/librte_eal/common/eal_common_lcore.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

David Marchand July 7, 2020, 11:46 a.m. UTC | #1 
On Wed, Apr 8, 2020 at 10:24 PM Stephen Hemminger
<stephen@networkplumber.org> wrote:
>
> If rte_lcore_index() is asked to give the index of the
> current lcore (argument -1) and is called from a non-DPDK thread
> then it would invalid result. The result would come
> lcore_config[-1].core_index which is some other data in the
> per-thread area.
>
> The resolution is to return -1 which is what rte_lcore_index()
> returns if handed an invalid lcore.
>
> Same issue existed with rte_lcore_to_cpu_id().
>
> Bugzilla ID: 446
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Acked-by: David Marchand <david.marchand@redhat.com>

Applied, thanks.
diff mbox series

Patch

diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/common/eal_common_lcore.c
index 5404922a87d2..1d05234192ba 100644
--- a/lib/librte_eal/common/eal_common_lcore.c
+++ b/lib/librte_eal/common/eal_common_lcore.c
@@ -31,8 +31,12 @@  int rte_lcore_index(int lcore_id)
 	if (unlikely(lcore_id >= RTE_MAX_LCORE))
 		return -1;
 
-	if (lcore_id < 0)
+	if (lcore_id < 0) {
+		if (rte_lcore_id() == LCORE_ID_ANY)
+			return -1;
+
 		lcore_id = (int)rte_lcore_id();
+	}
 
 	return lcore_config[lcore_id].core_index;
 }
@@ -42,8 +46,12 @@  int rte_lcore_to_cpu_id(int lcore_id)
 	if (unlikely(lcore_id >= RTE_MAX_LCORE))
 		return -1;
 
-	if (lcore_id < 0)
+	if (lcore_id < 0) {
+		if (rte_lcore_id() == LCORE_ID_ANY)
+			return -1;
+
 		lcore_id = (int)rte_lcore_id();
+	}
 
 	return lcore_config[lcore_id].core_id;
 }