From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK3kn-0006Pl-MY for qemu-devel@nongnu.org; Tue, 28 Jul 2015 08:13:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK3ki-0006kH-OF for qemu-devel@nongnu.org; Tue, 28 Jul 2015 08:13:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK3ki-0006k9-J8 for qemu-devel@nongnu.org; Tue, 28 Jul 2015 08:13:00 -0400 From: Stefan Hajnoczi Date: Tue, 28 Jul 2015 13:12:55 +0100 Message-Id: <1438085576-12072-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1438085576-12072-1-git-send-email-stefanha@redhat.com> References: <1438085576-12072-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/2] AioContext: avoid leaking deleted BHs on cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, Stefan Hajnoczi , Paolo Bonzini BHs are freed during aio_bh_poll(). This leads to memory leaks if there is no aio_bh_poll() between qemu_bh_delete() and aio_ctx_finalize(). Suggested-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- async.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/async.c b/async.c index 9a98a74..929d533 100644 --- a/async.c +++ b/async.c @@ -234,7 +234,20 @@ aio_ctx_finalize(GSource *source) aio_set_event_notifier(ctx, &ctx->notifier, NULL); event_notifier_cleanup(&ctx->notifier); rfifolock_destroy(&ctx->lock); + + qemu_mutex_lock(&ctx->bh_lock); + while (ctx->first_bh) { + QEMUBH *next = ctx->first_bh->next; + + /* TODO ignore leaks for now, change to an assertion in the future */ + if (ctx->first_bh->deleted) { + g_free(ctx->first_bh); + } + ctx->first_bh = next; + } + qemu_mutex_unlock(&ctx->bh_lock); qemu_mutex_destroy(&ctx->bh_lock); + timerlistgroup_deinit(&ctx->tlg); } -- 2.4.3