From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 721A0A0350; Thu, 25 Jun 2020 01:10:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1AC241B13C; Thu, 25 Jun 2020 01:10:53 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 69233199BC for ; Thu, 25 Jun 2020 01:10:52 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from tbashar@mellanox.com) with SMTP; 25 Jun 2020 02:10:47 +0300 Received: from mtsdev.labs.mlnx (mtsdev.mts.labs.mlnx [10.9.76.240]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05ONAiqg030149; Thu, 25 Jun 2020 02:10:44 +0300 From: Tasnim Bashar To: dev@dpdk.org Cc: harini.ramakrishnan@microsoft.com, pallavi.kadam@intel.com, ranjit.menon@intel.com, ocardona@microsoft.com, navasile@linux.microsoft.com, dmitry.kozliuk@gmail.com, talshn@mellanox.com, fady@mellanox.com, ophirmu@mellanox.com, thomas@monjalon.net Date: Wed, 24 Jun 2020 16:10:41 -0700 Message-Id: <20200624231041.5304-1-tbashar@mellanox.com> X-Mailer: git-send-email 2.19.1.windows.1 In-Reply-To: <20200602020052.4540-1-tbashar@mellanox.com> References: <20200602020052.4540-1-tbashar@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4] eal/windows: fix thread handle X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Casting thread ID to handle is not accurate way to get thread handle. Need to use OpenThread function to get thread handle from thread ID. pthread_setaffinity_np and pthread_getaffinity_np functions for Windows are affected because of it. Signed-off-by: Tasnim Bashar --- v3: WA to remove warning(-Wmaybe-uninitialized) v4: Directly used function name instead of #define --- lib/librte_eal/windows/include/pthread.h | 84 +++++++++++++++----- lib/librte_eal/windows/include/rte_windows.h | 1 + 2 files changed, 67 insertions(+), 18 deletions(-) diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/librte_eal/windows/include/pthread.h index e2274cf4e9..2553c0890a 100644 --- a/lib/librte_eal/windows/include/pthread.h +++ b/lib/librte_eal/windows/include/pthread.h @@ -6,6 +6,7 @@ #define _PTHREAD_H_ #include +#include /** * This file is required to support the common code in eal_common_proc.c, @@ -16,8 +17,8 @@ extern "C" { #endif -#include #include +#include #define PTHREAD_BARRIER_SERIAL_THREAD TRUE @@ -40,37 +41,84 @@ typedef SYNCHRONIZATION_BARRIER pthread_barrier_t; /* pthread function overrides */ #define pthread_self() \ ((pthread_t)GetCurrentThreadId()) -#define pthread_setaffinity_np(thread, size, cpuset) \ - eal_set_thread_affinity_mask(thread, (unsigned long *) cpuset) -#define pthread_getaffinity_np(thread, size, cpuset) \ - eal_get_thread_affinity_mask(thread, (unsigned long *) cpuset) -#define pthread_create(threadid, threadattr, threadfunc, args) \ - eal_create_thread(threadid, threadattr, threadfunc, args) static inline int -eal_set_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) +pthread_setaffinity_np(pthread_t threadid, size_t cpuset_size, + rte_cpuset_t *cpuset) { - SetThreadAffinityMask((HANDLE) threadid, *cpuset); - return 0; + DWORD_PTR ret; + HANDLE thread_handle; + + if (cpuset == NULL || cpuset_size == 0) + return -1; + + thread_handle = OpenThread(THREAD_ALL_ACCESS, FALSE, threadid); + if (thread_handle == NULL) { + RTE_LOG_WIN32_ERR("OpenThread()"); + return -1; + } + + ret = SetThreadAffinityMask(thread_handle, *cpuset->_bits); + if (ret == 0) { + RTE_LOG_WIN32_ERR("SetThreadAffinityMask()"); + goto close_handle; + } + +close_handle: + if (CloseHandle(thread_handle) == 0) { + RTE_LOG_WIN32_ERR("CloseHandle()"); + return -1; + } + return (ret == 0) ? -1 : 0; } static inline int -eal_get_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) +pthread_getaffinity_np(pthread_t threadid, size_t cpuset_size, + rte_cpuset_t *cpuset) { /* Workaround for the lack of a GetThreadAffinityMask() *API in Windows */ - /* obtain previous mask by setting dummy mask */ - DWORD dwprevaffinitymask = - SetThreadAffinityMask((HANDLE) threadid, 0x1); + DWORD_PTR prev_affinity_mask; + HANDLE thread_handle; + DWORD_PTR ret; + + if (cpuset == NULL || cpuset_size == 0) + return -1; + + thread_handle = OpenThread(THREAD_ALL_ACCESS, FALSE, threadid); + if (thread_handle == NULL) { + RTE_LOG_WIN32_ERR("OpenThread()"); + return -1; + } + + /* obtain previous mask by setting dummy mask */ + prev_affinity_mask = SetThreadAffinityMask(thread_handle, 0x1); + if (prev_affinity_mask == 0) { + RTE_LOG_WIN32_ERR("SetThreadAffinityMask()"); + goto close_handle; + } + /* set it back! */ - SetThreadAffinityMask((HANDLE) threadid, dwprevaffinitymask); - *cpuset = dwprevaffinitymask; - return 0; + ret = SetThreadAffinityMask(thread_handle, prev_affinity_mask); + if (ret == 0) { + RTE_LOG_WIN32_ERR("SetThreadAffinityMask()"); + goto close_handle; + } + + memset(cpuset, 0, cpuset_size); + *cpuset->_bits = prev_affinity_mask; + +close_handle: + if (CloseHandle(thread_handle) == 0) { + RTE_LOG_WIN32_ERR("SetThreadAffinityMask()"); + return -1; + } + return (ret == 0) ? -1 : 0; } static inline int -eal_create_thread(void *threadid, const void *threadattr, void *threadfunc, +pthread_create(void *threadid, const void *threadattr, void *threadfunc, void *args) { RTE_SET_USED(threadattr); diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h index 899ed7d874..d013b50241 100644 --- a/lib/librte_eal/windows/include/rte_windows.h +++ b/lib/librte_eal/windows/include/rte_windows.h @@ -31,6 +31,7 @@ #define INITGUID #endif #include +#include /** * Log GetLastError() with context, usually a Win32 API function and arguments. -- 2.19.1.windows.1