提交 c3cc3911 编写于 作者: J Johannes Weiner 提交者: Linus Torvalds

mm: memcontrol: fix NR_WRITEBACK leak in memcg and system stats

After commit a983b5eb ("mm: memcontrol: fix excessive complexity in
memory.stat reporting"), we observed slowly upward creeping NR_WRITEBACK
counts over the course of several days, both the per-memcg stats as well
as the system counter in e.g.  /proc/meminfo.

The conversion from full per-cpu stat counts to per-cpu cached atomic
stat counts introduced an irq-unsafe RMW operation into the updates.

Most stat updates come from process context, but one notable exception
is the NR_WRITEBACK counter.  While writebacks are issued from process
context, they are retired from (soft)irq context.

When writeback completions interrupt the RMW counter updates of new
writebacks being issued, the decs from the completions are lost.

Since the global updates are routed through the joint lruvec API, both
the memcg counters as well as the system counters are affected.

This patch makes the joint stat and event API irq safe.

Link: http://lkml.kernel.org/r/20180203082353.17284-1-hannes@cmpxchg.org
Fixes: a983b5eb ("mm: memcontrol: fix excessive complexity in memory.stat reporting")
Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
Debugged-by: NTejun Heo <tj@kernel.org>
Reviewed-by: NRik van Riel <riel@surriel.com>
Reviewed-by: NAndrew Morton <akpm@linux-foundation.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 101110f6
...@@ -523,9 +523,11 @@ static inline void __mod_memcg_state(struct mem_cgroup *memcg, ...@@ -523,9 +523,11 @@ static inline void __mod_memcg_state(struct mem_cgroup *memcg,
static inline void mod_memcg_state(struct mem_cgroup *memcg, static inline void mod_memcg_state(struct mem_cgroup *memcg,
int idx, int val) int idx, int val)
{ {
preempt_disable(); unsigned long flags;
local_irq_save(flags);
__mod_memcg_state(memcg, idx, val); __mod_memcg_state(memcg, idx, val);
preempt_enable(); local_irq_restore(flags);
} }
/** /**
...@@ -606,9 +608,11 @@ static inline void __mod_lruvec_state(struct lruvec *lruvec, ...@@ -606,9 +608,11 @@ static inline void __mod_lruvec_state(struct lruvec *lruvec,
static inline void mod_lruvec_state(struct lruvec *lruvec, static inline void mod_lruvec_state(struct lruvec *lruvec,
enum node_stat_item idx, int val) enum node_stat_item idx, int val)
{ {
preempt_disable(); unsigned long flags;
local_irq_save(flags);
__mod_lruvec_state(lruvec, idx, val); __mod_lruvec_state(lruvec, idx, val);
preempt_enable(); local_irq_restore(flags);
} }
static inline void __mod_lruvec_page_state(struct page *page, static inline void __mod_lruvec_page_state(struct page *page,
...@@ -630,9 +634,11 @@ static inline void __mod_lruvec_page_state(struct page *page, ...@@ -630,9 +634,11 @@ static inline void __mod_lruvec_page_state(struct page *page,
static inline void mod_lruvec_page_state(struct page *page, static inline void mod_lruvec_page_state(struct page *page,
enum node_stat_item idx, int val) enum node_stat_item idx, int val)
{ {
preempt_disable(); unsigned long flags;
local_irq_save(flags);
__mod_lruvec_page_state(page, idx, val); __mod_lruvec_page_state(page, idx, val);
preempt_enable(); local_irq_restore(flags);
} }
unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,
...@@ -659,9 +665,11 @@ static inline void __count_memcg_events(struct mem_cgroup *memcg, ...@@ -659,9 +665,11 @@ static inline void __count_memcg_events(struct mem_cgroup *memcg,
static inline void count_memcg_events(struct mem_cgroup *memcg, static inline void count_memcg_events(struct mem_cgroup *memcg,
int idx, unsigned long count) int idx, unsigned long count)
{ {
preempt_disable(); unsigned long flags;
local_irq_save(flags);
__count_memcg_events(memcg, idx, count); __count_memcg_events(memcg, idx, count);
preempt_enable(); local_irq_restore(flags);
} }
/* idx can be of type enum memcg_event_item or vm_event_item */ /* idx can be of type enum memcg_event_item or vm_event_item */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册