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 35964C3ABC5 for ; Wed, 14 May 2025 05:08:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F80C6B00B9; Wed, 14 May 2025 01:08:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A6F66B00C5; Wed, 14 May 2025 01:08:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16E536B00C6; Wed, 14 May 2025 01:08:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EC58D6B00C5 for ; Wed, 14 May 2025 01:08:55 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 31A0D120556 for ; Wed, 14 May 2025 05:08:56 +0000 (UTC) X-FDA: 83440333872.16.0272CA3 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) by imf12.hostedemail.com (Postfix) with ESMTP id 74F984000B for ; Wed, 14 May 2025 05:08:54 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=YoFovARI; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf12.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747199334; a=rsa-sha256; cv=none; b=4irT+e85U5gQCmg9nCVJA7pdOg/XEkWBWD8YsxXSBoOglU3uZn/NPoZ9a9lAZhSLjzIM0Z 05/JGwRYFLbhAnv+R904tvF+5qmlVPXkARiUvhCPin/YJymuNca0m/jYE8slkJjdgm3xHY UB5JCnLEMuz9Dd18CNe8X0QPkAEeu1g= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=YoFovARI; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf12.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.188 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=1747199334; 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=mzW+LD8ZEG60wZ0j6G3XrmFnJ+CfbtsHJ8eUjJxkklQ=; b=kX8ROZA06RXQSRdD3BLPXMAUoGJ7inTv6ua0rM64Ch9qI4xV3zq1sDClm+UqIKmvUNev06 te+616kcqm79FLQMl5DHWvBWXIoGaaf/1GBRM+6DY8v7hw0/sBUW0q1XorssC+Ole0jj3b Hy0f1RaUy+YgeDSuHwl8l3Y2aJsOECo= 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=1747199331; 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=mzW+LD8ZEG60wZ0j6G3XrmFnJ+CfbtsHJ8eUjJxkklQ=; b=YoFovARIwG2eKpzspzAbbuE0fz7QeHW2KPhjX6GO+wXrmRlmIK9emr+bBbYFAc3dinKO2q 4I2X1GTDbQQIUHW/ADzwyCQn5Yk28AkOoiEuDrJrCx2QPOG5E18BI+/OWyLYZjkHh2AmZ1 0LMgqr1i9erj3T3+cORkMgJ5fd4M3zE= 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 3/7] memcg: make mod_memcg_state re-entrant safe against irqs Date: Tue, 13 May 2025 22:08:09 -0700 Message-ID: <20250514050813.2526843-4-shakeel.butt@linux.dev> In-Reply-To: <20250514050813.2526843-1-shakeel.butt@linux.dev> References: <20250514050813.2526843-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 74F984000B X-Rspam-User: X-Stat-Signature: a7mhnk34r57rcu9zn7puzgjhykku6hh7 X-HE-Tag: 1747199334-871542 X-HE-Meta: U2FsdGVkX1/15WKij5YwjTAO8dR3N8JU43js/FWfUWCjt4rb0WoeWiy7aoaDe99siUJGpRvFiPK2J2JjS4afdwuIkfU85L9wyCtSlZGpJgD+T1DcNifBC21Cg1HpTId24GtEp9iLHJx3uPkD0l5HWY9dwAN2Y+KUwY+hvTSkD5Ye/8eeK55F+kvba6GYoD4M8V8Jf0QfaBBF2c0qL9DAjI3PHoFeR1bFPAymS97bj+LSzHn+J0F7nUlHL/D+SQeYo2J1tnK0GSNd/9pI3H9O215lt+fuFEaIhBEfD0MbIy2BsJVolXX9CDTJLzhhxx++UvUKXnvgr5Yz570rxNoyYso46hcNc7zrItIqAAl366t6dBTG4gg/cne0rOB+5xsieEqH4Mvx3k+bfjH9zZ/Zqs4IZEiazhjZpHMUIw7EEdPj4KcrfLkAganpsITk/a8+RN7t1AWb0aTVSrD6TFDmlWp1s8Gl6hqi7DjreOVDh2R5pduE8te5UclimHN2O41FnOXuQYWy4KuwcKTj2wLsaKWxGaPx8avF3hSHjlEY/3O1Ws+hcsjKbPV3mplaoVIfdsei5GOhT14YRElwK81HLWy58xh9j3ewT6b6Zfn17iaSQkKDNyQplSBUJVt6HbD4QSJa7lqDJl9xioJlVla0wznLwylO13CLnirDM7G8cAgMfa36QyoKmSh4PsrP7Or2qLguFskFT66of+MrMrDQs/8YNK4NhHgR2QhbY7i8UN8/tQxzFenXV16vUQpJHSetlicB/JGuuEUrIQTqyJMnJVYdH4btHwgi3i3ZVZWH4czbweMO1NpeZOfo9N+Gh9dgtOGsdj3298hpVYufuB2r9yuyJ2tHHtlsi0/w+AYI12+CNujbDi3Ky9sJjrjJXQjmMtggD3jgc8cmQwPtgkXswBblY5UnTXIKGpeIuv2itqQj60wOGjSzVSrIOx+/tzAiU8WhRMyRDth9bYW8tZW s5XZDLpy bTAs5x91+7Ib1cxb6cPC6Wv+IWPBjek1ntcmNxYnIMHG3yo4+ywXp+WMQlSITao813krQQWYxZfTNgec4RbZMnGl0uWWVpwgHQJfLy429kvn7XYhOpSLhmCTRX8VezluiC8Gsm0j6la2WMoMsWyBMZxFujgq628T48tDfmpV8QyKPAVA4I1CqSaD59MxGx7q4EofM4ccSFExUmduHoL1ZkltHWne3wQANukX6 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 308c01bf98f5..38a5d48400bf 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -905,19 +905,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) @@ -1384,12 +1374,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 8c8e0e1acd71..75616cd89aa1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -682,12 +682,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); @@ -701,7 +701,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); @@ -2945,7 +2945,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