From nobody Fri Nov 14 18:19:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761837954; cv=none; d=zohomail.com; s=zohoarc; b=ap54pbOv/dpyIAgTg5iI+YpUhB/tKfhGs6ifhrphHfMR+Z+haZCy39XbX1bN8vqCYq3ToepwkUllX5rVNDTumG/wtSWH3K4EvyBHzMcZrxXQehd9egU0yPLmQZiWl4cCh8ohxhYLpe0cH9S+r0+mWVzvbv8UgIHVlmO/upg+G3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761837954; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tTdhfXQSCMfe4/jirUlfNYrDfWi903ZqaUpy8KnZrhk=; b=K5nZxfu6fG+vtzpXvfGKBRfb/Z8Pb4/ZckHba1AtboeRZ6msrA8wL522u/udIHT5ury3VkCPc0YWvrAbs/pjzRlxp0jj2SZ3fLE6nBmcp5+CDFHepSJT4vSCZQHHDxdohSGs855XQTEonwerulRlcV4ImaaU/WJy6Sf4dqvsXbc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761837954453725.4490759946763; Thu, 30 Oct 2025 08:25:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEUU0-0004dh-2w; Thu, 30 Oct 2025 11:22:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEUTv-0004ch-HN for qemu-devel@nongnu.org; Thu, 30 Oct 2025 11:22:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEUTe-0006Tv-3B for qemu-devel@nongnu.org; Thu, 30 Oct 2025 11:22:31 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-523-bwlMmWUiPT2pozRpejUbog-1; Thu, 30 Oct 2025 11:22:02 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA2C7180AE16; Thu, 30 Oct 2025 15:22:01 +0000 (UTC) Received: from localhost (unknown [10.2.16.94]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1596B19560A2; Thu, 30 Oct 2025 15:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761837728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tTdhfXQSCMfe4/jirUlfNYrDfWi903ZqaUpy8KnZrhk=; b=SzgyL4/sEX2u+TubBNH1g/gdy/RPgMfGo2wgm0C3VSRSxms9NQFeIPKQpi2kwRKUovp0Iq lLaaxPnGq1kG5LIPt0q/zLo14etnMcWTr/x5Asb88/+OqtVDeLvDc49HNyQDU9e9PhSYJE oiVJ0oCeCUsw5l7/ldyXo/3hzpqkskc= X-MC-Unique: bwlMmWUiPT2pozRpejUbog-1 X-Mimecast-MFC-AGG-ID: bwlMmWUiPT2pozRpejUbog_1761837721 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Hanna Czenczek , Paolo Bonzini , hibriansong@gmail.com, eblake@redhat.com, Stefan Hajnoczi , Kevin Wolf , qemu-block@nongnu.org Subject: [RESEND PATCH v5 06/13] aio: free AioContext when aio_context_new() fails Date: Thu, 30 Oct 2025 11:21:42 -0400 Message-ID: <20251030152150.470170-7-stefanha@redhat.com> In-Reply-To: <20251030152150.470170-1-stefanha@redhat.com> References: <20251030152150.470170-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1761837956316154100 Content-Type: text/plain; charset="utf-8" g_source_destroy() only removes the GSource from the GMainContext it's attached to, if any. It does not free it. Use g_source_unref() instead so that the AioContext (which embeds a GSource) is freed. There is no need to call g_source_destroy() in aio_context_new() because the GSource isn't attached to a GMainContext yet. aio_ctx_finalize() expects everything to be set up already, so introduce the new ctx->initialized boolean and do nothing when called with !initialized. This also requires moving aio_context_setup() down after event_notifier_init() since aio_ctx_finalize() won't release any resources that aio_context_setup() acquired. Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- v5: - Added comments explaining how to clean up resources in error paths [Kevin] v2: - Fix spacing in aio_ctx_finalize() argument list [Eric] --- include/block/aio.h | 3 +++ util/async.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index 1657740a0e..2760f308f5 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -291,6 +291,9 @@ struct AioContext { gpointer epollfd_tag; =20 const FDMonOps *fdmon_ops; + + /* Was aio_context_new() successful? */ + bool initialized; }; =20 /** diff --git a/util/async.c b/util/async.c index cb72ad3777..7d06ff98f3 100644 --- a/util/async.c +++ b/util/async.c @@ -366,12 +366,16 @@ aio_ctx_dispatch(GSource *source, } =20 static void -aio_ctx_finalize(GSource *source) +aio_ctx_finalize(GSource *source) { AioContext *ctx =3D (AioContext *) source; QEMUBH *bh; unsigned flags; =20 + if (!ctx->initialized) { + return; + } + thread_pool_free_aio(ctx->thread_pool); =20 #ifdef CONFIG_LINUX_AIO @@ -579,16 +583,35 @@ AioContext *aio_context_new(Error **errp) int ret; AioContext *ctx; =20 + /* + * ctx is freed by g_source_unref() (e.g. aio_context_unref()). ctx's + * resources are freed as follows: + * + * 1. By aio_ctx_finalize() after aio_context_new() has returned and s= et + * ->initialized =3D true. + * + * 2. By manual cleanup code in this function's error paths before goto + * fail. + * + * Be careful to free resources in both cases! + */ ctx =3D (AioContext *) g_source_new(&aio_source_funcs, sizeof(AioConte= xt)); QSLIST_INIT(&ctx->bh_list); QSIMPLEQ_INIT(&ctx->bh_slice_list); - aio_context_setup(ctx); =20 ret =3D event_notifier_init(&ctx->notifier, false); if (ret < 0) { error_setg_errno(errp, -ret, "Failed to initialize event notifier"= ); goto fail; } + + /* + * Resources cannot easily be freed manually after aio_context_setup()= . If + * you add any new resources to AioContext, it's probably best to acqu= ire + * them before aio_context_setup(). + */ + aio_context_setup(ctx); + g_source_set_can_recurse(&ctx->source, true); qemu_lockcnt_init(&ctx->list_lock); =20 @@ -622,9 +645,11 @@ AioContext *aio_context_new(Error **errp) =20 register_aiocontext(ctx); =20 + ctx->initialized =3D true; + return ctx; fail: - g_source_destroy(&ctx->source); + g_source_unref(&ctx->source); return NULL; } =20 --=20 2.51.0