diff options
| author | Shakeel Butt <[email protected]> | 2024-10-26 16:37:07 +0000 |
|---|---|---|
| committer | Andrew Morton <[email protected]> | 2024-11-07 04:11:20 +0000 |
| commit | 906c38ff52e95575ddf3281bee531eded3dba150 (patch) | |
| tree | 139ddf5fdb1331dbfbfcfea30435d292cfa7116e /mm/workingset.c | |
| parent | mm/vma: the pgoff is correct if can_merge_right (diff) | |
| download | kernel-906c38ff52e95575ddf3281bee531eded3dba150.tar.gz kernel-906c38ff52e95575ddf3281bee531eded3dba150.zip | |
memcg: workingset: remove folio_memcg_rcu usage
The function workingset_activation() is called from folio_mark_accessed()
with the guarantee that the given folio can not be freed under us in
workingset_activation(). In addition, the association of the folio and
its memcg can not be broken here because charge migration is no more.
There is no need to use folio_memcg_rcu. Simply use folio_memcg_charged()
because that is what this function cares about.
[[email protected]: provide folio_memcg_charged stub for CONFIG_MEMCG=n]
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Shakeel Butt <[email protected]>
Suggested-by: Yu Zhao <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Roman Gushchin <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Muchun Song <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Yosry Ahmed <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Diffstat (limited to 'mm/workingset.c')
| -rw-r--r-- | mm/workingset.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/mm/workingset.c b/mm/workingset.c index a2b28e356e68..0e38bec261a4 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -591,22 +591,12 @@ void workingset_refault(struct folio *folio, void *shadow) */ void workingset_activation(struct folio *folio) { - struct mem_cgroup *memcg; - - rcu_read_lock(); /* * Filter non-memcg pages here, e.g. unmap can call * mark_page_accessed() on VDSO pages. - * - * XXX: See workingset_refault() - this should return - * root_mem_cgroup even for !CONFIG_MEMCG. */ - memcg = folio_memcg_rcu(folio); - if (!mem_cgroup_disabled() && !memcg) - goto out; - workingset_age_nonresident(folio_lruvec(folio), folio_nr_pages(folio)); -out: - rcu_read_unlock(); + if (mem_cgroup_disabled() || folio_memcg_charged(folio)) + workingset_age_nonresident(folio_lruvec(folio), folio_nr_pages(folio)); } /* |