Skip to content

Commit

Permalink
memcg: pin execution to current cpu while draining stock
Browse files Browse the repository at this point in the history
Commit d1a05b6 ("memcg do not try to drain per-cpu caches without
pages") added a drain_local_stock() call to a preemptible section.

The draining task looks up the cpu-local stock twice to set the
draining-flag, then to drain the stock and clear the flag again.  If the
task is migrated to a different CPU in between, noone will clear the
flag on the first stock and it will be forever undrainable.  Its charge
can not be recovered and the cgroup can not be deleted anymore.

Properly pin the task to the executing CPU while draining stocks.

Signed-off-by: Johannes Weiner <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]
Acked-by: Michal Hocko <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Johannes Weiner authored and torvalds committed Aug 25, 2011
1 parent a801876 commit 5af12d0
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -2169,13 +2169,7 @@ static void drain_all_stock(struct mem_cgroup *root_mem, bool sync)

/* Notify other cpus that system-wide "drain" is running */
get_online_cpus();
/*
* Get a hint for avoiding draining charges on the current cpu,
* which must be exhausted by our charging. It is not required that
* this be a precise check, so we use raw_smp_processor_id() instead of
* getcpu()/putcpu().
*/
curcpu = raw_smp_processor_id();
curcpu = get_cpu();
for_each_online_cpu(cpu) {
struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
struct mem_cgroup *mem;
Expand All @@ -2192,6 +2186,7 @@ static void drain_all_stock(struct mem_cgroup *root_mem, bool sync)
schedule_work_on(cpu, &stock->work);
}
}
put_cpu();

if (!sync)
goto out;
Expand Down

0 comments on commit 5af12d0

Please sign in to comment.