86 lines
2.8 KiB
Diff
86 lines
2.8 KiB
Diff
From 3ce8ad1252eef703b591537e125a6da3be2dd796 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Weiner <hannes@cmpxchg.org>
|
|
Date: Mon, 8 Aug 2022 14:55:56 +0200
|
|
Subject: [PATCH 165/171] mm/memcg: Opencode the inner part of
|
|
obj_cgroup_uncharge_pages() in drain_obj_stock()
|
|
|
|
Provide the inner part of refill_stock() as __refill_stock() without
|
|
disabling interrupts. This eases the integration of local_lock_t where
|
|
recursive locking must be avoided.
|
|
Open code obj_cgroup_uncharge_pages() in drain_obj_stock() and use
|
|
__refill_stock(). The caller of drain_obj_stock() already disables
|
|
interrupts.
|
|
|
|
[bigeasy: Patch body around Johannes' diff ]
|
|
|
|
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Reviewed-by: Shakeel Butt <shakeelb@google.com>
|
|
Reviewed-by: Roman Gushchin <guro@fb.com>
|
|
Acked-by: Michal Hocko <mhocko@suse.com>
|
|
[do: backported to v5.15]
|
|
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
|
|
Signed-off-by: Clark Williams <williams@redhat.com>
|
|
Signed-off-by: Clark Williams <clrkwllms@kernel.org>
|
|
---
|
|
mm/memcontrol.c | 26 ++++++++++++++++++++------
|
|
1 file changed, 20 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
|
|
index e566c34466a1..2cf55b3ab4b0 100644
|
|
--- a/mm/memcontrol.c
|
|
+++ b/mm/memcontrol.c
|
|
@@ -2264,12 +2264,9 @@ static void drain_local_stock(struct work_struct *dummy)
|
|
* Cache charges(val) to local per_cpu area.
|
|
* This will be consumed by consume_stock() function, later.
|
|
*/
|
|
-static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
+static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
{
|
|
struct memcg_stock_pcp *stock;
|
|
- unsigned long flags;
|
|
-
|
|
- local_irq_save(flags);
|
|
|
|
stock = this_cpu_ptr(&memcg_stock);
|
|
if (stock->cached != memcg) { /* reset if necessary */
|
|
@@ -2281,7 +2278,14 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
|
|
if (stock->nr_pages > MEMCG_CHARGE_BATCH)
|
|
drain_stock(stock);
|
|
+}
|
|
|
|
+static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
+{
|
|
+ unsigned long flags;
|
|
+
|
|
+ local_irq_save(flags);
|
|
+ __refill_stock(memcg, nr_pages);
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
@@ -3180,8 +3184,18 @@ static void drain_obj_stock(struct memcg_stock_pcp *stock)
|
|
unsigned int nr_pages = stock->nr_bytes >> PAGE_SHIFT;
|
|
unsigned int nr_bytes = stock->nr_bytes & (PAGE_SIZE - 1);
|
|
|
|
- if (nr_pages)
|
|
- obj_cgroup_uncharge_pages(old, nr_pages);
|
|
+ if (nr_pages) {
|
|
+ struct mem_cgroup *memcg;
|
|
+
|
|
+ memcg = get_mem_cgroup_from_objcg(old);
|
|
+
|
|
+ if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
|
|
+ page_counter_uncharge(&memcg->kmem, nr_pages);
|
|
+
|
|
+ __refill_stock(memcg, nr_pages);
|
|
+
|
|
+ css_put(&memcg->css);
|
|
+ }
|
|
|
|
/*
|
|
* The leftover is flushed to the centralized per-memcg value.
|
|
--
|
|
2.38.1
|
|
|