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 A66DEC3ABDA for ; Wed, 14 May 2025 18:42:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 447896B0092; Wed, 14 May 2025 14:42:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F43F6B0093; Wed, 14 May 2025 14:42:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BD316B0095; Wed, 14 May 2025 14:42:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0AB1D6B0092 for ; Wed, 14 May 2025 14:42:40 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A73F31610AB for ; Wed, 14 May 2025 18:42:40 +0000 (UTC) X-FDA: 83442384480.10.325AC42 Received: from out-173.mta0.migadu.com (out-173.mta0.migadu.com [91.218.175.173]) by imf23.hostedemail.com (Postfix) with ESMTP id E93CD140010 for ; Wed, 14 May 2025 18:42:38 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=AeGHYahc; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.173 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=1747248159; 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=0hq3oSPGOoYcep4MVQZiDjVHKcY+KXmN8QcGYtIe92g=; b=7g0a9ua7ONcTWxmzYe6cGie8GVQ8eeA3RSZXJ/JE8GSQ9QGCSPu1RkLUa9yMeEOzWkTbxM /Ui/giAnJ6ChRIjQP5liDJ/SHcaZkDy6e63hVC6Ftt4qWVqcU0Kl8LB4ILFdVruzATa8im 6TLQ82Rjif48no8/DTNBQxgNC2XzuLY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=AeGHYahc; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.173 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=1747248159; a=rsa-sha256; cv=none; b=GSnx/Ne7VLsGf8lqnmlNZ1gDSH35yNIRsAtBvBBHseiLDe6LaSkpvt7D45QehrUtmjCqyq EICql9KAHhcLEDNwTLAGoVFx8ImR8VMf6ffJzC7fo24VjUJNZHZKmtNCKBr1Hhkc3188Pa VoBsbg/RpiRhWRLRrweAZxUs0zcelQU= 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=1747248156; 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=0hq3oSPGOoYcep4MVQZiDjVHKcY+KXmN8QcGYtIe92g=; b=AeGHYahcQD4nY/SaOCUvLSzBipLtoKpoNJa3KmuL+Uo+M+Zi3uVoBSjGWm8N3I8w3dhhLm pVJt8eREwCiR9EwSHIxX2Se2gB4i3bxdgu7u+wT0Uk9+iso2cJpcHXF8fWaulJAe1jO0Ft CFTHhmUOmtjMi82XHcOkaTc1OZslUCs= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Alexei Starovoitov , Sebastian Andrzej Siewior , Harry Yoo , Yosry Ahmed , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH v2 3/7] memcg: make mod_memcg_state re-entrant safe against irqs Date: Wed, 14 May 2025 11:41:54 -0700 Message-ID: <20250514184158.3471331-4-shakeel.butt@linux.dev> In-Reply-To: <20250514184158.3471331-1-shakeel.butt@linux.dev> References: <20250514184158.3471331-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam10 X-Stat-Signature: m4d6w4gtzbsr3ornca4sffpfgae1mrxk X-Rspamd-Queue-Id: E93CD140010 X-Rspam-User: X-HE-Tag: 1747248158-365712 X-HE-Meta: U2FsdGVkX19Id4wp8lDeyB5v8IjORqRda9Ns4HGK9IRVIsypMRfiPc8ENLo9+VHJfGtank8JN9b2WWKp2vrsO2Is2trdsziXO14JwUYoPL4qDd3eUOAMIp0GzhebSqkm9g/RWdkfbrzDx0SZjeCKAlfC3g+OdeEVFaHB/3xVnXpq7ypHok8C+D8Xfu3j83p4qsDaTRO9NUpM5exqUAtWuZ2kdq55iyTaevXTRAfbhYABaHoP1AV+5ge7Dw+Tg0EtF41HAnu2GguNgyYil7H/VJLd3E0lVg+Ryc7gSuhNwQGMwrdu8v1+H7ITgLByN+SCgR+wRxl44lsx009/v401YxG9hkIJYlVZfx4KHRD7mriI0x86p+YcIAckOGEcVEgO8IR3/eywMhlTHTxqB4/7E6ge/B/gK2vMDcN9fA5xDgCyUV9nKvszbifXLMcA4hHukuV8cUOLZw4NrnYzqeuWAcPfvTJXtg3+UwNZ3ikWfsLjRfUd9M5VwBqe41dVqBta0f6ay27p3hPGilwOT1BNLCas8ECiLisc6vlZ8IPUQfQMSvr6+PZWrRkHJoGKmXk49aUBfvbp4dyct6fntimUlMGLNhy/SKpGLs+vgP6T80vtPIaQmF3aeuER9daq1Q/HdK8qChpqfUsMs1CoPh2e3iyS7PJFSR+I35JnftvHJlREeY6cFWMQBVJK8GhpsW3Tc4uuHDV85IobFI/IigiVBe4Q0hqrWZ1gl+SLvo/cL35tZIOTCDND+IzMTAADBtP6PCL6jVOeC8qo3mGT5WMAfeqrujeRjf86V332+ocTRSGuErTGKOY1TcvClsP6JNknENXxwEqmyjjx/U+lJyWUu7Rjr+lspSi6xa6oxXDZZGMoML0LtAbiz7pWnck3mCZs71OClRa4818TJ51KxpAoHnR4dsaUyhTL9SYdf/KMd811zXdD20UcLq96a/4yyF6nQx7OcayFMcsy0ZszLPh 6GUcZYlN 23EF1xMMAwwadIPAlfC+Twm7W1zH4kmvUt+EuZpZ7MLG6H2nNTZyMaHd+3uVl96x3Kzjwc7/40XueSMQdxlmcgVgZ20wn16lezdVmCQBsCPl4O0fkUW23uNj1QVK+4lHFGCCLgK/frSlmveBORgO7j63uPtHifpv4l25r0YQXnB2V37eDQlCUR0IpADnD/A71ga5U9l3WXAEw4H/QPNsWVnent/3Is+MutIuR 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: Let's make mod_memcg_state re-entrant safe against irqs. The only thing needed is to convert the usage of __this_cpu_add() to this_cpu_add(). In addition, with re-entrant safety, there is no need to disable irqs. mod_memcg_state() is not safe against nmi, so let's add warning if someone tries to call it in nmi context. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- include/linux/memcontrol.h | 20 ++------------------ mm/memcontrol.c | 8 ++++---- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9ed75f82b858..92861ff3c43f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -903,19 +903,9 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, struct mem_cgroup *oom_domain); void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); -void __mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, - int val); - /* idx can be of type enum memcg_stat_item or node_stat_item */ -static inline void mod_memcg_state(struct mem_cgroup *memcg, - enum memcg_stat_item idx, int val) -{ - unsigned long flags; - - local_irq_save(flags); - __mod_memcg_state(memcg, idx, val); - local_irq_restore(flags); -} +void mod_memcg_state(struct mem_cgroup *memcg, + enum memcg_stat_item idx, int val); static inline void mod_memcg_page_state(struct page *page, enum memcg_stat_item idx, int val) @@ -1375,12 +1365,6 @@ static inline void mem_cgroup_print_oom_group(struct mem_cgroup *memcg) { } -static inline void __mod_memcg_state(struct mem_cgroup *memcg, - enum memcg_stat_item idx, - int nr) -{ -} - static inline void mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, int nr) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1750d86012f3..c5a835071610 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -681,12 +681,12 @@ static int memcg_state_val_in_pages(int idx, int val) } /** - * __mod_memcg_state - update cgroup memory statistics + * mod_memcg_state - update cgroup memory statistics * @memcg: the memory cgroup * @idx: the stat item - can be enum memcg_stat_item or enum node_stat_item * @val: delta to add to the counter, can be negative */ -void __mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, +void mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, int val) { int i = memcg_stats_index(idx); @@ -700,7 +700,7 @@ void __mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, cpu = get_cpu(); - __this_cpu_add(memcg->vmstats_percpu->state[i], val); + this_cpu_add(memcg->vmstats_percpu->state[i], val); val = memcg_state_val_in_pages(idx, val); memcg_rstat_updated(memcg, val, cpu); trace_mod_memcg_state(memcg, idx, val); @@ -2920,7 +2920,7 @@ static void drain_obj_stock(struct obj_stock_pcp *stock) memcg = get_mem_cgroup_from_objcg(old); - __mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages); + mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages); memcg1_account_kmem(memcg, -nr_pages); if (!mem_cgroup_is_root(memcg)) memcg_uncharge(memcg, nr_pages); -- 2.47.1