From patchwork Tue Sep 15 12:13:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 305380 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80499C433E2 for ; Tue, 15 Sep 2020 12:49:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EAB9E20756 for ; Tue, 15 Sep 2020 12:49:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ORmkE7Sr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAB9E20756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAOz-0002a1-0a for qemu-devel@archiver.kernel.org; Tue, 15 Sep 2020 08:49:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kI9rT-0001ax-DO; Tue, 15 Sep 2020 08:15:03 -0400 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:52975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kI9rQ-0008Jf-Vs; Tue, 15 Sep 2020 08:15:03 -0400 Received: by mail-pj1-x1044.google.com with SMTP id o16so1678473pjr.2; Tue, 15 Sep 2020 05:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eTowCOmFGkug/aztHy6I04JZoGONhdCbvgRzQeqIV9w=; b=ORmkE7SrCuBO9Q89TIq+fj8LqIPGV4DJeFGxt1mcn8bhDlBzzDXZavsNkFhajh88nq nNoZz9H//Ka6v6LLKYghz6rL7577lbUOmIuijE78YKv4RB7hkFulF3SY9GMx20hRjOp/ caruDFKKbYGVfC6amTu/MUtIrylj38REwYYBehxCdGUnA/gATnAZN2gVEFMGfNtu1jYr f45JBNMZ343uehdIBk9GoX/ADSnN2ElLyDnLZZ3iYaYB6nGW0xq9lGnVZXmidOQp3qpH 9EbTXH3069fvrbfalKNVLjjBVLwu+qx5fkji4xx95hPBZ9c+Y8iax8sOzxLoaxgRVDTf DLaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eTowCOmFGkug/aztHy6I04JZoGONhdCbvgRzQeqIV9w=; b=PAQY7MlsW4FMWkFb7LhX7DoFtvDMd/D3Mpzb/Lq053rzU9ggIXrFVmDsk0dGQ13PRs /Z4/vDcFy/zrmz9h+by8c/vLygsoFWKr9kaCJ9vviNOZabEf21tLA7qMwQX8D6XpK/Rl MxZyiZ2A/VqIDTtKYGiCcZv1rNbIDgyfXf7Q6mrkhEauKmrPlpFPUHTP8zsXdAIEtF6E Oji8B3mFTz9Cg7s7FZAc6NpLWlu8bIZLoFWFaYYtDEwY0JsplubfRd3ubQ+XH1AWjUZc HCE+zogs7+0XNtYfHu0+xUX7YxCJVkdJ9q2lNKKJ/RWN3bbbYYOv75Z3ynj4d2vwiAvP mP5w== X-Gm-Message-State: AOAM5300BpHP9YcjSJe5r8TpUDEUCkHZwrcJOlydpWb7CTjuRFfJyyQT MCHHttqbZWvaGe5iiaDXKxpWQCyQwHpnTGQpksY= X-Google-Smtp-Source: ABdhPJzylrtBYOP6HBMQovno7GbcyIMj8u67KpmTHdz5HJEDbnl+iAVX+tB8EtT8Rt6xFD01j9pTjQ== X-Received: by 2002:a17:902:cf8f:b029:d0:90a3:24e9 with SMTP id l15-20020a170902cf8fb02900d090a324e9mr18444947ply.8.1600172098889; Tue, 15 Sep 2020 05:14:58 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id k28sm13683061pfh.196.2020.09.15.05.14.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 05:14:58 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v9 18/26] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c Date: Tue, 15 Sep 2020 20:13:10 +0800 Message-Id: <20200915121318.247-19-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200915121318.247-1-luoyonggang@gmail.com> References: <20200915121318.247-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1044; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1044.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Ed Maste , Michael Roth , qemu-block@nongnu.org, Stefan Weil , Xie Changlong , Peter Lieven , Markus Armbruster , Max Reitz , Yonggang Luo , Gerd Hoffmann , Wen Congyang , Paolo Bonzini , Richard Henderson , Li-Wen Hsu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is a fixes for (C:\work\xemu\qemu\build\tests\test-aio-multithread.exe:19100): GLib-CRITICAL **: 23:03:24.965: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' failed ERROR test-aio-multithread - Bail out! GLib-FATAL-CRITICAL: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' failed (C:\work\xemu\qemu\build\tests\test-bdrv-drain.exe:21036): GLib-CRITICAL **: 23:03:29.861: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' failed ERROR test-bdrv-drain - Bail out! GLib-FATAL-CRITICAL: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' failed And the idea comes from https://patchwork.kernel.org/patch/9975239/ Signed-off-by: Yonggang Luo --- util/aio-win32.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/util/aio-win32.c b/util/aio-win32.c index 953c56ab48..9899546a8a 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -37,6 +37,15 @@ struct AioHandler { static void aio_remove_fd_handler(AioContext *ctx, AioHandler *node) { + /* If the GSource is in the process of being destroyed then + * g_source_remove_poll() causes an assertion failure. Skip + * removal in that case, because glib cleans up its state during + * destruction anyway. + */ + if (!g_source_is_destroyed(&ctx->source)) { + g_source_remove_poll(&ctx->source, &node->pfd); + } + /* If aio_poll is in progress, just mark the node as deleted */ if (qemu_lockcnt_count(&ctx->list_lock)) { node->deleted = 1; @@ -139,8 +148,6 @@ void aio_set_event_notifier(AioContext *ctx, /* Are we deleting the fd handler? */ if (!io_notify) { if (node) { - g_source_remove_poll(&ctx->source, &node->pfd); - aio_remove_fd_handler(ctx, node); } } else {