Commit 9ac52315 authored by Laurent Vivier's avatar Laurent Vivier Committed by Ingo Molnar

sched: guest CPU accounting: add guest-CPU /proc/<pid>/stat fields

like for cpustat, introduce the "gtime" (guest time of the task) and
"cgtime" (guest time of the task children) fields for the
tasks. Modify signal_struct and task_struct.

Modify /proc/<pid>/stat to display these new fields.
Signed-off-by: default avatarLaurent Vivier <Laurent.Vivier@bull.net>
Acked-by: default avatarAvi Kivity <avi@qumranet.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5e84cfde
...@@ -370,6 +370,11 @@ static cputime_t task_stime(struct task_struct *p) ...@@ -370,6 +370,11 @@ static cputime_t task_stime(struct task_struct *p)
} }
#endif #endif
static cputime_t task_gtime(struct task_struct *p)
{
return p->gtime;
}
static int do_task_stat(struct task_struct *task, char *buffer, int whole) static int do_task_stat(struct task_struct *task, char *buffer, int whole)
{ {
unsigned long vsize, eip, esp, wchan = ~0UL; unsigned long vsize, eip, esp, wchan = ~0UL;
...@@ -385,6 +390,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -385,6 +390,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
unsigned long cmin_flt = 0, cmaj_flt = 0; unsigned long cmin_flt = 0, cmaj_flt = 0;
unsigned long min_flt = 0, maj_flt = 0; unsigned long min_flt = 0, maj_flt = 0;
cputime_t cutime, cstime, utime, stime; cputime_t cutime, cstime, utime, stime;
cputime_t cgtime, gtime;
unsigned long rsslim = 0; unsigned long rsslim = 0;
char tcomm[sizeof(task->comm)]; char tcomm[sizeof(task->comm)];
unsigned long flags; unsigned long flags;
...@@ -403,6 +409,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -403,6 +409,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
sigemptyset(&sigign); sigemptyset(&sigign);
sigemptyset(&sigcatch); sigemptyset(&sigcatch);
cutime = cstime = utime = stime = cputime_zero; cutime = cstime = utime = stime = cputime_zero;
cgtime = gtime = cputime_zero;
rcu_read_lock(); rcu_read_lock();
if (lock_task_sighand(task, &flags)) { if (lock_task_sighand(task, &flags)) {
...@@ -420,6 +427,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -420,6 +427,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
cmaj_flt = sig->cmaj_flt; cmaj_flt = sig->cmaj_flt;
cutime = sig->cutime; cutime = sig->cutime;
cstime = sig->cstime; cstime = sig->cstime;
cgtime = sig->cgtime;
rsslim = sig->rlim[RLIMIT_RSS].rlim_cur; rsslim = sig->rlim[RLIMIT_RSS].rlim_cur;
/* add up live thread stats at the group level */ /* add up live thread stats at the group level */
...@@ -430,6 +438,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -430,6 +438,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
maj_flt += t->maj_flt; maj_flt += t->maj_flt;
utime = cputime_add(utime, task_utime(t)); utime = cputime_add(utime, task_utime(t));
stime = cputime_add(stime, task_stime(t)); stime = cputime_add(stime, task_stime(t));
gtime = cputime_add(gtime, task_gtime(t));
t = next_thread(t); t = next_thread(t);
} while (t != task); } while (t != task);
...@@ -437,6 +446,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -437,6 +446,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
maj_flt += sig->maj_flt; maj_flt += sig->maj_flt;
utime = cputime_add(utime, sig->utime); utime = cputime_add(utime, sig->utime);
stime = cputime_add(stime, sig->stime); stime = cputime_add(stime, sig->stime);
gtime += cputime_add(gtime, sig->gtime);
} }
sid = signal_session(sig); sid = signal_session(sig);
...@@ -454,6 +464,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -454,6 +464,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
maj_flt = task->maj_flt; maj_flt = task->maj_flt;
utime = task_utime(task); utime = task_utime(task);
stime = task_stime(task); stime = task_stime(task);
gtime = task_gtime(task);
} }
/* scale priority and nice values from timeslices to -20..20 */ /* scale priority and nice values from timeslices to -20..20 */
...@@ -471,7 +482,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -471,7 +482,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
res = sprintf(buffer, "%d (%s) %c %d %d %d %d %d %u %lu \ res = sprintf(buffer, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu\n", %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
task->pid, task->pid,
tcomm, tcomm,
state, state,
...@@ -516,7 +527,9 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) ...@@ -516,7 +527,9 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
task_cpu(task), task_cpu(task),
task->rt_priority, task->rt_priority,
task->policy, task->policy,
(unsigned long long)delayacct_blkio_ticks(task)); (unsigned long long)delayacct_blkio_ticks(task),
cputime_to_clock_t(gtime),
cputime_to_clock_t(cgtime));
if (mm) if (mm)
mmput(mm); mmput(mm);
return res; return res;
......
...@@ -517,6 +517,8 @@ struct signal_struct { ...@@ -517,6 +517,8 @@ struct signal_struct {
* in __exit_signal, except for the group leader. * in __exit_signal, except for the group leader.
*/ */
cputime_t utime, stime, cutime, cstime; cputime_t utime, stime, cutime, cstime;
cputime_t gtime;
cputime_t cgtime;
unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw; unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt; unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
unsigned long inblock, oublock, cinblock, coublock; unsigned long inblock, oublock, cinblock, coublock;
...@@ -1048,6 +1050,7 @@ struct task_struct { ...@@ -1048,6 +1050,7 @@ struct task_struct {
unsigned int rt_priority; unsigned int rt_priority;
cputime_t utime, stime; cputime_t utime, stime;
cputime_t gtime;
unsigned long nvcsw, nivcsw; /* context switch counts */ unsigned long nvcsw, nivcsw; /* context switch counts */
struct timespec start_time; /* monotonic time */ struct timespec start_time; /* monotonic time */
struct timespec real_start_time; /* boot based time */ struct timespec real_start_time; /* boot based time */
......
...@@ -111,6 +111,7 @@ static void __exit_signal(struct task_struct *tsk) ...@@ -111,6 +111,7 @@ static void __exit_signal(struct task_struct *tsk)
*/ */
sig->utime = cputime_add(sig->utime, tsk->utime); sig->utime = cputime_add(sig->utime, tsk->utime);
sig->stime = cputime_add(sig->stime, tsk->stime); sig->stime = cputime_add(sig->stime, tsk->stime);
sig->gtime = cputime_add(sig->gtime, tsk->gtime);
sig->min_flt += tsk->min_flt; sig->min_flt += tsk->min_flt;
sig->maj_flt += tsk->maj_flt; sig->maj_flt += tsk->maj_flt;
sig->nvcsw += tsk->nvcsw; sig->nvcsw += tsk->nvcsw;
...@@ -1242,6 +1243,11 @@ static int wait_task_zombie(struct task_struct *p, int noreap, ...@@ -1242,6 +1243,11 @@ static int wait_task_zombie(struct task_struct *p, int noreap,
cputime_add(p->stime, cputime_add(p->stime,
cputime_add(sig->stime, cputime_add(sig->stime,
sig->cstime))); sig->cstime)));
psig->cgtime =
cputime_add(psig->cgtime,
cputime_add(p->gtime,
cputime_add(sig->gtime,
sig->cgtime)));
psig->cmin_flt += psig->cmin_flt +=
p->min_flt + sig->min_flt + sig->cmin_flt; p->min_flt + sig->min_flt + sig->cmin_flt;
psig->cmaj_flt += psig->cmaj_flt +=
......
...@@ -877,6 +877,8 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts ...@@ -877,6 +877,8 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts
sig->tty_old_pgrp = NULL; sig->tty_old_pgrp = NULL;
sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero; sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero;
sig->gtime = cputime_zero;
sig->cgtime = cputime_zero;
sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0; sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0;
sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0; sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0;
sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0; sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0;
...@@ -1045,6 +1047,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, ...@@ -1045,6 +1047,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
p->utime = cputime_zero; p->utime = cputime_zero;
p->stime = cputime_zero; p->stime = cputime_zero;
p->gtime = cputime_zero;
#ifdef CONFIG_TASK_XACCT #ifdef CONFIG_TASK_XACCT
p->rchar = 0; /* I/O counter: bytes read */ p->rchar = 0; /* I/O counter: bytes read */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment