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 C357FD6B6BB for ; Wed, 30 Oct 2024 18:30:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 433C96B0098; Wed, 30 Oct 2024 14:30:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3EAA66B0099; Wed, 30 Oct 2024 14:30:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25B026B009A; Wed, 30 Oct 2024 14:30:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 00DEF6B0098 for ; Wed, 30 Oct 2024 14:30:54 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B03ACC0E8C for ; Wed, 30 Oct 2024 18:30:54 +0000 (UTC) X-FDA: 82731109776.29.36F24C7 Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by imf17.hostedemail.com (Postfix) with ESMTP id 5C9C740018 for ; Wed, 30 Oct 2024 18:30:32 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=KvDyniWS; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf17.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.46 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730312876; 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=+BQyFvetyfEonBkCQfY0fCLeQcMCAqYlLQEbyNnwUY8=; b=KSDNQZmrLk536pRc6TctT03Dgk4m1haAeNIgoa0ZEwjQWVxdjQ2CEP8wMgFkL/BJ3t3Q4I K01PrguWGqkT4YlKkEinMWVGFkS3L30txFYNtwkI4emutIEZeDATzDvpFUHabEUwn+pTXT khKfbDrqpQ2TNCyt1bEA3aBXfJkGink= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730312876; a=rsa-sha256; cv=none; b=zFTS1u3a/CNDNpTg7I6PtNt9VUlq0PowCr7ttWso7nI6858+CnURoTO2uDhrCfSwGPbgaS yei9wGTLGRde2GEpOs30Z6q/QEKaIHwHB8A4dabpeFuZEkc/3c7LCphIx6jYUZIp2UKyoe BybqqiE1mkseEQYHCr6PKT5b+/UNyUo= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=KvDyniWS; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf17.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.46 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6cbce8d830dso1013466d6.1 for ; Wed, 30 Oct 2024 11:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1730313051; x=1730917851; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=+BQyFvetyfEonBkCQfY0fCLeQcMCAqYlLQEbyNnwUY8=; b=KvDyniWSM2SOw5w6S871qZuo+LddYdyooT7Qbw7fsAIUpOa83C3utr541NCWqtpFRm WcicQx9GU+MXvzvVg4h/ZW6aGb7DQci9mCztRpcOodcDe+/xQQmexMHoMq8ATsQiargJ Un6w9lazrY3upRon+oPdKmfzUNJwKptSF8cA5crltHDa/rUbYlN7O6LFXRRMz3W2bDxl zs40y0RZVLyMJ93xdODcbrXQfOFGyKWzPA4FWrPdze1nD+KWtIaVxSMI5qSy1W1vYf2L EqfkEbxo1ckHOomttr7bA9h+/yCi2dm0yc5SD0iuqBijBHuXFl58iNEyfylBXMyF/hXM JtNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730313051; x=1730917851; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+BQyFvetyfEonBkCQfY0fCLeQcMCAqYlLQEbyNnwUY8=; b=tBvzUM/5QbW0dresuOdfthbsuZq/aATUjeIZWvxoW1O9Zy4rdG9sYnNm0uYNy9HcHJ nbqJWdjhMnfJDV1uUT8JP37jbJl+7TSDuZngqaYrnGZGLBhUKrClRlC3pmUK4N4PsdtM zSJXwjfn5irtbzMyYw+Im4KcyA1t0ooY9iEmjgqpOSqJBVzarGsT8agf6TDQBrP6KNOF T9CnRBKLDXvv0XzjqnfM+TEM6J51xYf2+43yczDg4Ndr6EAf+6RrxOQoZcJ0QS0wFblG 00Zgqr0IZHTpz0KLsF4fKUBC5Jm5eKTz8ZHWU+wYfWCk7PlGCUZYeOa2asZBgty5QNrn Gs6w== X-Forwarded-Encrypted: i=1; AJvYcCX+RV8ZEfNns19BS3XpoU4CoLrSqZzf3fxTIDJMdhRP3euINDlc64Vrz+Sv/iLEvtpZ9inpgQm18Q==@kvack.org X-Gm-Message-State: AOJu0YyOKpETM+QH8u2ZV+CFuUEngCeDA4soCsdGXO64fMOXwlbAoKOG 5hiHUgOM7fWhdus+JOED9GTjB+kpV7J1k7JlmTRFgXy6LVY/KLCrklICBamwX9s= X-Google-Smtp-Source: AGHT+IFZKq2rPrctMfcx/ODZimdpPiE5Sd/oXmeAfoYjzVnlrEmEOTepjdE4Eu92d40qrV5Ks/x7Ag== X-Received: by 2002:a05:6214:5b01:b0:6d3:5187:bcf8 with SMTP id 6a1803df08f44-6d35187be34mr12861026d6.17.1730313049656; Wed, 30 Oct 2024 11:30:49 -0700 (PDT) Received: from localhost ([2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d179a2c829sm54520496d6.121.2024.10.30.11.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 11:30:48 -0700 (PDT) Date: Wed, 30 Oct 2024 14:30:44 -0400 From: Johannes Weiner To: Michal Hocko Cc: Joshua Hahn , nphamcs@gmail.com, shakeel.butt@linux.dev, roman.gushchin@linux.dev, muchun.song@linux.dev, tj@kernel.org, lizefan.x@bytedance.com, mkoutny@suse.com, corbet@lwn.net, lnyng@meta.com, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: Re: [PATCH v3 1/1] memcg/hugetlb: Adding hugeTLB counters to memcg Message-ID: <20241030183044.GA706387@cmpxchg.org> References: <20241028210505.1950884-1-joshua.hahnjy@gmail.com> <20241030150102.GA706616@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5C9C740018 X-Stat-Signature: 9szrr64weadmuzh1fbxmonh87optn8ie X-Rspam-User: X-HE-Tag: 1730313032-994329 X-HE-Meta: U2FsdGVkX198SAJX1ZVOPmh3uFsiIj6HqP7BoTRnCYyvu1uJJg8zHhrsZFvbGeNYxzNXgDnSnl73PXvoBd73GRkKAvyyTQfPfTP6/pL9GzrfBKn5x7XHinaTlsuMfe11fjnUgQjCVtEVaLKN14sX7GNEwo0qkCSWXBaFa8Xa1ATmJkwjQcOwiQIlajpRTQreCp4s59qfrFai9/RW4HHmNBXOlUXKfjdoxPX49SV8JBQvrDLMlatRIwH9tfuopFjspWlw/Xmt8w3Qn0wjuZZASOldhZ26Yxi+yPPA5VpTwox3waTM8McWbrH755d56cgsvkIGaMFT23xtjIXrlteaEgFm3g1hzbq7KZi0VrTyvfB0BhZuW4slsjgWKycJYeiENPF0DoOlBAGI3xO2fvyCU/64OfAkBL6Ahv1QFs3Umvazsqh0Y3V+BP59952JR8iFB2Axfic2o76ctb7sYQHF2XScB3FX2qayB5mKSViN9VrhYFb7tD0XTDuOSwtLHkMSgoVG2sZPlhF9DKmAlGvyU2V4oCdPIAeyanLotRtqcCfei1TbEWYLo5B6OzSojL9DGbkwvaUOgl9EBkLKy2Pars/Jnjc6yNNhDrb1VPpusrOiwlQjzPf8NHjc2+rlDVvYti1ZO7FpaHG9DQvX2bIa5ocSEzfHa3wE5cJMsVWzOA1EYJ7PJC1RWPnE2bWd5X09LTfwFIEMf5i3xfLa9N7CzLA3BGLKWNCbDc6jlMr6Ax6Cp3izXD0GtD9I/uU8z1BFWd8YF0GmnAhJ6cRw5A5I6YJEqHhiQJuCh3RzTDwePjL1M2ZasPpPoh+IaPtJpAYg1g/BuHVlha9Uv28fcZcOaB8ATLpt/Yt0ca1GwC0H1agPgKagymSna1iUhy2059upbNV9csXR5pReIWrwNnKM6kdg4GLTq7A3b9KEUOiI959xjPocTD05c6juEGZrv6x8jtp5D7KATyfFzQMqtLo uxgTacFG WV7hnhjEvnk7ml/vAcxzlwOX3/foZqV5wMbySserBe81ba0gS7z9mHOpSu4dw+gKl+yfsm+LYTbzcSX11OXfDtSpm47KzsJdwHJ2l/Pxz2zTYnMewpMIgYCaY/Q59LKIeZ26Wkz7e8A8sq5n+1FEuTJV3OzcCUvNH332QsckqxoBsVd3Czf/aomcDyG1NNMBlAZ5DpOEofDC5/zGReYCvdwzgCzaigusaaFyI+qOXZi9rLoeqUkBS02HL/xx2MQqit17awbvS+cE+WuSL2sCjBO5oTO9pCx0s/WtHoBnhdHzL6rJ2tmbY/7BDX4F+/i0vxfM6Ye8JrP0ZeHP5F5ihg78+ng1Yck2Vdt0Sf5j1lYY1uwSKa7MJvk8LGeInENBOaMncu5BfC3Xe7S89mnz/wI3hciz0Otpdy+jIClC/5iNgyaqDkplSnwHBEsZlppzQzzEJfOxgu6DVl3nHXu3W2c9N22fMf+Az0rGaM6D/6ywQnC95Nzl8UHy2ZywbKsZKBPgtrbOyCzPV541tk5zUekaw0BmS+lEm4pnwqAWYbU45Rtc= 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: List-Subscribe: List-Unsubscribe: On Wed, Oct 30, 2024 at 04:27:37PM +0100, Michal Hocko wrote: > On Wed 30-10-24 11:01:02, Johannes Weiner wrote: > > On Wed, Oct 30, 2024 at 12:35:25PM +0100, Michal Hocko wrote: > > > On Mon 28-10-24 14:05:05, Joshua Hahn wrote: > > > [...] > > > > Changelog > > > > v3: > > > > * Removed check for whether CGRP_ROOT_HUGETLB_ACCOUNTING is on, since > > > > this check is already handled by lruvec_stat_mod (and doing the > > > > check in hugetlb.c actually breaks the build if MEMCG is not > > > > enabled. > > > [...] > > > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > > > > index 190fa05635f4..fbb10e52d7ea 100644 > > > > --- a/mm/hugetlb.c > > > > +++ b/mm/hugetlb.c > > > > @@ -1925,6 +1925,7 @@ void free_huge_folio(struct folio *folio) > > > > pages_per_huge_page(h), folio); > > > > hugetlb_cgroup_uncharge_folio_rsvd(hstate_index(h), > > > > pages_per_huge_page(h), folio); > > > > + lruvec_stat_mod_folio(folio, NR_HUGETLB, -pages_per_huge_page(h)); > > > > mem_cgroup_uncharge(folio); > > > > if (restore_reserve) > > > > h->resv_huge_pages++; > > > > @@ -3093,6 +3094,7 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, > > > > > > > > if (!memcg_charge_ret) > > > > mem_cgroup_commit_charge(folio, memcg); > > > > + lruvec_stat_mod_folio(folio, NR_HUGETLB, pages_per_huge_page(h)); > > > > mem_cgroup_put(memcg); > > > > > > > > return folio; > > > > > > I do not see any specific checks for CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING > > > in these paths. I guess you wanted to say that you rely on > > > mem_cgroup_commit_charge setting memcg pointer which then __lruvec_stat_mod_folio > > > relies on when updating stats. > > > > Yes, this is what Shakeel pointed out here: > > > > https://lore.kernel.org/lkml/il346o3nahawquum3t5rzcuuntkdpyahidpm2ctmdibj3td7pm@2aqirlm5hrdh/ > > It belongs to the changelog. Joshua, can you please include something like this at the end: lruvec_stat_mod_folio() keys off of folio->memcg linkage, which is only set up if CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING is switched on. This ensures that memory.stat::hugetlb is in sync with the hugetlb share of memory.current.