Commit 55a68c82 authored Sep 02, 2021 by Vasily Averin Committed by Linus Torvalds Sep 03, 2021

memcg: replace in_interrupt() by !in_task() in active_memcg()

set_active_memcg() uses in_interrupt() check to select proper storage for
cgroup: pointer on task struct or per-cpu pointer.

It isn't fully correct: obsoleted in_interrupt() includes tasks with
disabled BH.  It's better to use '!in_task()' instead.

Link: https://lkml.org/lkml/2021/7/26/487
Link: https://lkml.kernel.org/r/ed4448b0-4970-616f-7368-ef9dd3cb628d@virtuozzo.com


Fixes: 37d5985c ("mm: kmem: prepare remote memcg charging infra for interrupt contexts")
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Roman Gushchin <guro@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 96e51ccf

include/linux/sched/mm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ set_active_memcg(struct mem_cgroup *memcg)
		{
		struct mem_cgroup *old;

		if (in_interrupt()) {
		if (!in_task()) {
		old = this_cpu_read(int_active_memcg);
		this_cpu_write(int_active_memcg, memcg);
		} else {

mm/memcontrol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -878,7 +878,7 @@ EXPORT_SYMBOL(mem_cgroup_from_task);

		static __always_inline struct mem_cgroup *active_memcg(void)
		{
		if (in_interrupt())
		if (!in_task())
		return this_cpu_read(int_active_memcg);
		else
		return current->active_memcg;