From: Tasnim Bashar <tbashar@mellanox.com> 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 Subject: [dpdk-dev] [PATCH v3] eal/windows: fix invalid thread handle Date: Mon, 1 Jun 2020 19:00:52 -0700 Message-ID: <20200602020052.4540-1-tbashar@mellanox.com> (raw) In-Reply-To: <20200522001112.48932-1-tbashar@mellanox.com> 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 <tbashar@mellanox.com> --- v3: WA to remove warning(-Wmaybe-uninitialized) --- lib/librte_eal/windows/include/pthread.h | 60 ++++++++++++++++---- lib/librte_eal/windows/include/rte_windows.h | 1 + 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/librte_eal/windows/include/pthread.h index 0bbed5c3b8..7b2c355443 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 <stdint.h> +#include <sched.h> /** * This file is required to support the common code in eal_common_proc.c, @@ -16,8 +17,8 @@ extern "C" { #endif -#include <windows.h> #include <rte_common.h> +#include <rte_windows.h> #define PTHREAD_BARRIER_SERIAL_THREAD TRUE @@ -41,31 +42,68 @@ typedef SYNCHRONIZATION_BARRIER pthread_barrier_t; #define pthread_self() \ ((pthread_t)GetCurrentThreadId()) #define pthread_setaffinity_np(thread, size, cpuset) \ - eal_set_thread_affinity_mask(thread, (unsigned long *) cpuset) + eal_set_thread_affinity_mask(thread, cpuset) #define pthread_getaffinity_np(thread, size, cpuset) \ - eal_get_thread_affinity_mask(thread, (unsigned long *) cpuset) + eal_get_thread_affinity_mask(thread, cpuset) #define pthread_create(threadid, threadattr, threadfunc, args) \ eal_create_thread(threadid, threadfunc, args) static inline int -eal_set_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) +eal_set_thread_affinity_mask(pthread_t threadid, rte_cpuset_t *cpuset) { - SetThreadAffinityMask((HANDLE) threadid, *cpuset); + DWORD_PTR ret; + HANDLE thread_handle; + + 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()"); + CloseHandle(thread_handle); + return -1; + } + CloseHandle(thread_handle); return 0; } static inline int -eal_get_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) +eal_get_thread_affinity_mask(pthread_t threadid, 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 dwprevaffinitymask; + HANDLE thread_handle; + DWORD_PTR ret; + + 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 */ + dwprevaffinitymask = SetThreadAffinityMask(thread_handle, 0x1); + if (dwprevaffinitymask == 0) { + RTE_LOG_WIN32_ERR("SetThreadAffinityMask()"); + CloseHandle(thread_handle); + return -1; + } + /* set it back! */ - SetThreadAffinityMask((HANDLE) threadid, dwprevaffinitymask); - *cpuset = dwprevaffinitymask; + ret = SetThreadAffinityMask(thread_handle, dwprevaffinitymask); + if (ret == 0) { + RTE_LOG_WIN32_ERR("SetThreadAffinityMask()"); + CloseHandle(thread_handle); + return -1; + } + memset(cpuset, 0, sizeof(rte_cpuset_t)); + *cpuset->_bits = dwprevaffinitymask; + CloseHandle(thread_handle); return 0; } diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h index ed6e4c1485..677b63c42d 100644 --- a/lib/librte_eal/windows/include/rte_windows.h +++ b/lib/librte_eal/windows/include/rte_windows.h @@ -29,6 +29,7 @@ #define INITGUID #endif #include <initguid.h> +#include <rte_log.h> /** * Log GetLastError() with context, usually a Win32 API function and arguments. -- 2.19.1.windows.1
next prev parent reply other threads:[~2020-06-02 2:01 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-22 0:11 [dpdk-dev] [PATCH] " Tasnim Bashar 2020-05-22 0:55 ` Dmitry Kozlyuk 2020-06-02 2:00 ` Tasnim Bashar [this message] 2020-06-11 14:35 ` [dpdk-dev] [PATCH v3] " Thomas Monjalon 2020-06-12 16:22 ` Tasnim Bashar 2020-06-12 21:33 ` Thomas Monjalon 2020-06-15 8:16 ` Thomas Monjalon 2020-06-16 18:53 ` Tasnim Bashar 2020-06-16 19:17 ` Thomas Monjalon 2020-06-16 19:59 ` Tasnim Bashar 2020-06-15 9:42 ` Thomas Monjalon 2020-06-16 19:00 ` Tasnim Bashar 2020-06-24 23:10 ` [dpdk-dev] [PATCH v4] eal/windows: fix " Tasnim Bashar 2020-06-25 0:38 ` Ranjit Menon 2020-06-25 19:11 ` Tasnim Bashar 2020-06-25 19:25 ` [dpdk-dev] [PATCH v5] " Tasnim Bashar 2020-06-29 23:09 ` Thomas Monjalon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200602020052.4540-1-tbashar@mellanox.com \ --to=tbashar@mellanox.com \ --cc=dev@dpdk.org \ --cc=dmitry.kozliuk@gmail.com \ --cc=fady@mellanox.com \ --cc=harini.ramakrishnan@microsoft.com \ --cc=navasile@linux.microsoft.com \ --cc=ocardona@microsoft.com \ --cc=ophirmu@mellanox.com \ --cc=pallavi.kadam@intel.com \ --cc=ranjit.menon@intel.com \ --cc=talshn@mellanox.com \ --cc=thomas@monjalon.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git