Commit f828c3d0 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar

sched/cputime, powerpc: Migrate stolen_time field to the accounting structure

That in order to gather all cputime accumulation to the same place.
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1483636310-6557-7-git-send-email-fweisbec@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8c8b73c4
...@@ -187,7 +187,6 @@ struct paca_struct { ...@@ -187,7 +187,6 @@ struct paca_struct {
/* Stuff for accurate time accounting */ /* Stuff for accurate time accounting */
struct cpu_accounting_data accounting; struct cpu_accounting_data accounting;
u64 stolen_time; /* TB ticks taken by hypervisor */
u64 dtl_ridx; /* read index in dispatch log */ u64 dtl_ridx; /* read index in dispatch log */
struct dtl_entry *dtl_curr; /* pointer corresponding to dtl_ridx */ struct dtl_entry *dtl_curr; /* pointer corresponding to dtl_ridx */
......
...@@ -273,7 +273,7 @@ void accumulate_stolen_time(void) ...@@ -273,7 +273,7 @@ void accumulate_stolen_time(void)
ust = scan_dispatch_log(acct->starttime); ust = scan_dispatch_log(acct->starttime);
acct->stime -= sst; acct->stime -= sst;
acct->utime -= ust; acct->utime -= ust;
local_paca->stolen_time += ust + sst; acct->steal_time += ust + sst;
local_paca->soft_enabled = save_soft_enabled; local_paca->soft_enabled = save_soft_enabled;
} }
...@@ -288,8 +288,8 @@ static inline u64 calculate_stolen_time(u64 stop_tb) ...@@ -288,8 +288,8 @@ static inline u64 calculate_stolen_time(u64 stop_tb)
acct->stime -= stolen; acct->stime -= stolen;
} }
stolen += get_paca()->stolen_time; stolen += acct->steal_time;
get_paca()->stolen_time = 0; acct->steal_time = 0;
return stolen; return stolen;
} }
......
...@@ -2294,7 +2294,7 @@ static void dump_one_paca(int cpu) ...@@ -2294,7 +2294,7 @@ static void dump_one_paca(int cpu)
DUMP(p, accounting.starttime_user, "llx"); DUMP(p, accounting.starttime_user, "llx");
DUMP(p, accounting.startspurr, "llx"); DUMP(p, accounting.startspurr, "llx");
DUMP(p, accounting.utime_sspurr, "llx"); DUMP(p, accounting.utime_sspurr, "llx");
DUMP(p, stolen_time, "llx"); DUMP(p, accounting.steal_time, "llx");
#undef DUMP #undef DUMP
catch_memory_errors = 0; catch_memory_errors = 0;
......
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