Re: [f2fs-dev] [PATCH v8 02/12] f2fs: cache: initialize meta cache

[Zhiguo Niu]

Chao Yu via Linux-f2fs-devel <linux-f2fs-devel@xxxxxxxxxxxxxxxxxxxxx>
于2026年9月16日周三 09:59写道：
>
> From: Chao Yu <chao@xxxxxxxxxx>
>
> 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.
>
> Signed-off-by: Chao Yu <chao@xxxxxxxxxx>
Reviewed-by: Zhiguo Niu <zhiguo.niu@xxxxxxxxxx>
thanks!
> ---
>  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
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel