From nobody Sun Feb 8 13:47:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589294824; cv=none; d=zohomail.com; s=zohoarc; b=bjVyBQFC3uMBhj9LS2yNBRZeerI90XYZB1A8n634nh0p5/9T4ZupJfPUDAzn+4BShxzoiijIqQUgTW1mugsaG8DLztR4jH9uM0MS2WP/CeDVc+zFsLqGw3aZeRZ1z4Q1cyvf7JLDVJ/5L5fIZ6uJeonKZIOsqu0Q8SvhqCRSar8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589294824; h=Content-Type: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=fGBQWwSx8J3Up4Q8x4/YZuvKiJkHxgyFQvzGyXc9bPE=; b=UONdjhVWjGQf2hcWEGYB4cjXwoC77SELoENJMFxwdbzkNEyo+MWsqLPxEBAKStaCYOgAlKYhED80WN0TeizmtlRUw/GTwdKxdMxhmInlid8Xi5cqKrYGqNptns89xQafbi1mLSJNNeixyI649dPoHF80SJ6XQP9YQBBHwPGN2QA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589294824084850.0808763323765; Tue, 12 May 2020 07:47:04 -0700 (PDT) Received: from localhost ([::1]:36324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYWBS-0007gR-Ni for importer@patchew.org; Tue, 12 May 2020 10:47:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYW8M-0002fN-Cu for qemu-devel@nongnu.org; Tue, 12 May 2020 10:43:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26629 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYW8L-00041X-D5 for qemu-devel@nongnu.org; Tue, 12 May 2020 10:43:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-414-UsF_gpGPND6BALCsdxgSew-1; Tue, 12 May 2020 10:43:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B04718A0750; Tue, 12 May 2020 14:43:45 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-74.ams2.redhat.com [10.36.114.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 661325D9DD; Tue, 12 May 2020 14:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589294628; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fGBQWwSx8J3Up4Q8x4/YZuvKiJkHxgyFQvzGyXc9bPE=; b=hB5AsN4XITV59mK6+d9S8MZl8V6mlm4tigfEE/7ErMgNLhTZpUd374s7dUFqSnyFxcUayL 5RuRywzvXYAHK5vCoUdrKjdwPQRuYBY9Ym3jee1K6hNgN5dzRocMxHGU3qWs7x/mLqDtW4 tUpJgtq/nbfJDb9REm3yGz43ZxryWog= X-MC-Unique: UsF_gpGPND6BALCsdxgSew-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [RFC PATCH 1/3] block: Factor out bdrv_run_co() Date: Tue, 12 May 2020 16:43:16 +0200 Message-Id: <20200512144318.181049-2-kwolf@redhat.com> In-Reply-To: <20200512144318.181049-1-kwolf@redhat.com> References: <20200512144318.181049-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/12 02:02:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, qemu-devel@nongnu.org, s.reiter@proxmox.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, t.lamprecht@proxmox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We have a few bdrv_*() functions that can either spawn a new coroutine and wait for it with BDRV_POLL_WHILE() or use a fastpath if they are alreeady running in a coroutine. All of them duplicate basically the same code. Factor the common code into a new function bdrv_run_co(). Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/io.c | 104 +++++++++++++++-------------------------------------- 1 file changed, 28 insertions(+), 76 deletions(-) diff --git a/block/io.c b/block/io.c index 7d30e61edc..c1badaadc9 100644 --- a/block/io.c +++ b/block/io.c @@ -891,6 +891,22 @@ static int bdrv_check_byte_request(BlockDriverState *b= s, int64_t offset, return 0; } =20 +static int bdrv_run_co(BlockDriverState *bs, CoroutineEntry *entry, + void *opaque, int *ret) +{ + if (qemu_in_coroutine()) { + /* Fast-path if already in coroutine context */ + entry(opaque); + } else { + Coroutine *co =3D qemu_coroutine_create(entry, opaque); + *ret =3D NOT_DONE; + bdrv_coroutine_enter(bs, co); + BDRV_POLL_WHILE(bs, *ret =3D=3D NOT_DONE); + } + + return *ret; +} + typedef struct RwCo { BdrvChild *child; int64_t offset; @@ -923,25 +939,15 @@ static int bdrv_prwv_co(BdrvChild *child, int64_t off= set, QEMUIOVector *qiov, bool is_write, BdrvRequestFlags flags) { - Coroutine *co; RwCo rwco =3D { .child =3D child, .offset =3D offset, .qiov =3D qiov, .is_write =3D is_write, - .ret =3D NOT_DONE, .flags =3D flags, }; =20 - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_rw_co_entry(&rwco); - } else { - co =3D qemu_coroutine_create(bdrv_rw_co_entry, &rwco); - bdrv_coroutine_enter(child->bs, co); - BDRV_POLL_WHILE(child->bs, rwco.ret =3D=3D NOT_DONE); - } - return rwco.ret; + return bdrv_run_co(child->bs, bdrv_rw_co_entry, &rwco, &rwco.ret); } =20 int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset, @@ -2230,7 +2236,6 @@ typedef struct BdrvCoBlockStatusData { int64_t *map; BlockDriverState **file; int ret; - bool done; } BdrvCoBlockStatusData; =20 int coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs, @@ -2492,7 +2497,6 @@ static void coroutine_fn bdrv_block_status_above_co_e= ntry(void *opaque) data->want_zero, data->offset, data->bytes, data->pnum, data->map, data->fi= le); - data->done =3D true; aio_wait_kick(); } =20 @@ -2508,7 +2512,6 @@ static int bdrv_common_block_status_above(BlockDriver= State *bs, int64_t *map, BlockDriverState **file) { - Coroutine *co; BdrvCoBlockStatusData data =3D { .bs =3D bs, .base =3D base, @@ -2518,18 +2521,9 @@ static int bdrv_common_block_status_above(BlockDrive= rState *bs, .pnum =3D pnum, .map =3D map, .file =3D file, - .done =3D false, }; =20 - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_block_status_above_co_entry(&data); - } else { - co =3D qemu_coroutine_create(bdrv_block_status_above_co_entry, &da= ta); - bdrv_coroutine_enter(bs, co); - BDRV_POLL_WHILE(bs, !data.done); - } - return data.ret; + return bdrv_run_co(bs, bdrv_block_status_above_co_entry, &data, &data.= ret); } =20 int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base, @@ -2669,22 +2663,13 @@ static inline int bdrv_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos, bool is_read) { - if (qemu_in_coroutine()) { - return bdrv_co_rw_vmstate(bs, qiov, pos, is_read); - } else { - BdrvVmstateCo data =3D { - .bs =3D bs, - .qiov =3D qiov, - .pos =3D pos, - .is_read =3D is_read, - .ret =3D -EINPROGRESS, - }; - Coroutine *co =3D qemu_coroutine_create(bdrv_co_rw_vmstate_entry, = &data); - - bdrv_coroutine_enter(bs, co); - BDRV_POLL_WHILE(bs, data.ret =3D=3D -EINPROGRESS); - return data.ret; - } + BdrvVmstateCo data =3D { + .bs =3D bs, + .qiov =3D qiov, + .pos =3D pos, + .is_read =3D is_read, + }; + return bdrv_run_co(bs, bdrv_co_rw_vmstate_entry, &data, &data.ret); } =20 int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf, @@ -2890,22 +2875,11 @@ early_exit: =20 int bdrv_flush(BlockDriverState *bs) { - Coroutine *co; FlushCo flush_co =3D { .bs =3D bs, - .ret =3D NOT_DONE, }; =20 - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_flush_co_entry(&flush_co); - } else { - co =3D qemu_coroutine_create(bdrv_flush_co_entry, &flush_co); - bdrv_coroutine_enter(bs, co); - BDRV_POLL_WHILE(bs, flush_co.ret =3D=3D NOT_DONE); - } - - return flush_co.ret; + return bdrv_run_co(bs, bdrv_flush_co_entry, &flush_co, &flush_co.ret); } =20 typedef struct DiscardCo { @@ -3038,24 +3012,13 @@ out: =20 int bdrv_pdiscard(BdrvChild *child, int64_t offset, int64_t bytes) { - Coroutine *co; DiscardCo rwco =3D { .child =3D child, .offset =3D offset, .bytes =3D bytes, - .ret =3D NOT_DONE, }; =20 - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_pdiscard_co_entry(&rwco); - } else { - co =3D qemu_coroutine_create(bdrv_pdiscard_co_entry, &rwco); - bdrv_coroutine_enter(child->bs, co); - BDRV_POLL_WHILE(child->bs, rwco.ret =3D=3D NOT_DONE); - } - - return rwco.ret; + return bdrv_run_co(child->bs, bdrv_pdiscard_co_entry, &rwco, &rwco.ret= ); } =20 int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf) @@ -3477,7 +3440,6 @@ static void coroutine_fn bdrv_truncate_co_entry(void = *opaque) int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact, PreallocMode prealloc, BdrvRequestFlags flags, Error **e= rrp) { - Coroutine *co; TruncateCo tco =3D { .child =3D child, .offset =3D offset, @@ -3485,17 +3447,7 @@ int bdrv_truncate(BdrvChild *child, int64_t offset, = bool exact, .prealloc =3D prealloc, .flags =3D flags, .errp =3D errp, - .ret =3D NOT_DONE, }; =20 - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - bdrv_truncate_co_entry(&tco); - } else { - co =3D qemu_coroutine_create(bdrv_truncate_co_entry, &tco); - bdrv_coroutine_enter(child->bs, co); - BDRV_POLL_WHILE(child->bs, tco.ret =3D=3D NOT_DONE); - } - - return tco.ret; + return bdrv_run_co(child->bs, bdrv_truncate_co_entry, &tco, &tco.ret); } --=20 2.25.3 From nobody Sun Feb 8 13:47:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589294740; cv=none; d=zohomail.com; s=zohoarc; b=V9673bDg9Ohpe5nCwD9KzSR4HtNEsooehAAhCsFbQjMIOjwvJDo5oRb6MT5NXMwREOhL0eMhQxIscHPYZVSrSFdfNSpvipcyuPwoV05chw0pf6ajpbgu4S24vdQ3ZZmCtK4n9AaKlgRYqCAHFKxc6pJcCQUb0LGFfRQw6FFwICg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589294740; h=Content-Type: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=ybxicmw62WPTarXz7cdaSgDqp3JUN9/hShkGjxRS1qg=; b=Q/3SqIFLoE7IA+jocFdYY4aEnlSnznADoHoh74CmJDwrET/Orlden6UrQm/I+1sMiUdwuPXUaCRxTBf8UG1Udo8eDzDazT6rOsJYcA/KF7wqp2LWKlxZO0JQpjWLkaD7MqgX1X1fvu8hdxsl2JPpjTlIqH0+nM/Iu33Kxd/K4qc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589294740478468.4990408454039; Tue, 12 May 2020 07:45:40 -0700 (PDT) Received: from localhost ([::1]:57936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYWA7-0004Fl-0j for importer@patchew.org; Tue, 12 May 2020 10:45:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYW8b-0002xS-9v for qemu-devel@nongnu.org; Tue, 12 May 2020 10:44:05 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:25856 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYW8Z-00042N-RA for qemu-devel@nongnu.org; Tue, 12 May 2020 10:44:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-234-SblDYKekP-WGsGPfSsEMcQ-1; Tue, 12 May 2020 10:44:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9D79EC1A1; Tue, 12 May 2020 14:43:59 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-74.ams2.redhat.com [10.36.114.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38CB35D9DD; Tue, 12 May 2020 14:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589294642; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ybxicmw62WPTarXz7cdaSgDqp3JUN9/hShkGjxRS1qg=; b=QnH7U/8jBpa9dAlltB/DkKgY8lz5jlUuW2cTtzn3QBM/gqwXH8SnYE8y1w1puMqUx5Acxj uiKUEWz5GYTBjYzhFUeojkz8GS5fRHi8E8cl/ubgg/etD4Nv5dY0xSApYBnqAEbsQ26xZC m7ozT784Ytwfr3dQyfseGwojbkW6IcA= X-MC-Unique: SblDYKekP-WGsGPfSsEMcQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [RFC PATCH 2/3] block: Allow bdrv_run_co() from different AioContext Date: Tue, 12 May 2020 16:43:17 +0200 Message-Id: <20200512144318.181049-3-kwolf@redhat.com> In-Reply-To: <20200512144318.181049-1-kwolf@redhat.com> References: <20200512144318.181049-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/12 02:02:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, qemu-devel@nongnu.org, s.reiter@proxmox.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, t.lamprecht@proxmox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Coroutine functions that are entered through bdrv_run_co() are already safe to call from synchronous code in a different AioContext because bdrv_coroutine_enter() will schedule them in the context of the node. However, the coroutine fastpath still requires that we're already in the right AioContext when called in coroutine context. In order to make the behaviour more consistent and to make life a bit easier for callers, let's check the AioContext and automatically move the current coroutine around if we're not in the right context yet. Signed-off-by: Kevin Wolf --- block/io.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index c1badaadc9..7808e8bdc0 100644 --- a/block/io.c +++ b/block/io.c @@ -895,8 +895,21 @@ static int bdrv_run_co(BlockDriverState *bs, Coroutine= Entry *entry, void *opaque, int *ret) { if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ + Coroutine *self =3D qemu_coroutine_self(); + AioContext *bs_ctx =3D bdrv_get_aio_context(bs); + AioContext *co_ctx =3D qemu_coroutine_get_aio_context(self); + + if (bs_ctx !=3D co_ctx) { + /* Move to the iothread of the node */ + aio_co_schedule(bs_ctx, self); + qemu_coroutine_yield(); + } entry(opaque); + if (bs_ctx !=3D co_ctx) { + /* Move back to the original AioContext */ + aio_co_schedule(bs_ctx, self); + qemu_coroutine_yield(); + } } else { Coroutine *co =3D qemu_coroutine_create(entry, opaque); *ret =3D NOT_DONE; --=20 2.25.3 From nobody Sun Feb 8 13:47:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589294768; cv=none; d=zohomail.com; s=zohoarc; b=UmWhhZhrdJO4rW6dAhnUp+FhxjoSIWljqxCKbslFLHzlCiQkKsVQFNw87cw7T7dSrlqngs5s0QxZlEHkP0DaLkeuaJ8wPo4lKx59tQ5uQDkfORnsIThj/gknEh9RSuKFYO5VFpvUuQf4B+3OjOsRZ1CIEkHgNz5BLwhkjJOinrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589294768; h=Content-Type: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=eVhphe42YboNI73ipReJhHsUFh2j7kanYA6+hAjilN0=; b=BcVGmguXrgcwGFPCMN4toZ71HRnCXYaLUsAhbrYSoomcOKuxFVMDQ0PqES2CnSmWLazupNcF7F5SGjCnOAchL+mdpsIivvTPvhQp7awXo/l6/rSTT1KCK/9tqiqPXMH3tlCdY0cnirhU5xg/7dBaSTYPFrm/qNkJpFc/UJOKVpo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589294768714137.9717583846915; Tue, 12 May 2020 07:46:08 -0700 (PDT) Received: from localhost ([::1]:59670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYWAZ-00057f-BJ for importer@patchew.org; Tue, 12 May 2020 10:46:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYW8r-0003OJ-Oe for qemu-devel@nongnu.org; Tue, 12 May 2020 10:44:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39493 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYW8r-00043O-2z for qemu-devel@nongnu.org; Tue, 12 May 2020 10:44:21 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-297-Q_5XCfcnOte1G7TsRcnwwg-1; Tue, 12 May 2020 10:44:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F77F88CE47; Tue, 12 May 2020 14:44:10 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-74.ams2.redhat.com [10.36.114.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D3995D9DD; Tue, 12 May 2020 14:44:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589294659; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eVhphe42YboNI73ipReJhHsUFh2j7kanYA6+hAjilN0=; b=iVLR58fRc5tcuhafTZb0yUrFFqIlHQntvZ0PQkOj1oNvluDle5zKqZ8NdnIvLvX3fLLwuQ iZVOhvSm0t0qXB7Z6avFQFKqR3lTzE4Im8AG2ytirNG2DzcR+vCvKot5rgb/QqsTEHYaxm G8utmX6EeN6TFwHsR4k5f/2fy5vqfI8= X-MC-Unique: Q_5XCfcnOte1G7TsRcnwwg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [RFC PATCH 3/3] block: Assert we're running in the right thread Date: Tue, 12 May 2020 16:43:18 +0200 Message-Id: <20200512144318.181049-4-kwolf@redhat.com> In-Reply-To: <20200512144318.181049-1-kwolf@redhat.com> References: <20200512144318.181049-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/12 02:20:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, qemu-devel@nongnu.org, s.reiter@proxmox.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, t.lamprecht@proxmox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" tracked_request_begin() is called for most I/O operations, so it's a good place to assert that we're indeed running in the home thread of the node's AioContext. Signed-off-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/io.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index 7808e8bdc0..924bf5ba46 100644 --- a/block/io.c +++ b/block/io.c @@ -695,14 +695,17 @@ static void tracked_request_begin(BdrvTrackedRequest = *req, uint64_t bytes, enum BdrvTrackedRequestType type) { + Coroutine *self =3D qemu_coroutine_self(); + assert(bytes <=3D INT64_MAX && offset <=3D INT64_MAX - bytes); + assert(bs->aio_context =3D=3D qemu_coroutine_get_aio_context(self)); =20 *req =3D (BdrvTrackedRequest){ .bs =3D bs, .offset =3D offset, .bytes =3D bytes, .type =3D type, - .co =3D qemu_coroutine_self(), + .co =3D self, .serialising =3D false, .overlap_offset =3D offset, .overlap_bytes =3D bytes, --=20 2.25.3