d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal/windows: fix interrupt thread handle leakage

Browse Source 
Each time a work was scheduled in the interrupt thread,
usually an alarm, a handle was opened but not closed.

Opening a handle is a system call, which harms alarm precision.
Instead of opening and closing a handle each time, open it
when interrupt thread starts and close it when the thread finishes.

Fixes: 5c016fc0205a ("eal/windows: add interrupt thread skeleton")
Cc: stable@dpdk.org

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Tested-by: Pallavi Kadam <pallavi.kadam@intel.com>
This commit is contained in:
Dmitry Kozlyuk 2021-05-02 05:33:32 +03:00 committed by Thomas Monjalon
parent 35dff5d3b7
commit 3888f31950
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/eal/windows/eal_interrupts.c
View File

@ -10,6 +10,7 @@
static pthread_t intr_thread; static pthread_t intr_thread;
static HANDLE intr_iocp; static HANDLE intr_iocp;
static HANDLE intr_thread_handle;
static void static void
eal_intr_process(const OVERLAPPED_ENTRY *event) eal_intr_process(const OVERLAPPED_ENTRY *event)
@ -17,9 +18,27 @@ eal_intr_process(const OVERLAPPED_ENTRY *event)
RTE_SET_USED(event); RTE_SET_USED(event);
} }
static int
eal_intr_thread_handle_init(void)
{
DWORD thread_id = GetCurrentThreadId();
intr_thread_handle = OpenThread(THREAD_ALL_ACCESS, FALSE, thread_id);
if (intr_thread_handle == NULL) {
RTE_LOG_WIN32_ERR("OpenThread(%lu)", thread_id);
return -1;
}
return 0;
}
static void * static void *
eal_intr_thread_main(LPVOID arg __rte_unused) eal_intr_thread_main(LPVOID arg __rte_unused)
{ {
if (eal_intr_thread_handle_init() < 0) {
RTE_LOG(ERR, EAL, "Cannot open interrupt thread handle\n");
goto cleanup;
}
while (1) { while (1) {
OVERLAPPED_ENTRY events[16]; OVERLAPPED_ENTRY events[16];
ULONG event_count, i; ULONG event_count, i;
@ -46,6 +65,10 @@ eal_intr_thread_main(LPVOID arg __rte_unused)
eal_intr_process(&events[i]); eal_intr_process(&events[i]);
} }
CloseHandle(intr_thread_handle);
intr_thread_handle = NULL;
cleanup:
intr_thread = 0; intr_thread = 0;
CloseHandle(intr_iocp); CloseHandle(intr_iocp);
@ -93,15 +116,8 @@ rte_intr_rx_ctl(__rte_unused struct rte_intr_handle *intr_handle,
int int
eal_intr_thread_schedule(void (*func)(void *arg), void *arg) eal_intr_thread_schedule(void (*func)(void *arg), void *arg)
{ {
HANDLE handle; if (!QueueUserAPC((PAPCFUNC)(ULONG_PTR)func,
intr_thread_handle, (ULONG_PTR)arg)) {
handle = OpenThread(THREAD_ALL_ACCESS, FALSE, intr_thread);
if (handle == NULL) {
RTE_LOG_WIN32_ERR("OpenThread(%llu)", intr_thread);
return -ENOENT;
}
if (!QueueUserAPC((PAPCFUNC)(ULONG_PTR)func, handle, (ULONG_PTR)arg)) {
RTE_LOG_WIN32_ERR("QueueUserAPC()"); RTE_LOG_WIN32_ERR("QueueUserAPC()");
return -EINVAL; return -EINVAL;
} }