From patchwork Tue Mar 14 22:44:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125123 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EAE7741E95; Tue, 14 Mar 2023 23:44:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3729041101; Tue, 14 Mar 2023 23:44:21 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 9723D40E5A for ; Tue, 14 Mar 2023 23:44:18 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id DD67220C343B; Tue, 14 Mar 2023 15:44:17 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com DD67220C343B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1678833857; bh=QdVmYb/o7Aq8A11P9wbdx3I8kxxqizdMblRmgtj6ZXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KpLv6YbnOvXI0gBtGv5znWxeLTHxwRzu2DI0kQPIKafVsOJD8afssork4ycRIV5OS yGFxqmmM+U2AgTsIaT0TeU1whKylqcCTwy03IfDXxWBrPZduevpI13Q6cxmqtL8bUX +XGnfr1nHNCOvWNc4ys3kTNo2p7TaqL9wN6EYyxU= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, david.marchand@redhat.com, Tyler Retzlaff Subject: [PATCH v3 1/2] eal: make cpusetp to rte thread set affinity const Date: Tue, 14 Mar 2023 15:44:15 -0700 Message-Id: <1678833856-9314-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1678833856-9314-1-git-send-email-roretzla@linux.microsoft.com> References: <1677782682-27200-1-git-send-email-roretzla@linux.microsoft.com> <1678833856-9314-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 const qualify rte_cpuset_t *cpusetp parameter in the rte_thread_set_affinity API. Signed-off-by: Tyler Retzlaff --- lib/eal/common/eal_common_thread.c | 6 +++--- lib/eal/include/rte_thread.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c index 079a385..c9e5619 100644 --- a/lib/eal/common/eal_common_thread.c +++ b/lib/eal/common/eal_common_thread.c @@ -34,7 +34,7 @@ unsigned rte_socket_id(void) } static int -eal_cpuset_socket_id(rte_cpuset_t *cpusetp) +eal_cpuset_socket_id(const rte_cpuset_t *cpusetp) { unsigned cpu = 0; int socket_id = SOCKET_ID_ANY; @@ -62,7 +62,7 @@ unsigned rte_socket_id(void) } static void -thread_update_affinity(rte_cpuset_t *cpusetp) +thread_update_affinity(const rte_cpuset_t *cpusetp) { unsigned int lcore_id = rte_lcore_id(); @@ -83,7 +83,7 @@ unsigned rte_socket_id(void) } int -rte_thread_set_affinity(rte_cpuset_t *cpusetp) +rte_thread_set_affinity(const rte_cpuset_t *cpusetp) { if (rte_thread_set_affinity_by_id(rte_thread_self(), cpusetp) != 0) { RTE_LOG(ERR, EAL, "rte_thread_set_affinity_by_id failed\n"); diff --git a/lib/eal/include/rte_thread.h b/lib/eal/include/rte_thread.h index ddd411e..e461354 100644 --- a/lib/eal/include/rte_thread.h +++ b/lib/eal/include/rte_thread.h @@ -348,7 +348,7 @@ int rte_thread_get_affinity_by_id(rte_thread_t thread_id, * @return * On success, return 0; otherwise return -1; */ -int rte_thread_set_affinity(rte_cpuset_t *cpusetp); +int rte_thread_set_affinity(const rte_cpuset_t *cpusetp); /** * Get core affinity of the current thread. From patchwork Tue Mar 14 22:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125124 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F203341E95; Tue, 14 Mar 2023 23:44:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57507427F5; Tue, 14 Mar 2023 23:44:23 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 9E83A40F18; Tue, 14 Mar 2023 23:44:18 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id E9B1320C343F; Tue, 14 Mar 2023 15:44:17 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E9B1320C343F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1678833857; bh=X3Gw+2RPoPU2QITN/FAbRo9gfmQCozMYPbrXBWSF+cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=URjqAanHzUEavFBe2PnrHwKC0pElhr4gipMk1PjH4BmnFJumzDRwxQEj8ytMx+vHM tohckQua5+Lft61LKi58UkPxy/u5L5yZE+sxIjg4rA+pb8oGXdeiOOibC+7h8uAMMa DtCpmPtGsKv4E1yGy378OuHWtArKrH+5sGBxQL+M= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, david.marchand@redhat.com, Tyler Retzlaff , stable@dpdk.org Subject: [PATCH v3 2/2] eal: fix failure path race setting new thread affinity Date: Tue, 14 Mar 2023 15:44:16 -0700 Message-Id: <1678833856-9314-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1678833856-9314-1-git-send-email-roretzla@linux.microsoft.com> References: <1677782682-27200-1-git-send-email-roretzla@linux.microsoft.com> <1678833856-9314-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 In rte_thread_create setting affinity after pthread_create may fail. Such a failure should result in the entire rte_thread_create failing but doesn't. Additionally if there is a failure to set affinity a race exists where the creating thread will free ctx and depending on scheduling of the new thread it may also free ctx (double free). Resolve both of the above issues by setting the affinity from the newly created thread instead of after thread creation. To achieve this modify the existing thread wrapper to allow the creating thread to wait on the result of the set affinity operation. Fixes: ce6e911d20f6 ("eal: add thread lifetime API") Cc: stable@dpdk.org Signed-off-by: Tyler Retzlaff --- lib/eal/unix/rte_thread.c | 51 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/lib/eal/unix/rte_thread.c b/lib/eal/unix/rte_thread.c index 37ebfcf..fde506b 100644 --- a/lib/eal/unix/rte_thread.c +++ b/lib/eal/unix/rte_thread.c @@ -16,8 +16,17 @@ struct eal_tls_key { pthread_key_t thread_index; }; +enum __rte_thread_wrapper_status { + THREAD_WRAPPER_LAUNCHING, /* Yet to call thread_func function */ + THREAD_WRAPPER_RUNNING, /* Thread is running successfully */ + THREAD_WRAPPER_ERROR /* Thread thread_wrapper encountered an error */ +}; + struct thread_routine_ctx { rte_thread_func thread_func; + const rte_thread_attr_t *thread_attr; + int thread_wrapper_ret; + enum __rte_thread_wrapper_status thread_wrapper_status; void *routine_args; }; @@ -83,11 +92,22 @@ struct thread_routine_ctx { static void * thread_func_wrapper(void *arg) { - struct thread_routine_ctx ctx = *(struct thread_routine_ctx *)arg; - - free(arg); + struct thread_routine_ctx *ctx = (struct thread_routine_ctx *)arg; + rte_thread_func thread_func = ctx->thread_func; + void * thread_args = ctx->routine_args; + + if (ctx->thread_attr != NULL && CPU_COUNT(&ctx->thread_attr->cpuset) > 0) { + ctx->thread_wrapper_ret = rte_thread_set_affinity(&ctx->thread_attr->cpuset); + if (ctx->thread_wrapper_ret != 0) { + RTE_LOG(DEBUG, EAL, "rte_thread_set_affinity failed\n"); + __atomic_store_n(&ctx->thread_wrapper_status, + THREAD_WRAPPER_ERROR, __ATOMIC_RELEASE); + } + } + __atomic_store_n(&ctx->thread_wrapper_status, + THREAD_WRAPPER_RUNNING, __ATOMIC_RELEASE); - return (void *)(uintptr_t)ctx.thread_func(ctx.routine_args); + return (void *)(uintptr_t)thread_func(thread_args); } int @@ -98,6 +118,7 @@ struct thread_routine_ctx { int ret = 0; pthread_attr_t attr; pthread_attr_t *attrp = NULL; + enum __rte_thread_wrapper_status thread_wrapper_status; struct thread_routine_ctx *ctx; struct sched_param param = { .sched_priority = 0, @@ -111,7 +132,10 @@ struct thread_routine_ctx { goto cleanup; } ctx->routine_args = args; + ctx->thread_attr = thread_attr; ctx->thread_func = thread_func; + ctx->thread_wrapper_ret = 0; + ctx->thread_wrapper_status = THREAD_WRAPPER_LAUNCHING; if (thread_attr != NULL) { ret = pthread_attr_init(&attr); @@ -164,14 +188,19 @@ struct thread_routine_ctx { goto cleanup; } - if (thread_attr != NULL && CPU_COUNT(&thread_attr->cpuset) > 0) { - ret = rte_thread_set_affinity_by_id(*thread_id, - &thread_attr->cpuset); - if (ret != 0) { - RTE_LOG(DEBUG, EAL, "rte_thread_set_affinity_by_id failed\n"); - goto cleanup; - } + /* Wait for the thread wrapper to initialize thread successfully */ + while ((thread_wrapper_status = + __atomic_load_n(&ctx->thread_wrapper_status, + __ATOMIC_ACQUIRE)) == THREAD_WRAPPER_LAUNCHING) + sched_yield(); + + /* Check if the control thread encountered an error */ + if (thread_wrapper_status == THREAD_WRAPPER_ERROR) { + /* thread wrapper is exiting */ + pthread_join((pthread_t)thread_id->opaque_id, NULL); + ret = ctx->thread_wrapper_ret; } + free(ctx); ctx = NULL; cleanup: