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 B3D05485506 for ; Thu, 17 Sep 2026 07:33:58 +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=1789630440; cv=none; b=lsTSaVwmRSSPiKdPYX6OqYviis7RlcX75hAUDS18r+/C3qugevYnGaL6mZtG8sdPX9nGIEvOW1vlGCSox1qmmTA98aSlkar9f8jG3X8Zh7nF3PfTVezvtsoxM5YfI/g1im7V6nw1duwoKfC6rZXrWSetsOgp57i+XyYo8B48e+k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789630440; c=relaxed/simple; bh=iLUgWzoIdsZd0ac/hJUD5UNgwWRWPRIwrb6pHoNaSCo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D5Za9nu+pByliYV8S/N9HL1DaqbVj+UJKiRekWxzOzXK4i3hRt63yWxv2q5o8YcTKhWX18NJ6ikYfR2v4AXln8mr5nnap57Tt+ZIulHHuhRnoPqexf2G3zbcurTACJdx3V/6sH6Bj6foVnbqfPD6HZXpscvJaFyk4v7kRIXYTAg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R/Qubk9f; 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="R/Qubk9f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B047A1F000FF; Thu, 17 Sep 2026 07:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789630438; bh=m9wRI6Emdls8LuwzSPGUgx42CYluv8A3lZzgMrKTgOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=R/Qubk9f0Kyj8FF1g0Yo/QUdatbRbCH4JpQbmgD6KOXm54UJTRFfp4u8FfASRaDX7 sRCIeLjOt6ITbVVynXbS1FROTPZ9UzvFlv+Z8WHeokcY9nAbLrvFRHjQHhiGa5YzQt zEH+UTZ9slezCW8Wttcm0vucpS15Z2T0sBV+DKfMGPgqYqX1ssenL8qL+2KPFskjm3 wKUGAjgprds6qt4cObTFAXzPOFKIJUHx9eCFtD+AaU9m7/CH6WtktVZ9qD5ejjJTsu LiID7JSE5GTjTAUuId+hK07cWwCj9NoYnT4dwN8kDABkq2nSru5qjxjeZUwY8WG1IM NlC73gSseD7Nw== 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 08/12] f2fs: cache: initialize compress cache Date: Thu, 17 Sep 2026 15:33:39 +0800 Message-ID: <20260917073343.2823157-9-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 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. Reviewed-by: Zhiguo Niu Signed-off-by: Chao Yu --- fs/f2fs/cache.c | 9 ++++++++- fs/f2fs/cache.h | 14 ++++++++++---- fs/f2fs/f2fs.h | 6 ++++++ fs/f2fs/super.c | 7 +++++-- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/cache.c b/fs/f2fs/cache.c index 918c69d13cd0..a56982a02585 100644 --- a/fs/f2fs/cache.c +++ b/fs/f2fs/cache.c @@ -175,7 +175,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; @@ -630,6 +633,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 113854a5b977..e50b9ad6fdae 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -18,12 +18,15 @@ struct f2fs_rwsem; struct f2fs_io_info; enum page_type; -/* Represents a single cached block (meta, node) */ +/* Represents a single cached block (meta, node or compress) */ struct f2fs_cached_block { struct list_head list; /* LRU list head */ struct f2fs_cached_block_list *cache; /* parent cache list */ - struct f2fs_cached_block *next_entry; /* chain for merged BIO */ - unsigned long index; /* key in radix tree, (meta: pba, node: nid) */ + union { + struct f2fs_cached_block *next_entry;/* chain for merged BIO */ + nid_t ino; /* inode number for compress cache */ + }; + unsigned long index; /* key in radix tree, (meta/compress: pba, node: nid) */ unsigned long state; /* cache entry state (e.g., Dirty, UpToDate) */ void *data; /* blocksize-aligned memory (4KB or 16KB) */ atomic_t refcount; /* reference count */ @@ -34,6 +37,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) */ @@ -43,12 +47,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 { @@ -196,6 +201,7 @@ void f2fs_drop_cache_range(struct f2fs_cached_block_list *cache, #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, 0) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index d6681276708e..1e23e02cac8b 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2106,6 +2106,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; @@ -2384,6 +2385,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 bf42fbffa348..47259e8172fc 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2071,6 +2071,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)); @@ -5263,11 +5264,12 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) f2fs_init_cache(sbi, META_CACHE(sbi), F2FS_META_CACHE); f2fs_init_cache(sbi, NODE_CACHE(sbi), F2FS_NODE_CACHE); + f2fs_init_cache(sbi, COMPRESS_CACHE(sbi), F2FS_COMPRESS_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)) @@ -5582,7 +5584,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc) free_devices: destroy_device_list(sbi); kvfree(sbi->ckpt); -free_node_cache: +free_compress_cache: + f2fs_destroy_cache(COMPRESS_CACHE(sbi)); f2fs_destroy_cache(NODE_CACHE(sbi)); f2fs_destroy_cache(META_CACHE(sbi)); f2fs_destroy_page_array_cache(sbi); -- 2.49.0