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 5DE65D29FA5 for ; Wed, 6 Nov 2024 23:18:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 736546B008C; Wed, 6 Nov 2024 18:18:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E6B26B0096; Wed, 6 Nov 2024 18:18:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AEAE6B0098; Wed, 6 Nov 2024 18:18:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3BC0A6B008C for ; Wed, 6 Nov 2024 18:18:08 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B1587C0193 for ; Wed, 6 Nov 2024 23:18:07 +0000 (UTC) X-FDA: 82757234700.16.1810186 Received: from out-172.mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) by imf25.hostedemail.com (Postfix) with ESMTP id AE251A000B for ; Wed, 6 Nov 2024 23:17:40 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=RXSFROyD; spf=pass (imf25.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.172 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730935001; 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=HVNrxnOTWHw6OWmvKt8/LXHQA09+jId2msib6dundh4=; b=LelJyEl2XENJnpWjWPNvAccjiJ2ixuboz7iyDJzT8bOqKsephCFqm0ISJME2nW/K3A08Jd U6TzPDuWbZzLHBeEs/sAzzfYvIgSzayicIdk4em5ZvKMT5mcDlnDNTLpXE7M9tKLjKom0q VyFEv/nQ8TszqofbxKuWGMyl7L/Jk0A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730935001; a=rsa-sha256; cv=none; b=eTns1Ka6uLbH2hUQlc1tvNOzOqZmJELYApmT75M2oX+cM9VUisl8+TMeCk42jF3AT2Dgm+ Wj0bah4iEAv19QAeLP2upiQrRNBOSj/82zZe2bhnb7mhx1Pm2rm8DAsr2fOYdAJd6+qrFU Dj3NZs+ZsCBtMb1uFrpPbicbqeVTPf4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=RXSFROyD; spf=pass (imf25.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.172 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev Date: Wed, 6 Nov 2024 15:17:57 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1730935083; h=from:from:reply-to:subject:subject: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=HVNrxnOTWHw6OWmvKt8/LXHQA09+jId2msib6dundh4=; b=RXSFROyDzEB9tUKffr0Rj0kBDUtbDnAtgKjs9ckhRQ1I7+9NsVePjXPKvOIBfqi2r+hNxB 5IUHUCbcZfffV48SVsy7X44NDu4qctGk0L5nzcfrJDnFep62Tl0XQ3/J7qUFFLtpACn+fs PB2mvdhWZpcOasvmNMWvQuZxEZW6hw4= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Joshua Hahn Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: Re: [PATCH 1/2] memcg/hugetlb: Introduce memcg_accounts_hugetlb Message-ID: References: <20241106221434.2029328-1-joshua.hahnjy@gmail.com> <20241106221434.2029328-2-joshua.hahnjy@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241106221434.2029328-2-joshua.hahnjy@gmail.com> X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam10 X-Stat-Signature: 3ympp6qn57iqboefustx181id9dmjoxx X-Rspamd-Queue-Id: AE251A000B X-Rspam-User: X-HE-Tag: 1730935060-188861 X-HE-Meta: U2FsdGVkX18Ri1xVKHLCdLdwDev26Ji64/M7UmHfh3+dxap9Q6GHJMuzgEkOxKnNPJzkzfu3VxfmvA16R9H/LLCdPLpGSk/tU6Xz/4OlAJTUeLnTHs11b7NJqzyM+TDaio8rWy0UY+wLZlbEmCbAOtOZDDQKeJSAjR+qXnxiLKMQwTCs4RNYuNHe2WIzjUaZTLxgNcLNqHIeQiVwi4FjTOXaVmw3W+Jl1TNWVkoEH4kVbKQ7K4gltFx39RA/D1scP4/DSLDs3HK8ltGJxjVfk0oim0xdalfe+wmGzPh9qC9amYdkXVeqjkLQ5lLxSZ4/Kos6Em4SbVCbhnuxO0CjKmURCtpmCyxdWyFXrvodswCk81P2+OlUlUCpAXb0/R2uOYPivsCGX6FChp2mrcC0zNFwAkR/uJHTYgxlevydJMtsbLCIvGavLusmq+A+addR6NfVDM8BdjC1Te10E2+AA2XnmHWnzlKPRHWEm8/eJ9+xkZ1OuVXFvrSkES5RUD3O1CCTGtrD7v1LJde+Jy28g3biCFxJHxpCRoafOmkKQGLR6zHll8e7Hx7ga2v3HMLI2MzhQzU03TbkKlCYyF0cgSTecsB70jkp3k71HJ2OO19k4WDglXVwxueg4H7WJTMIrPwMP+6dgxTkSCjPkWKxqrL9xW2+BJ9bU6oWlItEn6g5M2mQHbZSvIxq26KdHSPsbD0WOIctO6+n6sYn6/B3u5xDcOJ3ET5tkwhpwoyIjA8GDScvn1JTXzD8to3dXOcsb5+PZ/auFN+LzFAleSiKKIfF4xaSq6G1AZe4RlOxiZ3uBVhpnhm8+OLOIqoIfCFUOjs/S84Sb/jsue4EvG7x6bochE2e6LOqmvdOqpRyRZbHVFzkxjh6lg8rHOXsDGnM79yyNUihSV2jIR+8PqKWKox+9bFy7JZeIZYm7ZRCtGQOvlhQYIkaWtaaSDKDfT/A5Ydaoc2OL3ZF21O9zIU j7v/RycU w187W88zx0FxiliDkKF2VVtOWDfLfOXSLWSTd4bbczpekjdEN3sPmp8j8NRvTZ3rpxPZORl/6JbhPWFduw1AW+Q4DsrdVM9NgoxNy7aIW+IKEB3ird04903ua1EHi1FtyWQ0w3rw1VVRxMlZOegEF6ASyXZFya1WDmB7lzgVOQzQuOnMUiXh6UPNS5p5GXlGsKUlGngsfeNPiLKYet7gfBgTHJxn+EHT1tKkgxV18fZg7jnYUbe+pTrwdaX6TkFTBGLlJA4DDb1yQkUNjAlOCVTihZY8eOpN8aFYI 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, Nov 06, 2024 at 02:14:33PM -0800, Joshua Hahn wrote: > This patch isolates the check for whether memcg accounts hugetlb. > This condition can only be true if the memcg mount option > memory_hugetlb_accounting is on, which includes hugetlb usage > in memory.current. > > Signed-of-by: Joshua Hahn > > --- > include/linux/memcontrol.h | 2 ++ > mm/memcontrol.c | 12 ++++++++++-- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 34d2da05f2f1..25761d55799e 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -694,6 +694,8 @@ static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, > return __mem_cgroup_charge(folio, mm, gfp); > } > > +bool memcg_accounts_hugetlb(void); > + > int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, > long nr_pages); > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5444d0e7bb64..59dea0122579 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4497,6 +4497,15 @@ int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp) > return ret; > } > > +bool memcg_accounts_hugetlb(void) If this is only used in memcontrol.c then no need to add in the header, just make it static here. > +{ > +#ifdef CONFIG_HUGETLB_PAGE > + return cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING; > +#else > + return false; > +#endif > +} > + > /** > * mem_cgroup_hugetlb_try_charge - try to charge the memcg for a hugetlb folio > * @memcg: memcg to charge. > @@ -4522,8 +4531,7 @@ int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, > * but do not attempt to commit charge later (or cancel on error) either. > */ > if (mem_cgroup_disabled() || !memcg || > - !cgroup_subsys_on_dfl(memory_cgrp_subsys) || > - !(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING)) Why not replace in mem_cgroup_hugetlb_try_charge() as well? > + !cgroup_subsys_on_dfl(memory_cgrp_subsys) || !memcg_accounts_hugetlb()) > return -EOPNOTSUPP; > > if (try_charge(memcg, gfp, nr_pages)) > -- > 2.43.5 >