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 ADEE0D4336D for ; Thu, 7 Nov 2024 15:07:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 347016B008C; Thu, 7 Nov 2024 10:07:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 257FA6B0098; Thu, 7 Nov 2024 10:07:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB4E46B0092; Thu, 7 Nov 2024 10:07:16 -0500 (EST) 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 CE0CC6B008C for ; Thu, 7 Nov 2024 10:07:16 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 72BCE808C4 for ; Thu, 7 Nov 2024 15:07:16 +0000 (UTC) X-FDA: 82759625298.09.CECCBA3 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by imf10.hostedemail.com (Postfix) with ESMTP id A499DC0026 for ; Thu, 7 Nov 2024 15:06:58 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=VXoLPCI+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of joshua.hahnjy@gmail.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=joshua.hahnjy@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730991974; a=rsa-sha256; cv=none; b=ZWZcJeWqkRzKkUvroAPvHOJJbHqv/PF5xSepQBFhc0h96kFI6fu/6Nm2xtMP2TuatU6tJ4 FOvc3ov9mJ/LjTTWmE2AxGy2uqoIPkXZc3ZsjUUV7I33zEADoyNvriymxUJM6/hiY72NQC YwU9e8alt73BeBAcmAi4b8hcgxO7MZM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=VXoLPCI+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of joshua.hahnjy@gmail.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=joshua.hahnjy@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730991974; 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=VTbFFs4GMjF0GppxcpAZvv8cQk5IYlHwwCm9K1YyjBM=; b=DalwsF3VjPAM22McEXEMvqPPfEviRgHPw2YTXlMjCdiEyfKRBqED+mVIrvLplXl2rIOWL6 eUJBfuORR5A7HThJlzx6OwIrpK2Tkj9tQl1FkT5Ew5JL7DtjR7WcnLlIHtLjudzuSLiVTJ Yc87eI84b5b3FBW2qxs8IiEEbEqVjnM= Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5cefc36c5d4so1417642a12.0 for ; Thu, 07 Nov 2024 07:07:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730992033; x=1731596833; 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=VTbFFs4GMjF0GppxcpAZvv8cQk5IYlHwwCm9K1YyjBM=; b=VXoLPCI+3xMetTwWzB5+9EgY6aCGfrnZYtNFeM4ZE0Najv7dem2iZcRycd2GLoansC 9FYPdkRz1+30izCFreSGKjiGJ/HXkc3cPD+REtWIivG3AyCdnrjl/Wyqd9/XdidynI7z gPV2jaXNcc3nbrmQ0xCKVfiqjEOBdnXTyHSb8r+gyA/Hnbu+K6M+8OxO5G58nxEgUkU0 uSJ1Zro3N/NtuZJxf38d2bKAe+E2wtU8RdDglyPjxlVnQO1JWAsrjHj3mVMDjTGHecF7 H4S6+5vcr6vPGNn7thuVkcOzgYli6+bcbeFCHmQxPksgxbs/vu8zeiX8KxFKZG7r8n/j mucg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730992033; x=1731596833; 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=VTbFFs4GMjF0GppxcpAZvv8cQk5IYlHwwCm9K1YyjBM=; b=Zm2QuR5NsTmJLzr6p8pGRCN1sdAKZ4LjA5daMLIvy3/CFXkuqRuhLmLXBypjco+421 crbkq1/woakkiznNPK2BIhSVDbOL7wgmA1pnA5o94lKPvZlqVaazCyUn9noHLDgCvo0d hITfSxFGQGEJMo8453yMiBpMXRd5GwrYKcna2ePidia7KwVVrlZv3SDnXvCVNWH9cuCy pV7WKagucImAiXK/bXUdCmdCoPEY4IDsbKJIadDHnNDio+nM7UJKa1a7PFABjiEX35vP 2tGquwcPsYuO3yymc6HNp39zfAt9dHhl0ta1f8F4r8uGX/nlyB7jfsqn8GIT+B1USmC8 aLVQ== X-Forwarded-Encrypted: i=1; AJvYcCXZcntOjGliER7Jlj2iRbLI2WQjrv7Or2Luzknf4cjYvVVXpQQ1CZreapRqO3gtAAreZa9hfFNQgg==@kvack.org X-Gm-Message-State: AOJu0YySSiKMh24lmyYLsyEIPg5cJ+Wjc6xPQJul55ohqAEWmBiZWO2E Ht+2CVKo6gr82mnDrQ8Pkm/chMIFJTvvpTZC/4QOLnsT9J76l4QBqmkSn0eiiXgsWl2r41Gz/E8 uOjsAclwis2MD1upg+UseebvGxs8= X-Google-Smtp-Source: AGHT+IF5RIcl9161jr1QBTDKzzyt9nukgZq5RXyRyoAPSJy78RdLWhVzSFLWkidSrwMPtleb3JKBnV2qgyROzy04aOE= X-Received: by 2002:a05:6402:4416:b0:5ce:faa5:c038 with SMTP id 4fb4d7f45d1cf-5cefaa5c1afmr3351138a12.28.1730992032437; Thu, 07 Nov 2024 07:07:12 -0800 (PST) MIME-Version: 1.0 References: <20241106221434.2029328-1-joshua.hahnjy@gmail.com> <20241106221434.2029328-3-joshua.hahnjy@gmail.com> In-Reply-To: From: Joshua Hahn Date: Thu, 7 Nov 2024 10:07:01 -0500 Message-ID: Subject: Re: [PATCH 2/2] memcg/hugetlb: Deprecate hugetlb memcg try-commit-cancel charging To: Shakeel Butt 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Queue-Id: A499DC0026 X-Rspamd-Server: rspam11 X-Stat-Signature: inhkpc9ra8kjhgn96zip6be36kobzj5h X-HE-Tag: 1730992018-437599 X-HE-Meta: U2FsdGVkX1/k7WmfbSTOaQ3Kugm0LwSj+/T63ctOnDtckVM0NPDAF+Srk3Y7Qkg8VdH46s8l9PIXbQSUNerNcD37eWEqIrOeHGJrKrgw4YM5WfBDktdGvJ4yA/A6BWdJWe6Ti1ur7TOG9G4ru7YxhztoNCTPBUAA1n0627FYugBuRlVnnIS/j4D7GxV4o8WJitN43VrXDFZFaByoyKs6/lS53MePDBFwNAlnWKuA91mTKPlxbU6wcHoyy1QH2iekmFNj48snSA+QvHzYOcl9ocRIN5wl6rGJMf63bKT4Ag9597xdMcp+MoA2Omu7cPud0mASMcaCoX/RWBXUdZJn+C2NkXIiLTd5twARhGPm/CZ+UWfhDL43Ih63I3tY3BmkrZc/ZGF7wSNpl00oWeccgYfI8nJkDWoJKnipI1BXKRRinRT6c5pJhds3JtYwl4aIfYisIJxSRpmaLDQNm9IGnOMEUzen3BtswdUqW8cqiXCZhtdY/DTUb43n8Ndre635rW1hj0CtgYY6qPsP6xomODMnOU6bqVl+2z4bTe9F3Lw9s4B8qOe4/QKuDrZO1f46pyY1ds9U5VKNkVFB9gl0CupVp+6NcGJr+EL96quRKuTVNSPGWoXmhlZkqKMgENThP3xuckQToLMJJvt4aRnozMeOPUvqGn3L+a/7ZaOaWOa/1a7UaWuGp+Hir/0cnyQO46bOWMs/gD+PNhqeZzBLpda3Wy//zBL4oWjqKQrfxORKqx+ARGOnHEAdriXx92HP/aZakzB0JgUtRDvBf5VVSUybGFzOks+oZTw4l1LYWX0C+MW8fhqMPPyaLZEhkYdCG3CjIYagILzYMJ99fWkIugfec1vEdV8JqxUAfjnDwdo7Ht0EKrwulXe03oUxjwPkfxGOsPpud1mZHEGciIT5dzrbfWNUr8F777iBmhcM+uvytAQoOJ4OFD3GtSm3kH79OdJQ4/OpdmNvodG0qPN lIP+oETH ED92U4hyhleaW2qG5jcAWZ+MqP96vBtaDEqBfgN5DtB93gOOkYcllHP2brzFog16Q1qcNcrxDr9cjjmNxAvVXVzUgb8KYg9MSFKa5hqzza/+N8ttOzWoHYh2/nt9hIj3J441mrGjcQUlYbuJjkq++WO7NYK8YldGLBeP5rhbjLENmn89FILxx9VINnqt/YF35+CeYKM4Nc4mWCJfJ/pIRuJRA/bTqVZavdbfq37ObVXUqPznXfyQWOryy+rBT4XlC3Kglqc96P5lU+v33Z73/xBzyeVZtXHIx5js35JZVR2YF/0sO15gSz7nhYTKEnPJcSj0PlKJNRHOtDw7aEMon3tpl3rzY619h83c/ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000929, 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 6, 2024 at 6:50=E2=80=AFPM Shakeel Butt wrote: > > > > > -int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, > > - long nr_pages); > > +int mem_cgroup_charge_hugetlb(struct folio *folio, gfp_t gfp); > > Please cleanup mem_cgroup_cancel_charge() and mem_cgroup_commit_charge() > as well as there will be no users after this patch. > > > /* > > * Processes that did not create the mapping will have no > > @@ -3056,6 +3044,12 @@ struct folio *alloc_hugetlb_folio(struct vm_area= _struct *vma, > > /* Fall through */ > > } > > > > + ret =3D mem_cgroup_charge_hugetlb(folio, gfp); > > You can not call this with hugetlb_lock held. > > > { > > - /* > > - * If hugetlb memcg charging is not enabled, do not fail hugetlb = allocation, > > - * 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) || !memcg_accou= nts_hugetlb()) > > + struct mem_cgroup *memcg =3D get_mem_cgroup_from_current(); > > Leaking the above reference in error paths. > Hello Shakeel, Thank you for your feedback on this patch. I will implement the changes you mentioned in both patches. As for the comment on the other patch about replacing the accounting check in mem_cgroup_hugetlb_try_charge, I think this makes more sense. I will move the code from this patch to the first. Thank you again, have a great day! Joshua