Commitdbe9337

Muchun Song

authored and

Peter Zijlstra

committed

sched/cpuacct: Fix charge cpuacct.usage_sys

The user_mode(task_pt_regs(tsk)) always return true foruser thread, and false for kernel thread. So it means thatthe cpuacct.usage_sys is the time that kernel thread usesnot the time that thread uses in the kernel mode. We cantry get_irq_regs() first, if it is NULL, then we can fallback to task_pt_regs().Signed-off-by: Muchun Song <songmuchun@bytedance.com>Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>Link:https://lkml.kernel.org/r/20200420070453.76815-1-songmuchun@bytedance.com

1 parent04f5c36 commitdbe9337Copy full SHA for dbe9337

File tree

1 file changed

-1

lines changed

kernel/sched
- cpuacct.c

1 file changed

-1

lines changed

`‎kernel/sched/cpuacct.c‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`* Based on the work by Paul Menage (menage@google.com) and Balbir Singh`
`6`	`6`	`* (balbir@in.ibm.com).`
`7`	`7`	`*/`
	`8`	`+#include<asm/irq_regs.h>`
`8`	`9`	`#include"sched.h"`
`9`	`10`
`10`	`11`	`/* Time spent by the tasks of the CPU accounting group executing in ... */`
`@@ -339,7 +340,7 @@ void cpuacct_charge(struct task_struct *tsk, u64 cputime)`
`339`	`340`	`{`
`340`	`341`	`structcpuacct*ca;`
`341`	`342`	`intindex=CPUACCT_STAT_SYSTEM;`
`342`		`-structpt_regs*regs=task_pt_regs(tsk);`
	`343`	`+structpt_regs*regs=get_irq_regs() ? :task_pt_regs(tsk);`
`343`	`344`
`344`	`345`	`if (regs&&user_mode(regs))`
`345`	`346`	`index=CPUACCT_STAT_USER;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdbe9337

File tree

1 file changed

1 file changed

`‎kernel/sched/cpuacct.c‎`

0 commit comments