Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 resource control updates from Ingo Molnar: "The main change in this tree is the extension of the resctrl procfs ABI with a new file that helps tooling to navigate from tasks back to resctrl groups: /proc/{pid}/cpu_resctrl_groups. Also fix static key usage for certain feature combinations and simplify the task exit resctrl case" * 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/resctrl: Add task resctrl information display x86/resctrl: Check monitoring static key in the MBM overflow handler x86/resctrl: Do not reconfigure exiting tasks
This commit is contained in:
@@ -95,6 +95,7 @@
|
||||
#include <linux/sched/stat.h>
|
||||
#include <linux/posix-timers.h>
|
||||
#include <linux/time_namespace.h>
|
||||
#include <linux/resctrl.h>
|
||||
#include <trace/events/oom.h>
|
||||
#include "internal.h"
|
||||
#include "fd.h"
|
||||
@@ -3154,6 +3155,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),
|
||||
@@ -3554,6 +3558,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),
|
||||
|
Reference in New Issue
Block a user