x86/resctrl: Add task resctrl information display
Subsystems (4)
PATCH 1/1 x86/resctrl: Add task resctrl information display
Monitoring tools that want to find out which resctrl CTRL 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}/resctrl to provide this information.
For example:
cat /proc/1193/resctrl
CTRL_MON:/ctrl_grp0
MON:/ctrl_grp0/mon_groups/mon_grp0
If the resctrl filesystem has not been mounted, reading /proc/{pid}/resctrl returns an error:
cat: /proc/1193/resctrl: No such device
--- arch/x86/include/asm/resctrl_sched.h | 4 +++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 46 ++++++++++++++++++++++++++ fs/proc/base.c | 9 +++++ 3 files changed, 59 insertions(+)
arch/x86/include/asm/resctrl_sched.h +4 -0
@@ -5,6 +5,7 @@#ifdef CONFIG_X86_CPU_RESCTRL #include <linux/sched.h> +#include <linux/proc_fs.h> #include <linux/jump_label.h> #define IA32_PQR_ASSOC 0x0c8f
@@ -84,6 +85,9 @@ static inline void resctrl_sched_in(void) __resctrl_sched_in(); } +int proc_resctrl_show (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *tsk); +#else static inline void resctrl_sched_in (void ) {}
arch/x86/kernel/cpu/resctrl/rdtgroup.c +46 -0
52 lines not on this page · raw message
fs/proc/base.c +9 -0
@@ -95,6 +95,9 @@#include <linux/sched/stat.h> #include <linux/posix-timers.h> #include <trace/events/oom.h> +#ifdef CONFIG_X86_CPU_RESCTRL +#include <asm/resctrl_sched.h> +#endif #include "internal.h" #include "fd.h"
@@ -3060,6 +3063,9 @@ static const struct pid_entry tgid_base_stuff[] = {#endif #ifdef CONFIG_CGROUPS ONE("cgroup", S_IRUGO, proc_cgroup_show), +#endif +#ifdef CONFIG_X86_CPU_RESCTRL +ONE ("resctrl" ,S_IRUGO , proc_resctrl_show), #endifONE ("oom_score" ,S_IRUGO , proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
@@ -3460,6 +3466,9 @@ static const struct pid_entry tid_base_stuff[] = {#endif #ifdef CONFIG_CGROUPS ONE("cgroup", S_IRUGO, proc_cgroup_show), +#endif +#ifdef CONFIG_X86_CPU_RESCTRL +ONE ("resctrl" ,S_IRUGO , proc_resctrl_show), #endifONE ("oom_score" ,S_IRUGO , proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
Signature · 1 line
2.17.1
Borislav Petkov
maintainerQuoted 23 lines · Chen Yu
Monitoring tools that want to find out which resctrl CTRL 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}/resctrlto provide this information.For example:
cat/proc/1193/resctrl
CTRL_MON:/ctrl_grp0
MON:/ctrl_grp0/mon_groups/mon_grp0If the resctrl filesystem has not been mounted, reading
/proc/{pid}/resctrlreturns an error:
cat:/proc/1193/resctrl: No such deviceTested-by Jinshi Chen <[email protected]>Reviewed-by Reinette Chatre <[email protected]>Reviewed-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>Signed-off-by Chen Yu <[email protected]>
Quoted 4 lines
--- arch/x86/include/asm/resctrl_sched.h | 4 +++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 46 ++++++++++++++++++++++++++ fs/proc/base.c | 9 +++++
^^^^^^^^^^^^^^^
So you're touching this file here and yet your Cc list doesn't have *anyone* who might be responsible for the proc fs (yeah, you have linux-fsdevel but I don't think that's enough). Have you heard of scripts/get_maintainer.pl?
Use it in the future.
Cc-ing some more people for the generic /proc bits.
Quoted 48 lines
3 files changed, 59 insertions(+)arch/x86/include/asm/resctrl_sched.h +4
-0@@ -5,6 +5,7 @@#ifdef CONFIG_X86_CPU_RESCTRL #include <linux/sched.h> +#include <linux/proc_fs.h> #include <linux/jump_label.h> #define IA32_PQR_ASSOC 0x0c8f@@ -84,6 +85,9 @@ static inline void resctrl_sched_in(void) __resctrl_sched_in(); } +int proc_resctrl_show (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *tsk); +#else static inline void resctrl_sched_in (void ) {}arch/x86/kernel/cpu/resctrl/rdtgroup.c +16
-0@@ -727,6 +727,52 @@ static int rdtgroup_tasks_show(struct kernfs_open_file *of,return ret; } +int proc_resctrl_show (struct seq_file *s,struct pid_namespace *ns, +struct pid *pid,struct task_struct *tsk) +{ +struct rdtgroup *rdtg; +int ret =0 ; + +mutex_lock (&rdtgroup_mutex); + +/* Make sure resctrl has been mounted. */ +if (!static_branch_unlikely (&rdt_enable_key)) { + ret = -ENODEV ; + goto unlock; + } + +list_for_each_entry (rdtg, &rdt_all_groups, rdtgroup_list) { +struct rdtgroup *crg;
arch/x86/kernel/cpu/resctrl/rdtgroup.c static int rdtgroup_tasks_show(struct kernfs_open_file *of, · line 755
Quoted 10 lines
arch/x86/kernel/cpu/resctrl/rdtgroup.c +10
-0+ +/* +* Task information is only relevant for shareable +* and exclusive groups. +*/ +if (rdtg->mode !=RDT_MODE_SHAREABLE && + rdtg->mode !=RDT_MODE_EXCLUSIVE ) +continue ; + +if (rdtg->closid == tsk->closid) {
Save an indentation level:
if (rdtg->closid != tsk->closid) continue; seq_printf...
Quoted 28 lines
arch/x86/kernel/cpu/resctrl/rdtgroup.c +20
-0+seq_printf (s,"CTRL_MON:/%s\n" , rdtg->kn->name); +list_for_each_entry (crg, &rdtg->mon.crdtgrp_list, + mon.crdtgrp_list) { +if (tsk->rmid != crg->mon.rmid) +continue ; +seq_printf (s,"MON:%s%s/mon_groups/%s\n" , + rdtg == &rdtgroup_default ?"" :"/" , + rdtg->kn->name, crg->kn->name); + goto unlock; + } + goto unlock; + } + } + ret = -ENOENT ; +unlock: +mutex_unlock (&rdtgroup_mutex); + +return ret; +} +static int rdt_last_cmd_status_show (struct kernfs_open_file *of,struct seq_file *seq,void *v) {fs/proc/base.c +0
-0
fs/proc/base.c line 100
Quoted 6 lines
fs/proc/base.c +3
-0@@ -95,6 +95,9 @@#include <linux/sched/stat.h> #include <linux/posix-timers.h> #include <trace/events/oom.h> +#ifdef CONFIG_X86_CPU_RESCTRL +#include <asm/resctrl_sched.h> +#endif
If anything, this should be abstracted nicely into an include/linux/resctrl.h header. Other architectures would probably wanna use it too, I hear ARM64 has something like resctrl.
Quoted 14 lines
fs/proc/base.c +3
-0#include "internal.h" #include "fd.h" @@ -3060,6 +3063,9 @@ static const struct pid_entry tgid_base_stuff[] = {#endif #ifdef CONFIG_CGROUPS ONE("cgroup", S_IRUGO, proc_cgroup_show), +#endif +#ifdef CONFIG_X86_CPU_RESCTRL +ONE ("resctrl" ,S_IRUGO , proc_resctrl_show), #endifONE ("oom_score" ,S_IRUGO , proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
fs/proc/base.c static const struct pid_entry tid_base_stuff[] = { · line 3472
Quoted 7 lines
fs/proc/base.c +3
-0@@ -3460,6 +3466,9 @@ static const struct pid_entry tid_base_stuff[] = {#endif #ifdef CONFIG_CGROUPS ONE("cgroup", S_IRUGO, proc_cgroup_show), +#endif +#ifdef CONFIG_X86_CPU_RESCTRL + ONE("resctrl", S_IRUGO, proc_resctrl_show),#endif
Same here. proc_resctrl_show() looks like a generic function but it is x86-only. Need to call the x86-specific one in a real generic proc_resctrl_show() which other arches can add their code to, too.
Not like that.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteHi Boris,
Thanks for looking at the patch.
Quoted 30 lines · Borislav Petkov
Quoted 23 lines · Chen Yu
Monitoring tools that want to find out which resctrl CTRL 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}/resctrlto provide this information.For example:
cat/proc/1193/resctrl
CTRL_MON:/ctrl_grp0
MON:/ctrl_grp0/mon_groups/mon_grp0If the resctrl filesystem has not been mounted, reading
/proc/{pid}/resctrlreturns an error:
cat:/proc/1193/resctrl: No such deviceTested-by Jinshi Chen <[email protected]>Reviewed-by Reinette Chatre <[email protected]>Reviewed-by Fenghua Yu <[email protected]>Reviewed-by Tony Luck <[email protected]>Signed-off-by Chen Yu <[email protected]>Quoted 4 lines
--- arch/x86/include/asm/resctrl_sched.h | 4 +++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 46 ++++++++++++++++++++++++++ fs/proc/base.c | 9 +++++^^^^^^^^^^^^^^^
Quoted 9 lines
So you're touching this file here and yet your Cc list doesn't have *anyone* who might be responsible for the proc fs (yeah, you have linux-fsdevel but I don't think that's enough). Have you heard of
scripts/get_maintainer.pl?Use it in the future.
Cc-ing some more people for the generic /proc bits.
Okay, thanks.
Quoted 7 lines
Review
Quoted 4 lines
3 files changed, 59 insertions(+)(quoted diff) +2
-0+ + if (rdtg->closid == tsk->closid) {Save an indentation level:
Quoted 5 lines
if (rdtg->closid != tsk->closid) continue; seq_printf...
Okay.
Quoted 8 lines
fs/proc/base.c line 100
Quoted 3 lines
fs/proc/base.c +3
-0+#ifdef CONFIG_X86_CPU_RESCTRL +#include <asm/resctrl_sched.h> +#endif If anything, this should be abstracted nicely into an
include/linux/resctrl.hheader. Other architectures would probably wanna use it too, I hear ARM64 has something like resctrl.
Okay, created this header in the next version.
Quoted 11 lines
fs/proc/base.c static const struct pid_entry tgid_base_stuff[] = { · line 3069
Quoted 4 lines
fs/proc/base.c +3
-0+#endif +#ifdef CONFIG_X86_CPU_RESCTRL + ONE("resctrl", S_IRUGO, proc_resctrl_show),#endif Same here.
proc_resctrl_show()looks like a generic function but it is x86-only. Need to call the x86-specific one in a real genericproc_resctrl_show()which other arches can add their code to, too.Not like that.
Okay, in next version proc_resctrl_show() is declared in resctrl.h. However since there's no common c source file for resctrl currently, different architectures might need to implement proc_resctrl_show() accordingly - currently only x86 needs to do that.
Thanks,
Chenyu
Quoted 5 lines
Signature · 4 lines
Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
Borislav Petkov
maintainerQuoted 2 lines · Yu Chen
Okay, in next version
proc_resctrl_show()is declared inresctrl.h. However since there's no common c source file for resctrl currently,
And what do we do if there's no .c file in the repo?
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette