Skip to contentSkip to conversation

x86/resctrl: Add task resctrl information display

PATCH Applied Chen Yu 2 participants 2 messages Jan 15, 2020 – Jan 20, 2020

Subsystems (5)
x86 VFS Proc filesystem ABI/API +1 more subsystems
lore
Share & tools
lore

Chen Yu

author
#0 lore raw

PATCH v7 1/1 x86/resctrl: Add task resctrl information display

Monitoring tools that want to find out which resctrl control and monitor groups a task belongs to must currently read the "tasks" file in every group until they locate the process ID.

Add an additional file /proc/{pid}/cpu_resctrl_groups to provide this information:

1) res:
mon:

resctrl is not available.

2) res:/
mon:

Task is part of the root resctrl control group, and it is not associated to any monitor group.

3) res:/
mon:mon0

Task is part of the root resctrl control group and monitor group mon0.

4) res:group0
mon:

Task is part of resctrl control group group0, and it is not associated to any monitor group.

5) res:group0
mon:mon1

Task is part of resctrl control group group0 and monitor group mon1.

Cc Thomas Gleixner <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Alexey Dobriyan <[email protected]>
Cc Andrew Morton <akpm-de/[email protected]>
Cc Reinette Chatre <[email protected]>
Cc Fenghua Yu <[email protected]>
Cc Tony Luck <[email protected]>
Cc Chris Down <[email protected]>
Cc Michal Hocko <mhocko-IBi9RG/[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Linus Torvalds <torvalds-de/[email protected]>

---
v1: Initial version reviewed by Reinette Chatre,
Fenghua Yu and Tony Luck.

v2: According to Boris's suggestion,
reduce indentation level in proc_resctrl_show(). Create the include/linux/resctrl.h header and declare proc_resctrl_show() in this file, so that other architectures would probably use it in the future. Different architectures should implement architectural specific proc_resctrl_show() accordingly.

v3: According to Boris's suggestion,
Return empty string if the resctrl filesystem has not been mounted.
Rename the config from CPU_RESCTRL to PROC_CPU_RESCTRL to better represent its usage. Move PROC_CPU_RESCTRL from arch/Kconfig to fs/proc/Kconfig.
And let PROC_CPU_RESCTRL to be depended on PROC_FS.

v4: According to Thomas's suggestion, changed the output
from multiple lines to one single line.

v5: According to Alexey's feedback, removed the header file
proc_fs.h in resctrl.h, and changed seq_puts() to seq_putc() for simplicity.

v6: According to Chris Down's suggestion,
1. rename:
/proc/{pid}/resctrl to /proc/{pid}/cpu_resctrl to better reflect its meaning.
2. change the description in comments:
"control group" to "resctrl control group" as the former is confusing for cgroup users.

v7: According to Boris's suggestion,
split the output into two lines, to display the resctrl control group and monitor group respctively to be more human/tool-readable. Renamed the file to cpu_resctrl_groups.

---
 arch/x86/Kconfig                       |  1 +
 arch/x86/kernel/cpu/resctrl/rdtgroup.c | 86 ++++++++++++++++++++++++++
 fs/proc/Kconfig                        |  4 ++
 fs/proc/base.c                         |  7 +++
 include/linux/resctrl.h                | 14 +++++
 5 files changed, 112 insertions(+)
 create mode 100644 include/linux/resctrl.h
arch/x86/Kconfig +1 -0
index 5e8949953660..6e17a68c7d77 100644
@@ -456,6 +456,7 @@ config X86_CPU_RESCTRL
 	bool "x86 CPU resource control support"
 	depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD)
 	select KERNFS
+	select PROC_CPU_RESCTRL		if PROC_FS
 	help
 	  Enable x86 CPU resource control support.
 
arch/x86/kernel/cpu/resctrl/rdtgroup.c +86 -0

92 lines not on this page · raw message

fs/proc/Kconfig +4 -0
index 733881a6387b..27ef84d99f59 100644
@@ -103,3 +103,7 @@ config PROC_CHILDREN
 config PROC_PID_ARCH_STATUS
 	def_bool n
 	depends on PROC_FS
+
+config PROC_CPU_RESCTRL
+	def_bool n
+	depends on PROC_FS
fs/proc/base.c +7 -0
index ebea9501afb8..bbffd654bb0e 100644
@@ -94,6 +94,7 @@
 #include <linux/sched/debug.h>
 #include <linux/sched/stat.h>
 #include <linux/posix-timers.h>
+#include <linux/resctrl.h>
 #include <trace/events/oom.h>
 #include "internal.h"
 #include "fd.h"
@@ -3060,6 +3061,9 @@ static const struct pid_entry tgid_base_stuff[] = {
 #endif
 #ifdef CONFIG_CGROUPS
 	ONE("cgroup",  S_IRUGO, proc_cgroup_show),
+#endif
+#ifdef CONFIG_PROC_CPU_RESCTRL
+	ONE("cpu_resctrl_groups", S_IRUGO, proc_resctrl_show),
 #endif
 	ONE("oom_score",  S_IRUGO, proc_oom_score),
 	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),
@@ -3460,6 +3464,9 @@ static const struct pid_entry tid_base_stuff[] = {
 #endif
 #ifdef CONFIG_CGROUPS
 	ONE("cgroup",  S_IRUGO, proc_cgroup_show),
+#endif
+#ifdef CONFIG_PROC_CPU_RESCTRL
+	ONE("cpu_resctrl_groups", S_IRUGO, proc_resctrl_show),
 #endif
 	ONE("oom_score", S_IRUGO, proc_oom_score),
 	REG("oom_adj",   S_IRUGO|S_IWUSR, proc_oom_adj_operations),
include/linux/resctrl.h new file +14 -0
new file mode 100644
index 000000000000..daf5cf64c6a6
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _RESCTRL_H
+#define _RESCTRL_H
+
+#ifdef CONFIG_PROC_CPU_RESCTRL
+
+int proc_resctrl_show(struct seq_file *m,
+		      struct pid_namespace *ns,
+		      struct pid *pid,
+		      struct task_struct *tsk);
+
+#endif
+
+#endif /* _RESCTRL_H */
Signature · 1 line
2.17.1
merge bot Applied
#1 lore raw
The following commit has been merged into the x86/cache branch of tip:

The following commit has been merged into the x86/cache branch of tip:

Commit-ID:     e79f15a4598c1f3f3f7f3319ca308c63c91fdaf2
Gitweb:        https://git.kernel.org/tip/e79f15a4598c1f3f3f7f3319ca308c63c91fdaf2
Author:        Chen Yu <[email protected]>
AuthorDate:    Wed, 15 Jan 2020 17:28:51 +08:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Mon, 20 Jan 2020 16:19:10 +01:00

x86/resctrl: Add task resctrl information display

Monitoring tools that want to find out which resctrl control and monitor groups a task belongs to must currently read the "tasks" file in every group until they locate the process ID.

Add an additional file /proc/{pid}/cpu_resctrl_groups to provide this information:

1) res:
mon:

resctrl is not available.

2) res:/
mon:

Task is part of the root resctrl control group, and it is not associated to any monitor group.

3) res:/
mon:mon0

Task is part of the root resctrl control group and monitor group mon0.

4) res:group0
mon:

Task is part of resctrl control group group0, and it is not associated to any monitor group.

5) res:group0
mon:mon1

Task is part of resctrl control group group0 and monitor group mon1.

---
 arch/x86/Kconfig                       |  1 +-
 arch/x86/kernel/cpu/resctrl/rdtgroup.c | 86 +++++++++++++++++++++++++-
 fs/proc/Kconfig                        |  4 +-
 fs/proc/base.c                         |  7 ++-
 include/linux/resctrl.h                | 14 ++++-
 5 files changed, 112 insertions(+)
 create mode 100644 include/linux/resctrl.h
arch/x86/Kconfig +1 -0
index 5e89499..6e17a68 100644
@@ -456,6 +456,7 @@ config X86_CPU_RESCTRL
 	bool "x86 CPU resource control support"
 	depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD)
 	select KERNFS
+	select PROC_CPU_RESCTRL		if PROC_FS
 	help
 	  Enable x86 CPU resource control support.
 
arch/x86/kernel/cpu/resctrl/rdtgroup.c +86 -0

92 lines not on this page · raw message

fs/proc/Kconfig +4 -0
index 733881a..27ef84d 100644
@@ -103,3 +103,7 @@ config PROC_CHILDREN
 config PROC_PID_ARCH_STATUS
 	def_bool n
 	depends on PROC_FS
+
+config PROC_CPU_RESCTRL
+	def_bool n
+	depends on PROC_FS
fs/proc/base.c +7 -0
index ebea950..bbffd65 100644
@@ -94,6 +94,7 @@
 #include <linux/sched/debug.h>
 #include <linux/sched/stat.h>
 #include <linux/posix-timers.h>
+#include <linux/resctrl.h>
 #include <trace/events/oom.h>
 #include "internal.h"
 #include "fd.h"
@@ -3061,6 +3062,9 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_CGROUPS
 	ONE("cgroup",  S_IRUGO, proc_cgroup_show),
 #endif
+#ifdef CONFIG_PROC_CPU_RESCTRL
+	ONE("cpu_resctrl_groups", S_IRUGO, proc_resctrl_show),
+#endif
 	ONE("oom_score",  S_IRUGO, proc_oom_score),
 	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),
 	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
@@ -3461,6 +3465,9 @@ static const struct pid_entry tid_base_stuff[] = {
 #ifdef CONFIG_CGROUPS
 	ONE("cgroup",  S_IRUGO, proc_cgroup_show),
 #endif
+#ifdef CONFIG_PROC_CPU_RESCTRL
+	ONE("cpu_resctrl_groups", S_IRUGO, proc_resctrl_show),
+#endif
 	ONE("oom_score", S_IRUGO, proc_oom_score),
 	REG("oom_adj",   S_IRUGO|S_IWUSR, proc_oom_adj_operations),
 	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
include/linux/resctrl.h new file +14 -0
new file mode 100644
index 0000000..daf5cf6
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _RESCTRL_H
+#define _RESCTRL_H
+
+#ifdef CONFIG_PROC_CPU_RESCTRL
+
+int proc_resctrl_show(struct seq_file *m,
+		      struct pid_namespace *ns,
+		      struct pid *pid,
+		      struct task_struct *tsk);
+
+#endif
+
+#endif /* _RESCTRL_H */