Skip to content

Commit

Permalink
AioContext: avoid leaking BHs on cleanup
Browse files Browse the repository at this point in the history
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 <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1438101249-25166-3-git-send-email-pbonzini@redhat.com
Message-Id: <1438014819-18125-2-git-send-email-stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
stefanhaRH committed Jul 29, 2015
1 parent fed105e commit a076972
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions async.c
Expand Up @@ -231,6 +231,19 @@ aio_ctx_finalize(GSource *source)
AioContext *ctx = (AioContext *) source;

thread_pool_free(ctx->thread_pool);

qemu_mutex_lock(&ctx->bh_lock);
while (ctx->first_bh) {
QEMUBH *next = ctx->first_bh->next;

/* qemu_bh_delete() must have been called on BHs in this AioContext */
assert(ctx->first_bh->deleted);

g_free(ctx->first_bh);
ctx->first_bh = next;
}
qemu_mutex_unlock(&ctx->bh_lock);

aio_set_event_notifier(ctx, &ctx->notifier, NULL);
event_notifier_cleanup(&ctx->notifier);
rfifolock_destroy(&ctx->lock);
Expand Down

0 comments on commit a076972

Please sign in to comment.