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 4A457C3600C for ; Fri, 4 Apr 2025 01:39:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5BB26B0027; Thu, 3 Apr 2025 21:39:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE5EF6B0028; Thu, 3 Apr 2025 21:39:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A84CD6B002A; Thu, 3 Apr 2025 21:39:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 865066B0027 for ; Thu, 3 Apr 2025 21:39:43 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 263231A1C4C for ; Fri, 4 Apr 2025 01:39:44 +0000 (UTC) X-FDA: 83294654688.18.ECA7842 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) by imf16.hostedemail.com (Postfix) with ESMTP id 6FD1C180003 for ; Fri, 4 Apr 2025 01:39:42 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GBGlTaaO; spf=pass (imf16.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.185 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=1743730782; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=x+VJqH57jlWrbThx984SIHQEcQAexzgLOXZKVlgElzs=; b=WpGZHljbfIxVm50QANqcuowRu6QpUO6pKNQaBsvUIERO1kLtddnLCwKxeUX77XFKP+jy2W WeQcy5b/FH+Z+i20fSybtnJK0j6a3dhAdOTXmmN7AavLF5FePjPLfxXfbSmpI1ShmI6Yor U36Y3G/nJOxz/PRTgS4v/Z4fAsnci6o= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GBGlTaaO; spf=pass (imf16.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.185 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743730782; a=rsa-sha256; cv=none; b=HSEXX8eOWqqiMaW1tdC7N4DuI8S+UvU0pCEsrFfWjwDWkGiTrRvXKzGhF5Wx1l5eFqxQXN 4qxeBSY1AxmPCJtpbb1FaHcxnb+C4xhT4F+CivRo0KacmrTicUJTO+ArqvCgUDukATCPIx xs4b0cRdPoXB5KT9LyhOM4qeG1g7Jmw= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1743730780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x+VJqH57jlWrbThx984SIHQEcQAexzgLOXZKVlgElzs=; b=GBGlTaaOzOic8e54sSOr6B4iFeU2rPT3sI99/sfkGEvhKiXeEyqfuK0bvpBaWdvsDxDQZv XelY9nVeMRu7iMo1LxItUpyalrLdPwSU0UJPnLhiXAd8eCnsIuNtfNLnp8wiOMwWOhEJ6W PyvcCmYAn1lsfiVMDrkkk3ensDKlTt4= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Sebastian Andrzej Siewior , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH v2 3/9] memcg: introduce memcg_uncharge Date: Thu, 3 Apr 2025 18:39:07 -0700 Message-ID: <20250404013913.1663035-4-shakeel.butt@linux.dev> In-Reply-To: <20250404013913.1663035-1-shakeel.butt@linux.dev> References: <20250404013913.1663035-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 6FD1C180003 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 15yxn3o8rkpqtrxne8zgipge7utzriw1 X-HE-Tag: 1743730782-163145 X-HE-Meta: U2FsdGVkX1+ewgS0/JpoYozn0p2+68g1Zxpcgb7lFRpaMDulAdnSBt5Z7whPNQxIXXw771ie3hj7WfV0otKNfvUN1ma4keVQ/v6teS77QOVzQC3KQ3HLs+KiqqoYunsP9JlBDILvzVA9l3wPhHm2XiinWyVTmynVMHaIjZMQfXEMCOmV7d5OXJXeC3DEvcKMIkXSOe2APYi21n6J4/DJkI07Q6LugjQoxGHtj+vvadUtrlMryurmHoIKAsCPy3EJTKmblKBUPX4ZcDMZul/Tb5PipD9M2WKGMW8hX06m41fOwlZtt8z6W59oJvINYsY0M7LyhBB34mqyUNC6MNHjTTyuQEbAoHFemjm897sdYtcvSOzeyIoqyp3HMAKdh4DJF/EvCJkT+SJXr0qKqdjRGddVNPd6OyqndsSF9gdDPkpx/nNUKY46pD9mzp4Xa/fBjmXt6dOJAQYKamAdC4NICb16G5OCiO0eb6MS1W22otXokja7yaTys0p2DQEnZnXUSpaf955yb/tiHgoD3In/YrFwf8fKVr4J0I1Eopy69jUHSeHKXw/CMel3yh+leZ0pmqbm2s9GK0VVwLdVgsBfCYLn0HQmdzzDPtZV+hNb5bazEmSisZPBLew3q2lo+6e3AYJEusTcJPk9MlK1EssxL2hIk18yYWTxbWdnTL0mGdm0n+13S08seGTR+1gdoS6WzygPskVr7Pw/s7YR04HJ+rT4YbC28N+xPUhdFSHKId2s3OIg71s+sWSXImJxHs2X3rSdBvm4+BOhy8izrhONGiD/ELnQBH4t+nz9r4iRDKFFh/lfEEQMkVRHYLnejIrzZnEwasngIXrXJWJGXS1b5tKlGXeGH0wPvYA+JhNc4MkRQzfCodPtgKLcka5Sa4d5QYqeYKbUVdTQ4UWOzfOv9p7Yv/n1kbQihL4w0y/GYa10GwNxKCaMcBqkhZlmPQP7x0RGuiUkL4VRjbWG2ZV fPbOtji2 PZCcqGmE5j0lWqA3NmTmDiazEZKOOEKolEfm8gaM3BauPKY7TQgfNRPflQ7xCrIpGvYMoATDqXGAkC6vRmdwYAn5ejWPT/mbOWd9Y1I5vBQFaaYcP1bN6Z1IrpzPUb9Mlstq1hyDbZ41TcHCfifi+T+8u7XYxlnXDE9gK0G4O3Tz+M1FLMozrOG+QufRMKLNkQQCH9ltHV+NCSBefNAt1dPcibaBmOhFlFbpI 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: At multiple places in memcontrol.c, the memory and memsw page counters are being uncharged. This is error-prone. Let's move the functionality to a newly introduced memcg_uncharge and call it from all those places. Acked-by: Vlastimil Babka Reviewed-by: Roman Gushchin Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 52be78515d70..dfb3f14c1178 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1822,6 +1822,13 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages, return ret; } +static void memcg_uncharge(struct mem_cgroup *memcg, unsigned int nr_pages) +{ + page_counter_uncharge(&memcg->memory, nr_pages); + if (do_memsw_account()) + page_counter_uncharge(&memcg->memsw, nr_pages); +} + /* * Returns stocks cached in percpu and reset cached information. */ @@ -1834,10 +1841,7 @@ static void drain_stock(struct memcg_stock_pcp *stock) return; if (stock_pages) { - page_counter_uncharge(&old->memory, stock_pages); - if (do_memsw_account()) - page_counter_uncharge(&old->memsw, stock_pages); - + memcg_uncharge(old, stock_pages); WRITE_ONCE(stock->nr_pages, 0); } @@ -1900,9 +1904,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) * In case of unlikely failure to lock percpu stock_lock * uncharge memcg directly. */ - page_counter_uncharge(&memcg->memory, nr_pages); - if (do_memsw_account()) - page_counter_uncharge(&memcg->memsw, nr_pages); + memcg_uncharge(memcg, nr_pages); return; } __refill_stock(memcg, nr_pages); @@ -2876,12 +2878,8 @@ static struct obj_cgroup *drain_obj_stock(struct memcg_stock_pcp *stock) mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages); memcg1_account_kmem(memcg, -nr_pages); - if (!mem_cgroup_is_root(memcg)) { - page_counter_uncharge(&memcg->memory, nr_pages); - if (do_memsw_account()) - page_counter_uncharge(&memcg->memsw, - nr_pages); - } + if (!mem_cgroup_is_root(memcg)) + memcg_uncharge(memcg, nr_pages); css_put(&memcg->css); } @@ -4702,9 +4700,7 @@ static inline void uncharge_gather_clear(struct uncharge_gather *ug) static void uncharge_batch(const struct uncharge_gather *ug) { if (ug->nr_memory) { - page_counter_uncharge(&ug->memcg->memory, ug->nr_memory); - if (do_memsw_account()) - page_counter_uncharge(&ug->memcg->memsw, ug->nr_memory); + memcg_uncharge(ug->memcg, ug->nr_memory); if (ug->nr_kmem) { mod_memcg_state(ug->memcg, MEMCG_KMEM, -ug->nr_kmem); memcg1_account_kmem(ug->memcg, -ug->nr_kmem); -- 2.47.1