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 40902e4..99fe1aa 100644 (file)
--- a/lib/librte_eal/common/eal_common_thread.c
+++ b/lib/librte_eal/common/eal_common_thread.c
@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <signal.h>
 #include <sched.h>
 #include <assert.h>
 #include <string.h>
@@ -15,6 +16,8 @@
 #include <rte_memory.h>
 #include <rte_log.h>
 
+#include "eal_internal_cfg.h"
+#include "eal_private.h"
 #include "eal_thread.h"
 
 RTE_DECLARE_PER_LCORE(unsigned , _socket_id);
@@ -32,13 +35,11 @@ rte_lcore_has_role(unsigned int lcore_id, enum rte_lcore_role_t role)
        if (lcore_id >= RTE_MAX_LCORE)
                return -EINVAL;
 
-       if (cfg->lcore_role[lcore_id] == role)
-               return 0;
-
-       return -EINVAL;
+       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;
@@ -60,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;
 }
@@ -117,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;
 
@@ -140,3 +141,84 @@ exit:
 
        return ret;
 }
+
+
+struct rte_thread_ctrl_params {
+       void *(*start_routine)(void *);
+       void *arg;
+       pthread_barrier_t configured;
+};
+
+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);
+               free(params);
+       }
+
+       return start_routine(routine_arg);
+}
+
+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;
+       int ret;
+
+       params = malloc(sizeof(*params));
+       if (!params)
+               return -ENOMEM;
+
+       params->start_routine = start_routine;
+       params->arg = arg;
+
+       pthread_barrier_init(&params->configured, NULL, 2);
+
+       ret = pthread_create(thread, attr, rte_thread_init, (void *)params);
+       if (ret != 0) {
+               free(params);
+               return -ret;
+       }
+
+       if (name != NULL) {
+               ret = rte_thread_setname(*thread, name);
+               if (ret < 0)
+                       RTE_LOG(DEBUG, EAL,
+                               "Cannot set name for ctrl thread\n");
+       }
+
+       ret = pthread_setaffinity_np(*thread, sizeof(*cpuset), cpuset);
+       if (ret)
+               goto fail;
+
+       ret = pthread_barrier_wait(&params->configured);
+       if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
+               pthread_barrier_destroy(&params->configured);
+               free(params);
+       }
+
+       return 0;
+
+fail:
+       if (PTHREAD_BARRIER_SERIAL_THREAD ==
+           pthread_barrier_wait(&params->configured)) {
+               pthread_barrier_destroy(&params->configured);
+               free(params);
+       }
+       pthread_cancel(*thread);
+       pthread_join(*thread, NULL);
+       return -ret;
+}