From nobody Thu Apr 2 19:13:53 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 63BBF21765B for ; Thu, 12 Feb 2026 00:37:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770856658; cv=none; b=OCYGoF04dthBI7ESdJyrOCFVgE2DgVij8kBQF6IAMJuyjHXB3swwnbvmu4K/Aud9kDLJssYsiCNfSMRNilVQPwbVmJVkasijS4+uQ2C3nqA9SjoVIhltMZIfVxqJOOHuARxiv8TeFSzvzViVCxtd3pvb1w2TlVURKvTaxvM+IcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770856658; c=relaxed/simple; bh=RqGxcJZMCajIzXX/cvMijNOKy/G5sjCpvWdZwU4g+HE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=StAyfjgQuWHm5aWWeuuTjZBKnphPwu3ijTzQjWSroYC0mDVM+wPaIN/s8L3rsAldyrN1zmbvfl32qTrlBVL+h8SfyTTeK0FOLq0qiWbuFI4deU9hqSMtZkYW6ZtA/VaQFEusR3ZHv51T9/uvPwPgQ33id24DtQdz4bVKqeokQoY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=x/FYOMuB; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="x/FYOMuB" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2a946c0e441so27685805ad.1 for ; Wed, 11 Feb 2026 16:37:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770856656; x=1771461456; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=h8YVk6TJ+SxHQqdzURW4gj7SpPw0Nw5yYajSbj7tT84=; b=x/FYOMuB5GDsbo57iSbAOXtFAC0qluTj8kubfQNweia5bAEHIJuYwOMKdvEqNq7DUm wp+6W1QEajixdBXFmFHvwQepmwg3JBJKxGpWc9pjP5N4aS4Zk9xYhdi2r1DFWGLEL1WP tpoTesl+y+voOzBBQ/Ei1/0YGomPC/DU4tX2FCe6VOmPTgxHSbs/xbRE9zSS+TYZZ91t meJKY7po7Z1BlF9Oxp+0Cw1hwJoCWM0QfxUJc3DRMSBZLCV1zhJb1xkvvd9VI8LGmqhn hSEILrJ9eWGqokoLWOfomclnoF+V+u/713YkUcQGgFsCO73V6HdKMInItBE/Q+otHFq1 MjuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770856656; x=1771461456; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=h8YVk6TJ+SxHQqdzURW4gj7SpPw0Nw5yYajSbj7tT84=; b=irO4K8vrE/bbEDu0ULZDUYguDSXfH+WlykngnTDPw3CCVdahzTQQg7+lSVqqstvywW 6yRgorDb+3czlm9QZFShiPjBaYlaYvjQOJVxQBjBmaCQgPpoYWCJ+/ru75GwIXAqYyMl p8NUswZWviQ95caaWNKZelG4ecA3yNgA1p5CXnv3FACLaX6TkHu0UtYMIIlkGvkMvxdl oxZNIF1xxqUq9ufinfig2Oq6zQbvtB2A64qlQ4uuFztUBEJRvOmeQhnxlQ1WpUkT42Rh C46BdO3iLdNxzefDLUQly2a0cyjg9CEM8w7Or5nvKpDIVtlq2KxQpHNvSsQfIPvudfPU omrw== X-Forwarded-Encrypted: i=1; AJvYcCXoy0h0eJDW6R2Pxisy1oJ9x7kUictI1D2Bd4ur1JbzUUkZa0vIy5MsLSOIaToLpFr+RSyys0RoRtTg4MM=@vger.kernel.org X-Gm-Message-State: AOJu0Yww5LG4YQg+PQvz8W6psfj2ULVIdc5NruGBBohMZa9hFWTFsv5P qs0XWomJXK5+kJMfyyB0YeBaat+LJxpao90YaR6yinFxUTunW/dm8BVfS3fSmOK2EwYVtnQI9WO LrlvjsCq7/6/hnaaKsloeojh2Bw== X-Received: from plok7.prod.google.com ([2002:a17:903:3bc7:b0:29f:2b44:973b]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f788:b0:2ab:1eef:0 with SMTP id d9443c01a7336-2ab3b2accc3mr5208665ad.51.1770856655751; Wed, 11 Feb 2026 16:37:35 -0800 (PST) Date: Wed, 11 Feb 2026 16:37:17 -0800 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <9b59772c1c06f6628d842d5d30f1f7777c621c90.1770854662.git.ackerleytng@google.com> Subject: [RFC PATCH v1 6/7] mm: memcontrol: Remove now-unused function mem_cgroup_charge_hugetlb From: Ackerley Tng To: akpm@linux-foundation.org, dan.j.williams@intel.com, david@kernel.org, fvdl@google.com, hannes@cmpxchg.org, jgg@nvidia.com, jiaqiyan@google.com, jthoughton@google.com, kalyazin@amazon.com, mhocko@kernel.org, michael.roth@amd.com, muchun.song@linux.dev, osalvador@suse.de, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterx@redhat.com, pratyush@kernel.org, rick.p.edgecombe@intel.com, rientjes@google.com, roman.gushchin@linux.dev, seanjc@google.com, shakeel.butt@linux.dev, shivankg@amd.com, vannapurve@google.com, yan.y.zhao@intel.com Cc: ackerleytng@google.com, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With the (re)introduction of the try-commit-cancel charging protocol for HugeTLB's use, mem_cgroup_charge_hugetlb() is now redundant. Remove the function's implementation from mm/memcontrol.c and its declaration from include/linux/memcontrol.h No functional change intended. Signed-off-by: Ackerley Tng --- include/linux/memcontrol.h | 7 ------- mm/memcontrol.c | 34 ---------------------------------- 2 files changed, 41 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 59eab4caa01fa..572ad695afa40 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -668,8 +668,6 @@ 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 @@ -1158,11 +1156,6 @@ 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/memcontrol.c b/mm/memcontrol.c index 70d762ba465b1..87d22db5a4bd3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4855,40 +4855,6 @@ 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.53.0.310.g728cabbaf7-goog