memcg-no-irq-disable-for-memcg-stock-lock.patch removed from -mm tree
The quilt patch titled
Subject: memcg: no irq disable for memcg stock lock
has been removed from the -mm tree. Its filename was
memcg-no-irq-disable-for-memcg-stock-lock.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Shakeel Butt <[email protected]>
Subject: memcg: no irq disable for memcg stock lock
Date: Tue, 6 May 2025 15:55:33 -0700
There is no need to disable irqs to use memcg per-cpu stock, so let's just not do that. One consequence of this change is if the kernel while in task context has the memcg stock lock and that cpu got interrupted. The memcg charges on that cpu in the irq context will take the slow path of memcg charging. However that should be super rare and should be fine in general.
---
mm/memcontrol.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-no-irq-disable-for-memcg-stock-lock +6 -9
@@ -1854,12 +1854,11 @@ static bool consume_stock(struct mem_cgr {struct memcg_stock_pcp *stock;uint8_t stock_pages; -unsigned long flags;bool ret = false;int i;if (nr_pages >MEMCG_CHARGE_BATCH || - !local_trylock_irqsave (&memcg_stock.lock, flags)) + !local_trylock (&memcg_stock.lock))return ret; stock =this_cpu_ptr (&memcg_stock);
@@ -1876,7 +1875,7 @@ static bool consume_stock(struct mem_cgrbreak ; } -local_unlock_irqrestore (&memcg_stock.lock, flags); +local_unlock (&memcg_stock.lock);return ret; }
@@ -1920,18 +1919,17 @@ static void drain_stock_fully(struct memstatic void drain_local_memcg_stock (struct work_struct *dummy) {struct memcg_stock_pcp *stock; -unsigned long flags;if (WARN_ONCE (!in_task (),"drain in non-task context" ))return ; -local_lock_irqsave (&memcg_stock.lock, flags); +local_lock (&memcg_stock.lock); stock =this_cpu_ptr (&memcg_stock);drain_stock_fully (stock);clear_bit (FLUSHING_CACHED_CHARGE , &stock->flags); -local_unlock_irqrestore (&memcg_stock.lock, flags); +local_unlock (&memcg_stock.lock); }static void drain_local_obj_stock (struct work_struct *dummy)
@@ -1956,7 +1954,6 @@ static void refill_stock(struct mem_cgrostruct memcg_stock_pcp *stock;struct mem_cgroup *cached;uint8_t stock_pages; -unsigned long flags;bool success = false;int empty_slot =-1 ;int i;
@@ -1971,7 +1968,7 @@ static void refill_stock(struct mem_cgroVM_WARN_ON_ONCE (mem_cgroup_is_root (memcg));if (nr_pages >MEMCG_CHARGE_BATCH || - !local_trylock_irqsave (&memcg_stock.lock, flags)) { + !local_trylock (&memcg_stock.lock)) {/* * In case of larger than batch refill or unlikely failure to * lock the percpu memcg_stock.lock, uncharge memcg directly.
@@ -2006,7 +2003,7 @@ static void refill_stock(struct mem_cgroWRITE_ONCE (stock->nr_pages[i], nr_pages); } -local_unlock_irqrestore (&memcg_stock.lock, flags); +local_unlock (&memcg_stock.lock); } static bool is_memcg_drain_needed(struct memcg_stock_pcp *stock,
_
Patches currently in -mm which might be from [email protected] are