From nobody Wed Nov 5 19:36:34 2025 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 1496391218687356.79680618871885; Fri, 2 Jun 2017 01:13:38 -0700 (PDT) Received: from localhost ([::1]:48425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGhiD-0003U0-4Z for importer@patchew.org; Fri, 02 Jun 2017 04:13:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGhgV-0001ka-M2 for qemu-devel@nongnu.org; Fri, 02 Jun 2017 04:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGhgS-0002Ds-MQ for qemu-devel@nongnu.org; Fri, 02 Jun 2017 04:11:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGhgS-0002Dc-GD for qemu-devel@nongnu.org; Fri, 02 Jun 2017 04:11:48 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 9116980C24; Fri, 2 Jun 2017 08:11:47 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-49.pek2.redhat.com [10.72.12.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13D9D60BEB; Fri, 2 Jun 2017 08:11:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9116980C24 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9116980C24 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 2 Jun 2017 16:11:06 +0800 Message-Id: <20170602081120.3497-9-famz@redhat.com> In-Reply-To: <20170602081120.3497-1-famz@redhat.com> References: <20170602081120.3497-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 02 Jun 2017 08:11:47 +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 v2 08/22] block: access serialising_in_flight 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-5-pbonzini@redhat.com> Signed-off-by: Fam Zheng --- block/io.c | 6 +++--- include/block/block_int.h | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/block/io.c b/block/io.c index 70643df..d76202b 100644 --- a/block/io.c +++ b/block/io.c @@ -375,7 +375,7 @@ void bdrv_drain_all(void) static void tracked_request_end(BdrvTrackedRequest *req) { if (req->serialising) { - req->bs->serialising_in_flight--; + atomic_dec(&req->bs->serialising_in_flight); } =20 QLIST_REMOVE(req, list); @@ -414,7 +414,7 @@ static void mark_request_serialising(BdrvTrackedRequest= *req, uint64_t align) - overlap_offset; =20 if (!req->serialising) { - req->bs->serialising_in_flight++; + atomic_inc(&req->bs->serialising_in_flight); req->serialising =3D true; } =20 @@ -519,7 +519,7 @@ static bool coroutine_fn wait_serialising_requests(Bdrv= TrackedRequest *self) bool retry; bool waited =3D false; =20 - if (!bs->serialising_in_flight) { + if (!atomic_read(&bs->serialising_in_flight)) { return false; } =20 diff --git a/include/block/block_int.h b/include/block/block_int.h index 9691db3..e5f19eb 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -604,10 +604,6 @@ struct BlockDriverState { /* Callback before write request is processed */ NotifierWithReturnList before_write_notifiers; =20 - /* number of in-flight requests; overall and serialising */ - unsigned int in_flight; - unsigned int serialising_in_flight; - bool wakeup; =20 /* Offset after the highest byte written to */ @@ -634,6 +630,12 @@ struct BlockDriverState { */ int copy_on_read; =20 + /* number of in-flight requests; overall and serialising. + * Accessed with atomic ops. + */ + unsigned int in_flight; + unsigned int serialising_in_flight; + /* do we need to tell the quest if we have a volatile write cache? */ int enable_write_cache; =20 --=20 2.9.4