From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 A7C031D63D4 for ; Fri, 24 Jan 2025 04:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737693554; cv=none; b=MajOcCNp6oZqeUK0Hd2tuJXu/nLUS3/oqSihWbPnzWST/tTBh02rLwmr5cuZlkhBCz53AknjDsoB2wiazRWS85KHmGRqYK6JdNrtXiEAXBN3yghfio+57D0DLMrMukrZnEdzE7oVW75e8B2MNcrScdoZNifFncxKHq4rAknRVnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737693554; c=relaxed/simple; bh=PXg73LuFiGEKAa7Mt9lCJeMONLDawGYG3u6NrvTqFlA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LKVcDbageZulTtit/c99gynTslgCHw2MvvSP/CixfGvK4CLfU/0OE6BbVb10L4ck2lao4tYjNjnFSW1VjEZAIIZBSt4oeDHcHs6L7l+cf98hhYFTj8JDqCFPejf8HSBb06h2XdnlklbBRbx5zl6kMVm26gUpBSycHizBwEwA5aA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b=ahOTj5zq; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b="ahOTj5zq" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-6d89a727a19so28990296d6.0 for ; Thu, 23 Jan 2025 20:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1737693550; x=1738298350; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LA98XB9LYD/MipEPJEpEr2dcKbFDev2YEJD5nlY7UfU=; b=ahOTj5zq7WwXza76foPFPSTVQR7xim6MWJSkXCzanL5ZHlC1TCLZxIGVHZtLl3uGQn ZFAagHRq/ycYRRyoptTQbyPfCyOVZ6Wrg9qosq5ENn4+V9PpZB7Jotgnsl7km2wr7HR4 1MWfPqyGMajPOznouxhhGdUdMoob4ZB+mKKSs6/5WFnPJw1T8Gz+wRmw85CmrOmuBubj jteOtnQ9/h3nW+TahxKnQUf9C+GHTgBIu8M/2FVzyR4a9KqPifvt3QOrETtWt5QPvFRd KyDLvk+3lhzRvcbY5xmdkw/XR54qjA3UkOPIj249bvYG9aj8l5UtuRrlS0CHn/DXY82T oESw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737693550; x=1738298350; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LA98XB9LYD/MipEPJEpEr2dcKbFDev2YEJD5nlY7UfU=; b=maj6mtOweqd4Tz/2I4fCG/5X77kVQiUy6Q3oO7oJNtgE5a1d/7+pUIsD0cDWBK2Whx CLdjGZVuiF8l50MASf5jwkYa6QFRWjj9VoFaUiZn1LNEEpcypM5y0TL8cxpB6CTdt4Si obNpLa2GybdufXKOPwidg0zJKnxaZS+aTYqOKroJWuqnf9XdqTUSuOBc3PNPkOP5Qvyw wvsBRMkm8m0RyXTVVJBY/AbzNNC3B+W3snB2OtTS1h5n3yYdkhye1mes1m4RkuAe8MqT G4pRo6uPCWfdthqsnkXKMQCm1C3x/Y0C2VOYb6B+xiqB3yzOvV72jy0jmMBfm5nVBRZj pKNw== X-Forwarded-Encrypted: i=1; AJvYcCXF+xYs3qhWj8N064JmqEYt+XHyW6gGnWhvwmj40cJ/7Bjuc9CTfNj0MCWpLsuMTmXPW2fH0LAb6dHoRuU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywl5OwOFaeQGvBSq7IJCa8H2vltwu4BGUt4H0mEpKRZ7TwgTIgt 7+M9IkyJQRjFtcEZ9jTDfIEfxWOvdJ7hbgm11bDSakmwpipJ6tvYwVRRM6Yc+IrW0Gp2oFCm/Yy 2 X-Gm-Gg: ASbGnctIHoigoXKCXjRehcWrSN/eVWvt0t+1++blTzYPbBMxzGBN2wNZtmnDHWsgZJ9 DR5CQf1lmicDvTLI3sHTUabQjtQr1TtfgBufJ92rFpiiB7XDiLjsBy4NB247oGEve8DJtMVEtTs 8le4P46KxVTf65aPVnndMcwrcvAJmLumJBKwQiorW/IL9oTv5m9d8OZPLQjKmIcPu7k1hkCAxhE CTI4dMYpfXgIBfujDU8RC/d9DjGs01q1nstAW76uXwWIm4jxM/jsWewY28mPvELapZhoKteLbBT rNg= X-Google-Smtp-Source: AGHT+IFNV83+n81ZC7OSsymBf3rQHfUmDNRkj6S/SLoyQgdTGlbAJ2mV0G99gsb8+lXqSCYHJomFEA== X-Received: by 2002:ad4:5d4a:0:b0:6d9:2f70:2dab with SMTP id 6a1803df08f44-6e206253519mr36862156d6.16.1737693550460; Thu, 23 Jan 2025 20:39:10 -0800 (PST) Received: from localhost ([2603:7000:c01:2716:cbb0:8ad0:a429:60f5]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-6e2058c2b76sm5148046d6.107.2025.01.23.20.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 20:39:09 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] mm: memcontrol: unshare v2-only charge API bits again Date: Thu, 23 Jan 2025 23:38:58 -0500 Message-ID: <20250124043859.18808-1-hannes@cmpxchg.org> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6b611388b626 ("memcg-v1: remove charge move code") removed the remaining v1 callers. Signed-off-by: Johannes Weiner --- mm/memcontrol-v1.h | 15 --------------- mm/memcontrol.c | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 144d71b65907..6dd7eaf96856 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -7,21 +7,6 @@ /* Cgroup v1 and v2 common declarations */ -int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, - unsigned int nr_pages); - -static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, - unsigned int nr_pages) -{ - if (mem_cgroup_is_root(memcg)) - return 0; - - return try_charge_memcg(memcg, gfp_mask, nr_pages); -} - -void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n); -void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n); - /* * Iteration constructs for visiting all cgroups (under a tree). If * loops are exited prematurely (break), mem_cgroup_iter_break() must diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 46f8b372d212..818143b81760 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2198,8 +2198,8 @@ void mem_cgroup_handle_over_high(gfp_t gfp_mask) css_put(&memcg->css); } -int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, - unsigned int nr_pages) +static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, + unsigned int nr_pages) { unsigned int batch = max(MEMCG_CHARGE_BATCH, nr_pages); int nr_retries = MAX_RECLAIM_RETRIES; @@ -2388,6 +2388,15 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, return 0; } +static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, + unsigned int nr_pages) +{ + if (mem_cgroup_is_root(memcg)) + return 0; + + return try_charge_memcg(memcg, gfp_mask, nr_pages); +} + static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) { VM_BUG_ON_FOLIO(folio_memcg_charged(folio), folio); @@ -3368,13 +3377,13 @@ static void mem_cgroup_id_remove(struct mem_cgroup *memcg) } } -void __maybe_unused mem_cgroup_id_get_many(struct mem_cgroup *memcg, +static void __maybe_unused mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n) { refcount_add(n, &memcg->id.ref); } -void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) +static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) { if (refcount_sub_and_test(n, &memcg->id.ref)) { mem_cgroup_id_remove(memcg); -- 2.48.1