From nobody Tue Apr 15 03:11:27 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1694789321; cv=none; d=zohomail.com; s=zohoarc; b=FiseqsvIAOt3y+Slyi/7DewDwKEOsicMMG9NdAEZCuPPxii0UdkwPQaQDSsok11/Ah/A1+ko2CDKM8MBCbYqZkKEaikXq8sN46pdIEWjLeiLoSJCjTezcU50tcx6g996WfBKny/kMkY54k7PZAiH4/9IamIsQR1SbCRd0R/qRxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694789321; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e1ZNFh4cyyiQUdJMOtCof5P3KhhngdZUdVDGwlRANFc=; b=LMXbOe42QM94lGlI7w56WZvksbvJthu59BPD/cvjj/dtIjNZuJ05zMSrYVsVQgboopC3oULhQ+vNhd0yLtZA0l9X32zzijYlY5tROT+oqkbJ0WIlC1OdtWB/1In9fRueRWIBGEnNGgxLJJREA2rkkscVrldd24zNd+i5FiTvzDE= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1694789321000783.1801374591021; Fri, 15 Sep 2023 07:48:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhA3Y-0000Xs-IV; Fri, 15 Sep 2023 10:44:28 -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 1qhA3N-0000JE-Rt for qemu-devel@nongnu.org; Fri, 15 Sep 2023 10:44:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qhA3L-00055p-ED for qemu-devel@nongnu.org; Fri, 15 Sep 2023 10:44:17 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-76-x1wgglk5NJ2_ze4ISrHziQ-1; Fri, 15 Sep 2023 10:44:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F1FB8955977; Fri, 15 Sep 2023 14:44:11 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B9C72026D68; Fri, 15 Sep 2023 14:44:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694789053; 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=e1ZNFh4cyyiQUdJMOtCof5P3KhhngdZUdVDGwlRANFc=; b=axYeoBYu8vfEzKxvaBw4qTkwYmBEYSBjOY6rx5BNqYHg6mHCmdWkbi4mPCi6paR/nbbCIM wQCGiQ70RwG0Fi/W83LFsKRhwAFEtVYy/4dnOXjU7a4+c7aKkjDTdokmfIWn34l3ui2Dz2 TlJJrsRsUoUQyEtU2yagRWbb+bXrSjs= X-MC-Unique: x1wgglk5NJ2_ze4ISrHziQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 28/28] block-coroutine-wrapper: use qemu_get_current_aio_context() Date: Fri, 15 Sep 2023 16:43:44 +0200 Message-ID: <20230915144344.238596-29-kwolf@redhat.com> In-Reply-To: <20230915144344.238596-1-kwolf@redhat.com> References: <20230915144344.238596-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.133.124; envelope-from=kwolf@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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.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: 1694789321942100001 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi Use qemu_get_current_aio_context() in mixed wrappers and coroutine wrappers so that code runs in the caller's AioContext instead of moving to the BlockDriverState's AioContext. This change is necessary for the multi-queue block layer where any thread can call into the block layer. Most wrappers are IO_CODE where it's safe to use the current AioContext nowadays. BlockDrivers and the core block layer use their own locks and no longer depend on the AioContext lock for thread-safety. The bdrv_create() wrapper invokes GLOBAL_STATE code. Using the current AioContext is safe because this code is only called with the BQL held from the main loop thread. The output of qemu-iotests 051 is sensitive to event loop activity. Update the output because the monitor BH runs at a different time, causing prompts to be printed differently in the output. Signed-off-by: Stefan Hajnoczi Message-ID: <20230912231037.826804-6-stefanha@redhat.com> Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- scripts/block-coroutine-wrapper.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/block-coroutine-wrapper.py b/scripts/block-coroutine-w= rapper.py index 685d0b4ed4..66cda6b8db 100644 --- a/scripts/block-coroutine-wrapper.py +++ b/scripts/block-coroutine-wrapper.py @@ -91,8 +91,6 @@ def __init__(self, wrapper_type: str, return_type: str, n= ame: str, raise ValueError(f"no_co function can't be rdlock: {self.n= ame}") self.target_name =3D f'{subsystem}_{subname}' =20 - self.ctx =3D self.gen_ctx() - self.get_result =3D 's->ret =3D ' self.ret =3D 'return s.ret;' self.co_ret =3D 'return ' @@ -166,7 +164,7 @@ def create_mixed_wrapper(func: FuncDecl) -> str: {func.co_ret}{name}({ func.gen_list('{name}') }); }} else {{ {struct_name} s =3D {{ - .poll_state.ctx =3D {func.ctx}, + .poll_state.ctx =3D qemu_get_current_aio_context(), .poll_state.in_progress =3D true, =20 { func.gen_block(' .{name} =3D {name},') } @@ -190,7 +188,7 @@ def create_co_wrapper(func: FuncDecl) -> str: {func.return_type} {func.name}({ func.gen_list('{decl}') }) {{ {struct_name} s =3D {{ - .poll_state.ctx =3D {func.ctx}, + .poll_state.ctx =3D qemu_get_current_aio_context(), .poll_state.in_progress =3D true, =20 { func.gen_block(' .{name} =3D {name},') } --=20 2.41.0