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 20E11C3ABA9 for ; Fri, 2 May 2025 00:18:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00FBC6B00AF; Thu, 1 May 2025 20:18:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F02CD6B00B1; Thu, 1 May 2025 20:18:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCA516B00B4; Thu, 1 May 2025 20:18:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B8FB46B00AF for ; Thu, 1 May 2025 20:18:24 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id F3E051D07CC for ; Fri, 2 May 2025 00:18:25 +0000 (UTC) X-FDA: 83396056170.13.FD28F43 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) by imf23.hostedemail.com (Postfix) with ESMTP id 53B0B140002 for ; Fri, 2 May 2025 00:18:24 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=CtAc5AYq; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746145104; a=rsa-sha256; cv=none; b=kcQzJYnqNBsloi6Q+Hc0tzAt063ZxKHwCzDMJd5+XzVzTYRYM9pOXeBOyHUzZoMKF7x2iP IiFcA9EBMIGgsdC1Vs28s+jDop+8ZJ1sPkF0+ZDm/XagV1PFN23FxeTeOnQ54sIpAPf2lE KEaFNaqIJ9yLkhS/3Jjsp7iNbnt/UcA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=CtAc5AYq; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.172 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=1746145104; 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=wjhN3Y6FnUXW1h0Itb0ju6GbNSYKm3lt/+0DxAbkvdQ=; b=b/wPppxjyFOrarQAXhDZjOTva/omwZPphSif2fhdjBZ1uIyevTtJxRFbLvWx2Xhj4Q67n4 DqXgxJWdhnfJo+Xjvbak2En3Zj8KBjP/4uWcNkJz6UgT5aPljdGo2zaV/2CyZXNacFMiMq gWi5/RLrROxptlpzKfKVql7jJeH+bgU= 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=1746145102; 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=wjhN3Y6FnUXW1h0Itb0ju6GbNSYKm3lt/+0DxAbkvdQ=; b=CtAc5AYqfduFBQiuVXsgHGOTb00ozN+uxz70smBElMiX2eFEL6iBMfE/pLlICt0tNzw5aj t49hirx+9ceyMQRTKx97Zs8l7LN63GDQ8tHsQoCSKoli303RDO3x8JkA4pRXjyMjhKUkMG GTgt8J8Im7j0Z7bSbaSefV/VtLas5ac= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Alexei Starovoitov , linux-mm@kvack.org, cgroups@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team , Vlastimil Babka Subject: [PATCH v2 3/3] memcg: no irq disable for memcg stock lock Date: Thu, 1 May 2025 17:17:42 -0700 Message-ID: <20250502001742.3087558-4-shakeel.butt@linux.dev> In-Reply-To: <20250502001742.3087558-1-shakeel.butt@linux.dev> References: <20250502001742.3087558-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 53B0B140002 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: 5qzyxdgp9iccw9oe39pj57hgqxudkssm X-HE-Tag: 1746145104-921633 X-HE-Meta: U2FsdGVkX18574RGz8tNLiF0ZVILxherLtAg8l5kOOVEGbowpxYTN4Ezx8MMqEyik97sKD4D38ucCSyv+vvdcNdo6UzPRp2XTgOhxD/dBuaQU0OTRpTgxFcweBHHhc8dZMvqlUJjnSrs6QLiw3BjwWJr8Gfc3vggxpRVN+Bf+PIUtCfuicik/q0fyRciPtFPI/+JlV2GiS+M+4hRLIiZp8WLzOXFohBaPX4GKD/y7AuKu9/U3dMZRExE55qkioohW0IZ43YmvfOtAzLvMiMK1xjXjIydQyucYVw+ul/nXfIfFyEIR2UnHRMkglRxm2pz7mVsB6lwG1CNVRYnJMFBgV+EV1zCfpM1RWUuMjeZL3rt3FPJORAIcIEb20FSF1rPbPlXLMoKR2fLmO72/zHLrmHmi1LrJ2tW/fl7DuGw7ygMmNnkd9NRwx70T1z+X1/ERUUTG900EgHUfarhweptjr/C/YEMRZOnGcPSZmSmfPZ5D2eTDDC/aL2OhgwVPN+JuULbXvEZw8smubwwTnt6/kCYy64OpwEB6WXRluOeh0+ni2ayklSvIAMVn8ckjl4vT1zhkf+2UPkb5xf7TqBVITUSE5KsuscYfQS1sRtDW8WkGCUiW+JixiQVe0/ie7ubhNip3fsLHsz12PUNlXRuAJloqPPhm6+5RnxVusfjupKIrE617D25ZCLwDEgGqn5YQ9ToB0tJE3innOCzZOUr6SX0F/szuuxQtsjbem2OnrXulJmZBgFKj8Qye7diwgXcsDGgTPLFcuR1GjskRw1KBpwJc3MJPCzXAgp8FXwoMt3nGKIYn+zlqVCXJeazFSsnHwo9Ev1DsKiZQGPeI6Xe7/bLmyYeI48wLP3Ohp9EWHBe2tut+H3pBsTS9NonbFk7AD3bx5luBMK+IAgHESZp0EL6+ze9k7vlB2ZK4A+IaZ7m+LmofD/G6LAc1t9gfLaidxuKGARitRPGKWDkKiT 6jeVgqY3 JaprZrSkQua5IIylmVGTBaNaWfoPmo7XPUjxHeVdxnHh5N4egtoTJL7rtTqenJZ5qHRwquKVU1ULQRSX4/s4BdI57ob85QkmjsH7yDt6uOwzssPKXK/kzOtnfcxvSXPRdGcw7IlMCwXD4ZNdP7043fKoFTDipsT9t9fMv4Y0mel5YQZE= 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 Acked-by: Vlastimil Babka --- mm/memcontrol.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index cd81c70d144b..f8b9c7aa6771 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1858,7 +1858,6 @@ 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; @@ -1866,8 +1865,8 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages, return ret; if (gfpflags_allow_spinning(gfp_mask)) - local_lock_irqsave(&memcg_stock.lock, flags); - else if (!local_trylock_irqsave(&memcg_stock.lock, flags)) + local_lock(&memcg_stock.lock); + else if (!local_trylock(&memcg_stock.lock)) return ret; stock = this_cpu_ptr(&memcg_stock); @@ -1884,7 +1883,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; } @@ -1928,18 +1927,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) @@ -1964,7 +1962,6 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) struct memcg_stock_pcp *stock; struct mem_cgroup *cached; uint8_t stock_pages; - unsigned long flags; bool success = false; int empty_slot = -1; int i; @@ -1979,7 +1976,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. @@ -2014,7 +2011,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