From nobody Wed Nov 5 16:38:17 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 1496923741715689.0926673707235; Thu, 8 Jun 2017 05:09:01 -0700 (PDT) Received: from localhost ([::1]:48871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIwFG-00050N-On for importer@patchew.org; Thu, 08 Jun 2017 08:08:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIw4B-00026K-IW for qemu-devel@nongnu.org; Thu, 08 Jun 2017 07:57:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIw4A-00022E-Ii for qemu-devel@nongnu.org; Thu, 08 Jun 2017 07:57:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIw4A-00021m-AH for qemu-devel@nongnu.org; Thu, 08 Jun 2017 07:57:30 -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 42E0A804EC; Thu, 8 Jun 2017 11:57:29 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-24.pek2.redhat.com [10.72.12.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 002A817DC9; Thu, 8 Jun 2017 11:57:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 42E0A804EC 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 42E0A804EC From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 19:56:43 +0800 Message-Id: <20170608115643.18859-24-famz@redhat.com> In-Reply-To: <20170608115643.18859-1-famz@redhat.com> References: <20170608115643.18859-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.27]); Thu, 08 Jun 2017 11:57:29 +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 v3 23/23] block: make accounting thread-safe 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 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 I'm not trying too hard yet. Later, with multiqueue support, this may cause mutex contention or cacheline bouncing. Cc: Alberto Garcia Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini Message-Id: <20170605123908.18777-20-pbonzini@redhat.com> Reviewed-by: Alberto Garcia Signed-off-by: Fam Zheng --- block/accounting.c | 16 ++++++++++++++++ include/block/accounting.h | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/block/accounting.c b/block/accounting.c index ce6dbf7..87ef5bb 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -34,6 +34,7 @@ static const int qtest_latency_ns =3D NANOSECONDS_PER_SEC= OND / 1000; =20 void block_acct_init(BlockAcctStats *stats) { + qemu_mutex_init(&stats->lock); if (qtest_enabled()) { clock_type =3D QEMU_CLOCK_VIRTUAL; } @@ -52,6 +53,7 @@ void block_acct_cleanup(BlockAcctStats *stats) QSLIST_FOREACH_SAFE(s, &stats->intervals, entries, next) { g_free(s); } + qemu_mutex_destroy(&stats->lock); } =20 void block_acct_add_interval(BlockAcctStats *stats, unsigned interval_leng= th) @@ -61,12 +63,15 @@ void block_acct_add_interval(BlockAcctStats *stats, uns= igned interval_length) =20 s =3D g_new0(BlockAcctTimedStats, 1); s->interval_length =3D interval_length; + s->stats =3D stats; + qemu_mutex_lock(&stats->lock); QSLIST_INSERT_HEAD(&stats->intervals, s, entries); =20 for (i =3D 0; i < BLOCK_MAX_IOTYPE; i++) { timed_average_init(&s->latency[i], clock_type, (uint64_t) interval_length * NANOSECONDS_PER_SE= COND); } + qemu_mutex_unlock(&stats->lock); } =20 BlockAcctTimedStats *block_acct_interval_next(BlockAcctStats *stats, @@ -102,6 +107,8 @@ static void block_account_one_io(BlockAcctStats *stats,= BlockAcctCookie *cookie, =20 assert(cookie->type < BLOCK_MAX_IOTYPE); =20 + qemu_mutex_lock(&stats->lock); + if (failed) { stats->failed_ops[cookie->type]++; } else { @@ -117,6 +124,8 @@ static void block_account_one_io(BlockAcctStats *stats,= BlockAcctCookie *cookie, timed_average_account(&s->latency[cookie->type], latency_ns); } } + + qemu_mutex_unlock(&stats->lock); } =20 void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie) @@ -137,18 +146,23 @@ void block_acct_invalid(BlockAcctStats *stats, enum B= lockAcctType type) * not. The reason is that invalid requests are accounted during their * submission, therefore there's no actual I/O involved. */ + qemu_mutex_lock(&stats->lock); stats->invalid_ops[type]++; =20 if (stats->account_invalid) { stats->last_access_time_ns =3D qemu_clock_get_ns(clock_type); } + qemu_mutex_unlock(&stats->lock); } =20 void block_acct_merge_done(BlockAcctStats *stats, enum BlockAcctType type, int num_requests) { assert(type < BLOCK_MAX_IOTYPE); + + qemu_mutex_lock(&stats->lock); stats->merged[type] +=3D num_requests; + qemu_mutex_unlock(&stats->lock); } =20 int64_t block_acct_idle_time_ns(BlockAcctStats *stats) @@ -163,7 +177,9 @@ double block_acct_queue_depth(BlockAcctTimedStats *stat= s, =20 assert(type < BLOCK_MAX_IOTYPE); =20 + qemu_mutex_lock(&stats->stats->lock); sum =3D timed_average_sum(&stats->latency[type], &elapsed); + qemu_mutex_unlock(&stats->stats->lock); =20 return (double) sum / elapsed; } diff --git a/include/block/accounting.h b/include/block/accounting.h index 55cb06f..b833d26 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -26,8 +26,10 @@ #define BLOCK_ACCOUNTING_H =20 #include "qemu/timed-average.h" +#include "qemu/thread.h" =20 typedef struct BlockAcctTimedStats BlockAcctTimedStats; +typedef struct BlockAcctStats BlockAcctStats; =20 enum BlockAcctType { BLOCK_ACCT_READ, @@ -37,12 +39,14 @@ enum BlockAcctType { }; =20 struct BlockAcctTimedStats { + BlockAcctStats *stats; TimedAverage latency[BLOCK_MAX_IOTYPE]; unsigned interval_length; /* in seconds */ QSLIST_ENTRY(BlockAcctTimedStats) entries; }; =20 -typedef struct BlockAcctStats { +struct BlockAcctStats { + QemuMutex lock; uint64_t nr_bytes[BLOCK_MAX_IOTYPE]; uint64_t nr_ops[BLOCK_MAX_IOTYPE]; uint64_t invalid_ops[BLOCK_MAX_IOTYPE]; @@ -53,7 +57,7 @@ typedef struct BlockAcctStats { QSLIST_HEAD(, BlockAcctTimedStats) intervals; bool account_invalid; bool account_failed; -} BlockAcctStats; +}; =20 typedef struct BlockAcctCookie { int64_t bytes; --=20 2.9.4