* [PATCH 1/2] mm: memcg: fix zero throttle delay on 32-bit kernels
2026-11-17 8:04 [PATCH 0/2] mm: memcg: fix memory.high allocator throttling Hui Zhu
@ 2026-11-17 8:04 ` Hui Zhu
2026-11-17 23:57 ` Joshua Hahn
2026-11-17 8:04 ` [PATCH 2/2] mm: memcg: fix memory.high throttle lost to u64 overflow Hui Zhu
2026-11-17 22:17 ` [PATCH 0/2] mm: memcg: fix memory.high allocator throttling Chris Down
2 siblings, 1 reply; 5+ messages in thread
From: Hui Zhu @ 2026-11-17 8:04 UTC (permalink / raw)
To: Johannes Weiner, Michal Hocko, Roman Gushchin, Shakeel Butt,
Muchun Song, Andrew Morton, Chris Down, cgroups, linux-mm,
linux-kernel
Cc: Hui Zhu, stable
From: Hui Zhu <zhuhui@kylinos.cn>
calculate_high_delay() stores max_overage * max_overage * HZ, computed as
u64, into an unsigned long before shifting it right by 34 bits in total.
On 32-bit kernels the store truncates the value first, so the shift always
yields zero. Tasks over memory.high or memory.swap.high are then never
throttled, and the reclaim retry loop in __mem_cgroup_handle_over_high()
is skipped as well.
Keep the intermediate in u64 so the shifts see the full width, and clamp
to MEMCG_MAX_HIGH_DELAY_JIFFIES before narrowing to the unsigned long
return value: a truncated result would escape the caller's own min().
Nothing changes on 64-bit kernels, where clamping each term is equivalent
to clamping their sum, which the caller already does.
Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
Cc: stable@vger.kernel.org
Signed-off-by: Hui Zhu <zhuhui@kylinos.cn>
---
mm/memcontrol.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 84f4a8fd4d16..1ba42724ed1e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2576,7 +2576,7 @@ static u64 swap_find_max_overage(struct mem_cgroup *memcg)
static unsigned long calculate_high_delay(unsigned int nr_pages,
u64 max_overage)
{
- unsigned long penalty_jiffies;
+ u64 penalty_jiffies;
if (!max_overage)
return 0;
@@ -2601,7 +2601,13 @@ static unsigned long calculate_high_delay(unsigned int nr_pages,
* MEMCG_CHARGE_BATCH pages is nominal, so work out how much smaller or
* larger the current charge patch is than that.
*/
- return penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH;
+ penalty_jiffies = penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH;
+
+ /*
+ * Clamp before narrowing to unsigned long: a truncated return value
+ * would escape the caller's min() and look like a small delay.
+ */
+ return min_t(u64, penalty_jiffies, MEMCG_MAX_HIGH_DELAY_JIFFIES);
}
/*
--
2.53.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] mm: memcg: fix zero throttle delay on 32-bit kernels
2026-11-17 8:04 ` [PATCH 1/2] mm: memcg: fix zero throttle delay on 32-bit kernels Hui Zhu
@ 2026-11-17 23:57 ` Joshua Hahn
0 siblings, 0 replies; 5+ messages in thread
From: Joshua Hahn @ 2026-11-17 23:57 UTC (permalink / raw)
To: Hui Zhu
Cc: Johannes Weiner, Michal Hocko, Roman Gushchin, Shakeel Butt,
Muchun Song, Andrew Morton, Chris Down, cgroups, linux-mm,
linux-kernel, Hui Zhu, stable
On Tue, Nov 17, 2026 at 04:04:20PM +0800, Hui Zhu wrote:
> From: Hui Zhu <zhuhui@kylinos.cn>
Hello, thanks for the patch.
> calculate_high_delay() stores max_overage * max_overage * HZ, computed as
> u64, into an unsigned long before shifting it right by 34 bits in total.
> On 32-bit kernels the store truncates the value first, so the shift always
> yields zero. Tasks over memory.high or memory.swap.high are then never
> throttled, and the reclaim retry loop in __mem_cgroup_handle_over_high()
> is skipped as well.
>
> Keep the intermediate in u64 so the shifts see the full width, and clamp
> to MEMCG_MAX_HIGH_DELAY_JIFFIES before narrowing to the unsigned long
> return value: a truncated result would escape the caller's own min().
> Nothing changes on 64-bit kernels, where clamping each term is equivalent
> to clamping their sum, which the caller already does.
>
> Fixes: e26733e0d0ec ("mm, memcg: throttle allocators based on ancestral memory.high")
Is this the right fixes tag? That one doesn't introduce the division by
MEMCG_CHARGE_BATCH.
> Cc: stable@vger.kernel.org
>
> Signed-off-by: Hui Zhu <zhuhui@kylinos.cn>
> ---
> mm/memcontrol.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 84f4a8fd4d16..1ba42724ed1e 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2576,7 +2576,7 @@ static u64 swap_find_max_overage(struct mem_cgroup *memcg)
> static unsigned long calculate_high_delay(unsigned int nr_pages,
> u64 max_overage)
> {
> - unsigned long penalty_jiffies;
> + u64 penalty_jiffies;
>
> if (!max_overage)
> return 0;
> @@ -2601,7 +2601,13 @@ static unsigned long calculate_high_delay(unsigned int nr_pages,
> * MEMCG_CHARGE_BATCH pages is nominal, so work out how much smaller or
> * larger the current charge patch is than that.
> */
> - return penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH;
> + penalty_jiffies = penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH;
> +
> + /*
> + * Clamp before narrowing to unsigned long: a truncated return value
> + * would escape the caller's min() and look like a small delay.
> + */
I think this is a bit verbose for what is happening here.
Why not:
return min_t(u64, penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH,
MEMCG_MAX_HIGH_DELAY_JIFFIES);
Or just dropping the comment block seems fine. I think folks should be
familiar enough with values wrapping around.
Thanks, have a great day!
Joshua
> + return min_t(u64, penalty_jiffies, MEMCG_MAX_HIGH_DELAY_JIFFIES);
> }
>
> /*
> --
> 2.53.0
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] mm: memcg: fix memory.high throttle lost to u64 overflow
2026-11-17 8:04 [PATCH 0/2] mm: memcg: fix memory.high allocator throttling Hui Zhu
2026-11-17 8:04 ` [PATCH 1/2] mm: memcg: fix zero throttle delay on 32-bit kernels Hui Zhu
@ 2026-11-17 8:04 ` Hui Zhu
2026-11-17 22:17 ` [PATCH 0/2] mm: memcg: fix memory.high allocator throttling Chris Down
2 siblings, 0 replies; 5+ messages in thread
From: Hui Zhu @ 2026-11-17 8:04 UTC (permalink / raw)
To: Johannes Weiner, Michal Hocko, Roman Gushchin, Shakeel Butt,
Muchun Song, Andrew Morton, Chris Down, cgroups, linux-mm,
linux-kernel
Cc: Hui Zhu, stable
From: Hui Zhu <zhuhui@kylinos.cn>
calculate_high_delay() squares max_overage and scales it by HZ in u64.
max_overage is the ratio ((usage - high) << 20) / high, and memory.high has
no lower bound, so the product wraps once a cgroup is about 130x over its
limit (at HZ=1000). The wrapped value is arbitrary and can be exactly zero:
with memory.high set to one page and usage at 2049 pages, one page past the
8M mark, max_overage is 2^31, the product wraps to zero and the penalty
comes out 0 jiffies instead of the 2 seconds the formula calls for. The
caller then takes its "penalty_jiffies <= HZ / 100" exit, skipping both the
throttle and the reclaim retry loop.
Clamp the overage to MEMCG_MAX_DELAY_OVERAGE before squaring it. The bound
keeps the product within u64 for any supported HZ, and by then the delay
has long saturated at MEMCG_MAX_HIGH_DELAY_JIFFIES, so no penalty is
shortened.
Fixes: 0e4b01df8659 ("mm, memcg: throttle allocators when failing reclaim over memory.high")
Cc: stable@vger.kernel.org
Signed-off-by: Hui Zhu <zhuhui@kylinos.cn>
---
mm/memcontrol.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1ba42724ed1e..aeec1bbabb26 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2521,6 +2521,15 @@ static void high_irq_work_func(struct irq_work *work)
#define MEMCG_DELAY_PRECISION_SHIFT 20
#define MEMCG_DELAY_SCALING_SHIFT 14
+/*
+ * Cap for the overage passed to calculate_high_delay(). Squaring a larger
+ * overage and scaling it by HZ overflows u64, and the wrapped product may
+ * come out zero, skipping the throttle entirely. At the cap the square
+ * still fits in u64 for any HZ, and the delay has long saturated at
+ * MEMCG_MAX_HIGH_DELAY_JIFFIES, so clamping never shortens it.
+ */
+#define MEMCG_MAX_DELAY_OVERAGE (1ULL << 26)
+
static u64 calculate_overage(unsigned long usage, unsigned long high)
{
u64 overage;
@@ -2581,6 +2590,8 @@ static unsigned long calculate_high_delay(unsigned int nr_pages,
if (!max_overage)
return 0;
+ max_overage = min_t(u64, max_overage, MEMCG_MAX_DELAY_OVERAGE);
+
/*
* We use overage compared to memory.high to calculate the number of
* jiffies to sleep (penalty_jiffies). Ideally this value should be
--
2.53.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 0/2] mm: memcg: fix memory.high allocator throttling
2026-11-17 8:04 [PATCH 0/2] mm: memcg: fix memory.high allocator throttling Hui Zhu
2026-11-17 8:04 ` [PATCH 1/2] mm: memcg: fix zero throttle delay on 32-bit kernels Hui Zhu
2026-11-17 8:04 ` [PATCH 2/2] mm: memcg: fix memory.high throttle lost to u64 overflow Hui Zhu
@ 2026-11-17 22:17 ` Chris Down
2 siblings, 0 replies; 5+ messages in thread
From: Chris Down @ 2026-11-17 22:17 UTC (permalink / raw)
To: Hui Zhu
Cc: Johannes Weiner, Michal Hocko, Roman Gushchin, Shakeel Butt,
Muchun Song, Andrew Morton, cgroups, linux-mm, linux-kernel,
Hui Zhu
Hi Hui,
Thanks for fixing these, I've verified that these fix the issues
reported.
That said, Zhang Jiao sent a fix for the same two problems a few weeks
ago, and Johannes thought the overage cap there was a bit of a magic
value, which we have plenty of in mm already, and I agree we shouldn't
add more [1].
Could you please coordinate so we don't have two patchsets doing the
same thing?
Chris
[1] https://lore.kernel.org/all/auNrakxaET8qkuAn@cmpxchg.org/
^ permalink raw reply [flat|nested] 5+ messages in thread