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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB8F9C982D0 for ; Thu, 17 Sep 2026 07:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:References:In-Reply-To: Message-ID:Date:To:Sender:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=t2PNlCGlH31hL/77H1YzV9XAKhp5rO8F+JsbzVBIqnE=; b=bWYnYAdjNYLuY40YWv5tVD+y4R +kwToncVbMpZUSx1kTBrfoV8Ob9EdzD6w/boLhAsLRqpH4QScnXKXj57wv6fQiEymdfKxZLE63MO5 ysy+9COrsqFtvv/nGJb0s2VN3FB3Bl1o32AvGRjr6ceOnzXW+l3HDB/ded3Qaj/nUDdk=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1x76dF-00070g-G6; Thu, 17 Sep 2026 07:34:10 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1x76dA-000703-4H for linux-f2fs-devel@lists.sourceforge.net; Thu, 17 Sep 2026 07:34:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4cGCXX1mvu9N92x0nMTOvPtTo3sAsVkuF26H1EMF9N8=; b=VhZ7TWdEvcRsKiStUJIC0bjR9t GpG7V1xEzuQvDnMwsqpaK5Mmvq5OLemu6zPaXgfvN5sdQKhViJ3S3EEV49pV3/5toSMbOECAbK8QW 0DfmaqmK1U0O2ziT9acblroYsxTMjHldf6WBZJnjnZaBhLpcfPsrKsJwdpW93ov3paNc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=4cGCXX1mvu9N92x0nMTOvPtTo3sAsVkuF26H1EMF9N8=; b=B81A3d4qDnZv1yS+sX0jfID/N8 3fLyhlTc+2KnephT73kntDDswJk7pWypaZCGpfQB/Qe9bsxopM6aA+9AI/fGPd0UExTosPXk/8kxK AtpLJuMhin4DtpWmZQ1Db5LCuKSureLVtirDCwhsmtnN/WaWEYrJBNYVKQHq1Zrum0bs=; Received: from sea.source.kernel.org ([172.234.252.31]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1x76d7-0007N9-AY for linux-f2fs-devel@lists.sourceforge.net; Thu, 17 Sep 2026 07:34:04 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 0D2E2447F1; Thu, 17 Sep 2026 07:33:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09FCC1F000FF; Thu, 17 Sep 2026 07:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789630435; bh=4cGCXX1mvu9N92x0nMTOvPtTo3sAsVkuF26H1EMF9N8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cxg0vrbetwzox+H88WGRgRtp5PJOfnmArlAjWaJHztKdBJuAE6n65tHl95Nk8vIre qW9Hgu5J78RJpr5v3c7gEOaAqZxJ5OPHcQpqfuf/iyPNgD9ZyHEH70wf3OVdklNKdN NIPRKUFCyALTpa4R7b6+EVJH81uF2fXRUoQz7hR0Yu7UiZd4Dpq2WL+7MaFCunDFIe vnZXyqGCdcNMOYAV6bobXi6fs2zp5IWDi+BXKaNpI48WRMGZ8HBRW0v4VhNgWT669x olcfponst1Myj3bg3B18BuS/t4v8TwiGZt8JLD1wmbtLnDaA8/fn5dSF4gUj06vMFr a/ZSiihTawU/w== To: jaegeuk@kernel.org Date: Thu, 17 Sep 2026 15:33:37 +0800 Message-ID: <20260917073343.2823157-7-chao@kernel.org> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog In-Reply-To: <20260917073343.2823157-1-chao@kernel.org> References: <20260917073343.2823157-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1x76d7-0007N9-AY Subject: [f2fs-dev] [PATCH v9 06/12] f2fs: cache: initialize node cache X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Chao Yu via Linux-f2fs-devel Reply-To: Chao Yu Cc: Zhiguo Niu , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Chao Yu This patch introduces node_blocks in f2fs_sb_info structure, initializes and destroys the node cache during filesystem mount and unmount. It also introduces helper wrappers for node cache operation, and registers node cache into the memory shrinker and writeback kthread. Reviewed-by: Zhiguo Niu Signed-off-by: Chao Yu --- fs/f2fs/cache.c | 9 ++++++++- fs/f2fs/cache.h | 11 +++++++++++ fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 7 +++++-- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/cache.c b/fs/f2fs/cache.c index cec7e362001d..4579fa9ad560 100644 --- a/fs/f2fs/cache.c +++ b/fs/f2fs/cache.c @@ -626,7 +626,14 @@ static unsigned long f2fs_do_shrink_cache(struct f2fs_cached_block_list *cache, unsigned long f2fs_shrink_cache(struct f2fs_sb_info *sbi, unsigned long nr_to_scan) { - return f2fs_do_shrink_cache(META_CACHE(sbi), nr_to_scan); + unsigned long freed; + + freed = f2fs_do_shrink_cache(META_CACHE(sbi), nr_to_scan); + if (freed >= nr_to_scan) + return freed; + + freed += f2fs_do_shrink_cache(NODE_CACHE(sbi), nr_to_scan - freed); + return freed; } static int f2fs_cache_writeback_kthread(void *data) diff --git a/fs/f2fs/cache.h b/fs/f2fs/cache.h index 2273a5ab4924..e1376883133a 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -194,6 +194,7 @@ void f2fs_drop_cache_range(struct f2fs_cached_block_list *cache, unsigned long start, unsigned long len, bool drop_dirty); #define META_CACHE(sbi) (&(sbi)->meta_blocks) +#define NODE_CACHE(sbi) (&(sbi)->node_blocks) #define f2fs_find_meta_cache(sbi, blkaddr) \ f2fs_find_cache(META_CACHE(sbi), blkaddr, 0) @@ -202,6 +203,16 @@ void f2fs_drop_cache_range(struct f2fs_cached_block_list *cache, #define f2fs_truncate_meta_caches(sbi, start, len) \ f2fs_drop_cache_range(META_CACHE(sbi), start, len, true) +#define f2fs_grab_node_cache(sbi, blkaddr) \ + f2fs_grab_cache(NODE_CACHE(sbi), blkaddr, \ + F2FS_CACHE_LOCK_CREATE) +#define f2fs_find_node_cache(sbi, blkaddr) \ + f2fs_find_cache(NODE_CACHE(sbi), blkaddr) +#define f2fs_invalidate_node_cache(sbi, blkaddr) \ + f2fs_drop_cache_range(NODE_CACHE(sbi), blkaddr, 1, false) +#define f2fs_truncate_node_caches(sbi, start, len) \ + f2fs_drop_cache_range(NODE_CACHE(sbi), start, len, true) + unsigned long f2fs_shrink_cache(struct f2fs_sb_info *sbi, unsigned long nr_to_scan); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e2b29067eb0a..51c191c514bc 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2108,6 +2108,7 @@ struct f2fs_sb_info { /* f2fs internal cache */ struct f2fs_cached_block_list meta_blocks; + struct f2fs_cached_block_list node_blocks; /* internal cache flush thread */ struct f2fs_cache_kthread cache_thread; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1e6b9374df97..fa19152cd4da 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2092,6 +2092,7 @@ static void f2fs_put_super(struct super_block *sb) sbi->node_inode = NULL; f2fs_destroy_cache(META_CACHE(sbi)); + f2fs_destroy_cache(NODE_CACHE(sbi)); /* Should check the page counts after dropping all node/meta pages */ for (i = 0; i < NR_COUNT_TYPE; i++) { @@ -5282,11 +5283,12 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) goto free_percpu; f2fs_init_cache(sbi, META_CACHE(sbi), F2FS_META_CACHE); + f2fs_init_cache(sbi, NODE_CACHE(sbi), F2FS_NODE_CACHE); err = f2fs_get_valid_checkpoint(sbi); if (err) { f2fs_err(sbi, "Failed to get valid F2FS checkpoint"); - goto free_meta_cache; + goto free_node_cache; } if (__is_set_ckpt_flags(F2FS_CKPT(sbi), CP_QUOTA_NEED_FSCK_FLAG)) @@ -5612,7 +5614,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) free_devices: destroy_device_list(sbi); kvfree(sbi->ckpt); -free_meta_cache: +free_node_cache: + f2fs_destroy_cache(NODE_CACHE(sbi)); f2fs_destroy_cache(META_CACHE(sbi)); f2fs_destroy_page_array_cache(sbi); free_percpu: -- 2.49.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel