cpuset: Fix incorrect memory_pressure control file mapping

Waiman-Long · gregkh · commit ed48d9230e30 · 2017-09-07T08:34:09.000+02:00
commit 1c08c22c874ac88799cab1f78c40f46110274915 upstream. The memory_pressure control file was incorrectly set up without a private value (0, by default). As a result, this control file was treated like memory_migrate on read. By adding back the FILE_MEMORY_PRESSURE private value, the correct memory pressure value will be returned. Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org> Fixes: 7dbdb19 ("cgroup: replace cftype->mode with CFTYPE_WORLD_WRITABLE") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
@@ -1910,6 +1910,7 @@ static struct cftype files[] = {
 	{
 		.name = "memory_pressure",
 		.read_u64 = cpuset_read_u64,
+		.private = FILE_MEMORY_PRESSURE,
 	},
 
 	{

Original file line number	Diff line number	Diff line change
`@@ -1910,6 +1910,7 @@ static struct cftype files[] = {`
`1910`	`1910`	`{`
`1911`	`1911`	`.name = "memory_pressure",`
`1912`	`1912`	`.read_u64 = cpuset_read_u64,`
	`1913`	`+ .private = FILE_MEMORY_PRESSURE,`
`1913`	`1914`	`},`
`1914`	`1915`
`1915`	`1916`	`{`