From 23ce9e0a193636e2f5ec9b386ddd5307c17e9723 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Tue, 27 Jul 2021 00:36:32 +0300 Subject: [PATCH] eal/windows: cleanup virt2phys handle eal_mem_virt2phys_init() opens a handle for use by rte_mem_virt2phy(). Close this handle on EAL cleanup. Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management") Cc: stable@dpdk.org Signed-off-by: Dmitry Kozlyuk Acked-by: Ranjit Menon --- lib/eal/windows/eal.c | 1 + lib/eal/windows/eal_memory.c | 7 +++++++ lib/eal/windows/eal_windows.h | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index 5413d4d87f..3d8c520412 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -261,6 +261,7 @@ rte_eal_cleanup(void) eal_get_internal_configuration(); eal_intr_thread_cancel(); + eal_mem_virt2iova_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); eal_cleanup_config(internal_conf); diff --git a/lib/eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c index 4db048ccb5..71741fc07e 100644 --- a/lib/eal/windows/eal_memory.c +++ b/lib/eal/windows/eal_memory.c @@ -198,6 +198,13 @@ exit: return ret; } +void +eal_mem_virt2iova_cleanup(void) +{ + if (virt2phys_device != INVALID_HANDLE_VALUE) + CloseHandle(virt2phys_device); +} + phys_addr_t rte_mem_virt2phy(const void *virt) { diff --git a/lib/eal/windows/eal_windows.h b/lib/eal/windows/eal_windows.h index 7cc811485d..23ead6d30c 100644 --- a/lib/eal/windows/eal_windows.h +++ b/lib/eal/windows/eal_windows.h @@ -79,6 +79,11 @@ void eal_intr_thread_cancel(void); */ int eal_mem_virt2iova_init(void); +/** + * Cleanup resources used for virtual to physical address translation. + */ +void eal_mem_virt2iova_cleanup(void); + /** * Locate Win32 memory management routines in system libraries. * -- 2.20.1