From nobody Sat Feb 7 05:49:05 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 1494515877645856.2046319211923; Thu, 11 May 2017 08:17:57 -0700 (PDT) Received: from localhost ([::1]:48776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8pqm-0000UG-3g for importer@patchew.org; Thu, 11 May 2017 11:17:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8pIK-0001Kv-HR for qemu-devel@nongnu.org; Thu, 11 May 2017 10:42:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8pIJ-00048Z-LY for qemu-devel@nongnu.org; Thu, 11 May 2017 10:42:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d8pIH-00046s-IN; Thu, 11 May 2017 10:42:17 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F71B80F8E; Thu, 11 May 2017 14:42:16 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-123.ams2.redhat.com [10.36.117.123]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4BEg9A6012159; Thu, 11 May 2017 10:42:15 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8F71B80F8E 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=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8F71B80F8E From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 11 May 2017 16:41:54 +0200 Message-Id: <20170511144208.24075-5-pbonzini@redhat.com> In-Reply-To: <20170511144208.24075-1-pbonzini@redhat.com> References: <20170511144208.24075-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 11 May 2017 14:42:16 +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] [PATCH 04/18] 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: famz@redhat.com, qemu-block@nongnu.org, stefanha@redhat.com 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" Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- 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 3204e08c8f..28d2de6d93 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 b529f894be..8db83c2b2d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -590,10 +590,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 */ @@ -620,6 +616,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.12.2