From nobody Fri Dec 19 18:42:04 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=1646413503; cv=none; d=zohomail.com; s=zohoarc; b=cg4rOpyHEl4wOEVhjekRbKUf4EVtNHFN9riENpq6aXk6qfDEA1t1oOHaftonE9QFmaA7VvTYNVi3gZg0z2Bv/4bWdNxXZOr9T7IZbGlV2xSCGbdCKBfPMeHPuxMqeKbUYwZ8KCII7z7jpUMuh3mcvC8rh9d46jeCRDwm1+uVqWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646413503; 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=LJ9WrECMmOTEAX3pLvuzkpV8Gsgx/o75T1girkVhxzc=; b=PtnzSbqqpMnZZI5FaqizXLvlfOYv86xsbWb6tQl6A+FV3mO697EMSgMcSgfKVwolUqigR3xtuv551+H+7+sMp0KFHjOgRuSOCyW8zeZeJlFiQueiXSQVRGVVDUhkpJSg5FwPFtz048RTa1AmKeSiFTVCyz0qH96O/bOYrumJfT0= 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 1646413503855363.05610767913515; Fri, 4 Mar 2022 09:05:03 -0800 (PST) Received: from localhost ([::1]:39156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQBMU-0000gT-Id for importer@patchew.org; Fri, 04 Mar 2022 12:05:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQB60-0005ZA-Rh for qemu-devel@nongnu.org; Fri, 04 Mar 2022 11:48:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:30063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQB5v-0007Sb-58 for qemu-devel@nongnu.org; Fri, 04 Mar 2022 11:48:00 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-cd7FenCSNJeFq4cSO77aQA-1; Fri, 04 Mar 2022 11:47:52 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68DC7FC80; Fri, 4 Mar 2022 16:47:51 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.194.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C6288547C; Fri, 4 Mar 2022 16:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646412474; 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=LJ9WrECMmOTEAX3pLvuzkpV8Gsgx/o75T1girkVhxzc=; b=P9og6fG1A9WkFYHjzlVHF+H346yDaDbBhcq33toY+AHtyUkMhvhL9W3Rk8gAjjSn+hoC2j sYH1dXuCZElVrgCA4y8PNVe05076M5jpv/B2LR6LBKWfpZSVFnTkYA7uUYpWu4UEyNEosI xNu+efSJKpwnw4QADDcU/JSTYTZlAT8= X-MC-Unique: cd7FenCSNJeFq4cSO77aQA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 26/50] IO_CODE and IO_OR_GS_CODE for block_int I/O API Date: Fri, 4 Mar 2022 17:46:47 +0100 Message-Id: <20220304164711.474713-27-kwolf@redhat.com> In-Reply-To: <20220304164711.474713-1-kwolf@redhat.com> References: <20220304164711.474713-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com 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=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646413504421100003 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito Mark all I/O functions with IO_CODE, and all "I/O OR GS" with IO_OR_GS_CODE. Signed-off-by: Emanuele Giuseppe Esposito Message-Id: <20220303151616.325444-14-eesposit@redhat.com> Signed-off-by: Kevin Wolf --- include/block/block_int-io.h | 6 ++++++ block.c | 14 +++++++++++++- block/block-backend.c | 2 ++ block/dirty-bitmap.c | 3 +++ block/io.c | 13 +++++++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h index 677b8b49f4..3da5f01c42 100644 --- a/include/block/block_int-io.h +++ b/include/block/block_int-io.h @@ -50,6 +50,7 @@ static inline int coroutine_fn bdrv_co_pread(BdrvChild *c= hild, int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags) { QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); + IO_CODE(); =20 return bdrv_co_preadv(child, offset, bytes, &qiov, flags); } @@ -58,6 +59,7 @@ static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *= child, int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags) { QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); + IO_CODE(); =20 return bdrv_co_pwritev(child, offset, bytes, &qiov, flags); } @@ -120,21 +122,25 @@ BlockDriverState *bdrv_backing_chain_next(BlockDriver= State *bs); =20 static inline BlockDriverState *bdrv_cow_bs(BlockDriverState *bs) { + IO_CODE(); return child_bs(bdrv_cow_child(bs)); } =20 static inline BlockDriverState *bdrv_filter_bs(BlockDriverState *bs) { + IO_CODE(); return child_bs(bdrv_filter_child(bs)); } =20 static inline BlockDriverState *bdrv_filter_or_cow_bs(BlockDriverState *bs) { + IO_CODE(); return child_bs(bdrv_filter_or_cow_child(bs)); } =20 static inline BlockDriverState *bdrv_primary_bs(BlockDriverState *bs) { + IO_CODE(); return child_bs(bdrv_primary_child(bs)); } =20 diff --git a/block.c b/block.c index 1751b14baf..f2a7350548 100644 --- a/block.c +++ b/block.c @@ -999,6 +999,7 @@ BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf= _size, { int score_max =3D 0, score; BlockDriver *drv =3D NULL, *d; + IO_CODE(); =20 QLIST_FOREACH(d, &bdrv_drivers, list) { if (d->bdrv_probe) { @@ -1051,6 +1052,7 @@ static int find_image_format(BlockBackend *file, cons= t char *filename, int refresh_total_sectors(BlockDriverState *bs, int64_t hint) { BlockDriver *drv =3D bs->drv; + IO_CODE(); =20 if (!drv) { return -ENOMEDIUM; @@ -6197,6 +6199,7 @@ const char *bdrv_get_parent_name(const BlockDriverSta= te *bs) { BdrvChild *c; const char *name; + IO_CODE(); =20 /* If multiple parents have a name, just pick the first one. */ QLIST_FOREACH(c, &bs->parents, next_parent) { @@ -7933,6 +7936,8 @@ int bdrv_make_empty(BdrvChild *c, Error **errp) */ BdrvChild *bdrv_cow_child(BlockDriverState *bs) { + IO_CODE(); + if (!bs || !bs->drv) { return NULL; } @@ -7956,6 +7961,7 @@ BdrvChild *bdrv_cow_child(BlockDriverState *bs) BdrvChild *bdrv_filter_child(BlockDriverState *bs) { BdrvChild *c; + IO_CODE(); =20 if (!bs || !bs->drv) { return NULL; @@ -7987,6 +7993,7 @@ BdrvChild *bdrv_filter_or_cow_child(BlockDriverState = *bs) { BdrvChild *cow_child =3D bdrv_cow_child(bs); BdrvChild *filter_child =3D bdrv_filter_child(bs); + IO_CODE(); =20 /* Filter nodes cannot have COW backing files */ assert(!(cow_child && filter_child)); @@ -8007,6 +8014,7 @@ BdrvChild *bdrv_filter_or_cow_child(BlockDriverState = *bs) BdrvChild *bdrv_primary_child(BlockDriverState *bs) { BdrvChild *c, *found =3D NULL; + IO_CODE(); =20 QLIST_FOREACH(c, &bs->children, next) { if (c->role & BDRV_CHILD_PRIMARY) { @@ -8069,6 +8077,7 @@ BlockDriverState *bdrv_skip_implicit_filters(BlockDri= verState *bs) */ BlockDriverState *bdrv_skip_filters(BlockDriverState *bs) { + IO_CODE(); return bdrv_do_skip_filters(bs, false); } =20 @@ -8078,6 +8087,7 @@ BlockDriverState *bdrv_skip_filters(BlockDriverState = *bs) */ BlockDriverState *bdrv_backing_chain_next(BlockDriverState *bs) { + IO_CODE(); return bdrv_skip_filters(bdrv_cow_bs(bdrv_skip_filters(bs))); } =20 @@ -8113,8 +8123,8 @@ static bool bdrv_bsc_range_overlaps_locked(BlockDrive= rState *bs, */ bool bdrv_bsc_is_data(BlockDriverState *bs, int64_t offset, int64_t *pnum) { + IO_CODE(); RCU_READ_LOCK_GUARD(); - return bdrv_bsc_range_overlaps_locked(bs, offset, 1, pnum); } =20 @@ -8124,6 +8134,7 @@ bool bdrv_bsc_is_data(BlockDriverState *bs, int64_t o= ffset, int64_t *pnum) void bdrv_bsc_invalidate_range(BlockDriverState *bs, int64_t offset, int64_t bytes) { + IO_CODE(); RCU_READ_LOCK_GUARD(); =20 if (bdrv_bsc_range_overlaps_locked(bs, offset, bytes, NULL)) { @@ -8138,6 +8149,7 @@ void bdrv_bsc_fill(BlockDriverState *bs, int64_t offs= et, int64_t bytes) { BdrvBlockStatusCache *new_bsc =3D g_new(BdrvBlockStatusCache, 1); BdrvBlockStatusCache *old_bsc; + IO_CODE(); =20 *new_bsc =3D (BdrvBlockStatusCache) { .valid =3D true, diff --git a/block/block-backend.c b/block/block-backend.c index 93dc5cd8d6..7d2181ec01 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1115,6 +1115,7 @@ bool blk_dev_has_removable_media(BlockBackend *blk) */ bool blk_dev_has_tray(BlockBackend *blk) { + IO_CODE(); return blk->dev_ops && blk->dev_ops->is_tray_open; } =20 @@ -1135,6 +1136,7 @@ void blk_dev_eject_request(BlockBackend *blk, bool fo= rce) */ bool blk_dev_is_tray_open(BlockBackend *blk) { + IO_CODE(); if (blk_dev_has_tray(blk)) { return blk->dev_ops->is_tray_open(blk->dev_opaque); } diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index e2a1648deb..0334b85805 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -657,6 +657,7 @@ void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, =20 void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out) { + IO_CODE(); assert(!bdrv_dirty_bitmap_readonly(bitmap)); bdrv_dirty_bitmaps_lock(bitmap->bs); if (!out) { @@ -739,6 +740,7 @@ void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitm= ap *bitmap) void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes) { BdrvDirtyBitmap *bitmap; + IO_CODE(); =20 if (QLIST_EMPTY(&bs->dirty_bitmaps)) { return; @@ -930,6 +932,7 @@ bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *= dest, bool lock) { bool ret; + IO_CODE(); =20 assert(!bdrv_dirty_bitmap_readonly(dest)); assert(!bdrv_dirty_bitmap_inconsistent(dest)); diff --git a/block/io.c b/block/io.c index 83bf18c1fe..6a0bad10a3 100644 --- a/block/io.c +++ b/block/io.c @@ -570,6 +570,7 @@ void bdrv_subtree_drained_end(BlockDriverState *bs) void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_pare= nt) { int i; + IO_OR_GS_CODE(); =20 for (i =3D 0; i < new_parent->recursive_quiesce_counter; i++) { bdrv_do_drained_begin(child->bs, true, child, false, true); @@ -580,6 +581,7 @@ void bdrv_unapply_subtree_drain(BdrvChild *child, Block= DriverState *old_parent) { int drained_end_counter =3D 0; int i; + IO_OR_GS_CODE(); =20 for (i =3D 0; i < old_parent->recursive_quiesce_counter; i++) { bdrv_do_drained_end(child->bs, true, child, false, @@ -887,6 +889,7 @@ BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_reque= st(BlockDriverState *bs) { BdrvTrackedRequest *req; Coroutine *self =3D qemu_coroutine_self(); + IO_CODE(); =20 QLIST_FOREACH(req, &bs->tracked_requests, list) { if (req->co =3D=3D self) { @@ -932,16 +935,19 @@ static int bdrv_get_cluster_size(BlockDriverState *bs) =20 void bdrv_inc_in_flight(BlockDriverState *bs) { + IO_CODE(); qatomic_inc(&bs->in_flight); } =20 void bdrv_wakeup(BlockDriverState *bs) { + IO_CODE(); aio_wait_kick(); } =20 void bdrv_dec_in_flight(BlockDriverState *bs) { + IO_CODE(); qatomic_dec(&bs->in_flight); bdrv_wakeup(bs); } @@ -966,6 +972,7 @@ bool coroutine_fn bdrv_make_request_serialising(BdrvTra= ckedRequest *req, uint64_t align) { bool waited; + IO_CODE(); =20 qemu_co_mutex_lock(&req->bs->reqs_lock); =20 @@ -1822,6 +1829,7 @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child, int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { + IO_CODE(); return bdrv_co_preadv_part(child, offset, bytes, qiov, 0, flags); } =20 @@ -1834,6 +1842,7 @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child, BdrvTrackedRequest req; BdrvRequestPadding pad; int ret; + IO_CODE(); =20 trace_bdrv_co_preadv_part(bs, offset, bytes, flags); =20 @@ -2255,6 +2264,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { + IO_CODE(); return bdrv_co_pwritev_part(child, offset, bytes, qiov, 0, flags); } =20 @@ -2268,6 +2278,7 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *chil= d, BdrvRequestPadding pad; int ret; bool padded =3D false; + IO_CODE(); =20 trace_bdrv_co_pwritev_part(child->bs, offset, bytes, flags); =20 @@ -3451,6 +3462,7 @@ int coroutine_fn bdrv_co_copy_range_from(BdrvChild *s= rc, int64_t src_offset, BdrvRequestFlags read_flags, BdrvRequestFlags write_flags) { + IO_CODE(); trace_bdrv_co_copy_range_from(src, src_offset, dst, dst_offset, bytes, read_flags, write_flags); return bdrv_co_copy_range_internal(src, src_offset, dst, dst_offset, @@ -3467,6 +3479,7 @@ int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src= , int64_t src_offset, BdrvRequestFlags read_flags, BdrvRequestFlags write_flags) { + IO_CODE(); trace_bdrv_co_copy_range_to(src, src_offset, dst, dst_offset, bytes, read_flags, write_flags); return bdrv_co_copy_range_internal(src, src_offset, dst, dst_offset, --=20 2.35.1