From mboxrd@z Thu Jan 1 00:00:00 1970 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 B149DC43334 for ; Tue, 19 Jul 2022 04:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235754AbiGSESP (ORCPT ); Tue, 19 Jul 2022 00:18:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235236AbiGSESO (ORCPT ); Tue, 19 Jul 2022 00:18:14 -0400 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5293832BA6 for ; Mon, 18 Jul 2022 21:18:13 -0700 (PDT) Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 26IGi11O023393 for ; Mon, 18 Jul 2022 21:18:12 -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=wOSzvKmN32krd94TIAAeVBV2GyyV48Fc1P6zynZasoo=; b=p+FP5SH2BQkvuHs3o5Zae7Zs9IYTPS1j3Wb99M9OiZGoJuMAaBPG2zQpxKOX40I2Q52E g4NQ/sAEHjrkc+VU1I6eoCeLiArWsZ/Nh42WTr+XAtavidulwE2knAenFBtGx6s/ufuy 02VbXrwMea/XM0wAUNT9S3XicWuzPZNK1pI= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net (PPS) with ESMTPS id 3hbxbgd69m-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 18 Jul 2022 21:18:12 -0700 Received: from twshared35153.14.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 18 Jul 2022 21:18:09 -0700 Received: by devvm7778.ftw0.facebook.com (Postfix, from userid 558217) id 65CEA24A9238; Mon, 18 Jul 2022 21:18:04 -0700 (PDT) From: Ioannis Angelakopoulos To: , Subject: [PATCH v2 4/5] btrfs: Add a lockdep model for the pending_ordered wait event Date: Mon, 18 Jul 2022 21:09:58 -0700 Message-ID: <20220719040954.3964407-5-iangelak@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220719040954.3964407-1-iangelak@fb.com> References: <20220719040954.3964407-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: s_5ULZ-YOhgkHxkzGF4d_KlQJuvYOf9k X-Proofpoint-GUID: s_5ULZ-YOhgkHxkzGF4d_KlQJuvYOf9k X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-18_22,2022-07-18_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org In contrast to the num_writers and num_extwriters wait events, the condition for the pending_ordered wait event is signaled in a different context from the wait event itself. The condition signaling occurs in btrfs_remove_ordered_extent() in fs/btrfs/ordered-data.c while the wait event is implemented in btrfs_commit_transaction() in fs/btrfs/transaction.c Thus the thread signaling the condition has to acquire the lockdep map as= a reader at the start of btrfs_remove_ordered_extent() and release it after it has signaled the condition. In this case some dependencies might be le= ft out due to the placement of the annotation, but it is better than no annotation at all. Signed-off-by: Ioannis Angelakopoulos --- fs/btrfs/ctree.h | 1 + fs/btrfs/disk-io.c | 4 ++++ fs/btrfs/ordered-data.c | 3 +++ fs/btrfs/transaction.c | 1 + 4 files changed, 9 insertions(+) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index e6c7cafcd296..661d19ac41d1 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1098,6 +1098,7 @@ struct btrfs_fs_info { struct lockdep_map btrfs_trans_num_writers_map; struct lockdep_map btrfs_trans_num_extwriters_map; struct lockdep_map btrfs_state_change_map[4]; + struct lockdep_map btrfs_trans_pending_ordered_map; =20 #ifdef CONFIG_BTRFS_FS_REF_VERIFY spinlock_t ref_verify_lock; diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index be5cf86fa992..e9956cbf653f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3052,6 +3052,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_in= fo) static struct lock_class_key btrfs_trans_unblocked_key; static struct lock_class_key btrfs_trans_sup_committed_key; static struct lock_class_key btrfs_trans_completed_key; + static struct lock_class_key btrfs_trans_pending_ordered_key; =20 INIT_RADIX_TREE(&fs_info->fs_roots_radix, GFP_ATOMIC); INIT_RADIX_TREE(&fs_info->buffer_radix, GFP_ATOMIC); @@ -3087,6 +3088,9 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_in= fo) lockdep_init_map(&fs_info->btrfs_trans_num_extwriters_map, "btrfs_trans_num_extwriters", &btrfs_trans_num_extwriters_key, 0); + lockdep_init_map(&fs_info->btrfs_trans_pending_ordered_map, + "btrfs_trans_pending_ordered", + &btrfs_trans_pending_ordered_key, 0); =20 lockdep_init_map(&fs_info->btrfs_state_change_map[0], "btrfs_trans_commit_start", diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 1952ac85222c..2a4cb6db42d1 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -525,6 +525,7 @@ void btrfs_remove_ordered_extent(struct btrfs_inode *= btrfs_inode, struct rb_node *node; bool pending; =20 + btrfs_lockdep_acquire(fs_info, btrfs_trans_pending_ordered); /* This is paired with btrfs_add_ordered_extent. */ spin_lock(&btrfs_inode->lock); btrfs_mod_outstanding_extents(btrfs_inode, -1); @@ -580,6 +581,8 @@ void btrfs_remove_ordered_extent(struct btrfs_inode *= btrfs_inode, } } =20 + btrfs_lockdep_release(fs_info, btrfs_trans_pending_ordered); + spin_lock(&root->ordered_extent_lock); list_del_init(&entry->root_extent_list); root->nr_ordered_extents--; diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index e4efaa27ec17..3522e8f3381c 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -2320,6 +2320,7 @@ int btrfs_commit_transaction(struct btrfs_trans_han= dle *trans) * transaction. Otherwise if this transaction commits before the ordere= d * extents complete we lose logged data after a power failure. */ + btrfs_might_wait_for_event(fs_info, btrfs_trans_pending_ordered); wait_event(cur_trans->pending_wait, atomic_read(&cur_trans->pending_ordered) =3D=3D 0); =20 --=20 2.30.2