From nobody Tue Sep 9 07:32:56 2025 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 DEE39EB64DD for ; Tue, 25 Jul 2023 01:37:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229691AbjGYBhF (ORCPT ); Mon, 24 Jul 2023 21:37:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbjGYBhD (ORCPT ); Mon, 24 Jul 2023 21:37:03 -0400 Received: from mail-vk1-xa35.google.com (mail-vk1-xa35.google.com [IPv6:2607:f8b0:4864:20::a35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9FFD171E for ; Mon, 24 Jul 2023 18:36:57 -0700 (PDT) Received: by mail-vk1-xa35.google.com with SMTP id 71dfb90a1353d-4812f361e67so1535358e0c.2 for ; Mon, 24 Jul 2023 18:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690249017; x=1690853817; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1MUcyR27lsnAPH03DYgaTAElkpMdwyHtzt9K9Z4HiWc=; b=Bex30q252y1P7IrQ8sRrwcsyfInis6KqFEHqisSnSi7LjoTcE9baPxv62GS4lpasTX eyW/GxyscK6QNZHX1imKsGHxakCOSD8bHU+TCp1+ckgymAvkh90Cu8taneUSJssPccW+ FDfeA0xsbvTGWV2Ua9AY//AlcILIumXtQMAM/+WS0wQi3J+b9cI6BtEAhkshsJJdyFsz bX5SBHlRxscgu6v2wJyrNjIX1ygUpel8+Jr3BzTZ4avdwsYAY8xOtFddDxiPT8VpAPc5 W/8mkg1T51QqUq3/fwaE1jS6ZhLQ3ZwYiYp/2qfSuOrRWIc8hwPVwtuOjgU+dCzyn5qe 4ooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690249017; x=1690853817; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1MUcyR27lsnAPH03DYgaTAElkpMdwyHtzt9K9Z4HiWc=; b=Kan2reslBZOttf4HyLwofZHjeY5cNrfblBcjG3Cc5z8nxRQo3kg4OxjhRSbm4XM93t /CxBm6qFGjpD9mH68amPrtxtEo2ErCVraF+gZy7U7YWGie5hcT8KYKEi+dOyEwQjrHeI 14cndirXG3BUXtzuylTPCxNifsz9jaByIRoFij6F41WHmo7XMRDLunkNXg5L/rQimuHK y2wuD/Z9APm0qm3CFXg/aQP+QnBakpTyLibCc7zfLFHox3z/r3GOMTad7ZeksnPYWhgV NWkpcYnchFmLET/Zc7XXdVY632a1KeiGMEEtem23hj6ElSc46/sXLvCo34k6DIebBui2 dwiA== X-Gm-Message-State: ABy/qLY/4nALKoq8TEQWKN9yPCM6jKaKn7AZgT5SMe2//omCbsD2U8di gr3/+DpHnq8ODLWwm1svBfg= X-Google-Smtp-Source: APBJJlEMZAx4quaYubUevOxdtHBh8KjTFb3QFyoR8OAd735GkCWyiW+B5oI1ebsYLAnSwFrM05OSTA== X-Received: by 2002:a1f:c406:0:b0:471:1785:e838 with SMTP id u6-20020a1fc406000000b004711785e838mr4898823vkf.2.1690249016584; Mon, 24 Jul 2023 18:36:56 -0700 (PDT) Received: from localhost.localdomain ([156.236.96.165]) by smtp.gmail.com with ESMTPSA id e23-20020a17090ab39700b002609cadc56esm6904282pjr.11.2023.07.24.18.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 18:36:56 -0700 (PDT) From: Chao Liu To: Jaegeuk Kim , Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Liu Subject: [PATCH v2] f2fs: introduce two helper functions for the largest cached extent Date: Tue, 25 Jul 2023 09:36:07 +0800 Message-Id: <20230725013607.4134123-1-chaoliu719@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chao Liu This patch is a cleanup: 1. Merge __drop_largest_extent() since it has only one caller. 2. Introduce __unlock_tree_with_checking_largest() and __drop_largest_extent() to help manage largest and largest_update in extent_tree. Signed-off-by: Chao Liu --- v2: Make sure et->largest_updated gets updated within &et->lock. Thanks to Chao Yu for pointing out. --- fs/f2fs/extent_cache.c | 66 ++++++++++++++++++++---------------------- fs/f2fs/f2fs.h | 4 +-- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 0e2d49140c07f..cfc69621a8a26 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -19,6 +19,12 @@ #include "node.h" #include =20 +static void __drop_largest_extent(struct extent_tree *et) +{ + et->largest.len =3D 0; + et->largest_updated =3D true; +} + bool sanity_check_extent_cache(struct inode *inode) { struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); @@ -35,8 +41,7 @@ bool sanity_check_extent_cache(struct inode *inode) =20 /* Let's drop, if checkpoint got corrupted. */ if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) { - ei->len =3D 0; - et->largest_updated =3D true; + __drop_largest_extent(et); return true; } =20 @@ -310,6 +315,8 @@ static void __detach_extent_node(struct f2fs_sb_info *s= bi, =20 if (et->cached_en =3D=3D en) et->cached_en =3D NULL; + + /* keep the largest as we can still use it */ kmem_cache_free(extent_node_slab, en); } =20 @@ -385,15 +392,6 @@ static unsigned int __free_extent_tree(struct f2fs_sb_= info *sbi, return count - atomic_read(&et->node_cnt); } =20 -static void __drop_largest_extent(struct extent_tree *et, - pgoff_t fofs, unsigned int len) -{ - if (fofs < et->largest.fofs + et->largest.len && - fofs + len > et->largest.fofs) { - et->largest.len =3D 0; - et->largest_updated =3D true; - } -} =20 void f2fs_init_read_extent_tree(struct inode *inode, struct page *ipage) { @@ -601,6 +599,19 @@ static struct extent_node *__insert_extent_tree(struct= f2fs_sb_info *sbi, return en; } =20 +static void __unlock_tree_with_checking_largest(struct extent_tree *et, + struct inode *inode) +{ + if (et->type =3D=3D EX_READ && et->largest_updated) { + et->largest_updated =3D false; + write_unlock(&et->lock); + f2fs_mark_inode_dirty_sync(inode, true); + return; + } + + write_unlock(&et->lock); +} + static void __update_extent_tree_range(struct inode *inode, struct extent_info *tei, enum extent_type type) { @@ -612,7 +623,6 @@ static void __update_extent_tree_range(struct inode *in= ode, struct rb_node **insert_p =3D NULL, *insert_parent =3D NULL; unsigned int fofs =3D tei->fofs, len =3D tei->len; unsigned int end =3D fofs + len; - bool updated =3D false; bool leftmost =3D false; =20 if (!et) @@ -636,11 +646,10 @@ static void __update_extent_tree_range(struct inode *= inode, prev =3D et->largest; dei.len =3D 0; =20 - /* - * drop largest extent before lookup, in case it's already - * been shrunk from extent tree - */ - __drop_largest_extent(et, fofs, len); + /* updates may cause largest extent cache to become invalid */ + if (fofs < et->largest.fofs + et->largest.len && + fofs + len > et->largest.fofs) + __drop_largest_extent(et); } =20 /* 1. lookup first extent node in range [fofs, fofs + len - 1] */ @@ -733,8 +742,7 @@ static void __update_extent_tree_range(struct inode *in= ode, if (dei.len >=3D 1 && prev.len < F2FS_MIN_EXTENT_LEN && et->largest.len < F2FS_MIN_EXTENT_LEN) { - et->largest.len =3D 0; - et->largest_updated =3D true; + __drop_largest_extent(et); set_inode_flag(inode, FI_NO_EXTENT); } } @@ -742,10 +750,6 @@ static void __update_extent_tree_range(struct inode *i= node, if (is_inode_flag_set(inode, FI_NO_EXTENT)) __free_extent_tree(sbi, et); =20 - if (et->largest_updated) { - et->largest_updated =3D false; - updated =3D true; - } goto out_read_extent_cache; update_age_extent_cache: if (!tei->last_blocks) @@ -757,10 +761,7 @@ static void __update_extent_tree_range(struct inode *i= node, __insert_extent_tree(sbi, et, &ei, insert_p, insert_parent, leftmost); out_read_extent_cache: - write_unlock(&et->lock); - - if (updated) - f2fs_mark_inode_dirty_sync(inode, true); + __unlock_tree_with_checking_largest(et, inode); } =20 #ifdef CONFIG_F2FS_FS_COMPRESSION @@ -1092,7 +1093,6 @@ static void __drop_extent_tree(struct inode *inode, e= num extent_type type) { struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); struct extent_tree *et =3D F2FS_I(inode)->extent_tree[type]; - bool updated =3D false; =20 if (!__may_extent_tree(inode, type)) return; @@ -1101,14 +1101,10 @@ static void __drop_extent_tree(struct inode *inode,= enum extent_type type) __free_extent_tree(sbi, et); if (type =3D=3D EX_READ) { set_inode_flag(inode, FI_NO_EXTENT); - if (et->largest.len) { - et->largest.len =3D 0; - updated =3D true; - } + if (et->largest.len) + __drop_largest_extent(et); } - write_unlock(&et->lock); - if (updated) - f2fs_mark_inode_dirty_sync(inode, true); + __unlock_tree_with_checking_largest(et, inode); } =20 void f2fs_drop_extent_tree(struct inode *inode) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index d372bedb0fe4e..da02e120e5ea6 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -665,7 +665,7 @@ struct extent_tree { =20 struct extent_tree_info { struct radix_tree_root extent_tree_root;/* cache extent cache entries */ - struct mutex extent_tree_lock; /* locking extent radix tree */ + struct mutex extent_tree_lock; /* locking extent radix tree */ struct list_head extent_list; /* lru list for shrinker */ spinlock_t extent_lock; /* locking extent lru list */ atomic_t total_ext_tree; /* extent tree count */ @@ -766,7 +766,7 @@ enum { FI_ACL_MODE, /* indicate acl mode */ FI_NO_ALLOC, /* should not allocate any blocks */ FI_FREE_NID, /* free allocated nide */ - FI_NO_EXTENT, /* not to use the extent cache */ + FI_NO_EXTENT, /* not to use the read extent cache */ FI_INLINE_XATTR, /* used for inline xattr */ FI_INLINE_DATA, /* used for inline data*/ FI_INLINE_DENTRY, /* used for inline dentry */ --=20 2.25.1