From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fItzk-0001vF-8n for qemu-devel@nongnu.org; Wed, 16 May 2018 06:49:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fItzi-00062m-SW for qemu-devel@nongnu.org; Wed, 16 May 2018 06:49:20 -0400 From: Jie Wang Date: Wed, 16 May 2018 16:36:20 +0800 Message-ID: <1526459780-35100-1-git-send-email-wangjie88@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v4] iothread: fix epollfd leak in the process of delIOThread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanha@redhat.com, peterx@redhat.com, famz@redhat.com, eblake@redhat.com Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, eric.fangyi@huawei.com, wu.wubin@huawei.com, wangjie88@huawei.com When we call addIOThread, the epollfd created in aio_context_setup, but not close it in the process of delIOThread, so the epollfd will leak. Signed-off-by: Jie Wang --- include/block/aio.h | 8 ++++++++ util/aio-posix.c | 9 +++++++++ util/aio-win32.c | 4 ++++ util/async.c | 1 + 4 files changed, 22 insertions(+) diff --git a/include/block/aio.h b/include/block/aio.h index a1d6b9e..ae6f354 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -555,6 +555,14 @@ static inline bool in_aio_context_home_thread(AioContext *ctx) void aio_context_setup(AioContext *ctx); /** + * aio_context_destroy: + * @ctx: the aio context + * + * Destroy the aio context. + */ +void aio_context_destroy(AioContext *ctx); + +/** * aio_context_set_poll_params: * @ctx: the aio context * @max_ns: how long to busy poll for, in nanoseconds diff --git a/util/aio-posix.c b/util/aio-posix.c index d8f0cb4..0ade2c7 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -713,6 +713,15 @@ void aio_context_setup(AioContext *ctx) #endif } +void aio_context_destroy(AioContext *ctx) +{ +#ifdef CONFIG_EPOLL_CREATE1 + if (ctx->epollfd >= 0) { + close(ctx->epollfd); + } +#endif +} + void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **errp) { diff --git a/util/aio-win32.c b/util/aio-win32.c index a67b00c..e676a8d 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -407,6 +407,10 @@ void aio_context_setup(AioContext *ctx) { } +void aio_context_destroy(AioContext *ctx) +{ +} + void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **errp) { diff --git a/util/async.c b/util/async.c index 4dd9d95..03f6278 100644 --- a/util/async.c +++ b/util/async.c @@ -298,6 +298,7 @@ aio_ctx_finalize(GSource *source) qemu_rec_mutex_destroy(&ctx->lock); qemu_lockcnt_destroy(&ctx->list_lock); timerlistgroup_deinit(&ctx->tlg); + aio_context_destroy(ctx); } static GSourceFuncs aio_source_funcs = { -- 1.8.3.1