Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 19:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iothread: fix epollfd leak in the process of delIOThread

Browse Source 
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.

Reorder the code in aio_epoll_disable and reuse it.

Signed-off-by: Jie Wang <wangjie88@huawei.com>
Message-Id: <1526517763-11108-1-git-send-email-wangjie88@huawei.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
[Mention change to aio_epoll_disable in commit message. - Fam]
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Jie Wang 2018-05-17 08:42:43 +08:00 committed by Fam Zheng
parent 9d5e546af0
commit cd0a6d2b2c
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/block/aio.h
View File

@ -554,6 +554,14 @@ static inline bool in_aio_context_home_thread(AioContext *ctx)
*/ */
void aio_context_setup(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: * aio_context_set_poll_params:
* @ctx: the aio context * @ctx: the aio context

13
util/aio-posix.c
View File

@ -45,11 +45,11 @@ struct AioHandler
static void aio_epoll_disable(AioContext *ctx) static void aio_epoll_disable(AioContext *ctx)
{ {
ctx->epoll_available = false; ctx->epoll_enabled = false;
if (!ctx->epoll_enabled) { if (!ctx->epoll_available) {
return; return;
} }
ctx->epoll_enabled = false; ctx->epoll_available = false;
close(ctx->epollfd); close(ctx->epollfd);
} }
@ -713,6 +713,13 @@ void aio_context_setup(AioContext *ctx)
#endif #endif
} }
void aio_context_destroy(AioContext *ctx)
{
#ifdef CONFIG_EPOLL_CREATE1
aio_epoll_disable(ctx);
#endif
}
void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
int64_t grow, int64_t shrink, Error **errp) int64_t grow, int64_t shrink, Error **errp)
{ {

4
util/aio-win32.c
View File

@ -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, void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
int64_t grow, int64_t shrink, Error **errp) int64_t grow, int64_t shrink, Error **errp)
{ {

1
util/async.c
View File

@ -298,6 +298,7 @@ aio_ctx_finalize(GSource *source)
qemu_rec_mutex_destroy(&ctx->lock); qemu_rec_mutex_destroy(&ctx->lock);
qemu_lockcnt_destroy(&ctx->list_lock); qemu_lockcnt_destroy(&ctx->list_lock);
timerlistgroup_deinit(&ctx->tlg); timerlistgroup_deinit(&ctx->tlg);
aio_context_destroy(ctx);
} }
static GSourceFuncs aio_source_funcs = { static GSourceFuncs aio_source_funcs = {