From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 156CC22E415 for ; Wed, 21 May 2025 16:57:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747846666; cv=none; b=NzljJxF7xQILwWHbrCvJBftXG50VxNrolI4Aryr5HZnZGLFFidbTNYK8AYtRBQ/mig3r9C98a/OhJOSEKFuzDOOYawcabhJhq3/bk0KGqt0FPaFDat+RtrV7VA58fKQcKE2Gr5JuqPiebIko23iO7nurqPupUDEgkAYZXWB/iCM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747846666; c=relaxed/simple; bh=hoMEw378IbljZqn6te2pV2/GuNy7K+dq/v3FYSV1YFc=; h=Date:To:From:Subject:Message-Id; b=IN6CVa2H7krtpkgw6vHUBHYgNYyi/XOYUlK/9pwipU/NEEXhT73tkLzW6NiX3Nwq+PDM3PcqV/zDoUyNrX05VyuXYYtQiDgCTIuuFnzej6GehigIH8bLzCjyb26aBeGKAU1EWmpsd1i2ixf343jmEs6iPWM7cHnCAdB7F6bqBxY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=K8A4v33m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="K8A4v33m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB84DC4CEE4; Wed, 21 May 2025 16:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1747846665; bh=hoMEw378IbljZqn6te2pV2/GuNy7K+dq/v3FYSV1YFc=; h=Date:To:From:Subject:From; b=K8A4v33mVVpFakTMSPMIdsys+8K1cC7JY+J7gNRpr8rdqMjDkqU7l/CqT43IjnG6s QxEY5pX/P0GLqOStEuFx/lgazhfAnoV0+mKQRtheANnn5kQkm8slvJnsTwfzGd4EvP xExO214HHhki24mQUhLFZRnIME7shnkWjdW+Et50= Date: Wed, 21 May 2025 09:57:45 -0700 To: mm-commits@vger.kernel.org,vbabka@suse.cz,roman.gushchin@linux.dev,muchun.song@linux.dev,mhocko@kernel.org,hannes@cmpxchg.org,bigeasy@linutronix.de,ast@kernel.org,shakeel.butt@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] memcg-make-mod_memcg_state-re-entrant-safe-against-irqs.patch removed from -mm tree Message-Id: <20250521165745.DB84DC4CEE4@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: memcg: make mod_memcg_state re-entrant safe against irqs has been removed from the -mm tree. Its filename was memcg-make-mod_memcg_state-re-entrant-safe-against-irqs.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Shakeel Butt Subject: memcg: make mod_memcg_state re-entrant safe against irqs Date: Wed, 14 May 2025 11:41:54 -0700 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. Link: https://lkml.kernel.org/r/20250514184158.3471331-4-shakeel.butt@linux.dev Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka Cc: Alexei Starovoitov Cc: Johannes Weiner Cc: Michal Hocko Cc: Muchun Song Cc: Roman Gushchin Cc: Sebastian Andrzej Siewior Signed-off-by: Andrew Morton --- include/linux/memcontrol.h | 20 ++------------------ mm/memcontrol.c | 8 ++++---- 2 files changed, 6 insertions(+), 22 deletions(-) --- a/include/linux/memcontrol.h~memcg-make-mod_memcg_state-re-entrant-safe-against-irqs +++ a/include/linux/memcontrol.h @@ -903,19 +903,9 @@ struct mem_cgroup *mem_cgroup_get_oom_gr 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_ { } -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) --- a/mm/memcontrol.c~memcg-make-mod_memcg_state-re-entrant-safe-against-irqs +++ a/mm/memcontrol.c @@ -681,12 +681,12 @@ static int memcg_state_val_in_pages(int } /** - * __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 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_s 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); _ Patches currently in -mm which might be from shakeel.butt@linux.dev are memcg-disable-kmem-charging-in-nmi-for-unsupported-arch.patch memcg-nmi-safe-memcg-stats-for-specific-archs.patch memcg-add-nmi-safe-update-for-memcg_kmem.patch memcg-nmi-safe-slab-stats-updates.patch memcg-make-memcg_rstat_updated-nmi-safe.patch