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 B2F28C3601A for ; Fri, 4 Apr 2025 01:39:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45F256B002A; Thu, 3 Apr 2025 21:39:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3962B6B002B; Thu, 3 Apr 2025 21:39:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2121B6B002C; Thu, 3 Apr 2025 21:39:53 -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 002DE6B002A for ; Thu, 3 Apr 2025 21:39:52 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A1A06C1C0A for ; Fri, 4 Apr 2025 01:39:53 +0000 (UTC) X-FDA: 83294655066.18.DD27596 Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com [95.215.58.178]) by imf12.hostedemail.com (Postfix) with ESMTP id F3D9F4000B for ; Fri, 4 Apr 2025 01:39:51 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=p8V0zKcN; spf=pass (imf12.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.178 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=1743730792; 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=RVDoE6eFCjqBV3S3ZF9n6fC4QSKAYTJ/v3+Mxoye00w=; b=07n/gAOkeueswQ9O4Pd94uqjrCM7ewUdYqcnQ0+d4o/OnyjcfLUt5PcIilMSoXZSbnX3Kr Pd5bcAUpzHRdB1X66B0FTgGrDd8RY2ac+eBHJxT3nBrA2CZ89zWKbmliYD7qp8xBdckbmM CTv0ut0oZiTkuLq7kcTuMbDnzigqzQs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743730792; a=rsa-sha256; cv=none; b=r1s6spJ5FbkdSZasSUzCPe+k1TYSlyyKrPG1ZTUcPo05jH4sQ43SqrDLCxJzEuLihtj9oA 5ic2FtKJMzsClQjsyNzy2F34HjX5ewr9bPzx+1NoncVXWC3Owqf78nsQ0k3UUooC5+K8sA asNu0HavUclamve6C2DbNctxqoy7luU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=p8V0zKcN; spf=pass (imf12.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.178 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1743730790; 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=RVDoE6eFCjqBV3S3ZF9n6fC4QSKAYTJ/v3+Mxoye00w=; b=p8V0zKcNaP0A77aZrgaDTTYwvVlJQkDLPvmdgXWObqyzSJbqMjREH/50MV5cOOavF/gVvm y7RVw3kZklBuLqlN/sFz6gYdix2TatsRyA/riEY0zv7KheYl44KhAGWzTNNR5wFoaKgDNw cq+jh+19OszpG+bh/5kPun+qIJ2EbW4= 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 4/9] memcg: manually inline __refill_stock Date: Thu, 3 Apr 2025 18:39:08 -0700 Message-ID: <20250404013913.1663035-5-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-Stat-Signature: aem8777p381tuq96meiowt4mwuxzeiui X-Rspam-User: X-Rspamd-Queue-Id: F3D9F4000B X-Rspamd-Server: rspam08 X-HE-Tag: 1743730791-747689 X-HE-Meta: U2FsdGVkX19LuAiR2AL2jihBA4R79JnzSw6I/wyRbIgFzZ1C9Tibt76MALd3o2XJVZJ10JlDaSJxDcQu3mUqpnKAEd0xHHq3tn7I4dKYZJGUbX9jtI2QK4jR0rC/sMeb5nzZ9xfVFhVtOUVq+mlzro5UmGVmGEL9Py2JpwC5jrEfwlXiCVwkZo/AiNCN61OKQoCFHbdMK0pno5cGoV3BXo7xdfvJM+6CSE6lwWYPfiWJzYhQ/Ed9Xi4bbCW0NysajOmpvzGhOV1rJ0nQQm9rgd55Jsy7fLKfYcCNPNubG6vrcuppIfw6vFjCPcTchrDVZUJBPZIbVtIqTwjsWa9wXp+m1S22Yw0eb+FIbatFe8EItrd3OzsLjMrr1dmHEyVrUvYtJLXOyVe20zeIE4IyiQ2Obfcm7NtTpR55k4gvGPX8SxBrWWWrsyDwz1xlLbhLDeM/WLsT5XRP6rU7wAtztXLHmX015xBLrazn5mA1xq1EsO9/m2+jkVfeu4W/43JjtetUayhsywTF0NTPi42Ng47d7IyadykRD6YCvpA9ZiWQ61OjuvtaxaBjnIe9NJ8cykJKuuhtGr5r7mz6eFgqUjJRAIHpnsaMcyyU17uIsi3yFBIM0FAiOaNGlcjb135/i6pR/Igjpuj/ZSLZxVPUB0vGRQePDrrn9KvGCRt6FYHGteXuXf1XSKCsDBUfeN0zWhy/Lc1GePUF+9wLurmBWR7attzlhKOX/WrhCdFrHNaJiOV1755JR+Ux1iQcsdzIkenN4hpAYfQD0aF1QVhLDeMq/7pSYS6LGfCJVemPJarrqNHMRMqzsPu99xsFrSoZb13FidYleUiFle0kPzFr1366gb12mCDQYty1cR4raKGyNtVFXRNndpA6tMiIECkhoqyCHI7b7GQd+/UF0KFHVZa57LfHUXzUz4kPEby7NZ9f6ZTC1OZVcexseguJZfhZ6gF+62O6ztp4E5uEgyn fr0L0lMR jKqNjpawrsY/bbunZ7nsDlMDVGBntGci8EV78WIYNt9e6KQwoIZNogvh3rzeRs4PcCnDoNy/thg5DNtJ6a+d5Is7LVudoVpfy5ksLXOk2aXqJg/XnVXIEUK11tI7Ep5ROdQUM7xNr2DcOHhJbSygXajQcmBYYn+VO4F0heC5Dn4edR0lwwoRIdWfiTuB3QRx78wj7vhJas7hlOIyNmiTPoFUaxg== 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: There are no more multiple callers of __refill_stock(), so simply inline it to refill_stock(). Acked-by: Vlastimil Babka Reviewed-by: Roman Gushchin Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index dfb3f14c1178..03a2be6d4a67 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1871,14 +1871,22 @@ static void drain_local_stock(struct work_struct *dummy) obj_cgroup_put(old); } -/* - * Cache charges(val) to local per_cpu area. - * This will be consumed by consume_stock() function, later. - */ -static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) +static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { struct memcg_stock_pcp *stock; unsigned int stock_pages; + unsigned long flags; + + VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); + + if (!local_trylock_irqsave(&memcg_stock.stock_lock, flags)) { + /* + * In case of unlikely failure to lock percpu stock_lock + * uncharge memcg directly. + */ + memcg_uncharge(memcg, nr_pages); + return; + } stock = this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached) != memcg) { /* reset if necessary */ @@ -1891,23 +1899,7 @@ static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) if (stock_pages > MEMCG_CHARGE_BATCH) drain_stock(stock); -} - -static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) -{ - unsigned long flags; - - VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); - if (!local_trylock_irqsave(&memcg_stock.stock_lock, flags)) { - /* - * In case of unlikely failure to lock percpu stock_lock - * uncharge memcg directly. - */ - memcg_uncharge(memcg, nr_pages); - return; - } - __refill_stock(memcg, nr_pages); local_unlock_irqrestore(&memcg_stock.stock_lock, flags); } -- 2.47.1