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 950C1386C20 for ; Thu, 20 Aug 2026 03:17:37 +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=1787195859; cv=none; b=Qw8f0+75a1IOSYpOFvtO8OpeMKzChlcBrAVCwlY2AWExgrSIuookW36IgpjWAEFx9oXH1s4psP8Qlg0nH3lIqlqtmvrX9lGfcwXGz45QC6okcBqBuxxOEAkyqPGRbv7EBHZNi/w7IUc6lp2ocT7osUxc7UKoRchCTWplz4meEzA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787195859; c=relaxed/simple; bh=VZZ0ln0BC/u94pCkrd0GA4djb8YHuNEN7ZtDMHdkO7g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Oeqt5WA3AqEk95q0POek/cj7MEa+5CLVmte6CdsP1hiPGWPZIg+02SwvOEL5SMGi0ou5Avo/k8MfluqBqCbZ2tafOTocpNHuua3n16DutpCNIPCD+3BYjEyJ6AXAujcRKatcmIg9N5qw6J9uUz0CoUCEFlRJs6jW7UR5kr61f1Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WT+lmaFD; 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="WT+lmaFD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79D6A1F000E9; Thu, 20 Aug 2026 03:17:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787195857; bh=hetQH6YaAGHGGuPdQLisWNf4PhStPCZ4nCgE1al6fQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WT+lmaFDL6XIAbyCLwy1gxISUyl2+5lovfCIfco2NVYMlpql9voUsxOI0N/Stkq6i oX4OBl0raRdMM1VF95iuw7f1lT+onhnS7ThWj8oeoW2XnYtvigFKS01WhRyzKmjOGB 0qlMla5UHlvDeHty+88Xwne3D/+2eQNoZQim5Lv7z2ssPhFP3UvuV0FuqtEC6V6n8I YkOkFoBJ6fUQbdLZaY3YiTMzT03/tYi72HMbSuEmfVSyo7cP3ZZ8h9r/eJo+5Q3LP+ zy5tx+VaDdKz4YoNYCJTikPeR/wrtq1k3YEUtDNxJoF4QE0OIt0//DBlRYyHn5o9xh YXvVhW3d2WXCw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v1 08/12] f2fs: cache: initialize compress cache Date: Thu, 20 Aug 2026 11:17:17 +0800 Message-ID: <20260820031721.12218-9-chao@kernel.org> X-Mailer: git-send-email 2.55.0.737.g08866a6d13-goog In-Reply-To: <20260820031721.12218-1-chao@kernel.org> References: <20260820031721.12218-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 This patch introduces compress_blocks in f2fs_sb_info structure, initializes and destroys the compress cache during filesystem mount and unmount. It adds an ino union field in struct f2fs_cached_block (sharing space with writeback linkage for zero memory overhead) to track per-inode cached blocks, and registers compress cache into the memory shrinker. Signed-off-by: Chao Yu --- fs/f2fs/cache.c | 9 ++++++++- fs/f2fs/cache.h | 5 ++++- fs/f2fs/f2fs.h | 6 ++++++ fs/f2fs/super.c | 9 ++++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/cache.c b/fs/f2fs/cache.c index 3176d62ce25b..2cecf6287207 100644 --- a/fs/f2fs/cache.c +++ b/fs/f2fs/cache.c @@ -194,7 +194,10 @@ static struct f2fs_cached_block *f2fs_create_cache( entry->index = index; atomic_set(&entry->refcount, 0); - entry->next_entry = NULL; + if (!IS_COMPRESS_CACHE(cache)) + entry->next_entry = NULL; + else + entry->ino = 0; INIT_LIST_HEAD(&entry->list); entry->cache = cache; @@ -616,6 +619,10 @@ unsigned long f2fs_shrink_cache(struct f2fs_sb_info *sbi, return freed; freed += f2fs_do_shrink_cache(NODE_CACHE(sbi), nr_to_scan - freed); + if (freed >= nr_to_scan) + return freed; + + freed += f2fs_do_shrink_cache(COMPRESS_CACHE(sbi), nr_to_scan - freed); return freed; } diff --git a/fs/f2fs/cache.h b/fs/f2fs/cache.h index 397019cfb861..23583a52b8f8 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -38,6 +38,7 @@ struct f2fs_sb_info; enum f2fs_cache_type { F2FS_META_CACHE, F2FS_NODE_CACHE, + F2FS_COMPRESS_CACHE, }; /* Main cache control structure (per sb_info) */ @@ -47,12 +48,13 @@ struct f2fs_cached_block_list { spinlock_t tree_lock; /* Lock for radix tree */ struct list_head lru_list; /* Single global LRU list */ spinlock_t list_lock; /* Lock for LRU list */ - enum f2fs_cache_type type; /* Cache type (Node or Meta) */ + enum f2fs_cache_type type; /* Cache type (Node, Meta, Compress) */ unsigned long num_entries; /* Current number of entries */ }; #define IS_META_CACHE(cache) (cache->type == F2FS_META_CACHE) #define IS_NODE_CACHE(cache) (cache->type == F2FS_NODE_CACHE) +#define IS_COMPRESS_CACHE(cache) (cache->type == F2FS_COMPRESS_CACHE) /* Flags for f2fs_cached_block state */ enum f2fs_cached_state { @@ -182,6 +184,7 @@ void f2fs_stop_cache_wb_thread(struct f2fs_sb_info *sbi); #define META_CACHE(sbi) (&(sbi)->meta_blocks) #define NODE_CACHE(sbi) (&(sbi)->node_blocks) +#define COMPRESS_CACHE(sbi) (&(sbi)->compress_blocks) #define f2fs_find_meta_cache(sbi, blkaddr) \ f2fs_find_cache(META_CACHE(sbi), blkaddr) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4dd165ac05c9..36a6afbf3ba1 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2104,6 +2104,7 @@ struct f2fs_sb_info { /* f2fs internal cache */ struct f2fs_cached_block_list meta_blocks; struct f2fs_cached_block_list node_blocks; + struct f2fs_cached_block_list compress_blocks; /* internal cache flush thread */ struct f2fs_cache_kthread cache_thread; @@ -2325,6 +2326,11 @@ static inline bool f2fs_is_node_cache(struct f2fs_cached_block *entry) return entry->cache && entry->cache == NODE_CACHE(entry->cache->sbi); } +static inline bool f2fs_is_compress_cache(struct f2fs_cached_block *entry) +{ + return entry->cache && entry->cache == COMPRESS_CACHE(entry->cache->sbi); +} + static inline struct f2fs_bio *F2FS_BIO(struct bio *bio) { return container_of(bio, struct f2fs_bio, bio); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index bc1cff6cad0d..ac3a94736a91 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2030,6 +2030,7 @@ static void f2fs_put_super(struct super_block *sb) f2fs_destroy_compress_inode(sbi); + f2fs_destroy_cache(COMPRESS_CACHE(sbi)); f2fs_destroy_cache(NODE_CACHE(sbi)); f2fs_destroy_cache(META_CACHE(sbi)); @@ -5203,10 +5204,14 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) if (err) goto free_meta_cache; + err = f2fs_init_cache(sbi, COMPRESS_CACHE(sbi), F2FS_COMPRESS_CACHE); + if (err) + goto free_node_cache; + err = f2fs_get_valid_checkpoint(sbi); if (err) { f2fs_err(sbi, "Failed to get valid F2FS checkpoint"); - goto free_node_cache; + goto free_compress_cache; } if (__is_set_ckpt_flags(F2FS_CKPT(sbi), CP_QUOTA_NEED_FSCK_FLAG)) @@ -5519,6 +5524,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) free_devices: destroy_device_list(sbi); kvfree(sbi->ckpt); +free_compress_cache: + f2fs_destroy_cache(COMPRESS_CACHE(sbi)); free_node_cache: f2fs_destroy_cache(NODE_CACHE(sbi)); free_meta_cache: -- 2.49.0