freezer: Fix racy usage of try_to_freeze in kswapd
Subsystems (3)
PATCH 1/1 freezer: Fix racy usage of try_to_freeze in kswapd
From: Rafael J. Wysocki <[email protected]>
Currently we can miss freeze_process()->signal_wake_up() in kswapd() if it happens between try_to_freeze() and prepare_to_wait(). To prevent this from happening we should check freezing(current) before calling schedule().
Signed-off-by Rafael J. Wysocki <[email protected]>
--- mm/vmscan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
mm/vmscan.c +9 -4
@@ -1323,8 +1323,6 @@ static int kswapd(void *p)for ( ; ; ) {unsigned long new_order; -try_to_freeze (); -prepare_to_wait (&pgdat->kswapd_wait, &wait,TASK_INTERRUPTIBLE ); new_order = pgdat->kswapd_max_order; pgdat->kswapd_max_order =0 ;
@@ -1335,12 +1333,19 @@ static int kswapd(void *p)*/ order = new_order; }else { -schedule (); +if (!freezing (current)) +schedule (); + order = pgdat->kswapd_max_order; }finish_wait (&pgdat->kswapd_wait, &wait); -balance_pgdat (pgdat, order); +if (!try_to_freeze ()) { +/* We can speed up thawing tasks if we don't call +* balance_pgdat after returning from the refrigerator +*/ +balance_pgdat (pgdat, order); + } }return 0 ; }