d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: fix multiple definition of per lcore thread id

Browse Source 
Because of the inline accessor + static declaration in rte_gettid(),
we end up with multiple symbols for RTE_PER_LCORE(_thread_id).
Each compilation unit will pay a cost when accessing this information
for the first time.

$ nm build/app/dpdk-testpmd | grep per_lcore__thread_id
0000000000000054 d per_lcore__thread_id.5037
0000000000000040 d per_lcore__thread_id.5103
0000000000000048 d per_lcore__thread_id.5259
000000000000004c d per_lcore__thread_id.5259
0000000000000044 d per_lcore__thread_id.5933
0000000000000058 d per_lcore__thread_id.6261
0000000000000050 d per_lcore__thread_id.7378
000000000000005c d per_lcore__thread_id.7496
000000000000000c d per_lcore__thread_id.8016
0000000000000010 d per_lcore__thread_id.8431

Make it global as part of the DPDK_21 stable ABI.

Fixes: ef76436c68 ("eal: get unique thread id")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
Reviewed-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
David Marchand 2020-07-06 22:52:26 +02:00
parent 7afdfac8e6
commit 3ef1a0b4a1
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/librte_eal/common/eal_common_thread.c
View File

@ -22,6 +22,7 @@
#include "eal_thread.h"
RTE_DEFINE_PER_LCORE(unsigned int, _lcore_id) = LCORE_ID_ANY;
RTE_DEFINE_PER_LCORE(int, _thread_id) = -1;
static RTE_DEFINE_PER_LCORE(unsigned int, _socket_id) =
(unsigned int)SOCKET_ID_ANY;
static RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);

3
lib/librte_eal/include/rte_eal.h
View File

@ -461,6 +461,8 @@ void rte_eal_vfio_get_vf_token(rte_uuid_t vf_token);
*/
int rte_sys_gettid(void);
RTE_DECLARE_PER_LCORE(int, _thread_id);
/**
* Get system unique thread id.
*
@ -470,7 +472,6 @@ int rte_sys_gettid(void);
*/
static inline int rte_gettid(void)
{
static RTE_DEFINE_PER_LCORE(int, _thread_id) = -1;
if (RTE_PER_LCORE(_thread_id) == -1)
RTE_PER_LCORE(_thread_id) = rte_sys_gettid();
return RTE_PER_LCORE(_thread_id);

7
lib/librte_eal/rte_eal_version.map
View File

@ -221,6 +221,13 @@ DPDK_20.0 {
local: *;
};
DPDK_21 {
global:
per_lcore__thread_id;
} DPDK_20.0;
EXPERIMENTAL {
global: