| Message ID | 20230915105845.3199656-3-liushixin2@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Expose swapcache stat for memcg v1 | expand |
On Fri, Sep 15, 2023 at 3:05 AM Liu Shixin <liushixin2@huawei.com> wrote: > > Since commit b25806dcd3d5("mm: memcontrol: deprecate swapaccounting=0 mode") > do_memsw_account() is synonymous with !cgroup_subsys_on_dfl(memory_cgrp_subsys), > It always equals true in memcg1_stat_format(). Remove the unused code. > > Suggested-by: Michal Koutný <mkoutny@suse.com> > Signed-off-by: Liu Shixin <liushixin2@huawei.com> Reviewed-by: Yosry Ahmed <yosryahmed@google.com> > --- > mm/memcontrol.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 78ea10c5a636..bb9a617be046 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4112,8 +4112,6 @@ static void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) > for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) { > unsigned long nr; > > - if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account()) > - continue; > nr = memcg_page_state_local(memcg, memcg1_stats[i]); > seq_buf_printf(s, "%s %lu\n", memcg1_stat_names[i], > nr * memcg_page_state_unit(memcg1_stats[i])); > @@ -4136,15 +4134,12 @@ static void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) > } > seq_buf_printf(s, "hierarchical_memory_limit %llu\n", > (u64)memory * PAGE_SIZE); > - if (do_memsw_account()) > - seq_buf_printf(s, "hierarchical_memsw_limit %llu\n", > - (u64)memsw * PAGE_SIZE); > + seq_buf_printf(s, "hierarchical_memsw_limit %llu\n", > + (u64)memsw * PAGE_SIZE); > > for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) { > unsigned long nr; > > - if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account()) > - continue; > nr = memcg_page_state(memcg, memcg1_stats[i]); > seq_buf_printf(s, "total_%s %llu\n", memcg1_stat_names[i], > (u64)nr * memcg_page_state_unit(memcg1_stats[i])); > -- > 2.25.1 >
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 78ea10c5a636..bb9a617be046 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4112,8 +4112,6 @@ static void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) { unsigned long nr; - if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account()) - continue; nr = memcg_page_state_local(memcg, memcg1_stats[i]); seq_buf_printf(s, "%s %lu\n", memcg1_stat_names[i], nr * memcg_page_state_unit(memcg1_stats[i])); @@ -4136,15 +4134,12 @@ static void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) } seq_buf_printf(s, "hierarchical_memory_limit %llu\n", (u64)memory * PAGE_SIZE); - if (do_memsw_account()) - seq_buf_printf(s, "hierarchical_memsw_limit %llu\n", - (u64)memsw * PAGE_SIZE); + seq_buf_printf(s, "hierarchical_memsw_limit %llu\n", + (u64)memsw * PAGE_SIZE); for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) { unsigned long nr; - if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account()) - continue; nr = memcg_page_state(memcg, memcg1_stats[i]); seq_buf_printf(s, "total_%s %llu\n", memcg1_stat_names[i], (u64)nr * memcg_page_state_unit(memcg1_stats[i]));
Since commit b25806dcd3d5("mm: memcontrol: deprecate swapaccounting=0 mode") do_memsw_account() is synonymous with !cgroup_subsys_on_dfl(memory_cgrp_subsys), It always equals true in memcg1_stat_format(). Remove the unused code. Suggested-by: Michal Koutný <mkoutny@suse.com> Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- mm/memcontrol.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)