Commit 41d17431 authored by Muchun Song's avatar Muchun Song Committed by Linus Torvalds

mm: list_lru: fix the return value of list_lru_count_one()

Since commit 2788cf0c ("memcg: reparent list_lrus and free kmemcg_id
on css offline"), ->nr_items can be negative during memory cgroup
reparenting.  In this case, list_lru_count_one() will return an unusual
and huge value, which can surprise users.  At least for now it hasn't
affected any users.  But it is better to let list_lru_count_ont()
returns zero when ->nr_items is negative.

Link: https://lkml.kernel.org/r/20211025124910.56433-1-songmuchun@bytedance.comSigned-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 60ec6a48
...@@ -176,13 +176,16 @@ unsigned long list_lru_count_one(struct list_lru *lru, ...@@ -176,13 +176,16 @@ unsigned long list_lru_count_one(struct list_lru *lru,
{ {
struct list_lru_node *nlru = &lru->node[nid]; struct list_lru_node *nlru = &lru->node[nid];
struct list_lru_one *l; struct list_lru_one *l;
unsigned long count; long count;
rcu_read_lock(); rcu_read_lock();
l = list_lru_from_memcg_idx(nlru, memcg_cache_id(memcg)); l = list_lru_from_memcg_idx(nlru, memcg_cache_id(memcg));
count = READ_ONCE(l->nr_items); count = READ_ONCE(l->nr_items);
rcu_read_unlock(); rcu_read_unlock();
if (unlikely(count < 0))
count = 0;
return count; return count;
} }
EXPORT_SYMBOL_GPL(list_lru_count_one); EXPORT_SYMBOL_GPL(list_lru_count_one);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment