linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] zram: fix missing zero pages for memory tracking
@ 2018-09-19  5:18 Minchan Kim
  2018-09-19  7:29 ` Sergey Senozhatsky
  0 siblings, 1 reply; 5+ messages in thread
From: Minchan Kim @ 2018-09-19  5:18 UTC (permalink / raw)
  To: LKML, Andrew Morton; +Cc: Minchan Kim, Sergey Senozhatsky, stable

We need to count zero filled pages as well as other pages in zram.
Otherwise, it doesn't match swap page count via pagemap of process
so that memory tracking feature in zram doesn't provide accurate
information.

Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: <stable@vger.kernel.org>    [4.18+]
Signed-off-by: Minchan Kim <minchan@kernel.org>
---
 drivers/block/zram/zram_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index a1d6b5597c17..40d303d8826f 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -71,7 +71,7 @@ static inline bool init_done(struct zram *zram)
 static inline bool zram_allocated(struct zram *zram, u32 index)
 {
 
-	return (zram->table[index].value >> (ZRAM_FLAG_SHIFT + 1)) ||
+	return zram->table[index].value >> ZRAM_FLAG_SHIFT ||
 					zram->table[index].handle;
 }
 
-- 
2.19.0.397.gdd90340f6a-goog


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-10-01 10:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-19  5:18 [PATCH] zram: fix missing zero pages for memory tracking Minchan Kim
2018-09-19  7:29 ` Sergey Senozhatsky
2018-09-20 11:12   ` Minchan Kim
2018-09-22  3:11   ` Minchan Kim
2018-10-01 10:08     ` Sergey Senozhatsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).