mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-28 22:54:05 +08:00
perf kwork top: Add statistics on softirq event support
Calculate the runtime of the softirq events and subtract it from the corresponding task runtime to improve the precision. Example usage: # perf kwork -k sched,irq,softirq record -- perf record -e cpu-clock -o perf_record.data -a sleep 10 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.467 MB perf_record.data (7154 samples) ] [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 2.152 MB perf.data (22846 samples) ] # perf kwork top Total : 136601.588 ms, 8 cpus %Cpu(s): 95.66% id, 0.04% hi, 0.05% si %Cpu0 [ 0.02%] %Cpu1 [ 0.01%] %Cpu2 [| 4.61%] %Cpu3 [ 0.04%] %Cpu4 [ 0.01%] %Cpu5 [||||| 17.31%] %Cpu6 [ 0.51%] %Cpu7 [||| 11.42%] PID %CPU RUNTIME COMMMAND ---------------------------------------------------- 0 99.98 17073.515 ms swapper/4 0 99.98 17072.173 ms swapper/1 0 99.93 17064.229 ms swapper/3 0 99.62 17011.013 ms swapper/0 0 99.47 16985.180 ms swapper/6 0 95.17 16250.874 ms swapper/2 0 88.51 15111.684 ms swapper/7 0 82.62 14108.577 ms swapper/5 4342 33.00 5644.045 ms perf 4344 0.43 74.351 ms perf 16 0.13 22.296 ms rcu_preempt 4345 0.05 10.093 ms perf 4343 0.05 8.769 ms perf 4341 0.02 4.882 ms perf 4095 0.02 4.605 ms kworker/7:1 75 0.02 4.261 ms kworker/2:1 120 0.01 1.909 ms systemd-journal 98 0.01 2.540 ms jbd2/sda-8 61 0.01 3.404 ms kcompactd0 667 0.01 2.542 ms kworker/u16:2 4340 0.00 1.052 ms kworker/7:2 97 0.00 0.489 ms kworker/7:1H 51 0.00 0.209 ms ksoftirqd/7 50 0.00 0.646 ms migration/7 76 0.00 0.753 ms kworker/6:1 45 0.00 0.572 ms migration/6 87 0.00 0.145 ms kworker/5:1H 73 0.00 0.596 ms kworker/5:1 41 0.00 0.041 ms ksoftirqd/5 40 0.00 0.718 ms migration/5 64 0.00 0.115 ms kworker/4:1 35 0.00 0.556 ms migration/4 353 0.00 2.600 ms sshd 74 0.00 0.205 ms kworker/3:1 33 0.00 1.576 ms kworker/3:0H 30 0.00 0.996 ms migration/3 26 0.00 1.665 ms ksoftirqd/2 25 0.00 0.662 ms migration/2 397 0.00 0.057 ms kworker/1:1 20 0.00 1.005 ms migration/1 2909 0.00 1.053 ms kworker/0:2 17 0.00 0.720 ms migration/0 15 0.00 0.039 ms ksoftirqd/0 Reviewed-by: Ian Rogers <irogers@google.com> Signed-off-by: Yang Jihong <yangjihong1@huawei.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sandipan Das <sandipan.das@amd.com> Link: https://lore.kernel.org/r/20230812084917.169338-13-yangjihong1@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
2f21f5e4b4
commit
e29090d28c
@ -1090,7 +1090,7 @@ static char *evsel__softirq_name(struct evsel *evsel, u64 num)
|
||||
return name;
|
||||
}
|
||||
|
||||
static void softirq_work_init(struct perf_kwork *kwork __maybe_unused,
|
||||
static void softirq_work_init(struct perf_kwork *kwork,
|
||||
struct kwork_class *class,
|
||||
struct kwork_work *work,
|
||||
enum kwork_trace_type src_type __maybe_unused,
|
||||
@ -1098,12 +1098,19 @@ static void softirq_work_init(struct perf_kwork *kwork __maybe_unused,
|
||||
struct perf_sample *sample,
|
||||
struct machine *machine __maybe_unused)
|
||||
{
|
||||
u64 num = evsel__intval(evsel, sample, "vec");
|
||||
u64 num;
|
||||
|
||||
work->id = num;
|
||||
work->class = class;
|
||||
work->cpu = sample->cpu;
|
||||
work->name = evsel__softirq_name(evsel, num);
|
||||
|
||||
if (kwork->report == KWORK_REPORT_TOP) {
|
||||
work->id = evsel__intval_common(evsel, sample, "common_pid");
|
||||
work->name = NULL;
|
||||
} else {
|
||||
num = evsel__intval(evsel, sample, "vec");
|
||||
work->id = num;
|
||||
work->name = evsel__softirq_name(evsel, num);
|
||||
}
|
||||
}
|
||||
|
||||
static void softirq_work_name(struct kwork_work *work, char *buf, int len)
|
||||
@ -1547,6 +1554,7 @@ static void top_print_cpu_usage(struct perf_kwork *kwork)
|
||||
struct kwork_top_stat *stat = &kwork->top_stat;
|
||||
u64 idle_time = stat->cpus_runtime[MAX_NR_CPUS].idle;
|
||||
u64 hardirq_time = stat->cpus_runtime[MAX_NR_CPUS].irq;
|
||||
u64 softirq_time = stat->cpus_runtime[MAX_NR_CPUS].softirq;
|
||||
int cpus_nr = bitmap_weight(stat->all_cpus_bitmap, MAX_NR_CPUS);
|
||||
u64 cpus_total_time = stat->cpus_runtime[MAX_NR_CPUS].total;
|
||||
|
||||
@ -1555,12 +1563,15 @@ static void top_print_cpu_usage(struct perf_kwork *kwork)
|
||||
(double)cpus_total_time / NSEC_PER_MSEC,
|
||||
cpus_nr);
|
||||
|
||||
printf("%%Cpu(s): %*.*f%% id, %*.*f%% hi\n",
|
||||
printf("%%Cpu(s): %*.*f%% id, %*.*f%% hi, %*.*f%% si\n",
|
||||
PRINT_CPU_USAGE_WIDTH, PRINT_CPU_USAGE_DECIMAL_WIDTH,
|
||||
cpus_total_time ? (double)idle_time * 100 / cpus_total_time : 0,
|
||||
|
||||
PRINT_CPU_USAGE_WIDTH, PRINT_CPU_USAGE_DECIMAL_WIDTH,
|
||||
cpus_total_time ? (double)hardirq_time * 100 / cpus_total_time : 0);
|
||||
cpus_total_time ? (double)hardirq_time * 100 / cpus_total_time : 0,
|
||||
|
||||
PRINT_CPU_USAGE_WIDTH, PRINT_CPU_USAGE_DECIMAL_WIDTH,
|
||||
cpus_total_time ? (double)softirq_time * 100 / cpus_total_time : 0);
|
||||
|
||||
top_print_per_cpu_load(kwork);
|
||||
}
|
||||
@ -1966,6 +1977,9 @@ static void top_calc_irq_runtime(struct perf_kwork *kwork,
|
||||
if (type == KWORK_CLASS_IRQ) {
|
||||
stat->cpus_runtime[work->cpu].irq += work->total_runtime;
|
||||
stat->cpus_runtime[MAX_NR_CPUS].irq += work->total_runtime;
|
||||
} else if (type == KWORK_CLASS_SOFTIRQ) {
|
||||
stat->cpus_runtime[work->cpu].softirq += work->total_runtime;
|
||||
stat->cpus_runtime[MAX_NR_CPUS].softirq += work->total_runtime;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1975,7 +1989,7 @@ static void top_subtract_irq_runtime(struct perf_kwork *kwork,
|
||||
struct kwork_class *class;
|
||||
struct kwork_work *data;
|
||||
unsigned int i;
|
||||
int irq_class_list[] = {KWORK_CLASS_IRQ};
|
||||
int irq_class_list[] = {KWORK_CLASS_IRQ, KWORK_CLASS_SOFTIRQ};
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(irq_class_list); i++) {
|
||||
class = get_kwork_class(kwork, irq_class_list[i]);
|
||||
@ -2392,7 +2406,7 @@ int cmd_kwork(int argc, const char **argv)
|
||||
}
|
||||
kwork.report = KWORK_REPORT_TOP;
|
||||
if (!kwork.event_list_str)
|
||||
kwork.event_list_str = "sched, irq";
|
||||
kwork.event_list_str = "sched, irq, softirq";
|
||||
setup_event_list(&kwork, kwork_options, kwork_usage);
|
||||
setup_sorting(&kwork, top_options, top_usage);
|
||||
return perf_kwork__top(&kwork);
|
||||
|
@ -184,6 +184,7 @@ struct __top_cpus_runtime {
|
||||
u64 load;
|
||||
u64 idle;
|
||||
u64 irq;
|
||||
u64 softirq;
|
||||
u64 total;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user