mm-move-penalty-delay-clamping-out-of-calculate_high_delay.patch removed from -mm tree
The patch titled
Subject: mm/memcg: move penalty delay clamping out of calculate_high_delay()
has been removed from the -mm tree. Its filename was
mm-move-penalty-delay-clamping-out-of-calculate_high_delay.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jakub Kicinski <[email protected]>
Subject: mm/memcg: move penalty delay clamping out of calculate_high_delay()
We will want to call calculate_high_delay() twice - once for memory and once for swap, and we should apply the clamp value to sum of the penalties. Clamping has to be applied outside of calculate_high_delay().
Signed-off-by Jakub Kicinski <[email protected]>
Reviewed-by Shakeel Butt <[email protected]>
Acked-by Johannes Weiner <[email protected]>
Cc Chris Down <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Tejun Heo <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-move-penalty-delay-clamping-out-of-calculate_high_delay +8 -8
@@ -2386,14 +2386,7 @@ static unsigned long calculate_high_dela* MEMCG_CHARGE_BATCH pages is nominal, so work out how much smaller or * larger the current charge patch is than that. */ - penalty_jiffies = penalty_jiffies * nr_pages /MEMCG_CHARGE_BATCH ; - -/* -* Clamp the max delay per usermode return so as to still keep the -* application moving forwards and also permit diagnostics, albeit -* extremely slowly. -*/ -return min (penalty_jiffies,MEMCG_MAX_HIGH_DELAY_JIFFIES ); +return penalty_jiffies * nr_pages /MEMCG_CHARGE_BATCH ; }/*
@@ -2422,6 +2415,13 @@ void mem_cgroup_handle_over_high(void) mem_find_max_overage(memcg));/* +* Clamp the max delay per usermode return so as to still keep the +* application moving forwards and also permit diagnostics, albeit +* extremely slowly. +*/ + penalty_jiffies =min (penalty_jiffies,MEMCG_MAX_HIGH_DELAY_JIFFIES ); + +/* * Don't sleep if the amount of jiffies this memcg owes us is so low * that it's not even worth doing, in an attempt to be nice to those who * go only a small amount over their memory.high value and maybe haven't
_
Patches currently in -mm which might be from [email protected] are