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 A6152EC8739 for ; Thu, 7 Sep 2023 15:24:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DC5C8D0005; Thu, 7 Sep 2023 11:24:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 964D38D0001; Thu, 7 Sep 2023 11:24:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 805D48D0005; Thu, 7 Sep 2023 11:24:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 68D388D0001 for ; Thu, 7 Sep 2023 11:24:58 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 306EF1A02C0 for ; Thu, 7 Sep 2023 15:24:58 +0000 (UTC) X-FDA: 81210174276.09.24E5EB9 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf27.hostedemail.com (Postfix) with ESMTP id 438AA40026 for ; Thu, 7 Sep 2023 15:24:55 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=jnp2Ycfg; spf=pass (imf27.hostedemail.com: domain of mkoutny@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mkoutny@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694100296; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zFcvvMfLX/FLCw89MZD/SftO31WVSjyKM8zaaef4qC0=; b=FepfbLwzMEPEWgPN0xiaH9IFeDgN00z3c6yzrkhJ/yrLLF3INq3v9fWoUTHCiNDpgdbdPP B2PuAg8ZvKMRJGVUZqk/Z5AS3X9fHrHQhR1rGBcZPvnQcxip03wQTUPBC/gF2lnmEGgDgE LZvUNmzLPkONFzhWGcm1XTaJN6StCeE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=jnp2Ycfg; spf=pass (imf27.hostedemail.com: domain of mkoutny@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mkoutny@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694100296; a=rsa-sha256; cv=none; b=v83LtJXPToGxDKwp6lm3f/2spr6Xt0JotOQnhM9rfPv0mE2zjANGLyqJPj9waMUzK25s1M 9VXPaZ9hLRSS+Kh1kPamxBbyR3quBHR51WrvsY0wYtJttgDDEx31sIY6FbGAB6cqINCjC5 by8oY8+gvb8gGECb71PmdZnwzfwJgfY= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1F7E621869; Thu, 7 Sep 2023 15:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1694100294; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zFcvvMfLX/FLCw89MZD/SftO31WVSjyKM8zaaef4qC0=; b=jnp2YcfgSBGHrqpz0lPrMlO2WAiAnLH5iVvvgzOw4A0LNJAcaIhIAL2PfJWwQMnErcne/D d6Iy5cxt7/mnHfXeO6GKOwiWGZ62czzPOrS5mtYz82g64fG2uLRVcwc+jaVSKc0/vZ7CX5 yAfGbYQLBoFhWbc4LrA1JQ7NVZlcV4Q= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CD0B9138FA; Thu, 7 Sep 2023 15:24:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id RkM2MUXr+WSxewAAMHmgww (envelope-from ); Thu, 07 Sep 2023 15:24:53 +0000 Date: Thu, 7 Sep 2023 17:24:52 +0200 From: Michal =?utf-8?Q?Koutn=C3=BD?= To: Liu Shixin Cc: Yosry Ahmed , Tejun Heo , Zefan Li , Johannes Weiner , Jonathan Corbet , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Kefeng Wang , Andrew Morton , cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH] mm, memcg: expose swapcache stat for memcg v1 Message-ID: References: <20230902100728.3850149-1-liushixin2@huawei.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wxfpj2ogfybqrtvf" Content-Disposition: inline In-Reply-To: <20230902100728.3850149-1-liushixin2@huawei.com> X-Rspamd-Queue-Id: 438AA40026 X-Rspam-User: X-Stat-Signature: bdy4dk5ad67635bkmp3wcusnbguuokbz X-Rspamd-Server: rspam01 X-HE-Tag: 1694100295-838193 X-HE-Meta: U2FsdGVkX1/9kaFNDSdgTb/4REPdV+YB5GvgC0AfTl63ZOi8dir+9e0d033stCcfM1NNa6MzFbJT9ksmwWTVIFl6Pqe4enkyJ1rSdX7j7TncrqkeWgpF2TUdk7kCBoqgoHmWGaih0Yq7UcfxXF1xgKMOSvat/AJ0SFFYuMdOLedor+AXTZj/yE4NVxWNWNNt2clht4d4aJAj9Tnx/jbWW0O5gBqNBm4/J9damuY8iBNc4Nq4y2qTCbXGBVFgkDKENq1IPlp60yBfp+1fhXATnczYs31/tgeOJD89nIB5kDX8SuA0MG6FCZU880zVvAGOj0eBau7doEz2ZKZrt7StmnfBr+iOUchVc+DT5jDV9Jeix290luOX+zQ2jXARHDj+ZmV7Vgxhj1yxQUr0ZiLQeUzb29/TFid5EpvKc0YZcExsaTUkkO/KwE6uA0xG69v2nuuf8cUgAuWJxyYxAygRzBccfiE6vWB/WudcXfnOPZN06tB8xohJK+Pu+v8tGnQsnI9wrQepPhI2Rgsg4webY33nC0R/DXKzTPaGG6wi6m81bWrKNv9tok99h3QR3uXIs2YhKFj5RxGSVVuj5baHaWPfJO5jjRIS31Rdy3VyFuCb/vgoMn0Wa9J7q+M8C8HDjCeQjdZR3MXRtdBjiNu0hvJyZYO7FxjsKuiMjBxbNUzbftjaTHA0xRSx8M2HsLIHcZFcAYr02+1iYWrH3qrf3uIWj0Rpp1aWgHyiDNowswSNG1ooe5EQObEx5/CJg+57IRBBB2G819OTEq8ZMQQfgsrnMC5oYvBuq2IoFACz+TE38sHtdIsLw1xCIFIiEz7J5N0Q1EbrDEcZIHKShSSoOTMZEcRFGBC0aqbYFM8j1FscpE9RZoRxIAfk8VMvfstsmTVUnsq3bA0e7cOF8PD700aX6LkyTjgUzeD4xzQKqWMB1me4dFpUMw1dLsRadiLyjNMz0KF0GWiduRb36p+ pzlEdV5V YtXnSx+wSVZp8AK0zv31GND9Dk3Jhg/oNe6pHeP7Ns4VhO1mbPPNTb+0vnsCdFAKSpBAsi28zNaAWrUMJcx3QzgwJYqZ8/tb3G0IgfTfaRO1UUcZavY1gORMOK0KbUvcFHJLP/aNCIcHBvFtmsAFsO2rlD5uA+Fn7a8Wb974ce/DMglfmCVkkFjhdWZmTajOuipUe+sWybCMSI8fmCrmnRxjGYGJfqYHdNprUl4LRy0ibX5ThhxFzk+0H69n9R55eRXHp3BEduJ6dniTFG7F1KbxSxdUoPtdhLZtl2u+CbxaEIx28jPDs+r1cX8k497fCchUhssn/w+uomlOwRc9jx3uWRg== 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: --wxfpj2ogfybqrtvf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello. On Sat, Sep 02, 2023 at 06:07:28PM +0800, Liu Shixin wrote: > Since commit b6038942480e ("mm: memcg: add swapcache stat for memcg v2") > adds swapcache stat for the cgroup v2, it seems there is no reason to > hide it in memcg v1. Conversely, with swapcached it is more accurate to > evaluate the available memory for memcg. Hm, since the commit b25806dcd3d5 ("mm: memcontrol: deprecate swapaccountin= g=3D0 mode")=20 do_memsw_account() is synonymous with !cgroup_subsys_on_dfl(memory_cgrp_subsys) so its uses in memcg1_stat_format can be simplified. Would you mind making your patch into a series with (to keep diffstat low ;-)): --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4098,8 +4098,6 @@ static void memcg1_stat_format(struct mem_cgroup *mem= cg, struct seq_buf *s) for (i =3D 0; i < ARRAY_SIZE(memcg1_stats); i++) { unsigned long nr; =20 - if (memcg1_stats[i] =3D=3D MEMCG_SWAP && !do_memsw_account(= )) - 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])); @@ -4122,15 +4120,12 @@ static void memcg1_stat_format(struct mem_cgroup *m= emcg, 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); =20 for (i =3D 0; i < ARRAY_SIZE(memcg1_stats); i++) { unsigned long nr; =20 - if (memcg1_stats[i] =3D=3D MEMCG_SWAP && !do_memsw_account(= )) - 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])= ); Also, > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4068,6 +4068,9 @@ static const unsigned int memcg1_stats[] =3D { > WORKINGSET_REFAULT_ANON, > WORKINGSET_REFAULT_FILE, > MEMCG_SWAP, > +#ifdef CONFIG_SWAP > + NR_SWAPCACHE, > +#endif > }; The guard should cover both NR_SWAPCACHE and MEMCG_SWAP or none, no? (Similarly in memcg1_stat_names.) Thanks, Michal --wxfpj2ogfybqrtvf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQpEWyjXuwGT2dDBqAGvrMr/1gcjgUCZPnrQgAKCRAGvrMr/1gc jn8BAP9ux2iqMVWdi0SIkBy8fzCs7S97CpmXcNHLQr2/54hnqQD/crinaGH5Lq0o qJTHnwxhWG1t9D1dZK8ifnirUwdT/wY= =KKmU -----END PGP SIGNATURE----- --wxfpj2ogfybqrtvf--