luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sched/cpuacct: Fix charge cpuacct.usage_sys

Browse Source 
The user_mode(task_pt_regs(tsk)) always return true for
user thread, and false for kernel thread. So it means that
the cpuacct.usage_sys is the time that kernel thread uses
not the time that thread uses in the kernel mode. We can
try get_irq_regs() first, if it is NULL, then we can fall
back 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
This commit is contained in:
Muchun Song 2020-04-20 15:04:53 +08:00 committed by Peter Zijlstra
parent 04f5c362ec
commit dbe9337109
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/sched/cpuacct.c
View File

@ -5,6 +5,7 @@
* Based on the work by Paul Menage (menage@google.com) and Balbir Singh * Based on the work by Paul Menage (menage@google.com) and Balbir Singh
* (balbir@in.ibm.com). * (balbir@in.ibm.com).
*/ */
#include <asm/irq_regs.h>
#include "sched.h" #include "sched.h"
/* Time spent by the tasks of the CPU accounting group executing in ... */ /* 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)
{ {
struct cpuacct *ca; struct cpuacct *ca;
int index = CPUACCT_STAT_SYSTEM; int index = CPUACCT_STAT_SYSTEM;
struct pt_regs *regs = task_pt_regs(tsk); struct pt_regs *regs = get_irq_regs() ? : task_pt_regs(tsk);
if (regs && user_mode(regs)) if (regs && user_mode(regs))
index = CPUACCT_STAT_USER; index = CPUACCT_STAT_USER;