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 A385AC88E75 for ; Wed, 16 Sep 2026 01:54:56 +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=FkVL5mDkty62bRCNLTW7gc+bU6QWuLmmgEywDb4UNRg=; b=iyR5EJqa/hWguwGOIIIJ/T8Vsd eOOBbrFkvtErzR4Awj49/x3XxTX3fkpoqWWOTMkyRpKByZfHthXIvuWIOv6Lj8MuNFdBuTXmjsRBK cDxvwOd0Emgy83Zxz6VHtNJOjugA1+FQ49yIvAgFnYs3e7JH2Fuhp5B5v+FYRqQQgSSg=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1x6erP-0004kq-DU; Wed, 16 Sep 2026 01:54:56 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1x6erN-0004kb-Rg for linux-f2fs-devel@lists.sourceforge.net; Wed, 16 Sep 2026 01:54:54 +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=SNax8LZ5BiFC7qyyGJiQSVkVdoqWzSwk2la4Wc54AFc=; b=AvcBN27AxYQpQu6bhu1Do9hBV5 nWbvKSBSNoXHwvG4KarHaG5WAqTmrdXwgiX/g0Qfn8Qsyssxw/y3zxrEePSj4avF/TdEsVureoaSk tG5U1nfG/9PG+tA9uf3MnVpIyzt5x+NgRGklIMuadpqGkaoQK0Q36VZ6E/ALRBlzjeKA=; 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=SNax8LZ5BiFC7qyyGJiQSVkVdoqWzSwk2la4Wc54AFc=; b=IfF5fPED4cR53NvCWReMNRkXmO T+e5TkXyqYiEr3I+x0oIIu0QBiK78bPhDxp0SWUsjX1Q867UZOs1NfbpkjRha7NeCrMVHhJRoicrV 1ZfJ9axdJ2AGFDxLO1q10BVqwigX4qiJKZsHX8AXyMPhcYZq0yGpolRMMB0gTS9roxvk=; Received: from sea.source.kernel.org ([172.234.252.31]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1x6erO-0004wB-0J for linux-f2fs-devel@lists.sourceforge.net; Wed, 16 Sep 2026 01:54:54 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id B62AD4389B for ; Wed, 16 Sep 2026 01:54:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7F601F00898; Wed, 16 Sep 2026 01:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789523688; bh=SNax8LZ5BiFC7qyyGJiQSVkVdoqWzSwk2la4Wc54AFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZQZ+KH9rd41OwsXFNUEhO1XHYFikKYhFBvbQDcr1175xS/Fvj/HEpSLZQ3Ojp7Lo0 3QwG4rDmqEKLmc6dR13AcYpnxI/+sWcUOrv3CfbC2mpjSXiHfDQT3oSzC8N+Ooauci /SbSaL77pwZnpL9W2ECGHoF+Jh1EtkHcx4loxV8vV5dJvyNlRRiR8huSs9tEAo48J2 42tNxtkPK8nG9p25YDsCaAbSVWq9clUHl4gIjZ4adsdZJ5CuWRFxmbGrbEOiA+wyEb zH41Oz7r/L9jD8s9gKeSod12ADpEdpVaL2wcg68g2q/etWWpInBOCAn8QPiqSo5g6z CUJtjyQsPQ90Q== To: jaegeuk@kernel.org Date: Wed, 16 Sep 2026 09:54:30 +0800 Message-ID: <20260916015440.2232938-3-chao@kernel.org> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog In-Reply-To: <20260916015440.2232938-1-chao@kernel.org> References: <20260916015440.2232938-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1x6erO-0004wB-0J Subject: [f2fs-dev] [PATCH v8 02/12] f2fs: cache: initialize meta 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: 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 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 --- 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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel