From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56464A0547; Mon, 5 Dec 2022 21:24:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21DA342D27; Mon, 5 Dec 2022 21:24:36 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 54E8840687 for ; Mon, 5 Dec 2022 21:24:32 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 2DEE920B83DC; Mon, 5 Dec 2022 12:24:31 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2DEE920B83DC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1670271871; bh=ledP728Mm6yVOXhDOwlofb5OXtScXTACwzB1Ni/IxiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sou9nsjFGWPx34d/Jy2tI3lmkh47PRxfcVZBdNy/y7y6qC/KgVjcCCIedGb4VYrmX IdouekOaA1AkGoSpei2LAdv7S58qbzWyWjJOQMhFIEgNEl22zoI6t+IbQ9U4kmc/M8 AnaYii8xFf4Q0U5l4q7eNFP+CwFxhGe780t10qmA= From: Tyler Retzlaff To: dev@dpdk.org, thomas@monjalon.net, david.marchand@redhat.com, stephen@networkplumber.org, olivier.matz@6wind.com Cc: Tyler Retzlaff Subject: [PATCH 1/3] eal: add rte control thread create API Date: Mon, 5 Dec 2022 12:24:26 -0800 Message-Id: <1670271868-11364-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1670271868-11364-1-git-send-email-roretzla@linux.microsoft.com> References: <1670271868-11364-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Signed-off-by: Tyler Retzlaff --- lib/eal/common/eal_common_thread.c | 93 ++++++++++++++++++++++++++++++++++---- lib/eal/include/rte_thread.h | 29 ++++++++++++ lib/eal/version.map | 3 ++ 3 files changed, 117 insertions(+), 8 deletions(-) diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c index c5d8b43..ca85c51 100644 --- a/lib/eal/common/eal_common_thread.c +++ b/lib/eal/common/eal_common_thread.c @@ -234,7 +234,10 @@ enum __rte_ctrl_thread_status { }; struct rte_thread_ctrl_params { - void *(*start_routine)(void *); + union { + void * (*start_routine)(void *); + rte_thread_func thread_func; + } u; void *arg; int ret; /* Control thread status. @@ -243,14 +246,12 @@ struct rte_thread_ctrl_params { enum __rte_ctrl_thread_status ctrl_thread_status; }; -static void *ctrl_thread_init(void *arg) +static int ctrl_thread_init(void *arg) { 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; __rte_thread_init(rte_lcore_id(), cpuset); params->ret = pthread_setaffinity_np(pthread_self(), sizeof(*cpuset), @@ -258,13 +259,35 @@ static void *ctrl_thread_init(void *arg) if (params->ret != 0) { __atomic_store_n(¶ms->ctrl_thread_status, CTRL_THREAD_ERROR, __ATOMIC_RELEASE); - return NULL; + return params->ret; } __atomic_store_n(¶ms->ctrl_thread_status, CTRL_THREAD_RUNNING, __ATOMIC_RELEASE); - return start_routine(routine_arg); + return 0; +} + +static void *ctrl_thread_start(void *arg) +{ + struct rte_thread_ctrl_params *params = arg; + void *(*start_routine)(void *) = params->u.start_routine; + + if (0 != ctrl_thread_init(arg)) + return NULL; + + return start_routine(params->arg); +} + +static uint32_t control_thread_start(void *arg) +{ + struct rte_thread_ctrl_params *params = arg; + rte_thread_func start_routine = params->u.thread_func; + + if (0 != ctrl_thread_init(arg)) + return params->ret; + + return start_routine(params->arg); } int @@ -280,12 +303,12 @@ static void *ctrl_thread_init(void *arg) if (!params) return -ENOMEM; - params->start_routine = start_routine; + params->u.start_routine = start_routine; params->arg = arg; params->ret = 0; params->ctrl_thread_status = CTRL_THREAD_LAUNCHING; - ret = pthread_create(thread, attr, ctrl_thread_init, (void *)params); + ret = pthread_create(thread, attr, ctrl_thread_start, (void *)params); if (ret != 0) { free(params); return -ret; @@ -322,6 +345,60 @@ static void *ctrl_thread_init(void *arg) } int +rte_control_thread_create(rte_thread_t *thread, const char *name, + const rte_thread_attr_t *attr, + rte_thread_func start_routine, void *arg) +{ + struct rte_thread_ctrl_params *params; + enum __rte_ctrl_thread_status ctrl_thread_status; + int ret; + + params = malloc(sizeof(*params)); + if (!params) + return -ENOMEM; + + params->u.thread_func = start_routine; + params->arg = arg; + params->ret = 0; + params->ctrl_thread_status = CTRL_THREAD_LAUNCHING; + + ret = rte_thread_create(thread, attr, control_thread_start, params); + if (ret != 0) { + free(params); + return -ret; + } + + if (name != NULL) { + ret = rte_thread_setname(thread->opaque_id, name); + if (ret < 0) + RTE_LOG(DEBUG, EAL, + "Cannot set name for ctrl thread\n"); + } + + /* Wait for the control thread to initialize successfully */ + while ((ctrl_thread_status = + __atomic_load_n(¶ms->ctrl_thread_status, + __ATOMIC_ACQUIRE)) == CTRL_THREAD_LAUNCHING) { + /* Yield the CPU. Using sched_yield call requires maintaining + * another implementation for Windows as sched_yield is not + * supported on Windows. + */ + rte_delay_us_sleep(1); + } + + /* Check if the control thread encountered an error */ + if (ctrl_thread_status == CTRL_THREAD_ERROR) { + /* ctrl thread is exiting */ + rte_thread_join(*thread, NULL); + } + + ret = params->ret; + free(params); + + return ret; +} + +int rte_thread_register(void) { unsigned int lcore_id; diff --git a/lib/eal/include/rte_thread.h b/lib/eal/include/rte_thread.h index b9edf70..ffc6207 100644 --- a/lib/eal/include/rte_thread.h +++ b/lib/eal/include/rte_thread.h @@ -95,6 +95,35 @@ int rte_thread_create(rte_thread_t *thread_id, rte_thread_func thread_func, void *arg); /** + * Create a control thread. + * + * Creates a control thread with the given name and attributes. The + * affinity of the new thread is based on the CPU affinity retrieved + * at the time rte_eal_init() was called, the dataplane and service + * lcores are then excluded. If setting the name of the thread fails, + * the error is ignored and a debug message is logged. + * + * @param thread + * Filled with the thread id of the new created thread. + * @param name + * The name of the control thread (max 16 characters including '\0'). + * @param attr + * Attributes for the new thread. + * @param start_routine + * Function to be executed by the new thread. + * @param arg + * Argument passed to start_routine. + * @return + * On success, returns 0; on error, it returns a negative value + * corresponding to the error number. + */ +__rte_experimental +int +rte_control_thread_create(rte_thread_t *thread, const char *name, + const rte_thread_attr_t *thread_attr, + rte_thread_func thread_func, void *arg); + +/** * @warning * @b EXPERIMENTAL: this API may change without prior notice. * diff --git a/lib/eal/version.map b/lib/eal/version.map index 7ad12a7..8f9eeb9 100644 --- a/lib/eal/version.map +++ b/lib/eal/version.map @@ -440,6 +440,9 @@ EXPERIMENTAL { rte_thread_detach; rte_thread_equal; rte_thread_join; + + # added in 23.03 + rte_control_thread_create; }; INTERNAL { -- 1.8.3.1