#include <assert.h>
#include <string.h>
+#include <rte_errno.h>
#include <rte_lcore.h>
-#include <rte_memory.h>
#include <rte_log.h>
+#include <rte_memory.h>
+#include <rte_trace_point.h>
+#include "eal_internal_cfg.h"
#include "eal_private.h"
#include "eal_thread.h"
+#include "eal_trace.h"
-RTE_DECLARE_PER_LCORE(unsigned , _socket_id);
+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);
unsigned rte_socket_id(void)
{
return RTE_PER_LCORE(_socket_id);
}
-int
-rte_lcore_has_role(unsigned int lcore_id, enum rte_lcore_role_t role)
-{
- struct rte_config *cfg = rte_eal_get_configuration();
-
- if (lcore_id >= RTE_MAX_LCORE)
- 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;
break;
}
- } while (++cpu < RTE_MAX_LCORE);
+ } while (++cpu < CPU_SETSIZE);
return socket_id;
}
-int
-rte_thread_set_affinity(rte_cpuset_t *cpusetp)
+static void
+thread_update_affinity(rte_cpuset_t *cpusetp)
{
- int s;
- unsigned lcore_id;
- pthread_t tid;
-
- tid = pthread_self();
-
- s = pthread_setaffinity_np(tid, sizeof(rte_cpuset_t), cpusetp);
- if (s != 0) {
- RTE_LOG(ERR, EAL, "pthread_setaffinity_np failed\n");
- return -1;
- }
+ unsigned int lcore_id = rte_lcore_id();
/* store socket_id in TLS for quick access */
RTE_PER_LCORE(_socket_id) =
memmove(&RTE_PER_LCORE(_cpuset), cpusetp,
sizeof(rte_cpuset_t));
- lcore_id = rte_lcore_id();
if (lcore_id != (unsigned)LCORE_ID_ANY) {
/* EAL thread will update lcore_config */
lcore_config[lcore_id].socket_id = RTE_PER_LCORE(_socket_id);
memmove(&lcore_config[lcore_id].cpuset, cpusetp,
sizeof(rte_cpuset_t));
}
+}
+int
+rte_thread_set_affinity(rte_cpuset_t *cpusetp)
+{
+ if (pthread_setaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+ cpusetp) != 0) {
+ RTE_LOG(ERR, EAL, "pthread_setaffinity_np failed\n");
+ return -1;
+ }
+
+ thread_update_affinity(cpusetp);
return 0;
}
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;
return ret;
}
+void
+__rte_thread_init(unsigned int lcore_id, rte_cpuset_t *cpuset)
+{
+ /* set the lcore ID in per-lcore memory area */
+ RTE_PER_LCORE(_lcore_id) = lcore_id;
+
+ /* acquire system unique id */
+ rte_gettid();
+
+ thread_update_affinity(cpuset);
+
+ __rte_trace_mem_per_thread_alloc();
+}
+
+void
+__rte_thread_uninit(void)
+{
+ trace_mem_per_thread_free();
+
+ RTE_PER_LCORE(_lcore_id) = LCORE_ID_ANY;
+}
struct rte_thread_ctrl_params {
void *(*start_routine)(void *);
pthread_barrier_t configured;
};
-static void *rte_thread_init(void *arg)
+static void *ctrl_thread_init(void *arg)
{
+ int ret;
+ struct internal_config *internal_conf =
+ eal_get_internal_configuration();
+ rte_cpuset_t *cpuset = &internal_conf->ctrl_cpuset;
struct rte_thread_ctrl_params *params = arg;
void *(*start_routine)(void *) = params->start_routine;
void *routine_arg = params->arg;
- pthread_barrier_wait(¶ms->configured);
+ __rte_thread_init(rte_lcore_id(), cpuset);
+
+ ret = pthread_barrier_wait(¶ms->configured);
+ if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
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)
{
- struct rte_thread_ctrl_params params = {
- .start_routine = start_routine,
- .arg = arg,
- };
- unsigned int lcore_id;
- rte_cpuset_t cpuset;
- int cpu_found, ret;
+ struct internal_config *internal_conf =
+ eal_get_internal_configuration();
+ rte_cpuset_t *cpuset = &internal_conf->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(¶ms.configured, NULL, 2);
+ pthread_barrier_init(¶ms->configured, NULL, 2);
- ret = pthread_create(thread, attr, rte_thread_init, (void *)¶ms);
- if (ret != 0)
- return ret;
+ ret = pthread_create(thread, attr, ctrl_thread_init, (void *)params);
+ if (ret != 0) {
+ free(params);
+ return -ret;
+ }
if (name != NULL) {
ret = rte_thread_setname(*thread, name);
if (ret < 0)
- goto fail;
+ RTE_LOG(DEBUG, EAL,
+ "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);
- if (ret < 0)
+ ret = pthread_setaffinity_np(*thread, sizeof(*cpuset), cpuset);
+ if (ret)
goto fail;
- pthread_barrier_wait(¶ms.configured);
+ ret = pthread_barrier_wait(¶ms->configured);
+ if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
return 0;
fail:
+ if (PTHREAD_BARRIER_SERIAL_THREAD ==
+ pthread_barrier_wait(¶ms->configured)) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
pthread_cancel(*thread);
pthread_join(*thread, NULL);
- return ret;
+ return -ret;
+}
+
+int
+rte_thread_register(void)
+{
+ unsigned int lcore_id;
+ rte_cpuset_t cpuset;
+
+ /* EAL init flushes all lcores, we can't register before. */
+ if (eal_get_internal_configuration()->init_complete != 1) {
+ RTE_LOG(DEBUG, EAL, "Called %s before EAL init.\n", __func__);
+ rte_errno = EINVAL;
+ return -1;
+ }
+ if (!__rte_mp_disable()) {
+ RTE_LOG(ERR, EAL, "Multiprocess in use, registering non-EAL threads is not supported.\n");
+ rte_errno = EINVAL;
+ return -1;
+ }
+ if (pthread_getaffinity_np(pthread_self(), sizeof(cpuset),
+ &cpuset) != 0)
+ CPU_ZERO(&cpuset);
+ lcore_id = eal_lcore_non_eal_allocate();
+ if (lcore_id >= RTE_MAX_LCORE)
+ lcore_id = LCORE_ID_ANY;
+ __rte_thread_init(lcore_id, &cpuset);
+ if (lcore_id == LCORE_ID_ANY) {
+ rte_errno = ENOMEM;
+ return -1;
+ }
+ RTE_LOG(DEBUG, EAL, "Registered non-EAL thread as lcore %u.\n",
+ lcore_id);
+ return 0;
+}
+
+void
+rte_thread_unregister(void)
+{
+ unsigned int lcore_id = rte_lcore_id();
+
+ if (lcore_id != LCORE_ID_ANY)
+ eal_lcore_non_eal_release(lcore_id);
+ __rte_thread_uninit();
+ if (lcore_id != LCORE_ID_ANY)
+ RTE_LOG(DEBUG, EAL, "Unregistered non-EAL thread (was lcore %u).\n",
+ lcore_id);
}
git.droids-corp.org / dpdk.git / blobdiff