import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / lib / librte_eal / common / eal_common_thread.c

diff --git a/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_thread.c b/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_thread.c
index 48ef4d6de6308efa993d3d2135c206d720c28f6a..c91aba8f9555fa2844c5ebe2ea26e63a74957ce5 100644 (file)
--- a/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_thread.c
+++ b/ceph/src/spdk/dpdk/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"
 
@@ -163,15 +164,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,21 +195,8 @@ 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);
-       if (ret < 0)
+       ret = pthread_setaffinity_np(*thread, sizeof(*cpuset), cpuset);
+       if (ret)
                goto fail;
 
        ret = pthread_barrier_wait(&params->configured);