From nobody Tue Feb 10 11:15:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495785294426623.6652974425496; Fri, 26 May 2017 00:54:54 -0700 (PDT) Received: from localhost ([::1]:35359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEA5F-0005KN-2V for importer@patchew.org; Fri, 26 May 2017 03:54:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEA3X-00049R-Hr for qemu-devel@nongnu.org; Fri, 26 May 2017 03:53:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEA3W-00067o-F7 for qemu-devel@nongnu.org; Fri, 26 May 2017 03:53:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39240) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dEA3W-00067b-5J for qemu-devel@nongnu.org; Fri, 26 May 2017 03:53:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12D888004F; Fri, 26 May 2017 07:53:05 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-65.pek2.redhat.com [10.72.12.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A4525C883; Fri, 26 May 2017 07:53:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 12D888004F Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 12D888004F From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 26 May 2017 15:52:29 +0800 Message-Id: <20170526075246.20265-6-famz@redhat.com> In-Reply-To: <20170526075246.20265-1-famz@redhat.com> References: <20170526075246.20265-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 26 May 2017 07:53:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 05/22] block: access copy_on_read with atomic ops X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini Message-Id: <20170525163225.29954-2-pbonzini@redhat.com> Signed-off-by: Fam Zheng --- block.c | 6 ++++-- block/io.c | 8 ++++---- blockdev.c | 2 +- include/block/block_int.h | 11 ++++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/block.c b/block.c index 50ba264..f6066ef 100644 --- a/block.c +++ b/block.c @@ -1260,7 +1260,9 @@ static int bdrv_open_common(BlockDriverState *bs, Blo= ckBackend *file, goto fail_opts; } =20 - assert(bs->copy_on_read =3D=3D 0); /* bdrv_new() and bdrv_close() make= it so */ + /* bdrv_new() and bdrv_close() make it so */ + assert(atomic_read(&bs->copy_on_read) =3D=3D 0); + if (bs->open_flags & BDRV_O_COPY_ON_READ) { if (!bs->read_only) { bdrv_enable_copy_on_read(bs); @@ -3023,7 +3025,7 @@ static void bdrv_close(BlockDriverState *bs) =20 g_free(bs->opaque); bs->opaque =3D NULL; - bs->copy_on_read =3D 0; + atomic_set(&bs->copy_on_read, 0); bs->backing_file[0] =3D '\0'; bs->backing_format[0] =3D '\0'; bs->total_sectors =3D 0; diff --git a/block/io.c b/block/io.c index fdd7485..80a3a8c 100644 --- a/block/io.c +++ b/block/io.c @@ -129,13 +129,13 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error = **errp) */ void bdrv_enable_copy_on_read(BlockDriverState *bs) { - bs->copy_on_read++; + atomic_inc(&bs->copy_on_read); } =20 void bdrv_disable_copy_on_read(BlockDriverState *bs) { - assert(bs->copy_on_read > 0); - bs->copy_on_read--; + int old =3D atomic_fetch_dec(&bs->copy_on_read); + assert(old >=3D 1); } =20 /* Check if any requests are in-flight (including throttled requests) */ @@ -1157,7 +1157,7 @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child, bdrv_inc_in_flight(bs); =20 /* Don't do copy-on-read if we read data before write operation */ - if (bs->copy_on_read && !(flags & BDRV_REQ_NO_SERIALISING)) { + if (atomic_read(&bs->copy_on_read) && !(flags & BDRV_REQ_NO_SERIALISIN= G)) { flags |=3D BDRV_REQ_COPY_ON_READ; } =20 diff --git a/blockdev.c b/blockdev.c index c63f4e8..a2fa9f7 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1791,7 +1791,7 @@ static void external_snapshot_commit(BlkActionState *= common) /* We don't need (or want) to use the transactional * bdrv_reopen_multiple() across all the entries at once, because we * don't want to abort all of them if one of them fails the reopen */ - if (!state->old_bs->copy_on_read) { + if (!atomic_read(&state->old_bs->copy_on_read)) { bdrv_reopen(state->old_bs, state->old_bs->open_flags & ~BDRV_O_RDW= R, NULL); } diff --git a/include/block/block_int.h b/include/block/block_int.h index 8d3724c..c71492a 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -595,11 +595,6 @@ struct BlockDriverState { =20 /* Protected by AioContext lock */ =20 - /* If true, copy read backing sectors into image. Can be >1 if more - * than one client has requested copy-on-read. - */ - int copy_on_read; - /* If we are reading a disk image, give its size in sectors. * Generally read-only; it is written to by load_vmstate and save_vmst= ate, * but the block layer is quiescent during those. @@ -633,6 +628,12 @@ struct BlockDriverState { =20 QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps; =20 + /* If true, copy read backing sectors into image. Can be >1 if more + * than one client has requested copy-on-read. Accessed with atomic + * ops. + */ + int copy_on_read; + /* do we need to tell the quest if we have a volatile write cache? */ int enable_write_cache; =20 --=20 2.9.4