From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DFF9BC3DA78 for ; Tue, 17 Jan 2023 15:45:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHo9e-000215-99; Tue, 17 Jan 2023 10:45:42 -0500 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 1pHo9b-0001zU-33 for qemu-devel@nongnu.org; Tue, 17 Jan 2023 10:45:39 -0500 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 1pHo9Z-0007hw-KJ for qemu-devel@nongnu.org; Tue, 17 Jan 2023 10:45:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673970337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5ruRXzE441JDDVjqyZviu7xdaVzoKIn8KhDEBGNFQVc=; b=S5oCLJIWzM/mJt45For4ZK1GnTZi9TyRf91efEaS4Udy5z1ymPCfjwUBdevu5DHExu/AY+ ZjdQjVdr+5QgNLTotmSSCrlSq9Igs+qRHMaFUJQEopds8ZUPk6/szmL0yS9IL1WdHTSC6T oYOyG4C3SwP7j7QDGQ2foN0OvNsFzvM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-103-3uEL5FbZMNu8RAOsOQ4OqA-1; Tue, 17 Jan 2023 10:45:20 -0500 X-MC-Unique: 3uEL5FbZMNu8RAOsOQ4OqA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6428D1C277CF; Tue, 17 Jan 2023 15:44:47 +0000 (UTC) Received: from redhat.com (unknown [10.39.194.190]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7DBB140EBF5; Tue, 17 Jan 2023 15:44:46 +0000 (UTC) Date: Tue, 17 Jan 2023 16:44:45 +0100 From: Kevin Wolf To: Paolo Bonzini Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org Subject: Re: [PATCH] blkdebug: ignore invalid rules in non-coroutine context Message-ID: References: <20221215130225.476477-3-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221215130225.476477-3-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Am 15.12.2022 um 14:02 hat Paolo Bonzini geschrieben: > blkdebug events can be called from either non-coroutine or coroutine > contexts. However, suspend actions only make sense from within > a coroutine. Currently, using those action would lead to an abort() in > qemu_coroutine_yield() ("Co-routine is yielding to no one"). Catch them > and print an error instead. > > Signed-off-by: Paolo Bonzini > --- > block.c | 2 +- > block/blkdebug.c | 10 ++++++++-- > include/block/block-io.h | 2 +- > include/block/block_int-common.h | 3 ++- > 4 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/block.c b/block.c > index 3f2bd128570e..49c66475c73e 100644 > --- a/block.c > +++ b/block.c > @@ -6334,7 +6334,7 @@ BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs) > return drv->bdrv_get_specific_stats(bs); > } > > -void bdrv_debug_event(BlockDriverState *bs, BlkdebugEvent event) > +void coroutine_mixed_fn bdrv_debug_event(BlockDriverState *bs, BlkdebugEvent event) > { > IO_CODE(); > if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) { > diff --git a/block/blkdebug.c b/block/blkdebug.c > index 4265ca125e25..ce297961b7db 100644 > --- a/block/blkdebug.c > +++ b/block/blkdebug.c > @@ -31,6 +31,7 @@ > #include "block/qdict.h" > #include "qemu/module.h" > #include "qemu/option.h" > +#include "qemu/error-report.h" > #include "qapi/qapi-visit-block-core.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qlist.h" > @@ -837,7 +838,7 @@ static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, > } > } > > -static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) > +static void coroutine_mixed_fn blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) > { > BDRVBlkdebugState *s = bs->opaque; > struct BlkdebugRule *rule, *next; > @@ -855,7 +856,12 @@ static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) > } > > while (actions_count[ACTION_SUSPEND] > 0) { > - qemu_coroutine_yield(); > + if (qemu_in_coroutine()) { > + qemu_coroutine_yield(); > + } else { > + error_report("Non-coroutine event %s cannot suspend\n", > + BlkdebugEvent_lookup.array[event]); error_report() already adds a newline, so we shouldn't have an "\n" here. > + } > actions_count[ACTION_SUSPEND]--; > } > } Thanks, fixed this up and applied to the block branch. Kevin