Commit d8ef4b38 authored Apr 09, 2020 by Tejun Heo

Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window"



This reverts commit 9a9e97b2 ("cgroup: Add memory barriers to plug
cgroup_rstat_updated() race window").

The commit was added in anticipation of memcg rstat conversion which needed
synchronous accounting for the event counters (e.g. oom kill count). However,
the conversion didn't get merged due to percpu memory overhead concern which
couldn't be addressed at the time.

Unfortunately, the patch's addition of smp_mb() to cgroup_rstat_updated()
meant that every scheduling event now had to go through an additional full
barrier and Mel Gorman noticed it as 1% regression in netperf UDP_STREAM test.

There's no need to have this barrier in tree now and even if we need
synchronous accounting in the future, the right thing to do is separating that
out to a separate function so that hot paths which don't care about
synchronous behavior don't have to pay the overhead of the full barrier. Let's
revert.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Mel Gorman <mgorman@techsingularity.net>
Link: http://lkml.kernel.org/r/20200409154413.GK3818@techsingularity.net
Cc: v4.18+

parent 87ebc45d

kernel/cgroup/rstat.c

+3 −13

Original line number	Diff line number	Diff line
		@@ -33,12 +33,9 @@ void cgroup_rstat_updated(struct cgroup *cgrp, int cpu)
		return;

		/*
		* Paired with the one in cgroup_rstat_cpu_pop_updated(). Either we
		* see NULL updated_next or they see our updated stat.
		*/
		smp_mb();

		/*
		* Speculative already-on-list test. This may race leading to
		* temporary inaccuracies, which is fine.
		*
		* Because @parent's updated_children is terminated with @parent
		* instead of NULL, we can tell whether @cgrp is on the list by
		* testing the next pointer for NULL.
		@@ -134,13 +131,6 @@ static struct cgroup cgroup_rstat_cpu_pop_updated(struct cgroup pos,
		*nextp = rstatc->updated_next;
		rstatc->updated_next = NULL;

		/*
		* Paired with the one in cgroup_rstat_cpu_updated().
		* Either they see NULL updated_next or we see their
		* updated stat.
		*/
		smp_mb();

		return pos;
		}

Admin message