From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9193C46CA1 for ; Mon, 18 Sep 2023 19:12:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AF056B044C; Mon, 18 Sep 2023 15:12:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 485E56B044E; Mon, 18 Sep 2023 15:12:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34E236B044F; Mon, 18 Sep 2023 15:12:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 246CD6B044C for ; Mon, 18 Sep 2023 15:12:49 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EE705B3E7F for ; Mon, 18 Sep 2023 19:12:48 +0000 (UTC) X-FDA: 81250665216.28.19A4A4A Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by imf23.hostedemail.com (Postfix) with ESMTP id 327AB140014 for ; Mon, 18 Sep 2023 19:12:45 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pAXdFkXw; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of yosryahmed@google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695064366; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=U/tyJ7h5gd84THXUpDn3bC5d/vZANrGk+ne6Pb/iGd0=; b=ekvIcqmgi4/aqZKq9F2eiz37SJG6j1PkVVL0XO9vbrRZU5RLBcd9URSSgzmMirM6BC36Rl FcTino2qrxzK6ydaLDU1MafF8FLKBmhprgKE98IN5xfXTq8kiGfiexTX0qGGm78afQGuXy 8xZVk8pfAu1ygX2XlzLl6KOOrBSGtEM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pAXdFkXw; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of yosryahmed@google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695064366; a=rsa-sha256; cv=none; b=ew/AEOV42wB2k7aHpwH4R9O70yXqTUzTJmbunF/v9t7RHe1+wwmmfm4rAuG2jOZ2PF4fkw KE13xjSGphFJAqUe22vLo5wZ3X+6Qbd+Es+vfItI+7myJHS+d02wU5FN23SCuMwIg9KnIW gyiMFdVeOWZl87Yufe6TVBMb1cwpoEE= Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-31f7400cb74so4340168f8f.2 for ; Mon, 18 Sep 2023 12:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695064364; x=1695669164; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=U/tyJ7h5gd84THXUpDn3bC5d/vZANrGk+ne6Pb/iGd0=; b=pAXdFkXwQcDHBUBbWzxGJfS/AfUyMIiJH510sExcmqMZan1T0SIpYHjti15S6U6H6m wFGUUfUGZ9UOkcGiv3yZguXG3cITgg8efSMtPovo9CZlPlUJ3a5+mgaph/AP3qj/mWRX m3SSidNPjB2AgtRTIUk2MX2VLyW2W4XvRmsgcSmT9OL48lJw1+DrkeZEEjHSwjfYIxhi TKYM9i2PuVMhyB6ilDo/QBKPilfHA8i1cXz5KYIYfjg4Su7xXo0f2HEIge4PsAxmTPV3 cQzgnuUFiRdxNSmg2QybDQ5EU2K/Ev7gJkvI9co5AqqzVXkPHm/GsQkDHzNOx5KC0LGr epJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695064364; x=1695669164; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U/tyJ7h5gd84THXUpDn3bC5d/vZANrGk+ne6Pb/iGd0=; b=Kj3yvgzPTUGwABvNeMig3FQ0Ykslm2IiIpB3yvdR4ciF8aIc8p85dR9qlSnvKI+3wW kBi2PQf3uzjyob59dEH9ng0xkjvSO9siiEi7wbZpAfsxEJ8w70zmJ66U7j7+fJgJeSoD TqZGjswhPIaCkQt3oFMxY3kUKHcDE7WNFXlZFKdMeewipWSZnVaY6IJ1z/aUZImxI4Gs FIP97zYPWS3xAljhstQMBP4EnHpOckCXlaeFyh0E39Ed7B59WOSXiScUw/qR4ElSrXXj i/YTR5rRBFz7RoYZQvMuQdZDvcybtgN0B7xGaivyo7RZFN/132W06I8XbBwsYsyIXGYD SCaQ== X-Gm-Message-State: AOJu0Yz1PjTEE48jQ4W81RQUHc3HV80ZfYuF2tpPekszj+cYkS7B1YEo huay7/LbdGfv06E1V+D4FKnn4cXA6G2OkjRWNlOepg== X-Google-Smtp-Source: AGHT+IF7Bks7+fIGeY2oO408299xAYQ7YI6fsDKsoF65p99IrKoxYRSz2PqehP0dbWsJRA52Q6600cYf+8PYROaZKOY= X-Received: by 2002:a5d:4cc7:0:b0:319:52da:8f0b with SMTP id c7-20020a5d4cc7000000b0031952da8f0bmr8164345wrt.17.1695064364448; Mon, 18 Sep 2023 12:12:44 -0700 (PDT) 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 Date: Mon, 18 Sep 2023 12:12:06 -0700 Message-ID: Subject: Re: [PATCH v2 2/2] memcg: remove unused do_memsw_account in memcg1_stat_format To: Liu Shixin Cc: Andrew Morton , =?UTF-8?Q?Michal_Koutn=C3=BD?= , Tejun Heo , Zefan Li , Johannes Weiner , Jonathan Corbet , Michal Hocko , Kefeng Wang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 327AB140014 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: twjt187fbaetk85baqmkgpwb1ods5cnm X-HE-Tag: 1695064365-959241 X-HE-Meta: U2FsdGVkX1+oWueoFJ5zfaDvBFhw+iUnh8RYVq3YanH3sXCPd9UqgNiswOEbKuY3c5acuZZYUSuUseGYfyQSoE4tDVLM9XrX1DtP/wE2JOhLvY/oKQte8weRAN2cUM3Y0HjmqfFwVeJ547oCpIK5yX/xYUocCGijNBgJFK/ZUZrPMLmOnLOpm30spS/eNWDsu8JVQTudMykWisiu9PZZ1TVekKoI7PZqZnTlSPcpdGJsa1vOi+dDYj0DZVrLS8LhejRbNBJEhDOhKMkA9Ut06RvvtpjMQIc1yXiuDSDL5r7AKIFgyfkaKi0yuWfLYEah1m6bKiuSjwuMBI3hgu43dkIqBHHXIEbtrjdXsKiz+gue46JVqUWIOKlbx5CJNtqJR3gQd6nPMdJRl6B9BtPQ1t/gEiDyxucvOAY/CHht487uXxtdJHEF4vJ7YGoKgiJH1YyZzVxRDkNlesgFXFsOzwp7NWdd3fxn6ACIW5P3S10oozBUNa3FSU7+Hon/7INpAjD/AjCE4bxHhge5ItqL1fjn+BpPirQfrpbKG97xtOauzBrsWMxTiDsoH0xST5+4QT2bfWEG6W2lwi1u4WI2XL/1cvog+in4Dy4tBSt4B9GFMV8lfJ+QPS2o+uATChOfPi4voerU9cT4yFDgugPv3iA7xf5b0/bOB/Dr4wcKh4QJu7Ch1M/Tto3Pku0gf/DS+Pg+tVSGzvQxlSz1xbS/4ZeE+hbHeprJ7tKoo5mFBNNqZ5PRD4kHmHutBYF8/J+JO93PTCEQeFK/mYJ/SN3Ep1KytOHncX3p0ssa7UF3EUdo1rWPSsdxbq10hohLXFaDyvTnMdLQSnBn8ZYEEgN5Z7vokuBYEUZtnvxhulWl0tYIRTP3BxKPtjZBqARC5LNYAXQJNJ1gTwMCsbeiacAoIiS7LyMNKBsLc5dtgROCl/cgmE9wMsdIKRMI4N2iIBlPJUT+DtnjLl0+J8iAyjc pWrwTvKB DZ3r4+lO6V93Ap9KtFAKIyo+PXvjT74504JcUYhUN5MknF82A6RcL0lICweP7Et84z5q9rwzjvKzMJgWjMCwegUuMpzLxtXgqQIAdqKedsXfgLa2XiTL67JvKzb6TOgiA6YBP4DdLme/FBKj8p2NZ5hi1c/DBGjltzA+bjBcuwS9D6lwLkSZVK35FwF8xuuLcYwArtfbaIBBJdFoIf3dkh5lorVc/znBKn59zKC9INsrhQP92ZJJO//p5+LUZ58wOZifSp5BiquulVfTGmesFXwSdrVL15TwlPxdz X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Sep 15, 2023 at 3:05=E2=80=AFAM Liu Shixin = 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 > Signed-off-by: Liu Shixin Reviewed-by: Yosry Ahmed > --- > 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 >