From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0923F456DFB for ; Thu, 17 Sep 2026 07:33:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789630432; cv=none; b=p2NlUqxJW5hVD4juxgkLaR0RNIXpe14uwRfQIzN+pWrQR2sI1/HTzTx8MLlsRUQHrN9tSZl1MidU2+15jlSzisHVmb+RQIdW8mUISPVtVG7mURHaxc31LJ7vHeGmYP7R6blUjUfKXfc4m2SQj1qQDMyzPWWROeyjziPwzCwn+zI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789630432; c=relaxed/simple; bh=J7sV8zPIqul0NiHU2t8XBGLCYoV4O1NIgqFP54ktitA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hG5SX5vSFWbnuIZjNP2zm3NVBUeQdvvuT1Ag2j0X6NcFPBgjBg3VY2Uzveg4+pXDHpv6Bw5nmgpBB/D6g6GIXmc6OBrnc9/JGSdEIwQ/jQc7an+ROXGpjrClH+A0O4hS2nbNicJhVQy311Qa4K7SrqwDBr69al/5UiDEt6cX7+0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KEq+5LsC; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KEq+5LsC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE09B1F00893; Thu, 17 Sep 2026 07:33:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789630430; bh=l3YAgWOqepbRrYKYedoyAN2j63VVPP7PzkceBO8zFBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KEq+5LsCQ6BEBrm8yHmOmWhVPsLSm8dbB8QGx8D0Cl9q78KwgPp/cf32e6IHlB6U2 RNdrxqeNYTid83XXv5atGe7cnLBECKwje62WjQ0vHzbvZbmvRVdCnvXnCyQHB5UyBl R0ogwU2VhAPioJs0GB4wJql5OklIKTXt+Qqt+DlYFUdihK/rF4gKsKN0BQWCBF7nE/ CPkqC0gv/z6aiCo1LRFQyimetndClNebdvxQ4H5WIyFhBFHdCnKo1trwDi138wguKd squqUZxN8bYmcoF2leDpU9TnYDETYKKDhSEEleEE3pj/7vwR7Zw2PStoPzC7qCXnqB 8sV9xg6NNJEMg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Zhiguo Niu Subject: [PATCH v9 02/12] f2fs: cache: initialize meta cache Date: Thu, 17 Sep 2026 15:33:33 +0800 Message-ID: <20260917073343.2823157-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chao Yu This patch introduces meta_blocks in f2fs_sb_info structure, initializes and destroys the meta cache during filesystem mount and unmount. It also introduces helper wrappers for meta cache operation. Reviewed-by: Zhiguo Niu Signed-off-by: Chao Yu --- fs/f2fs/cache.h | 9 +++++++++ fs/f2fs/data.c | 3 +++ fs/f2fs/f2fs.h | 3 +++ fs/f2fs/super.c | 9 +++++++-- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/cache.h b/fs/f2fs/cache.h index 1fa279f9d69e..d8123a86cdf8 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -193,4 +193,13 @@ void f2fs_truncate_cache(struct f2fs_cached_block *entry, bool drop_dirty); 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 f2fs_find_meta_cache(sbi, blkaddr) \ + f2fs_find_cache(META_CACHE(sbi), blkaddr) +#define f2fs_invalidate_meta_caches(sbi, start, len) \ + f2fs_drop_cache_range(META_CACHE(sbi), start, len, false) +#define f2fs_truncate_meta_caches(sbi, start, len) \ + f2fs_drop_cache_range(META_CACHE(sbi), start, len, true) + #endif /* _LINUX_F2FS_CACHE_H */ diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index d868b939caee..59fef2132177 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -670,6 +670,9 @@ static bool __has_merged_page(struct f2fs_sb_info *sbi, struct bio *bio, if (!inode && !folio && !ino) return true; + if (f2fs_is_cache_bio(bio)) + return false; + bio_for_each_folio_all(fi, bio) { struct folio *target = fi.folio; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index c0c7d51c830f..85c4bf40b4aa 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2107,6 +2107,9 @@ struct f2fs_sb_info { #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key cp_global_sem_key; #endif + + /* f2fs internal cache */ + struct f2fs_cached_block_list meta_blocks; }; /* Definitions to access f2fs_sb_info */ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 6a2f09c61dcd..bc3d378371e5 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2094,6 +2094,8 @@ static void f2fs_put_super(struct super_block *sb) iput(sbi->meta_inode); sbi->meta_inode = NULL; + f2fs_destroy_cache(META_CACHE(sbi)); + /* Should check the page counts after dropping all node/meta pages */ for (i = 0; i < NR_COUNT_TYPE; i++) { if (!get_pages(sbi, i)) @@ -5263,12 +5265,14 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) if (err) goto free_percpu; + f2fs_init_cache(sbi, META_CACHE(sbi), F2FS_META_CACHE); + /* get an inode for meta space */ sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi)); if (IS_ERR(sbi->meta_inode)) { f2fs_err(sbi, "Failed to read F2FS meta data inode"); err = PTR_ERR(sbi->meta_inode); - goto free_page_array_cache; + goto free_meta_cache; } err = f2fs_get_valid_checkpoint(sbi); @@ -5596,7 +5600,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) make_bad_inode(sbi->meta_inode); iput(sbi->meta_inode); sbi->meta_inode = NULL; -free_page_array_cache: +free_meta_cache: + f2fs_destroy_cache(META_CACHE(sbi)); f2fs_destroy_page_array_cache(sbi); free_percpu: destroy_percpu_info(sbi); -- 2.49.0