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 F19C3C61DE2 for ; Mon, 31 Aug 2026 09:23:04 +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=BGWtz5fsIvpE8u07zFP0ncT80ZqDiteNcGD8Ul4nsOo=; b=cX849nSRuPbDgcnZh5Honzpa+B lyBtQsN88UOEzAosNISBlbFQUWKtopQS8tPVvez0WiqBkVocc5dRroJn//tnVZfCv3PWGzy3oEr8v IYQa20zQMXJ0Nux3SU9I4+3g4PWPJ87D7oja7dwimMLy+qC8mwdKNvWm2/DPz7mNKw0k=; 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 1x0yEJ-0002pm-SF; Mon, 31 Aug 2026 09:23:04 +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 1x0yEC-0002ov-M6 for linux-f2fs-devel@lists.sourceforge.net; Mon, 31 Aug 2026 09:22:57 +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=wR4gcDTfo0sEXIHsla1JLsFwguWdPTvZQrvqB/wDCEA=; b=e3AEtqHvKRbg4ngMf6rNdT5uOy ltuORwXvY1ICXAZVDZDY1OmpD/Ca7EUpgm3NrO2z1mhd4Z4wkHWf2Z8s5RBjj/Yrn3VjzsnwiT0U1 Yg0J3qWxZJhXhat6txXnBw90vAt2uowqOla4U89D4Lq6pmL7S7GKpiAwVrsfg0nyKLeI=; 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=wR4gcDTfo0sEXIHsla1JLsFwguWdPTvZQrvqB/wDCEA=; b=KMqZiDLexkWrA/RpBwJe6pTHct p7ZVojXalWAQDcZRfMxkl6CcMUDBTy4GH0T15cCsyaQILKHC3K1Pdu0e29R+IHCie/J9p/yfGP9VM Zcg7jDeT1nwicT0eAyXpYmYmngLoZiEEoXQ+iHyTdHJnK2SX//UEAy8Y796NxYBvS8iI=; Received: from tor.source.kernel.org ([172.105.4.254]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1x0yEB-0005ud-VL for linux-f2fs-devel@lists.sourceforge.net; Mon, 31 Aug 2026 09:22:57 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id C293A6020D for ; Mon, 31 Aug 2026 09:22:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0CDC1F0155F; Mon, 31 Aug 2026 09:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788168175; bh=wR4gcDTfo0sEXIHsla1JLsFwguWdPTvZQrvqB/wDCEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HJ8O7Pd+KYgStgOEpXec8c4tljcZAkOInI49aw3etx/qjCBq/no26aCQ+VTK7uzju JcEjCGdOELauS67HrwabpO4f5OLCwuPi5nmtr9w+0stD6KZGbBk4JRj8k2meflp6VM Gwn9y0XSBSj250aFgrvDr99cijTRSnvRJ1cW9LAUpuXb702RqfJR7cQ07rZKLbh9fz DC+zwe+S3cSnkcVDwLwaObeNn9Gv5Y9CzzgNlCXYFFIgKgXUhOIBlgchvzg3kRQ+8z dA1DXaaYdx8WU290alCSVGUmILfo63t+uZ+G/poRYexwKo3KnuSUxT86kJo0Exroxr fyKGusHhx39Bw== To: jaegeuk@kernel.org Date: Mon, 31 Aug 2026 17:22:27 +0800 Message-ID: <20260831092227.739737-13-chao@kernel.org> X-Mailer: git-send-email 2.55.0.897.gb25b4bd76c-goog In-Reply-To: <20260831092227.739737-1-chao@kernel.org> References: <20260831092227.739737-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1x0yEB-0005ud-VL Subject: [f2fs-dev] [PATCH v5 12/12] f2fs: cache: show per-cache usage in debugfs 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 exposes per-cache memory usage (entry struct memory vs. cached block buffer memory) for meta, node, and compress caches under the memory section in debugfs: - meta entry: xxx KB, meta cache: xxx KB - node entry: xxx KB, node cache: xxx KB - compress entry: xxx KB, compress cache: xxx KB Signed-off-by: Chao Yu --- fs/f2fs/cache.h | 1 + fs/f2fs/debug.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- fs/f2fs/f2fs.h | 2 ++ 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/cache.h b/fs/f2fs/cache.h index 99a0c9557e4f..bc630d6df687 100644 --- a/fs/f2fs/cache.h +++ b/fs/f2fs/cache.h @@ -38,6 +38,7 @@ enum f2fs_cache_type { F2FS_META_CACHE, F2FS_NODE_CACHE, F2FS_COMPRESS_CACHE, + NR_CACHE_TYPES, }; /* Main cache control structure (per sb_info) */ diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index 8cd06f7ba9e7..68a9d589da8c 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c @@ -380,17 +380,36 @@ static void update_mem_info(struct f2fs_sb_info *sbi) si->cache_mem += si->ext_mem[i]; } - si->page_mem = 0; - si->page_mem += (unsigned long long)META_CACHE(sbi)->num_entries << PAGE_SHIFT; - si->cache_mem += META_CACHE(sbi)->num_entries * sizeof(struct f2fs_cached_block); - si->page_mem += (unsigned long long)NODE_CACHE(sbi)->num_entries << PAGE_SHIFT; - si->cache_mem += NODE_CACHE(sbi)->num_entries * sizeof(struct f2fs_cached_block); + si->cache_entry_mem[F2FS_META_CACHE] = + (unsigned long long)META_CACHE(sbi)->num_entries * + sizeof(struct f2fs_cached_block); + si->cache_data_mem[F2FS_META_CACHE] = + (unsigned long long)META_CACHE(sbi)->num_entries * sbi->blocksize; + + si->cache_entry_mem[F2FS_NODE_CACHE] = + (unsigned long long)NODE_CACHE(sbi)->num_entries * + sizeof(struct f2fs_cached_block); + si->cache_data_mem[F2FS_NODE_CACHE] = + (unsigned long long)NODE_CACHE(sbi)->num_entries * sbi->blocksize; + + si->cache_mem += si->cache_entry_mem[F2FS_META_CACHE] + + si->cache_entry_mem[F2FS_NODE_CACHE]; + si->page_mem = si->cache_data_mem[F2FS_META_CACHE] + + si->cache_data_mem[F2FS_NODE_CACHE]; #ifdef CONFIG_F2FS_FS_COMPRESSION if (test_opt(sbi, COMPRESS_CACHE)) { - unsigned long npages = COMPRESS_CACHE(sbi)->num_entries; - - si->page_mem += (unsigned long long)npages << PAGE_SHIFT; - si->cache_mem += npages * sizeof(struct f2fs_cached_block); + si->cache_entry_mem[F2FS_COMPRESS_CACHE] = + (unsigned long long)COMPRESS_CACHE(sbi)->num_entries * + sizeof(struct f2fs_cached_block); + si->cache_data_mem[F2FS_COMPRESS_CACHE] = + (unsigned long long)COMPRESS_CACHE(sbi)->num_entries * + sbi->blocksize; + + si->cache_mem += si->cache_entry_mem[F2FS_COMPRESS_CACHE]; + si->page_mem += si->cache_data_mem[F2FS_COMPRESS_CACHE]; + } else { + si->cache_entry_mem[F2FS_COMPRESS_CACHE] = 0; + si->cache_data_mem[F2FS_COMPRESS_CACHE] = 0; } #endif } @@ -749,6 +768,18 @@ static int stat_show(struct seq_file *s, void *v) si->ext_mem[EX_READ] >> 10); seq_printf(s, " - block age extent cache: %llu KB\n", si->ext_mem[EX_BLOCK_AGE] >> 10); + seq_printf(s, " - meta entry: %llu KB, meta cache: %llu KB\n", + si->cache_entry_mem[F2FS_META_CACHE] >> 10, + si->cache_data_mem[F2FS_META_CACHE] >> 10); + seq_printf(s, " - node entry: %llu KB, node cache: %llu KB\n", + si->cache_entry_mem[F2FS_NODE_CACHE] >> 10, + si->cache_data_mem[F2FS_NODE_CACHE] >> 10); +#ifdef CONFIG_F2FS_FS_COMPRESSION + if (test_opt(sbi, COMPRESS_CACHE)) + seq_printf(s, " - compress entry: %llu KB, compress cache: %llu KB\n", + si->cache_entry_mem[F2FS_COMPRESS_CACHE] >> 10, + si->cache_data_mem[F2FS_COMPRESS_CACHE] >> 10); +#endif seq_printf(s, " - paged : %llu KB\n", si->page_mem >> 10); } diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4c5744152a11..ec446a4212a8 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4455,6 +4455,8 @@ struct f2fs_stat_info { unsigned int block_count[2]; unsigned int inplace_count; unsigned long long base_mem, cache_mem, page_mem; + unsigned long long cache_entry_mem[NR_CACHE_TYPES]; + unsigned long long cache_data_mem[NR_CACHE_TYPES]; struct f2fs_dev_stats *dev_stats; }; -- 2.49.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel