Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C60F3C43334 for ; Tue, 14 Jun 2022 22:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234269AbiFNWXq (ORCPT ); Tue, 14 Jun 2022 18:23:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229969AbiFNWXq (ORCPT ); Tue, 14 Jun 2022 18:23:46 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 129E54D277 for ; Tue, 14 Jun 2022 15:23:45 -0700 (PDT) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25EM2rGP023513 for ; Tue, 14 Jun 2022 15:23:44 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=R6ZabyngYR/sZvPXz9IczHjz3UlbOWrLVrHdFClJr/w=; b=QNsjQwlxPef6CkH2QG/Www0ifi6zLNWyJk7LmjtXlb2HRq1TPE34NhQCHZZhWzhpdpHC G/ZRnDS/49fFOzbJPDk7o4A9W4IUxyhhfuo00Bt0j2XVLCkcHwfd2Wv/XSFpA7qg1X6G 5ZlyKZUD8daMLa9HKXUndB3JMMQBrNicWOM= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3gmrvvauh5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 14 Jun 2022 15:23:44 -0700 Received: from twshared18317.08.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Tue, 14 Jun 2022 15:23:43 -0700 Received: by devvm7778.ftw0.facebook.com (Postfix, from userid 558217) id 137F9F8C834; Tue, 14 Jun 2022 15:23:35 -0700 (PDT) From: Ioannis Angelakopoulos To: , Subject: [PATCH v2 1/2] btrfs: Add the capability of getting commit stats in BTRFS Date: Tue, 14 Jun 2022 15:22:32 -0700 Message-ID: <20220614222231.2582876-2-iangelak@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614222231.2582876-1-iangelak@fb.com> References: <20220614222231.2582876-1-iangelak@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: wP_QHlZGyxjQidmJ2otnAETKaEuIM2Ng X-Proofpoint-GUID: wP_QHlZGyxjQidmJ2otnAETKaEuIM2Ng X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-14_10,2022-06-13_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org First we add "struct btrfs_commit_stats" data structure under "fs_info" in fs/btrfs/ctree.h to store the commit stats for BTRFS that will be exposed through sysfs. The stats exposed are: 1) The number of commits so far, 2) The duration o= f the last commit in ms, 3) The maximum commit duration seen so far in ms and 4) The total duration for all commits so far in ms. The update of the commit stats occurs after the commit thread has gone through all the logic that checks if there is another thread committing at the same time. This means that we only account for actual commit work in the commit stats we report and not the time the thread spends waiting until it is ready to do the commit work. Signed-off-by: Ioannis Angelakopoulos --- fs/btrfs/ctree.h | 14 ++++++++++++++ fs/btrfs/disk-io.c | 5 +++++ fs/btrfs/transaction.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index f7afdfd0bae7..ff8a3fba0b80 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -660,6 +660,18 @@ enum btrfs_exclusive_operation { BTRFS_EXCLOP_SWAP_ACTIVATE, }; =20 +/* Storing data about btrfs commits. The data are accessible over sysfs = */ +struct btrfs_commit_stats { + /* Total number of commits */ + u64 commit_counter; + /* The maximum commit duration so far*/ + u64 max_commit_dur; + /* The last commit duration */ + u64 last_commit_dur; + /* The total commit duration */ + u64 total_commit_dur; +}; + struct btrfs_fs_info { u8 chunk_tree_uuid[BTRFS_UUID_SIZE]; unsigned long flags; @@ -1082,6 +1094,8 @@ struct btrfs_fs_info { spinlock_t eb_leak_lock; struct list_head allocated_ebs; #endif + + struct btrfs_commit_stats commit_stats; }; =20 static inline struct btrfs_fs_info *btrfs_sb(struct super_block *sb) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 800ad3a9c68e..3478732e322f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3133,6 +3133,11 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_i= nfo) fs_info->sectorsize_bits =3D ilog2(4096); fs_info->stripesize =3D 4096; =20 + fs_info->commit_stats.commit_counter =3D 0; + fs_info->commit_stats.max_commit_dur =3D 0; + fs_info->commit_stats.last_commit_dur =3D 0; + fs_info->commit_stats.total_commit_dur =3D 0; + spin_lock_init(&fs_info->swapfile_pins_lock); fs_info->swapfile_pins =3D RB_ROOT; =20 diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 06c0a958d114..9cb09aa05275 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "misc.h" #include "ctree.h" #include "disk-io.h" @@ -2084,12 +2085,24 @@ static void add_pending_snapshot(struct btrfs_tra= ns_handle *trans) list_add(&trans->pending_snapshot->list, &cur_trans->pending_snapshots)= ; } =20 +static void update_commit_stats(struct btrfs_fs_info *fs_info, + ktime_t interval) +{ + fs_info->commit_stats.commit_counter +=3D 1; + fs_info->commit_stats.last_commit_dur =3D interval; + fs_info->commit_stats.max_commit_dur =3D max_t(u64, + fs_info->commit_stats.max_commit_dur, interval); + fs_info->commit_stats.total_commit_dur +=3D interval; +} + int btrfs_commit_transaction(struct btrfs_trans_handle *trans) { struct btrfs_fs_info *fs_info =3D trans->fs_info; struct btrfs_transaction *cur_trans =3D trans->transaction; struct btrfs_transaction *prev_trans =3D NULL; int ret; + ktime_t start_time; + ktime_t interval; =20 ASSERT(refcount_read(&trans->use_count) =3D=3D 1); =20 @@ -2214,6 +2227,12 @@ int btrfs_commit_transaction(struct btrfs_trans_ha= ndle *trans) } } =20 + /* + * Get the time spent on the work done by the commit thread and not + * the time spent waiting on a previous commit + */ + start_time =3D ktime_get_ns(); + extwriter_counter_dec(cur_trans, trans->type); =20 ret =3D btrfs_start_delalloc_flush(fs_info); @@ -2455,6 +2474,8 @@ int btrfs_commit_transaction(struct btrfs_trans_han= dle *trans) =20 trace_btrfs_transaction_commit(fs_info); =20 + interval =3D ktime_get_ns() - start_time; + btrfs_scrub_continue(fs_info); =20 if (current->journal_info =3D=3D trans) @@ -2462,6 +2483,14 @@ int btrfs_commit_transaction(struct btrfs_trans_ha= ndle *trans) =20 kmem_cache_free(btrfs_trans_handle_cachep, trans); =20 + /* + * Protect the commit stats updates from concurrent updates through + * sysfs. + */ + spin_lock(&fs_info->super_lock); + update_commit_stats(fs_info, interval); + spin_unlock(&fs_info->super_lock); + return ret; =20 unlock_reloc: --=20 2.30.2