zram: clear IDLE flag in mark_idle()

BugLink: https://bugs.launchpad.net/bugs/2102118

[ Upstream commit d37da422edb0664a2037e6d7d42fe6d339aae78a ]

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: 755804d169 ("zram: introduce an aged idle interface")
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reported-by: Shin Kawamura <kawasin@google.com>
Acked-by: Brian Geffon <bgeffon@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

This commit is contained in:

Sergey Senozhatsky

2025-03-12 22:51:00 +09:00

committed by

Stefan Bader

parent a83dc85c3d

commit 214e8c139e

1 changed files with 2 additions and 0 deletions

									
										drivers/block/zram/zram_drv.c
									
		+2
		
												View File
												
				@@ -319,6 +319,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);

					}

				}