From nobody Sun Dec 14 19:12:20 2025 Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B6FD2288CB; Wed, 11 Dec 2024 20:39:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733949596; cv=none; b=eWq7hKqe4pq5Tdl0HOjDdxrouwg5ARdXSJWXuHbIHOAieWkODk9VeEOfGengk5qxZjNVMgtRXiQcHa7b/1vUv71/2oLJQzjtvF/samiaNYbYlM98GLGRsdheSOvOdrbIToBT0pXsj/0aslTF2feNRgy0PYW6Pp2JjfaL9efRntE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733949596; c=relaxed/simple; bh=vYKGqCrghO03UwSp2whEgKHoH6CDYHYyd59nBm5u0x8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lFOjlpuI8AZEb4rHzJfRtHoQKitJsgPyq91H2wCYA5wnzBXd1RFG5XYrc4CKKKsOqBlPlueWEs8gWTnZeY6KFHCtSDFUr1Qmz/DBi+1qC0wsJROYz9tzBprTuO6ycGnFMkCiwOYaUchF0PYwE0uAkLnu6z7m/sTfe/K2hjc87U8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fwE6kdvC; arc=none smtp.client-ip=209.85.128.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fwE6kdvC" Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-6ef7f8acc33so65629687b3.1; Wed, 11 Dec 2024 12:39:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733949594; x=1734554394; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T/fpH6v9netOl4stZyFABUBGIIZaGTv9D9Clx9j8z/8=; b=fwE6kdvC1zUoSH91oyuGR51pQ/8Rvz3ooQoZ8m6xtcW1cPd66k14iJ6IBw641L7wkV COL/yALJKUwsnyBYQ8eTI+CxiziGnZySCUmg7xpSJUjSv8Xqxx19KaLswLixhfnj9pEW uKoZulEtqsFR2uL8WlBXoW+NPdh+HXLK0jselxEprjZd4OSjLmYWKFtOZ1oDAameZMdP v9/l+vNam9zuzwswNHJxupbDU6dfuYZ+DqlXWCX86clpmFhaJDsK6bXeJV57POoqFCIh rpeSlwjGW7eGE9OyCgpNErh/ShbZq3ub57mWmqRoXggjR85GIaJ3CU7m/f9htO5M9eWG mTtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733949594; x=1734554394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T/fpH6v9netOl4stZyFABUBGIIZaGTv9D9Clx9j8z/8=; b=HSBazGChW2mLPZi3+RZ7++E8AcBz6/Q56V2WpmDCWe9w3gvbzBIfVb1h/rEwArv9lc yx4hlPOUEUJJaMiTkJ7ZxdbVL4pPsq2olbaxQA3IY6Zy4dd1C+H4ZnlKVEoIsxIahUjD qE0eWfm/Vseg+SGHMksoPrRiINuMTs6POsPnCuBERyIiBZ250ww3pD7tjFgn81gUgEup Cmo0/ZU4Q7o49pPgZTJeCmPObGOB44EVCiK6WoF1z3NoDDyn9Cv/TPsc73+tjJ2O15oN 0YcRQqQmJwN6G2CvNdhChPDTbKBTIphYgoN/8Eu9bakew8J3wU0Lsnfbbdr6KU0UOs6v ahvQ== X-Forwarded-Encrypted: i=1; AJvYcCUB/0vvGvYpM9f1DNU24zSSuBQOf66AMJfvGcVhQCyNTRR9u+06/XLmLrOKHOCS8tVBJm0sDOgT@vger.kernel.org, AJvYcCWdX8+DBzMjOH9miE7YZLqHf+0JwlR1saHAxrVcnDS9cFZtfWInaT26pQZ+3jUTdAxu/apBRse99CujKhv2@vger.kernel.org X-Gm-Message-State: AOJu0YxhSN5xk2AKjcJHpXSCcKORo4fOkJSUZZLTVOFR5l0KbVZI6Jde EVwlHh3VdN1p5U1wRD/+YqEoZieS+2o8KCeXWH1VBUpXhMX4t/rL X-Gm-Gg: ASbGncs0ibqrzmLwBNvdmudii2TqevkVL44jB9RQJklSGCddFKpp+GyKLKdpCi+hIIi PXScREqhAf1uLlDTr2qGo04TLR7j+cVx1hlSR0VtDuUsrozza/ogLobKzDhgSDA61MlkGnalcRS am3B1th/Ut0UCYKkQ9X8Px8iYt9j3FhoZznZyupYmbqKAmEziilEaDeZN7rHPcZIQawrU6xHVTy RrZAuDmfurg74CsLStmn7Su7M3rvs7M6Av4Ykvo5GH5ZawbZZu0T7KkWk7yiTGE9stEgvyebkEQ cFIvoFkHQQNUMg== X-Google-Smtp-Source: AGHT+IFjh1B7FesLgwVZ8NbRhB6v4JhL21WCugQRgRvU5yKBoLTE4Ii4DA6DYdGbfcfCWzLWySHbVQ== X-Received: by 2002:a05:690c:4c13:b0:6ef:6ec2:ac62 with SMTP id 00721157ae682-6f19e4f2690mr11106417b3.15.1733949593961; Wed, 11 Dec 2024 12:39:53 -0800 (PST) Received: from localhost (fwdproxy-nha-006.fbsv.net. [2a03:2880:25ff:6::face:b00c]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f14cebffeesm4012597b3.126.2024.12.11.12.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2024 12:39:53 -0800 (PST) From: Joshua Hahn To: shakeel.butt@linux.dev Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, sj@kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [v3 PATCH 1/3] memcg/hugetlb: Introduce memcg_accounts_hugetlb Date: Wed, 11 Dec 2024 12:39:49 -0800 Message-ID: <20241211203951.764733-2-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241211203951.764733-1-joshua.hahnjy@gmail.com> References: <20241211203951.764733-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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-off-by: Joshua Hahn Acked-by: Shakeel Butt Reviewed-by: Nhat Pham Suggested-by: Shakeel Butt --- mm/memcontrol.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7b3503d12aaf..b25eab9c933e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1448,6 +1448,18 @@ unsigned long memcg_page_state_local_output(struct m= em_cgroup *memcg, int item) memcg_page_state_output_unit(item); } =20 +#ifdef CONFIG_HUGETLB_PAGE +static bool memcg_accounts_hugetlb(void) +{ + return cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING; +} +#else /* CONFIG_HUGETLB_PAGE */ +static bool memcg_accounts_hugetlb(void) +{ + return false; +} +#endif /* CONFIG_HUGETLB_PAGE */ + static void memcg_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) { int i; @@ -1469,7 +1481,7 @@ static void memcg_stat_format(struct mem_cgroup *memc= g, struct seq_buf *s) =20 #ifdef CONFIG_HUGETLB_PAGE if (unlikely(memory_stats[i].idx =3D=3D NR_HUGETLB) && - !(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING)) + !memcg_accounts_hugetlb()) continue; #endif size =3D memcg_page_state_output(memcg, memory_stats[i].idx); @@ -4540,8 +4552,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)) + !cgroup_subsys_on_dfl(memory_cgrp_subsys) || !memcg_accounts_hugetlb()) return -EOPNOTSUPP; =20 if (try_charge(memcg, gfp, nr_pages)) --=20 2.43.5 From nobody Sun Dec 14 19:12:20 2025 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06D5C20B814; Wed, 11 Dec 2024 20:39:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733949597; cv=none; b=vERLb6nDFrExDxcYZwsm5R521GbrA3pW891O0lBL/z9GvvwLjmAe/eRL8+vuOQOqJzqXElx+Qou1rfq2pPDbqD5OrNGleYC7QCzLLI0FzFFYWFmVQlNHK3s8zQZC6aAIV7/gRNMB6s2cZW1yAj43BilAfL8Y3FknrBU9U2kxlTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733949597; c=relaxed/simple; bh=AMF98hLGCzXV3uQ3vwmyZ1DrjpwjRU+6QG+eTj8OkyQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VlC97Y34wOzi8e8yox7XRsOQtKxWRH0+ZBwvddJ5lLJ1vjDDx6MSRsxLMwqcKSu+E7qUNUDqYoe0yRKBL3rKeTwx+BzCx3/rncHYpZKq+rlOzdjoVMuZZBCHbXLkwJIB9ppPCOk7nchIshAsDTH90UoGX1LNqGAzhwuKVPahCZk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FaRYoimu; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FaRYoimu" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-6f006748fd1so38519667b3.3; Wed, 11 Dec 2024 12:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733949595; x=1734554395; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=etyn39dYkYYqxl1MOdPR2a9G+AL/gyYbItp4iRGm6Gk=; b=FaRYoimusqmsan+E3uZILZalhaW3MwCstftpzKwPlgm8N3BKS4dtfQA9IfYi2KupGp tLIwMDKb1yoTNpxbv+fKf1jRWUB1LuF5SpD5P4DjhNIXvXISQoBdaFeV+vcQrfrm2nF7 /mIhROytpmmWpZ6hUpQ4Fngx3EdrdqqLFSz9siulqretWHG4ua85Uoadx1hU1Ct6e6hB 4/GgwYf3cd0Il6xwtzCG5rgsmK3l25eBQki0r2/ZNtmqJV68AlvDt6spstq+D9IZrwvX BnxMkV61o86uDIvlD3hcGy+nR4pRkyq9dV02FAJMYeR01Prm/YBsmCYmJ0elq+wj77P2 jlSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733949595; x=1734554395; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=etyn39dYkYYqxl1MOdPR2a9G+AL/gyYbItp4iRGm6Gk=; b=pBjfxC5ssdtDvdsElI0mJtfSHNdxMaP7ctaKwf8vqdcf01uWrc5qnuIB+ld38/hJjK MPyQ+arvlQYfbhSrrsapYhgPyoNxhqo8KDRL+uqwtNmSd3r9X8yKGGpOTZtmUK/WDTga hUTIHNMJRRhuqdMmHdpq2M+OdWBRQxrw2bPCFtqdNTgmPgk6YqIwc30q869CB4+9zDWP M8Wpait7nShomsIr+QWIoAwUhr6/xz1GiVz2OgzpmC+YB4g3J+Tca1JY0qPMATCn7oNj jrA4J0sjZ6YrAr9ybkGHJzK6vnR9M7qJhMw13J8yrq75vDF4V/cIxvkE6HNt6jHl/HB6 ADkw== X-Forwarded-Encrypted: i=1; AJvYcCVRd58fG0eACnAwVQXyU0Ebgeq6Y3TtUyspfMbRZiW/r2euo262zTWS42exC/KGijcAiNF3Txlb@vger.kernel.org, AJvYcCVWtzY3YiotIFaFXswtOMcJ4XJqIuNHuVa+NXXG+AXQvvFfWIdv8Xyes0X8tH5xyPGL25c+jYu1cXb8ZzUv@vger.kernel.org X-Gm-Message-State: AOJu0YyT1FoYvcGKuaveASX210c6hZAiaoFhT04G7zmjet5drg94zLPZ fu4DPtilNyUSqr8rc7VdNs2/ZMhAhTRbnC8VcZYAbZc72O/5lCJA X-Gm-Gg: ASbGncsLIwr9xlShCW04N3v5kfhfT4PjhLUPmei6Vg8sQAlzq5plg3jPcrILcxg/xPC GkSkMq0wnaLzNQXWIoKc4N5Zp6VsuJgWZ5UiI3fLp+b933EbxyD/BBEwLvmoTMVeCvwfsH8ujoI fsQdtI/SffC0J4ub0vP1n6xYmhcX3cm/N2hjXec4QrQlMQN/V9+zi2zROR3GKuQqo75L9sriPLV jr6GO2fGKKFV18sge9aIMR7BgiPNPHqmKCp7iiZYvNBMyPWLMakLUWHt/f8y3ScglZrCuN9if0i fVKVPvxaN2hyRg== X-Google-Smtp-Source: AGHT+IHiKNGpDGljLutgpDps2QixRf6dKOvZDYWteW4cFSGFlQb0IBB4jIkNpQKhnKnsth+eROjXLA== X-Received: by 2002:a05:690c:9a01:b0:6ef:7312:d05c with SMTP id 00721157ae682-6f1a4f68714mr11743177b3.2.1733949595078; Wed, 11 Dec 2024 12:39:55 -0800 (PST) Received: from localhost (fwdproxy-nha-010.fbsv.net. [2a03:2880:25ff:a::face:b00c]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f14cebffeesm4012667b3.126.2024.12.11.12.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2024 12:39:54 -0800 (PST) From: Joshua Hahn To: shakeel.butt@linux.dev Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, sj@kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [v3 PATCH 2/3] memcg/hugetlb: Introduce mem_cgroup_charge_hugetlb Date: Wed, 11 Dec 2024 12:39:50 -0800 Message-ID: <20241211203951.764733-3-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241211203951.764733-1-joshua.hahnjy@gmail.com> References: <20241211203951.764733-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch introduces mem_cgroup_charge_hugetlb which combines the logic of mem_cgroup_hugetlb_try_charge / mem_cgroup_hugetlb_commit_charge and removes the need for mem_cgroup_hugetlb_cancel_charge. It also reduces the footprint of memcg in hugetlb code and consolidates all memcg related error paths into one. Signed-off-by: Joshua Hahn Acked-by: Shakeel Butt Reviewed-by: Nhat Pham Suggested-by: Shakeel Butt --- include/linux/memcontrol.h | 7 +++++++ mm/hugetlb.c | 35 ++++++++++++++--------------------- mm/memcontrol.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 21 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 5502aa8e138e..f4271cfdba92 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -649,6 +649,8 @@ static inline int mem_cgroup_charge(struct folio *folio= , struct mm_struct *mm, int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, long nr_pages); =20 +int mem_cgroup_charge_hugetlb(struct folio* folio, gfp_t gfp); + int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *= mm, gfp_t gfp, swp_entry_t entry); =20 @@ -1152,6 +1154,11 @@ static inline int mem_cgroup_hugetlb_try_charge(stru= ct mem_cgroup *memcg, return 0; } =20 +static inline int mem_cgroup_charge_hugetlb(struct folio* folio, gfp_t gfp) +{ + return 0; +} + static inline int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry) { diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ea2ed8e301ef..f0f0ffae30a3 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2967,21 +2967,13 @@ struct folio *alloc_hugetlb_folio(struct vm_area_st= ruct *vma, struct hugepage_subpool *spool =3D subpool_vma(vma); struct hstate *h =3D hstate_vma(vma); struct folio *folio; - long map_chg, map_commit, nr_pages =3D pages_per_huge_page(h); + long map_chg, map_commit; long gbl_chg; - int memcg_charge_ret, ret, idx; + int ret, idx; struct hugetlb_cgroup *h_cg =3D NULL; - struct mem_cgroup *memcg; bool deferred_reserve; gfp_t gfp =3D htlb_alloc_mask(h) | __GFP_RETRY_MAYFAIL; =20 - memcg =3D get_mem_cgroup_from_current(); - memcg_charge_ret =3D mem_cgroup_hugetlb_try_charge(memcg, gfp, nr_pages); - if (memcg_charge_ret =3D=3D -ENOMEM) { - mem_cgroup_put(memcg); - return ERR_PTR(-ENOMEM); - } - idx =3D hstate_index(h); /* * Examine the region/reserve map to determine if the process @@ -2989,12 +2981,8 @@ struct folio *alloc_hugetlb_folio(struct vm_area_str= uct *vma, * code of zero indicates a reservation exists (no change). */ map_chg =3D gbl_chg =3D vma_needs_reservation(h, vma, addr); - if (map_chg < 0) { - if (!memcg_charge_ret) - mem_cgroup_cancel_charge(memcg, nr_pages); - mem_cgroup_put(memcg); + if (map_chg < 0) return ERR_PTR(-ENOMEM); - } =20 /* * Processes that did not create the mapping will have no @@ -3092,10 +3080,18 @@ struct folio *alloc_hugetlb_folio(struct vm_area_st= ruct *vma, } } =20 - if (!memcg_charge_ret) - mem_cgroup_commit_charge(folio, memcg); + ret =3D mem_cgroup_charge_hugetlb(folio, gfp); + /* + * Unconditionally increment NR_HUGETLB here. If it turns out that + * mem_cgroup_charge_hugetlb failed, then immediately free the page and + * decrement NR_HUGETLB. + */ lruvec_stat_mod_folio(folio, NR_HUGETLB, pages_per_huge_page(h)); - mem_cgroup_put(memcg); + + if (ret =3D=3D -ENOMEM) { + free_huge_folio(folio); + return ERR_PTR(-ENOMEM); + } =20 return folio; =20 @@ -3110,9 +3106,6 @@ struct folio *alloc_hugetlb_folio(struct vm_area_stru= ct *vma, hugepage_subpool_put_pages(spool, 1); out_end_reservation: vma_end_reservation(h, vma, addr); - if (!memcg_charge_ret) - mem_cgroup_cancel_charge(memcg, nr_pages); - mem_cgroup_put(memcg); return ERR_PTR(-ENOSPC); } =20 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b25eab9c933e..c903e260a830 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4561,6 +4561,40 @@ int mem_cgroup_hugetlb_try_charge(struct mem_cgroup = *memcg, gfp_t gfp, return 0; } =20 +/** + * mem_cgroup_charge_hugetlb - charge the memcg for a hugetlb folio + * @folio: folio being charged + * @gfp: reclaim mode + * + * This function is called when allocating a huge page folio, after the pa= ge has + * already been obtained and charged to the appropriate hugetlb cgroup + * controller (if it is enabled). + * + * Returns ENOMEM if the memcg is already full. + * Returns 0 if either the charge was successful, or if we skip the chargi= ng. + */ +int mem_cgroup_charge_hugetlb(struct folio *folio, gfp_t gfp) +{ + struct mem_cgroup *memcg =3D get_mem_cgroup_from_current(); + int ret =3D 0; + + /* + * Even memcg does not account for hugetlb, we still want to update + * system-level stats via lruvec_stat_mod_folio. Return 0, and skip + * charging the memcg. + */ + if (mem_cgroup_disabled() || !memcg_accounts_hugetlb() || + !memcg || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) + goto out; + + if (charge_memcg(folio, memcg, gfp)) + ret =3D -ENOMEM; + +out: + mem_cgroup_put(memcg); + return ret; +} + /** * mem_cgroup_swapin_charge_folio - Charge a newly allocated folio for swa= pin. * @folio: folio to charge. --=20 2.43.5 From nobody Sun Dec 14 19:12:20 2025 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E5672288EF; Wed, 11 Dec 2024 20:39:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733949598; cv=none; b=cjoXnkhcb8svgR7alZJOkMU9srY+OzVunUfCl4AGpvMzCpiNa34lB0YL6j0WcRavjS+508DcrCUt3AifRh7T69gS6lOcdRyT6IYph1eXNZwHnkgk2f58qumBhflOiXX3q6wIam+GVhTzXdSEtjPJlIJ5SProIeCphMdYeZ2Z8qI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733949598; c=relaxed/simple; bh=WLwynhVDcI3vfVE61poQ/NqrgK1s6dKzdDUa9svjbqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j24RWxn6879BqahRaFFdrrBYT0VJ8cFFeJIAnlWnpyjp+CM7pKNCqUE7mMOG5aKuNwHjtYHTMhBJhlxrpftX9i3q0skDrrJOw1U7YPb2mBI8uV3GC0y025632IrIYqHB4SYtN3lsknNROYSIj48pp97KAP0MVeyCIHPLF09BV+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=guaxL6dW; arc=none smtp.client-ip=209.85.128.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="guaxL6dW" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-6eff4f0d627so41036667b3.1; Wed, 11 Dec 2024 12:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733949596; x=1734554396; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TB7w562sxA4ON1zeYB8I14khwhTIPTHUGFUW2mmo+w4=; b=guaxL6dW80b2SmMCzEUCOSqmpk6W12+0A7jCKqn9YGO1OfMlPdKgR9fh1s1LpnvjKR B+rg9KU8fYez1ca2nnFtQi4+ka57Q4HTdcFo2H1h4BjxWiQbtZhK+jKWjnac5nTa9s3F t9sLYyMxJUiL77dBtouo6MaFwsjwlBA+lveapOLBIX93rKtP8KRZrWr5ra3ObnxwUQKQ uuXoOgE/OXZQdjb60e2fcCRM5MpvoZSv9rgMEsR8Q4PU+nl+J0A9szgkrStsBq3wGinu ceIVT0pCmF5j1d7c+cdJ82Pjv5iN2L1OgGAGKoa7N+V8uiJ6Ny5f8klu9s1Won/3L4PD Wb6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733949596; x=1734554396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TB7w562sxA4ON1zeYB8I14khwhTIPTHUGFUW2mmo+w4=; b=iplAcdA6RcNkGSoOERDRmW/1vU66EH8Sq43n9AGsT5CIN1kkA6CrWb2lpAD7U32flu 9YcNGzEGt+beT3VN3xcITSGxayUTs/5smT0WSweKfO86awshiIJks67I6jmdj59VVFSF 8UrsepMq1tJoDZCxjP86Qdu2lVb6EjkaWbPS6N5y62nm9DifvcGGWUrCDi2CXkk89P3u KMwISFyWFQtYRdzmdDhKUmdh9RyRzgNk+EHoiIr4lE4MvtmBOUFf44P01+JDJQqJrzwE rojQOwO9/w4CSPBjf3HA2khJlsXxP0FWIWZSe72Oe3bchtWjlFur7f1KaUUmYVSlNCu3 1wZQ== X-Forwarded-Encrypted: i=1; AJvYcCUn70iFr2n4d1LMMZkWXYAfiShKKuz2cE1N7yUHO6KBf8Jay3jaaZzypTLEvO/oCKbPD6flI+Dq1ttdzUsa@vger.kernel.org, AJvYcCXEETj4IzzhsBDc3IXYSeB5u53LWD1aD7AfPA8rWuByjAZuafyaTCTm7SjbAww7qkpw0tI0sWHU@vger.kernel.org X-Gm-Message-State: AOJu0YwtfMdVSgMd5IPTqkh3W2ZrSl9Q/YPxBgnuZx2rKW32TD+dRyBP SoSES9jPNUj/po283+RvQ4mHQCsKtuOLZHZ9E3PnrdlKP05dilMW X-Gm-Gg: ASbGnctdvUe/u0tOEASX5Td2fwivnRmJ25YV7/3+TlQuidho5xKaw6XNJry9vO4bko+ NE0VuM+tf0FQU477rrf8VUBtrKz5/Ir2bqScl+dSzGcTGttjIQaFaYfssOLivhGYwEfdSeVvYhM jVqd2uVwKTcXuCw2xEWtCPWMM0w8A3yTL5Gq4pzUGM8vpbgFWmsrG+P446elW/agWPSd6GHN4jA aJWavedpMFxYn0hZoDOPNisN1oN5KD9nmZRv9XVmPrXD3h5EkGwmWPgpEQ0PauVkNsp6ydi9uJC Luy2Y4bMMRVR0w== X-Google-Smtp-Source: AGHT+IHKldzU41mVArIiVR43SbQPj9lPuiGmJL7kSl+CvnB5gG8KxKv/VPEhLHgXKWwXvwNSDfRJ8g== X-Received: by 2002:a05:690c:6610:b0:6ef:504e:a50a with SMTP id 00721157ae682-6f198a3cf33mr14425157b3.2.1733949596093; Wed, 11 Dec 2024 12:39:56 -0800 (PST) Received: from localhost (fwdproxy-nha-002.fbsv.net. [2a03:2880:25ff:2::face:b00c]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e3c94b436f9sm455633276.42.2024.12.11.12.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2024 12:39:55 -0800 (PST) From: Joshua Hahn To: shakeel.butt@linux.dev Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, sj@kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [PATCH 3/3] memcg/hugetlb: Remove memcg hugetlb try-commit-cancel protocol Date: Wed, 11 Dec 2024 12:39:51 -0800 Message-ID: <20241211203951.764733-4-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241211203951.764733-1-joshua.hahnjy@gmail.com> References: <20241211203951.764733-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch fully removes the mem_cgroup_{try, commit, cancel}_charge functions, as well as their hugetlb variants. Signed-off-by: Joshua Hahn Acked-by: Shakeel Butt Reviewed-by: Nhat Pham Suggested-by: Shakeel Butt --- include/linux/memcontrol.h | 22 ------------- mm/memcontrol.c | 65 ++------------------------------------ 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d1ee98dc3a38..e1a9998d8add 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -620,8 +620,6 @@ static inline bool mem_cgroup_below_min(struct mem_cgro= up *target, page_counter_read(&memcg->memory); } =20 -void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memc= g); - int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t g= fp); =20 /** @@ -646,9 +644,6 @@ static inline int mem_cgroup_charge(struct folio *folio= , struct mm_struct *mm, return __mem_cgroup_charge(folio, mm, gfp); } =20 -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); =20 int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *= mm, @@ -679,7 +674,6 @@ static inline void mem_cgroup_uncharge_folios(struct fo= lio_batch *folios) __mem_cgroup_uncharge_folios(folios); } =20 -void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pa= ges); void mem_cgroup_replace_folio(struct folio *old, struct folio *new); void mem_cgroup_migrate(struct folio *old, struct folio *new); =20 @@ -1137,23 +1131,12 @@ static inline bool mem_cgroup_below_min(struct mem_= cgroup *target, return false; } =20 -static inline void mem_cgroup_commit_charge(struct folio *folio, - struct mem_cgroup *memcg) -{ -} - static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp) { return 0; } =20 -static inline int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, - gfp_t gfp, long nr_pages) -{ - return 0; -} - static inline int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry) { @@ -1172,11 +1155,6 @@ static inline void mem_cgroup_uncharge_folios(struct= folio_batch *folios) { } =20 -static inline void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, - unsigned int nr_pages) -{ -} - static inline void mem_cgroup_replace_folio(struct folio *old, struct folio *new) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c903e260a830..7ddbb2d12eb9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2383,21 +2383,6 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t= gfp_mask, return 0; } =20 -/** - * mem_cgroup_cancel_charge() - cancel an uncommitted try_charge() call. - * @memcg: memcg previously charged. - * @nr_pages: number of pages previously charged. - */ -void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pa= ges) -{ - if (mem_cgroup_is_root(memcg)) - return; - - page_counter_uncharge(&memcg->memory, nr_pages); - if (do_memsw_account()) - page_counter_uncharge(&memcg->memsw, nr_pages); -} - static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) { VM_BUG_ON_FOLIO(folio_memcg_charged(folio), folio); @@ -2411,18 +2396,6 @@ static void commit_charge(struct folio *folio, struc= t mem_cgroup *memcg) folio->memcg_data =3D (unsigned long)memcg; } =20 -/** - * mem_cgroup_commit_charge - commit a previously successful try_charge(). - * @folio: folio to commit the charge to. - * @memcg: memcg previously charged. - */ -void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memc= g) -{ - css_get(&memcg->css); - commit_charge(folio, memcg); - memcg1_commit_charge(folio, memcg); -} - static inline void __mod_objcg_mlstate(struct obj_cgroup *objcg, struct pglist_data *pgdat, enum node_stat_item idx, int nr) @@ -4510,7 +4483,9 @@ static int charge_memcg(struct folio *folio, struct m= em_cgroup *memcg, if (ret) goto out; =20 - mem_cgroup_commit_charge(folio, memcg); + css_get(&memcg->css); + commit_charge(folio, memcg); + memcg1_commit_charge(folio, memcg); out: return ret; } @@ -4527,40 +4502,6 @@ int __mem_cgroup_charge(struct folio *folio, struct = mm_struct *mm, gfp_t gfp) return ret; } =20 -/** - * mem_cgroup_hugetlb_try_charge - try to charge the memcg for a hugetlb f= olio - * @memcg: memcg to charge. - * @gfp: reclaim mode. - * @nr_pages: number of pages to charge. - * - * This function is called when allocating a huge page folio to determine = if - * the memcg has the capacity for it. It does not commit the charge yet, - * as the hugetlb folio itself has not been obtained from the hugetlb pool. - * - * Once we have obtained the hugetlb folio, we can call - * mem_cgroup_commit_charge() to commit the charge. If we fail to obtain t= he - * folio, we should instead call mem_cgroup_cancel_charge() to undo the ef= fect - * of try_charge(). - * - * Returns 0 on success. Otherwise, an error code is returned. - */ -int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, - long nr_pages) -{ - /* - * If hugetlb memcg charging is not enabled, do not fail hugetlb allocati= on, - * 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_accounts_hugetlb()) - return -EOPNOTSUPP; - - if (try_charge(memcg, gfp, nr_pages)) - return -ENOMEM; - - return 0; -} - /** * mem_cgroup_charge_hugetlb - charge the memcg for a hugetlb folio * @folio: folio being charged --=20 2.43.5