Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
MIME-Version: 1.0
References: <20230915105845.3199656-1-liushixin2@huawei.com> <20230915105845.3199656-3-liushixin2@huawei.com>
In-Reply-To: <20230915105845.3199656-3-liushixin2@huawei.com>
From:   Yosry Ahmed <yosryahmed@google.com>
Date:   Mon, 18 Sep 2023 12:12:06 -0700
Message-ID: <CAJD7tkY3FjA90v_h8JP3+GxDSLMGL2JpbVsQupMvNXt6-fqUkg@mail.gmail.com>
Subject: Re: [PATCH v2 2/2] memcg: remove unused do_memsw_account in memcg1_stat_format
To:     Liu Shixin <liushixin2@huawei.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        =?UTF-8?Q?Michal_Koutn=C3=BD?= <mkoutny@suse.com>,
        Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Jonathan Corbet <corbet@lwn.net>,
        Michal Hocko <mhocko@kernel.org>,
        Kefeng Wang <wangkefeng.wang@huawei.com>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Sep 15, 2023 at 3:05=E2=80=AFAM Liu Shixin <liushixin2@huawei.com> =
wrote:
>
> Since commit b25806dcd3d5("mm: memcontrol: deprecate swapaccounting=3D0 m=
ode")
> do_memsw_account() is synonymous with !cgroup_subsys_on_dfl(memory_cgrp_s=
ubsys),
> It always equals true in memcg1_stat_format(). Remove the unused code.
>
> Suggested-by: Michal Koutn=C3=BD <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 *m=
emcg, struct seq_buf *s)
>         for (i =3D 0; i < ARRAY_SIZE(memcg1_stats); i++) {
>                 unsigned long nr;
>
> -               if (memcg1_stats[i] =3D=3D MEMCG_SWAP && !do_memsw_accoun=
t())
> -                       continue;
>                 nr =3D 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 =3D 0; i < ARRAY_SIZE(memcg1_stats); i++) {
>                 unsigned long nr;
>
> -               if (memcg1_stats[i] =3D=3D MEMCG_SWAP && !do_memsw_accoun=
t())
> -                       continue;
>                 nr =3D 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
>