summaryrefslogtreecommitdiffstats
path: root/include/linux/zsmalloc.h
diff options
context:
space:
mode:
authorRokudo Yan <wu-yan@tcl.com>2021-02-25 17:18:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 09:41:01 -0800
commit2395928158059b8f9858365fce7713ce7fef62e4 (patch)
treec4820ae564c16e975abebb1707b96b72fbfde04c /include/linux/zsmalloc.h
parentf0231305acd53375c6cf736971bf5711105dd6bb (diff)
downloadlinux-2395928158059b8f9858365fce7713ce7fef62e4.tar.gz
linux-2395928158059b8f9858365fce7713ce7fef62e4.tar.bz2
linux-2395928158059b8f9858365fce7713ce7fef62e4.zip
zsmalloc: account the number of compacted pages correctly
There exists multiple path may do zram compaction concurrently. 1. auto-compaction triggered during memory reclaim 2. userspace utils write zram<id>/compaction node So, multiple threads may call zs_shrinker_scan/zs_compact concurrently. But pages_compacted is a per zsmalloc pool variable and modification of the variable is not serialized(through under class->lock). There are two issues here: 1. the pages_compacted may not equal to total number of pages freed(due to concurrently add). 2. zs_shrinker_scan may not return the correct number of pages freed(issued by current shrinker). The fix is simple: 1. account the number of pages freed in zs_compact locally. 2. use actomic variable pages_compacted to accumulate total number. Link: https://lkml.kernel.org/r/20210202122235.26885-1-wu-yan@tcl.com Fixes: 860c707dca155a56 ("zsmalloc: account the number of compacted pages") Signed-off-by: Rokudo Yan <wu-yan@tcl.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/zsmalloc.h')
-rw-r--r--include/linux/zsmalloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
index 4807ca4d52e0..2a430e713ce5 100644
--- a/include/linux/zsmalloc.h
+++ b/include/linux/zsmalloc.h
@@ -35,7 +35,7 @@ enum zs_mapmode {
struct zs_pool_stats {
/* How many pages were migrated (freed) */
- unsigned long pages_compacted;
+ atomic_long_t pages_compacted;
};
struct zs_pool;