From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f194.google.com ([209.85.215.194]:41248 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728021AbeISKzP (ORCPT ); Wed, 19 Sep 2018 06:55:15 -0400 From: Minchan Kim To: LKML , Andrew Morton Cc: Minchan Kim , Sergey Senozhatsky , stable@vger.kernel.org Subject: [PATCH] zram: fix missing zero pages for memory tracking Date: Wed, 19 Sep 2018 14:18:46 +0900 Message-Id: <20180919051846.234615-1-minchan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 Cc: [4.18+] Signed-off-by: Minchan Kim --- 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