Commit d37da422 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Andrew Morton
Browse files

zram: clear IDLE flag in mark_idle() 

If entry does not fulfill current mark_idle() parameters, e.g.  cutoff
time, then we should clear its ZRAM_IDLE from previous mark_idle()
invocations.

Consider the following case:
- mark_idle() cutoff time 8h
- mark_idle() cutoff time 4h
- writeback() idle - will writeback entries with cutoff time 8h,
  while it should only pick entries with cutoff time 4h

The bug was reported by Shin Kawamura.

Link: https://lkml.kernel.org/r/20241028153629.1479791-3-senozhatsky@chromium.org


Fixes: 755804d1 ("zram: introduce an aged idle interface")
Signed-off-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Reported-by: default avatarShin Kawamura <kawasin@google.com>
Acked-by: default avatarBrian Geffon <bgeffon@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: <stable@vger.kernel.org>
parent f8521909

drivers/block/zram/zram_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ static void mark_idle(struct zram *zram, ktime_t cutoff) 
#endif

		if (is_idle)

			zram_set_flag(zram, index, ZRAM_IDLE);

		else

			zram_clear_flag(zram, index, ZRAM_IDLE);

		zram_slot_unlock(zram, index);

	}

}