Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f371763a authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: fix false-positive VM_BUG_ON() on -rt 



On -rt, the VM_BUG_ON(!irqs_disabled()) triggers inside the memcg
swapout path because the spin_lock_irq(&mapping->tree_lock) in the
caller doesn't actually disable the hardware interrupts - which is fine,
because on -rt the tophalves run in process context and so we are still
safe from preemption while updating the statistics.

Remove the VM_BUG_ON() but keep the comment of what we rely on.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reported-by: default avatarClark Williams <williams@redhat.com>
Cc: Fernando Lopez-Lezcano <nando@ccrma.Stanford.EDU>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5129e87c

mm/memcontrol.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -5835,9 +5835,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) 
	if (!mem_cgroup_is_root(memcg))

	if (!mem_cgroup_is_root(memcg))

		page_counter_uncharge(&memcg->memory, 1);

		page_counter_uncharge(&memcg->memory, 1);





	/* XXX: caller holds IRQ-safe mapping->tree_lock */

	/* Caller disabled preemption with mapping->tree_lock */

	VM_BUG_ON(!irqs_disabled());



	mem_cgroup_charge_statistics(memcg, page, -1);

	mem_cgroup_charge_statistics(memcg, page, -1);

	memcg_check_events(memcg, page);

	memcg_check_events(memcg, page);

}

}