eal: store control thread CPU affinity in TLS

[dpdk.git] / lib / librte_eal / common / eal_common_thread.c

diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/librte_eal/common/eal_common_thread.c
index a3985ce..99fe1aa 100644 (file)
--- a/lib/librte_eal/common/eal_common_thread.c
+++ b/lib/librte_eal/common/eal_common_thread.c
@@ -16,6 +16,7 @@
 #include <rte_memory.h>
 #include <rte_log.h>
 
+#include "eal_internal_cfg.h"
 #include "eal_private.h"
 #include "eal_thread.h"
 
@@ -37,7 +38,8 @@ rte_lcore_has_role(unsigned int lcore_id, enum rte_lcore_role_t role)
        return cfg->lcore_role[lcore_id] == role;
 }
 
-int eal_cpuset_socket_id(rte_cpuset_t *cpusetp)
+static int
+eal_cpuset_socket_id(rte_cpuset_t *cpusetp)
 {
        unsigned cpu = 0;
        int socket_id = SOCKET_ID_ANY;
@@ -59,7 +61,7 @@ int eal_cpuset_socket_id(rte_cpuset_t *cpusetp)
                        break;
                }
 
-       } while (++cpu < RTE_MAX_LCORE);
+       } while (++cpu < CPU_SETSIZE);
 
        return socket_id;
 }
@@ -116,7 +118,7 @@ eal_thread_dump_affinity(char *str, unsigned size)
 
        rte_thread_get_affinity(&cpuset);
 
-       for (cpu = 0; cpu < RTE_MAX_LCORE; cpu++) {
+       for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
                if (!CPU_ISSET(cpu, &cpuset))
                        continue;
 
@@ -150,10 +152,14 @@ struct rte_thread_ctrl_params {
 static void *rte_thread_init(void *arg)
 {
        int ret;
+       rte_cpuset_t *cpuset = &internal_config.ctrl_cpuset;
        struct rte_thread_ctrl_params *params = arg;
        void *(*start_routine)(void *) = params->start_routine;
        void *routine_arg = params->arg;
 
+       /* Store cpuset in TLS for quick access */
+       memmove(&RTE_PER_LCORE(_cpuset), cpuset, sizeof(rte_cpuset_t));
+
        ret = pthread_barrier_wait(&params->configured);
        if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
                pthread_barrier_destroy(&params->configured);
@@ -163,15 +169,14 @@ static void *rte_thread_init(void *arg)
        return start_routine(routine_arg);
 }
 
-__rte_experimental int
+int
 rte_ctrl_thread_create(pthread_t *thread, const char *name,
                const pthread_attr_t *attr,
                void *(*start_routine)(void *), void *arg)
 {
+       rte_cpuset_t *cpuset = &internal_config.ctrl_cpuset;
        struct rte_thread_ctrl_params *params;
-       unsigned int lcore_id;
-       rte_cpuset_t cpuset;
-       int cpu_found, ret;
+       int ret;
 
        params = malloc(sizeof(*params));
        if (!params)
@@ -195,20 +200,7 @@ rte_ctrl_thread_create(pthread_t *thread, const char *name,
                                "Cannot set name for ctrl thread\n");
        }
 
-       cpu_found = 0;
-       CPU_ZERO(&cpuset);
-       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
-               if (eal_cpu_detected(lcore_id) &&
-                               rte_lcore_has_role(lcore_id, ROLE_OFF)) {
-                       CPU_SET(lcore_id, &cpuset);
-                       cpu_found = 1;
-               }
-       }
-       /* if no detected cpu is off, use master core */
-       if (!cpu_found)
-               CPU_SET(rte_get_master_lcore(), &cpuset);
-
-       ret = pthread_setaffinity_np(*thread, sizeof(cpuset), &cpuset);
+       ret = pthread_setaffinity_np(*thread, sizeof(*cpuset), cpuset);
        if (ret)
                goto fail;