Skip to content

Commit 66953c1

Browse files
Muchun Songjfvogel
authored andcommitted
mm: memcontrol: introduce memcg_reparent_ops
In the previous patch, we know how to make the lruvec lock safe when LRU pages are reparented. We should do something like following. memcg_reparent_objcgs(memcg) 1) lock // lruvec belongs to memcg and lruvec_parent belongs to parent memcg. spin_lock(&lruvec->lru_lock); spin_lock(&lruvec_parent->lru_lock); 2) relocate from current memcg to its parent // Move all the pages from the lruvec list to the parent lruvec list. 3) unlock spin_unlock(&lruvec_parent->lru_lock); spin_unlock(&lruvec->lru_lock); Apart from the page lruvec lock, the deferred split queue lock (THP only) also needs to do something similar. So we extract the necessary three steps in the memcg_reparent_objcgs(). memcg_reparent_objcgs(memcg) 1) lock memcg_reparent_ops->lock(memcg, parent); 2) relocate memcg_reparent_ops->relocate(memcg, reparent); 3) unlock memcg_reparent_ops->unlock(memcg, reparent); Now there are two different locks (e.g. lruvec lock and deferred split queue lock) need to use this infrastructure. In the next patch, we will use those APIs to make those locks safe when the LRU pages reparented. Signed-off-by: Muchun Song <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Orabug: 37405594 Signed-off-by: Imran Khan <[email protected]> Reviewed-by: Kamalesh Babulal <[email protected]>
1 parent 4717687 commit 66953c1

File tree

2 files changed

+69
-13
lines changed

2 files changed

+69
-13
lines changed

include/linux/memcontrol.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,26 @@ struct mem_cgroup {
338338
struct mem_cgroup_per_node *nodeinfo[];
339339
};
340340

341+
struct memcg_reparent_ops {
342+
/*
343+
* Note that interrupt is disabled before calling those callbacks,
344+
* so the interrupt should remain disabled when leaving those callbacks.
345+
*/
346+
void (*lock)(struct mem_cgroup *src, struct mem_cgroup *dst);
347+
void (*relocate)(struct mem_cgroup *src, struct mem_cgroup *dst);
348+
void (*unlock)(struct mem_cgroup *src, struct mem_cgroup *dst);
349+
};
350+
351+
#define DEFINE_MEMCG_REPARENT_OPS(name) \
352+
const struct memcg_reparent_ops memcg_##name##_reparent_ops = { \
353+
.lock = name##_reparent_lock, \
354+
.relocate = name##_reparent_relocate, \
355+
.unlock = name##_reparent_unlock, \
356+
}
357+
358+
#define DECLARE_MEMCG_REPARENT_OPS(name) \
359+
extern const struct memcg_reparent_ops memcg_##name##_reparent_ops
360+
341361
/*
342362
* size of first charge trial.
343363
* TODO: maybe necessary to use big numbers in big irons or dynamic based of the

mm/memcontrol.c

Lines changed: 49 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,24 +195,60 @@ static struct obj_cgroup *obj_cgroup_alloc(void)
195195
return objcg;
196196
}
197197

198-
static void memcg_reparent_objcgs(struct mem_cgroup *memcg)
198+
static void objcg_reparent_lock(struct mem_cgroup *src, struct mem_cgroup *dst)
199+
{
200+
spin_lock(&objcg_lock);
201+
}
202+
203+
static void objcg_reparent_relocate(struct mem_cgroup *src, struct mem_cgroup *dst)
199204
{
200205
struct obj_cgroup *objcg, *iter;
201-
struct mem_cgroup *parent = parent_mem_cgroup(memcg);
202206

203-
objcg = rcu_replace_pointer(memcg->objcg, NULL, true);
207+
objcg = rcu_replace_pointer(src->objcg, NULL, true);
208+
/* 1) Ready to reparent active objcg. */
209+
list_add(&objcg->list, &src->objcg_list);
210+
/* 2) Reparent active objcg and already reparented objcgs to dst. */
211+
list_for_each_entry(iter, &src->objcg_list, list)
212+
WRITE_ONCE(iter->memcg, dst);
213+
/* 3) Move already reparented objcgs to the dst's list */
214+
list_splice(&src->objcg_list, &dst->objcg_list);
215+
}
204216

205-
spin_lock_irq(&objcg_lock);
217+
static void objcg_reparent_unlock(struct mem_cgroup *src, struct mem_cgroup *dst)
218+
{
219+
spin_unlock(&objcg_lock);
220+
}
206221

207-
/* 1) Ready to reparent active objcg. */
208-
list_add(&objcg->list, &memcg->objcg_list);
209-
/* 2) Reparent active objcg and already reparented objcgs to parent. */
210-
list_for_each_entry(iter, &memcg->objcg_list, list)
211-
WRITE_ONCE(iter->memcg, parent);
212-
/* 3) Move already reparented objcgs to the parent's list */
213-
list_splice(&memcg->objcg_list, &parent->objcg_list);
214-
215-
spin_unlock_irq(&objcg_lock);
222+
static DEFINE_MEMCG_REPARENT_OPS(objcg);
223+
224+
static const struct memcg_reparent_ops *memcg_reparent_ops[] = {
225+
&memcg_objcg_reparent_ops,
226+
};
227+
228+
#define DEFINE_MEMCG_REPARENT_FUNC(phase) \
229+
static void memcg_reparent_##phase(struct mem_cgroup *src, \
230+
struct mem_cgroup *dst) \
231+
{ \
232+
int i; \
233+
\
234+
for (i = 0; i < ARRAY_SIZE(memcg_reparent_ops); i++) \
235+
memcg_reparent_ops[i]->phase(src, dst); \
236+
}
237+
238+
DEFINE_MEMCG_REPARENT_FUNC(lock)
239+
DEFINE_MEMCG_REPARENT_FUNC(relocate)
240+
DEFINE_MEMCG_REPARENT_FUNC(unlock)
241+
242+
static void memcg_reparent_objcgs(struct mem_cgroup *src)
243+
{
244+
struct mem_cgroup *dst = parent_mem_cgroup(src);
245+
struct obj_cgroup *objcg = rcu_dereference_protected(src->objcg, true);
246+
247+
local_irq_disable();
248+
memcg_reparent_lock(src, dst);
249+
memcg_reparent_relocate(src, dst);
250+
memcg_reparent_unlock(src, dst);
251+
local_irq_enable();
216252

217253
percpu_ref_kill(&objcg->refcnt);
218254
}

0 commit comments

Comments
 (0)