[PATCH] mm: zswap: add basic meminfo and vmstat coverage fix fix

From: Johannes Weiner
Date: Wed Apr 27 2022 - 17:15:15 EST


Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
---
Documentation/filesystems/proc.rst | 7 ++++---
fs/proc/meminfo.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst
index 8b5a94cfa722..93edcf233464 100644
--- a/Documentation/filesystems/proc.rst
+++ b/Documentation/filesystems/proc.rst
@@ -964,7 +964,7 @@ Example output. You may not have all of these fields.
Mlocked: 0 kB
SwapTotal: 0 kB
SwapFree: 0 kB
- Zswap: 1904 kB
+ Compressed: 1904 kB
Zswapped: 7792 kB
Dirty: 12 kB
Writeback: 0 kB
@@ -1057,8 +1057,9 @@ SwapTotal
SwapFree
Memory which has been evicted from RAM, and is temporarily
on the disk
-Zswap
- Memory consumed by the zswap backend (compressed size)
+Compressed
+ Memory consumed by compression backends, such as zswap
+ (compressed size)
Zswapped
Amount of anonymous memory stored in zswap (original size)
Dirty
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 6e89f0e2fd20..554d6f230e67 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -87,7 +87,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
show_val_kb(m, "SwapTotal: ", i.totalswap);
show_val_kb(m, "SwapFree: ", i.freeswap);
#ifdef CONFIG_ZSWAP
- seq_printf(m, "Zswap: %8lu kB\n",
+ seq_printf(m, "Compressed: %8lu kB\n",
(unsigned long)(zswap_pool_total_size >> 10));
seq_printf(m, "Zswapped: %8lu kB\n",
(unsigned long)atomic_read(&zswap_stored_pages) <<
--
2.35.3