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 059E9C3ABA5 for ; Wed, 30 Apr 2025 00:24:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37D626B00A5; Tue, 29 Apr 2025 20:24:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 137E76B00A8; Tue, 29 Apr 2025 20:24:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F14866B00A6; Tue, 29 Apr 2025 20:24:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CD0FC6B00A5 for ; Tue, 29 Apr 2025 20:24:50 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 97DACC1496 for ; Tue, 29 Apr 2025 23:05:27 +0000 (UTC) X-FDA: 83388614694.11.E599636 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) by imf18.hostedemail.com (Postfix) with ESMTP id D51FE1C0004 for ; Tue, 29 Apr 2025 23:05:25 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=FpN7Cos5; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.183 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745967926; a=rsa-sha256; cv=none; b=wOOQMGtNnwuQC4nsJQtCydYecZFx7fIm7iE4aTCdXN4f2hfyznniOdnbOIApFgjqOuD0nZ /Af6476rr52rrRrq+nRK79/o4OMmvqar2U0W0ghXr8FSWbqmQUE9qCjOzdf2eFsRlkzWVs c4ZRdzNu2mdiYtTn0BUSPfv7U/WZEE8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=FpN7Cos5; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.183 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=1745967926; 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=+wZ3v2muB0VupF4eSm9lwfoOuI+XDtB2dNKm1AuFXCU=; b=aaDsgSODC4i8eSx6Ukzh5JdMHU4hG8JIjB33qtEMoX0ByuuwWhZiroEYJPQj7lA+GuyTF7 tnasdSB05eiohGYrkBkEtfF3HellwP1in6+NbkhY0Mt9XnwdTak4+3BI+qQpfG+xAwnjzu 1U2LJ/cQyqpPvaGPnQQ0CqrEzCfDbvE= 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=1745967922; 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=+wZ3v2muB0VupF4eSm9lwfoOuI+XDtB2dNKm1AuFXCU=; b=FpN7Cos5+LvGlJ0uN4wUjtj7q62hwDzl34qGZWAa8an12kny3cW+RWdWjX0voaSFS2d8ns baVq1k2+kMkUxX+1intyzYgXU/SVc8vJTJp1Wtg+sOl2e5cmA4RB4DfpCipF0xy/CoWPWD eKZuGCqqdWXUaFLaYqD9I2TjwG+p+hs= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Sebastian Andrzej Siewior , Vlastimil Babka , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 4/4] memcg: no irq disable for memcg stock lock Date: Tue, 29 Apr 2025 16:04:28 -0700 Message-ID: <20250429230428.1935619-5-shakeel.butt@linux.dev> In-Reply-To: <20250429230428.1935619-1-shakeel.butt@linux.dev> References: <20250429230428.1935619-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: D51FE1C0004 X-Stat-Signature: 15odwnxoqx9hta6r6hpgyrf8oejam4h5 X-Rspam-User: X-HE-Tag: 1745967925-24774 X-HE-Meta: U2FsdGVkX19sD+J1FX2EqGZByy62bKTlil5MMMICneMoHbwlZc1dAsBm5+9OnCdhpuUROzNkk2a3Nz2IzmQmWe/kwp9zLgzBGoesJ5QY2at80TmpOvVpKvJJEoVzU4HSLrKgrLZjZ4nADvl/yt4LXr5oNqGkvcwkYyx75pRTRgSkjiKlWVl5dxW8m9d+y3SX0v2MogzMspZbqAb2rg1Obn8yBKApNVBh5RqLriSV+sog1pAaUUGnzgXDPc6Oj5q0i3Yh3SbvJ7bjRwMy4wDCF/jcHXFx+kB2SyXaafCmrrlKjlDaFEFvQ7zVrUUKzJ8LgoR9nvT8lSKS3qajqZbjf3ZxHEdpnDquGEyG760vY8vTNeTFYQG6/y1ITa0xkn0loa/SWz7eZoAh5f5XpYTtNaSzSg2nkMG8H+VyplCms5DudlRua9IfLmsYh4WHuBx24UM9E4aXeVAKjsjEYxDhjHY4bNPYM7CnYZah9BVJm/xleuOB7N/Z3IzD2dK1ugbcu2WwJgR6Rj7XyH5O1AiAY5QtOyuE8Sl0gzgPNWhE1jxUqjbFMwJVJ7HNZ7zTrvY7LosSY/1S4+K4iE0eQ79SqlOdOpqLxVzaE+cmzUo2hvNBrUpS0s5/f57U2hoECRVCy9k/0I8yo1EkpU7lJEDFCxwF4oGISsqT6bnPGrbWAMAzaN87nG9IUj+OVNkcw4kjr4i/V6CfLFS9yX6zU7fXwAwjCtrL0YUO+fcex/0FsVx1pQHSQeti5v4UHBPBR7QmhS4Sv/IMDOdS8t54eS4Nx/+gWU5DHvYkBriWMh8dtI4Qenj6kKewsjkNkX/0twqqipH98tQVNyerirwY8LB9i+pa+tIbxnPEtPlDGhOyk/OhIp0ROzP9bRaGMuopmEPcQRPZ8hvAKsWaOkqNY9XEsSRS2fI0mw+sS7Z9pgWbvV4qTAevZ9m7mFiOKrbiuw5lSSjawRRJ4vHM1I5J2zp cd0v5PtH JUftMnRaU+cCqGgr8Q3nwGigu95rlBQ6k/+z9Npd+tJ37jnuszdylVaIND+RuCTwIFyX/mDbCs/tChgYKEeYneAe492A982Ppd3vjYcBKowDRFWE8TnYxkWmBZ3HG6JJOT/KPnWAx1W1blm8rjf4z4rJgKesnQFAEpcyYz8QKoyAjlso= 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 is no need to disable irqs to use memcg per-cpu stock, so let's just not do that. One consequence of this change is if the kernel while in task context has the memcg stock lock and that cpu got interrupted. The memcg charges on that cpu in the irq context will take the slow path of memcg charging. However that should be super rare and should be fine in general. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8f31b35ddcb3..25bd312d0455 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1827,12 +1827,11 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { struct memcg_stock_pcp *stock; uint8_t stock_pages; - unsigned long flags; bool ret = false; int i; if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.lock, flags)) + !local_trylock(&memcg_stock.lock)) return ret; stock = this_cpu_ptr(&memcg_stock); @@ -1849,7 +1848,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) break; } - local_unlock_irqrestore(&memcg_stock.lock, flags); + local_unlock(&memcg_stock.lock); return ret; } @@ -1893,18 +1892,17 @@ static void drain_stock_fully(struct memcg_stock_pcp *stock) static void drain_local_memcg_stock(struct work_struct *dummy) { struct memcg_stock_pcp *stock; - unsigned long flags; if (WARN_ONCE(!in_task(), "drain in non-task context")) return; - local_lock_irqsave(&memcg_stock.lock, flags); + local_lock(&memcg_stock.lock); stock = this_cpu_ptr(&memcg_stock); drain_stock_fully(stock); clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); - local_unlock_irqrestore(&memcg_stock.lock, flags); + local_unlock(&memcg_stock.lock); } static void drain_local_obj_stock(struct work_struct *dummy) @@ -1944,7 +1942,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.lock, flags)) { + !local_trylock(&memcg_stock.lock)) { /* * In case of larger than batch refill or unlikely failure to * lock the percpu memcg_stock.lock, uncharge memcg directly. @@ -1979,7 +1977,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) WRITE_ONCE(stock->nr_pages[i], nr_pages); } - local_unlock_irqrestore(&memcg_stock.lock, flags); + local_unlock(&memcg_stock.lock); } static bool is_memcg_drain_needed(struct memcg_stock_pcp *stock, -- 2.47.1