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; }
Hi Sergey,
On Wed, Sep 19, 2018 at 04:29:16PM +0900, Sergey Senozhatsky wrote:
On (09/19/18 14:18), Minchan Kim wrote:
We need to count zero filled pages as well as other pages in zram.
A nit,
'ZRAM_FLAG_SHIFT + 1' covers all ZRAM_SAME pages, not only zero filled pages.
Yub, that's what I want. Currently, it covers only non-zero filled same page, which is inconsistent and user easily miss zero-filled same page.
On Wed, Sep 19, 2018 at 04:29:16PM +0900, Sergey Senozhatsky wrote:
On (09/19/18 14:18), Minchan Kim wrote:
We need to count zero filled pages as well as other pages in zram.
A nit,
'ZRAM_FLAG_SHIFT + 1' covers all ZRAM_SAME pages, not only zero filled pages.
Ah, now I got your point. I was brainfart. I will drop this patch and find other reason I have missed.
Thanks, Sergey.
On (09/22/18 12:11), Minchan Kim wrote:
On Wed, Sep 19, 2018 at 04:29:16PM +0900, Sergey Senozhatsky wrote:
On (09/19/18 14:18), Minchan Kim wrote:
We need to count zero filled pages as well as other pages in zram.
A nit,
'ZRAM_FLAG_SHIFT + 1' covers all ZRAM_SAME pages, not only zero filled pages.
I was brainfart.
No, never :) And I totally didn't mean it.
-ss
linux-stable-mirror@lists.linaro.org