LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] psi: Expose pressure metrics on root cgroup
@ 2019-05-10 17:49 Dan Schatzberg
  2019-05-10 18:23 ` Johannes Weiner
  2019-05-10 21:16 ` Andrew Morton
  0 siblings, 2 replies; 3+ messages in thread
From: Dan Schatzberg @ 2019-05-10 17:49 UTC (permalink / raw)
  Cc: Dan Schatzberg, Tejun Heo, Li Zefan, Johannes Weiner,
	Ingo Molnar, Peter Zijlstra, Andrew Morton, linux-kernel,
	cgroups

Pressure metrics are already recorded and exposed in procfs for the
entire system, but any tool which monitors cgroup pressure has to
special case the root cgroup to read from procfs. This patch exposes
the already recorded pressure metrics on the root cgroup.

Signed-off-by: Dan Schatzberg <dschatzberg@fb.com>
---
 include/linux/psi.h    |  1 +
 kernel/cgroup/cgroup.c | 18 ++++++++++++------
 kernel/sched/psi.c     |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/linux/psi.h b/include/linux/psi.h
index fc08da2bcc0a..64740dc42aa2 100644
--- a/include/linux/psi.h
+++ b/include/linux/psi.h
@@ -10,6 +10,7 @@ struct css_set;
 #ifdef CONFIG_PSI
 
 extern bool psi_disabled;
+extern struct psi_group psi_system;
 
 void psi_init(void);
 
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index dc8adb124874..3a748c746324 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -3392,15 +3392,24 @@ static int cpu_stat_show(struct seq_file *seq, void *v)
 #ifdef CONFIG_PSI
 static int cgroup_cpu_pressure_show(struct seq_file *seq, void *v)
 {
-	return psi_show(seq, &seq_css(seq)->cgroup->psi, PSI_CPU);
+	struct cgroup *cgroup = seq_css(seq)->cgroup;
+	struct psi_group *psi = cgroup->id == 1 ? &psi_system : &cgroup->psi;
+
+	return psi_show(seq, psi, PSI_CPU);
 }
 static int cgroup_memory_pressure_show(struct seq_file *seq, void *v)
 {
-	return psi_show(seq, &seq_css(seq)->cgroup->psi, PSI_MEM);
+	struct cgroup *cgroup = seq_css(seq)->cgroup;
+	struct psi_group *psi = cgroup->id == 1 ? &psi_system : &cgroup->psi;
+
+	return psi_show(seq, psi, PSI_MEM);
 }
 static int cgroup_io_pressure_show(struct seq_file *seq, void *v)
 {
-	return psi_show(seq, &seq_css(seq)->cgroup->psi, PSI_IO);
+	struct cgroup *cgroup = seq_css(seq)->cgroup;
+	struct psi_group *psi = cgroup->id == 1 ? &psi_system : &cgroup->psi;
+
+	return psi_show(seq, psi, PSI_IO);
 }
 #endif
 
@@ -4518,17 +4527,14 @@ static struct cftype cgroup_base_files[] = {
 #ifdef CONFIG_PSI
 	{
 		.name = "cpu.pressure",
-		.flags = CFTYPE_NOT_ON_ROOT,
 		.seq_show = cgroup_cpu_pressure_show,
 	},
 	{
 		.name = "memory.pressure",
-		.flags = CFTYPE_NOT_ON_ROOT,
 		.seq_show = cgroup_memory_pressure_show,
 	},
 	{
 		.name = "io.pressure",
-		.flags = CFTYPE_NOT_ON_ROOT,
 		.seq_show = cgroup_io_pressure_show,
 	},
 #endif
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index cc3faf56b614..59e67b3c3bc4 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -150,7 +150,7 @@ static u64 psi_period __read_mostly;
 
 /* System-level pressure and stall tracking */
 static DEFINE_PER_CPU(struct psi_group_cpu, system_group_pcpu);
-static struct psi_group psi_system = {
+struct psi_group psi_system = {
 	.pcpu = &system_group_pcpu,
 };
 
-- 
2.17.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] psi: Expose pressure metrics on root cgroup
  2019-05-10 17:49 [PATCH] psi: Expose pressure metrics on root cgroup Dan Schatzberg
@ 2019-05-10 18:23 ` Johannes Weiner
  2019-05-10 21:16 ` Andrew Morton
  1 sibling, 0 replies; 3+ messages in thread
From: Johannes Weiner @ 2019-05-10 18:23 UTC (permalink / raw)
  To: Dan Schatzberg
  Cc: Tejun Heo, Li Zefan, Ingo Molnar, Peter Zijlstra, Andrew Morton,
	linux-kernel, cgroups

On Fri, May 10, 2019 at 10:49:34AM -0700, Dan Schatzberg wrote:
> Pressure metrics are already recorded and exposed in procfs for the
> entire system, but any tool which monitors cgroup pressure has to
> special case the root cgroup to read from procfs. This patch exposes
> the already recorded pressure metrics on the root cgroup.
> 
> Signed-off-by: Dan Schatzberg <dschatzberg@fb.com>

Looks good to me, thanks Dan!

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] psi: Expose pressure metrics on root cgroup
  2019-05-10 17:49 [PATCH] psi: Expose pressure metrics on root cgroup Dan Schatzberg
  2019-05-10 18:23 ` Johannes Weiner
@ 2019-05-10 21:16 ` Andrew Morton
  1 sibling, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2019-05-10 21:16 UTC (permalink / raw)
  To: Dan Schatzberg
  Cc: Tejun Heo, Li Zefan, Johannes Weiner, Ingo Molnar,
	Peter Zijlstra, linux-kernel, cgroups

On Fri, 10 May 2019 10:49:34 -0700 Dan Schatzberg <dschatzberg@fb.com> wrote:

> Pressure metrics are already recorded and exposed in procfs for the
> entire system, but any tool which monitors cgroup pressure has to
> special case the root cgroup to read from procfs. This patch exposes
> the already recorded pressure metrics on the root cgroup.
> 

Documentation/admin-guide/cgroup-v2.rst says "A read-only nested-key
file which exists on non-root cgroups". 
Documentation/accounting/psi.txt could do woth some clarification as
well.


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-05-10 21:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-10 17:49 [PATCH] psi: Expose pressure metrics on root cgroup Dan Schatzberg
2019-05-10 18:23 ` Johannes Weiner
2019-05-10 21:16 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).