| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220107234138.1765668-2-joshdon@google.com>
Date: Fri, 7 Jan 2022 15:41:38 -0800
From: Josh Don <joshdon@...gle.com>
To: Tejun Heo <tj@...nel.org>, Zefan Li <lizefan.x@...edance.com>,
Johannes Weiner <hannes@...xchg.org>,
Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Juri Lelli <juri.lelli@...hat.com>,
Vincent Guittot <vincent.guittot@...aro.org>
Cc: Dietmar Eggemann <dietmar.eggemann@....com>,
Steven Rostedt <rostedt@...dmis.org>,
Ben Segall <bsegall@...gle.com>, Mel Gorman <mgorman@...e.de>,
Daniel Bristot de Oliveira <bristot@...hat.com>,
cgroups@...r.kernel.org, linux-kernel@...r.kernel.org,
Josh Don <joshdon@...gle.com>
Subject: [PATCH 2/2] sched: show percpu throttled stats
Now that we have a cpu.stat_percpu interface, we can expose some
statistics percpu. From the cpu controller, CFS bandwidth throttling
time is a useful metric to expose percpu.
Signed-off-by: Josh Don <joshdon@...gle.com>
---
include/linux/cgroup-defs.h | 3 ++-
kernel/cgroup/cgroup.c | 15 +++++++++++----
kernel/sched/core.c | 38 +++++++++++++++++++++++++++++++++++--
kernel/sched/fair.c | 5 ++++-
kernel/sched/sched.h | 1 +
5 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 7778a011f457..e6903a6e0a10 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -636,7 +636,8 @@ struct cgroup_subsys {
void (*css_reset)(struct cgroup_subsys_state *css);
void (*css_rstat_flush)(struct cgroup_subsys_state *css, int cpu);
int (*css_extra_stat_show)(struct seq_file *seq,
- struct cgroup_subsys_state *css);
+ struct cgroup_subsys_state *css,
+ bool percpu);
int (*can_attach)(struct cgroup_taskset *tset);
void (*cancel_attach)(struct cgroup_taskset *tset);
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 4f5ddce529eb..05d9aeb3ff48 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -3574,7 +3574,8 @@ static int cgroup_stat_show(struct seq_file *seq, void *v)
}
static int __maybe_unused cgroup_extra_stat_show(struct seq_file *seq,
- struct cgroup *cgrp, int ssid)
+ struct cgroup *cgrp, int ssid,
+ bool percpu)
{
struct cgroup_subsys *ss = cgroup_subsys[ssid];
struct cgroup_subsys_state *css;
@@ -3587,7 +3588,7 @@ static int __maybe_unused cgroup_extra_stat_show(struct seq_file *seq,
if (!css)
return 0;
- ret = ss->css_extra_stat_show(seq, css);
+ ret = ss->css_extra_stat_show(seq, css, percpu);
css_put(css);
return ret;
}
@@ -3599,15 +3600,21 @@ static int cpu_stat_show(struct seq_file *seq, void *v)
cgroup_base_stat_cputime_show(seq);
#ifdef CONFIG_CGROUP_SCHED
- ret = cgroup_extra_stat_show(seq, cgrp, cpu_cgrp_id);
+ ret = cgroup_extra_stat_show(seq, cgrp, cpu_cgrp_id, /*percpu=*/false);
#endif
return ret;
}
static int cpu_stat_percpu_show(struct seq_file *seq, void *v)
{
+ struct cgroup __maybe_unused *cgrp = seq_css(seq)->cgroup;
+ int ret = 0;
+
cgroup_base_stat_percpu_cputime_show(seq);
- return 0;
+#ifdef CONFIG_CGROUP_SCHED
+ ret = cgroup_extra_stat_show(seq, cgrp, cpu_cgrp_id, /*percpu=*/true);
+#endif
+ return ret;
}
#ifdef CONFIG_PSI
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 4604e80fac5e..8b383e58aaa2 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -10651,8 +10651,8 @@ static struct cftype cpu_legacy_files[] = {
{ } /* Terminate */
};
-static int cpu_extra_stat_show(struct seq_file *sf,
- struct cgroup_subsys_state *css)
+static void __cpu_extra_stat_show(struct seq_file *sf,
+ struct cgroup_subsys_state *css)
{
#ifdef CONFIG_CFS_BANDWIDTH
{
@@ -10674,6 +10674,40 @@ static int cpu_extra_stat_show(struct seq_file *sf,
throttled_usec, cfs_b->nr_burst, burst_usec);
}
#endif
+}
+
+static void __cpu_extra_stat_percpu_show(struct seq_file *sf,
+ struct cgroup_subsys_state *css)
+{
+#ifdef CONFIG_CFS_BANDWIDTH
+ {
+ struct task_group *tg = css_tg(css);
+ struct cfs_rq *cfs_rq;
+ u64 throttled_usec;
+ int cpu;
+
+ seq_puts(sf, "throttled_usec");
+ for_each_possible_cpu(cpu) {
+ cfs_rq = tg->cfs_rq[cpu];
+
+ throttled_usec = READ_ONCE(cfs_rq->throttled_time);
+ do_div(throttled_usec, NSEC_PER_USEC);
+
+ seq_printf(sf, " %llu", throttled_usec);
+ }
+ seq_puts(sf, "\n");
+ }
+#endif
+}
+
+static int cpu_extra_stat_show(struct seq_file *sf,
+ struct cgroup_subsys_state *css,
+ bool percpu)
+{
+ if (percpu)
+ __cpu_extra_stat_percpu_show(sf, css);
+ else
+ __cpu_extra_stat_show(sf, css);
return 0;
}
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d4b463e015cd..2de0ce23ee99 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4878,6 +4878,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq)
struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(cfs_rq->tg);
struct sched_entity *se;
long task_delta, idle_task_delta;
+ u64 throttled_time;
se = cfs_rq->tg->se[cpu_of(rq)];
@@ -4886,7 +4887,9 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq)
update_rq_clock(rq);
raw_spin_lock(&cfs_b->lock);
- cfs_b->throttled_time += rq_clock(rq) - cfs_rq->throttled_clock;
+ throttled_time = rq_clock(rq) - cfs_rq->throttled_clock;
+ cfs_b->throttled_time += throttled_time;
+ cfs_rq->throttled_time += throttled_time;
list_del_rcu(&cfs_rq->throttled_list);
raw_spin_unlock(&cfs_b->lock);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index de53be905739..c1ac2b8d8dd5 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -620,6 +620,7 @@ struct cfs_rq {
u64 throttled_clock;
u64 throttled_clock_task;
u64 throttled_clock_task_time;
+ u64 throttled_time;
int throttled;
int throttle_count;
struct list_head throttled_list;
--
2.34.1.575.g55b058a8bb-goog
Powered by blists - more mailing lists