summarylogtreecommitdiffstats
path: root/0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch
diff options
context:
space:
mode:
Diffstat (limited to '0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch')
-rw-r--r--0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch b/0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch
index dbfc3e3f0a71..ecb3a5a23a5c 100644
--- a/0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch
+++ b/0017-ZEN-mm-Increment-kswapd_waiters-for-throttled-direct.patch
@@ -18,10 +18,10 @@ Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com>
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 3d8cbc64af8c..478df26db0e9 100644
+index 48652f0523ac6e334522e0989e09d3ec2e80056b..f8c20a80a7d526a55c42ddc3af607d0418b6acaa 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
-@@ -3658,7 +3658,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
+@@ -3584,7 +3584,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
return 0;
}
@@ -30,7 +30,7 @@ index 3d8cbc64af8c..478df26db0e9 100644
{
struct zone *zone;
unsigned long pfmemalloc_reserve = 0;
-@@ -3687,6 +3687,10 @@ static bool allow_direct_reclaim(pg_data_t *pgdat)
+@@ -3613,6 +3613,10 @@ static bool allow_direct_reclaim(pg_data_t *pgdat)
wmark_ok = free_pages > pfmemalloc_reserve / 2;
@@ -41,7 +41,7 @@ index 3d8cbc64af8c..478df26db0e9 100644
/* kswapd must be awake if processes are being throttled */
if (!wmark_ok && waitqueue_active(&pgdat->kswapd_wait)) {
if (READ_ONCE(pgdat->kswapd_highest_zoneidx) > ZONE_NORMAL)
-@@ -3752,7 +3756,7 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,
+@@ -3678,7 +3682,7 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,
/* Throttle based on the first usable node */
pgdat = zone->zone_pgdat;
@@ -50,7 +50,7 @@ index 3d8cbc64af8c..478df26db0e9 100644
goto out;
break;
}
-@@ -3774,11 +3778,14 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,
+@@ -3700,11 +3704,14 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,
*/
if (!(gfp_mask & __GFP_FS))
wait_event_interruptible_timeout(pgdat->pfmemalloc_wait,
@@ -67,7 +67,7 @@ index 3d8cbc64af8c..478df26db0e9 100644
if (fatal_signal_pending(current))
return true;
-@@ -4268,7 +4275,7 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx)
+@@ -4197,7 +4204,7 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx)
* able to safely make forward progress. Wake them
*/
if (waitqueue_active(&pgdat->pfmemalloc_wait) &&
@@ -76,6 +76,3 @@ index 3d8cbc64af8c..478df26db0e9 100644
wake_up_all(&pgdat->pfmemalloc_wait);
/* Check if kswapd should be suspending */
---
-2.35.1
-