From patchwork Thu May 17 00:42:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "wangjie (P)" X-Patchwork-Id: 915049 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40mbZg231Yz9s3X for ; Thu, 17 May 2018 12:57:45 +1000 (AEST) Received: from localhost ([::1]:57023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ96s-000167-KE for incoming@patchwork.ozlabs.org; Wed, 16 May 2018 22:57:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ96V-00014Q-2I for qemu-devel@nongnu.org; Wed, 16 May 2018 22:57:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ96U-00039x-5e for qemu-devel@nongnu.org; Wed, 16 May 2018 22:57:19 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2326 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fJ96P-000335-7C; Wed, 16 May 2018 22:57:13 -0400 Received: from DGGEML404-HUB.china.huawei.com (unknown [172.30.72.54]) by Forcepoint Email with ESMTP id 02C33A9EBF734; Thu, 17 May 2018 10:57:07 +0800 (CST) Received: from localhost.localdomain (10.175.104.211) by DGGEML404-HUB.china.huawei.com (10.3.17.39) with Microsoft SMTP Server id 14.3.382.0; Thu, 17 May 2018 10:55:33 +0800 From: Jie Wang To: , , , Date: Thu, 17 May 2018 08:42:43 +0800 Message-ID: <1526517763-11108-1-git-send-email-wangjie88@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.104.211] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 45.249.212.188 Subject: [Qemu-devel] [PATCH v5] iothread: fix epollfd leak in the process of delIOThread X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wu.wubin@huawei.com, wangjie88@huawei.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, eric.fangyi@huawei.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Fam Zheng Reviewed-by: Peter Xu --- include/block/aio.h | 8 ++++++++ util/aio-posix.c | 13 ++++++++++--- util/aio-win32.c | 4 ++++ util/async.c | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) 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..118bf57 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -45,11 +45,11 @@ struct AioHandler static void aio_epoll_disable(AioContext *ctx) { - ctx->epoll_available = false; - if (!ctx->epoll_enabled) { + ctx->epoll_enabled = false; + if (!ctx->epoll_available) { return; } - ctx->epoll_enabled = false; + ctx->epoll_available = false; close(ctx->epollfd); } @@ -713,6 +713,13 @@ void aio_context_setup(AioContext *ctx) #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, 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 = {