From nobody Thu Apr 3 11:26:39 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=1743014077; cv=none; d=zohomail.com; s=zohoarc; b=JHK7E+WSZOW/YDVckXAQ6ZA6X5mA4pPnDexuC63KSvTGeee8MgWb99kLoIIqT2D9IapxJvhsAyMFpwm40XguKfGwmp2nWhj9ZtUc3QJVc87fo8GIqcjEDT9vkekD1FpSXvkC4Ghhu60mSzgpCDdLMppPqgT8gKJIiJcd8RmU0Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743014077; 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=1+TRRRr+GYIAG4VyV+8vgtOLkMCbtBvsUV68bR5izEo=; b=mE60QbWHPkg3tOamU0VCWUv5BlcYQW9lo1VAOWyQyXWP9l+P1UojFXE/6mCGbdCDXKVO5a1QFxOeoQ5OT611GQmUsxdDJTqz2IrjGqiiMZfx46AwKqFeiXOyL5xp+KjPxDDyWH4vntzF5xDM7/kka9kCxmnlwX6K7R5WhaTOO08= 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 1743014077103155.42631467723174; Wed, 26 Mar 2025 11:34:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txVZn-000223-6t; Wed, 26 Mar 2025 14:34:07 -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 1txVZi-0001z3-V4 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 14:34:03 -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 1txVZf-0003Vl-D7 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 14:34:02 -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-125-0Ja3Avh2PJKBaRG9LuOKhg-1; Wed, 26 Mar 2025 14:33:54 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 94DC51800349; Wed, 26 Mar 2025 18:33:53 +0000 (UTC) Received: from localhost (unknown [10.2.16.113]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2CDDD1801747; Wed, 26 Mar 2025 18:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743014038; 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=1+TRRRr+GYIAG4VyV+8vgtOLkMCbtBvsUV68bR5izEo=; b=KhvA2HxcLHcncnd+y1DewHg3hp7p64+R/B6lH7F/omjSHHg7iN6gK3jagKpELodpn4WyXB vt2kWUtT4g4hFp5c3cL67i7USqg+R2QXBYRqmC4wR0EaA29JzciNZrn4Dhpo4OLRizA8Ay UZ9VQCSOAxXNpJFk8mCvcjunqDGWJz4= X-MC-Unique: 0Ja3Avh2PJKBaRG9LuOKhg-1 X-Mimecast-MFC-AGG-ID: 0Ja3Avh2PJKBaRG9LuOKhg_1743014033 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf , Stefan Hajnoczi , Stefan Weil , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , Paolo Bonzini , Fam Zheng Subject: [PATCH 4/4] aio: remove aio_context_use_g_source() Date: Wed, 26 Mar 2025 14:33:40 -0400 Message-ID: <20250326183340.1010531-5-stefanha@redhat.com> In-Reply-To: <20250326183340.1010531-1-stefanha@redhat.com> References: <20250326183340.1010531-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1743014078824019100 Content-Type: text/plain; charset="utf-8" There is no need for aio_context_use_g_source() now that epoll(7) and io_uring(7) file descriptor monitoring works with the glib event loop. AioContext doesn't need to be notified that GSource is being used. Signed-off-by: Stefan Hajnoczi --- include/block/aio.h | 3 --- tests/unit/test-nested-aio-poll.c | 6 ------ util/aio-posix.c | 12 ------------ util/aio-win32.c | 4 ---- util/async.c | 1 - 5 files changed, 26 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index 39ed86d14d..1657740a0e 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -728,9 +728,6 @@ void aio_context_setup(AioContext *ctx); */ void aio_context_destroy(AioContext *ctx); =20 -/* Used internally, do not call outside AioContext code */ -void aio_context_use_g_source(AioContext *ctx); - /** * aio_context_set_poll_params: * @ctx: the aio context diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio= -poll.c index 45484e745b..d13ecccd8c 100644 --- a/tests/unit/test-nested-aio-poll.c +++ b/tests/unit/test-nested-aio-poll.c @@ -83,12 +83,6 @@ static void test(void) /* Enable polling */ aio_context_set_poll_params(td.ctx, 1000000, 2, 2, &error_abort); =20 - /* - * The GSource is unused but this has the side-effect of changing the = fdmon - * that AioContext uses. - */ - aio_get_g_source(td.ctx); - /* Make the event notifier active (set) right away */ event_notifier_init(&td.poll_notifier, 1); aio_set_event_notifier(td.ctx, &td.poll_notifier, diff --git a/util/aio-posix.c b/util/aio-posix.c index 8ed1c4a405..6c2ee0b0b4 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -736,18 +736,6 @@ void aio_context_destroy(AioContext *ctx) aio_free_deleted_handlers(ctx); } =20 -void aio_context_use_g_source(AioContext *ctx) -{ - /* - * Disable io_uring when the glib main loop is used because it doesn't - * support mixed glib/aio_poll() usage. It relies on aio_poll() being - * called regularly so that changes to the monitored file descriptors = are - * submitted, otherwise a list of pending fd handlers builds up. - */ - fdmon_io_uring_destroy(ctx); - aio_free_deleted_handlers(ctx); -} - void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **err= p) { diff --git a/util/aio-win32.c b/util/aio-win32.c index 6583d5c5f3..34c4074133 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -427,10 +427,6 @@ void aio_context_destroy(AioContext *ctx) { } =20 -void aio_context_use_g_source(AioContext *ctx) -{ -} - void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **err= p) { diff --git a/util/async.c b/util/async.c index 863416dee9..11954f8931 100644 --- a/util/async.c +++ b/util/async.c @@ -430,7 +430,6 @@ static GSourceFuncs aio_source_funcs =3D { =20 GSource *aio_get_g_source(AioContext *ctx) { - aio_context_use_g_source(ctx); g_source_ref(&ctx->source); return &ctx->source; } --=20 2.49.0