From patchwork Sat Mar 15 17:49:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 14018172 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 6F749C28B28 for ; Sat, 15 Mar 2025 17:50:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E6C428000B; Sat, 15 Mar 2025 13:50:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 27B24280001; Sat, 15 Mar 2025 13:50:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0792528000B; Sat, 15 Mar 2025 13:50:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D45D6280001 for ; Sat, 15 Mar 2025 13:50:14 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 319B31A1E95 for ; Sat, 15 Mar 2025 17:50:16 +0000 (UTC) X-FDA: 83224524432.15.9C76C2C Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) by imf13.hostedemail.com (Postfix) with ESMTP id 6FB412000C for ; Sat, 15 Mar 2025 17:50:14 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LHDQm3SA; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742061014; a=rsa-sha256; cv=none; b=pNOZLE5+mOD9fmGw3oJ0Oa7GuAqV10qPSwugntQAJiKEsJjCJ2aTvwDRX7Z0WHfLPbg8g0 97mYk8Iw6c4vUchDT0IVSwnvQw7toQOAJaCf4Nia87MykjF1vETWEVtrOPRwOrrjGGRs1c VJ6Oepvnfel+L9lOtXyjL/hpV3CzskU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LHDQm3SA; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742061014; 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=TYGBaqcauUTYU40tZGtRDDBbg7pHPWXhJB6/pipNZSg=; b=ljtAKnUB8yOCXyyHoFnO4iFQ0i258Q5SQ0KlSvDq8ekUwmLkzWkcipFRGt5ZTYiYUvHYW7 Q6oPfQr9vObL1TaJtH36MC1uJPVj4sXBl5vCBD0j1H0ZtgC3iJ7Zi2iTA7Zhi3LUbhBXKf uHNkSGBZDX0ElSb4UF0LieUVz3dQVlI= 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=1742061013; 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=TYGBaqcauUTYU40tZGtRDDBbg7pHPWXhJB6/pipNZSg=; b=LHDQm3SAQHbOdOc/lx7xNRctT2V94M44B935v1mp0JKaFZD4ihZxYWRfQk1mXWZlM0YnV8 mUJPtgGxHSicxTjlkyDNWob2m9rowYzZQ0N2FbX6cTsr0uOiJu8tvTqevoPkB6VEYHtP9L MnOPP/rrbzJKtED4KZRq6GaquCbHc40= 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 9/9] memcg: manually inline replace_stock_objcg Date: Sat, 15 Mar 2025 10:49:30 -0700 Message-ID: <20250315174930.1769599-10-shakeel.butt@linux.dev> In-Reply-To: <20250315174930.1769599-1-shakeel.butt@linux.dev> References: <20250315174930.1769599-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: bi1osot9poig8og3wtt918dnfnhdjqjf X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6FB412000C X-Rspam-User: X-HE-Tag: 1742061014-547132 X-HE-Meta: U2FsdGVkX1+9m/d9Q7VU2JMZumMHN1ITZmuHYB9C5mxduepg6fV3EX29b/8FUbwZ6aaQjT1f+83jASznC9y2oMK4cWFWi8ePdbYlM7CkjaHSrnziLR5PPEzZF5xzpzJt/tx/i5++pUIbRHuT4fR85yVp9MYgj26/kVBAZ7IpBUcKuAlSCRwpFNK2GX6JY825l18EkfHchzLBdYGSFCUmL8SLFU57L6fpzeFNhi//WG7OfBpf3YqTrxgaljYG9Y3B5cgy6rwB+sk3BWeQYhCWbq2SAXyrwOVY8mcez15ONdwrAwgE6hLLfK7jdipnP1eOAtcBykZqgbgUUd/UnCu4JTpbAlNlKLD3NaoCGCRvFlFVwJsoieWJCOIrrysem7DX8dZgYagupQ7yMX0Ai+SImWmQmo1sHySJ7PzBKBGpPlhLPX+Ez8Cloc7FXiSNwBQ8DPDDd7ir8/NYe92ajSDNA99cyXrcrQzhkFDjq7uIuQqT46jh4Mes2AqGrySCR+C/3WGD4Y7/owHcVOYImIvATzBJu7ImrSeSAHLNdI362DGxgeuLmR2sVpRWusmjZvOkYYrpW0tVVX4TB0kYPQq/mJ3uDwF8xsKaKOCeVos5rdh77UphVnMlEFSful7Oh85aAJ2SwWJyvVz8SLRJ43h7jWjRDaSsIyiJ0SCiVWiBA9jnuDpK+2bOrk35K58PPps0k6H+36G4Q1a+xx85UO7UNyoGRCBWKYFizWI2ItTKVp+LhLixmRqEK/zYpRCur2oUgArlowIZytVCMt5vGjF2oxE8R86zhlBqPSuacZsQfq7ZmUj9gAiGTI0/zOukondtKBwrwzZxKnNg3zgQH4KO4OtqdjXzAHlPOIodmnLeFY+nu3j9m/crR/3Dbi78sXJggofxdDfUCK2ycizDaEorM5K70p627nxLIO8TdritIfCpugRTDRPg5zARaG7qvn/e/XuGGEIMl6z/obRpExJ kjSqxDnd freZguLwX6fmBfGcbqmh9zPfBZksHif4rvzaqOrXLd9UwwpafsBzmWz2GCUuLzfQT52a3vm4/O3P/BUcA3vpn/NY0K13qH4BuY5PLPJEDy97F7dB/nvfxwrMlYp+PfM0WakzftVsOpQUHxz/iICVK/2zTDabKSuZ7UQ3ZtWsUikiCsnHdwhubJmk3ziP5m295/s7z8QOxx4GZ2XAbqUHt6QQgx/VjAD43sMPD 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: The replace_stock_objcg() is being called by only refill_obj_stock, so manually inline it. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 553eb1d7250a..f6e3fc418866 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2742,17 +2742,6 @@ void __memcg_kmem_uncharge_page(struct page *page, int order) obj_cgroup_put(objcg); } -/* Replace the stock objcg with objcg, return the old objcg */ -static void replace_stock_objcg(struct memcg_stock_pcp *stock, - struct obj_cgroup *objcg) -{ - drain_obj_stock(stock); - obj_cgroup_get(objcg); - stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; - WRITE_ONCE(stock->cached_objcg, objcg); -} - static void __account_obj_stock(struct obj_cgroup *objcg, struct memcg_stock_pcp *stock, int nr, struct pglist_data *pgdat, enum node_stat_item idx) @@ -2913,7 +2902,12 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes, stock = this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) != objcg) { /* reset if necessary */ - replace_stock_objcg(stock, objcg); + drain_obj_stock(stock); + obj_cgroup_get(objcg); + stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) + ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; + WRITE_ONCE(stock->cached_objcg, objcg); + allow_uncharge = true; /* Allow uncharge when objcg changes */ } stock->nr_bytes += nr_bytes;