Commit cbcdb93d authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[POWERPC] Simplify stolen time calculation

In calculating stolen time, we were trying to actually account for time
spent in the hypervisor.  We don't really have enough information to do
that accurately, so don't try.  Instead, we now calculate stolen time as
time that the current cpu thread is not actually dispatching instructions.
On chips without a PURR, we cannot do this, so stolen time will always
be zero.  On chips with a PURR, this is merely the difference between
the elapsed PURR values and the elapsed TB values.

This gives us much more sane vaules from tools such as mpstat, even if
they are still a bit strange e.g. 2 busy threads on one cpu will both
appear to have 50% user time and 50% stolen time while 1 busy thread on
a cpu will look like 100% user on one of them and 100% idle on the other.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5cfc35cf
...@@ -220,11 +220,8 @@ static void account_process_time(struct pt_regs *regs) ...@@ -220,11 +220,8 @@ static void account_process_time(struct pt_regs *regs)
*/ */
struct cpu_purr_data { struct cpu_purr_data {
int initialized; /* thread is running */ int initialized; /* thread is running */
u64 tb0; /* timebase at origin time */
u64 purr0; /* PURR at origin time */
u64 tb; /* last TB value read */ u64 tb; /* last TB value read */
u64 purr; /* last PURR value read */ u64 purr; /* last PURR value read */
u64 stolen; /* stolen time so far */
spinlock_t lock; spinlock_t lock;
}; };
...@@ -234,10 +231,8 @@ static void snapshot_tb_and_purr(void *data) ...@@ -234,10 +231,8 @@ static void snapshot_tb_and_purr(void *data)
{ {
struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data); struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data);
p->tb0 = mftb(); p->tb = mftb();
p->purr0 = mfspr(SPRN_PURR); p->purr = mfspr(SPRN_PURR);
p->tb = p->tb0;
p->purr = 0;
wmb(); wmb();
p->initialized = 1; p->initialized = 1;
} }
...@@ -258,37 +253,24 @@ void snapshot_timebases(void) ...@@ -258,37 +253,24 @@ void snapshot_timebases(void)
void calculate_steal_time(void) void calculate_steal_time(void)
{ {
u64 tb, purr, t0; u64 tb, purr;
s64 stolen; s64 stolen;
struct cpu_purr_data *p0, *pme, *phim; struct cpu_purr_data *pme;
int cpu;
if (!cpu_has_feature(CPU_FTR_PURR)) if (!cpu_has_feature(CPU_FTR_PURR))
return; return;
cpu = smp_processor_id(); pme = &per_cpu(cpu_purr_data, smp_processor_id());
pme = &per_cpu(cpu_purr_data, cpu);
if (!pme->initialized) if (!pme->initialized)
return; /* this can happen in early boot */ return; /* this can happen in early boot */
p0 = &per_cpu(cpu_purr_data, cpu & ~1); spin_lock(&pme->lock);
phim = &per_cpu(cpu_purr_data, cpu ^ 1);
spin_lock(&p0->lock);
tb = mftb(); tb = mftb();
purr = mfspr(SPRN_PURR) - pme->purr0; purr = mfspr(SPRN_PURR);
if (!phim->initialized || !cpu_online(cpu ^ 1)) {
stolen = (tb - pme->tb) - (purr - pme->purr); stolen = (tb - pme->tb) - (purr - pme->purr);
} else { if (stolen > 0)
t0 = pme->tb0;
if (phim->tb0 < t0)
t0 = phim->tb0;
stolen = phim->tb - t0 - phim->purr - purr - p0->stolen;
}
if (stolen > 0) {
account_steal_time(current, stolen); account_steal_time(current, stolen);
p0->stolen += stolen;
}
pme->tb = tb; pme->tb = tb;
pme->purr = purr; pme->purr = purr;
spin_unlock(&p0->lock); spin_unlock(&pme->lock);
} }
/* /*
...@@ -297,30 +279,17 @@ void calculate_steal_time(void) ...@@ -297,30 +279,17 @@ void calculate_steal_time(void)
*/ */
static void snapshot_purr(void) static void snapshot_purr(void)
{ {
int cpu; struct cpu_purr_data *pme;
u64 purr;
struct cpu_purr_data *p0, *pme, *phim;
unsigned long flags; unsigned long flags;
if (!cpu_has_feature(CPU_FTR_PURR)) if (!cpu_has_feature(CPU_FTR_PURR))
return; return;
cpu = smp_processor_id(); pme = &per_cpu(cpu_purr_data, smp_processor_id());
pme = &per_cpu(cpu_purr_data, cpu); spin_lock_irqsave(&pme->lock, flags);
p0 = &per_cpu(cpu_purr_data, cpu & ~1); pme->tb = mftb();
phim = &per_cpu(cpu_purr_data, cpu ^ 1); pme->purr = mfspr(SPRN_PURR);
spin_lock_irqsave(&p0->lock, flags);
pme->tb = pme->tb0 = mftb();
purr = mfspr(SPRN_PURR);
if (!phim->initialized) {
pme->purr = 0;
pme->purr0 = purr;
} else {
/* set p->purr and p->purr0 for no change in p0->stolen */
pme->purr = phim->tb - phim->tb0 - phim->purr - p0->stolen;
pme->purr0 = purr - pme->purr;
}
pme->initialized = 1; pme->initialized = 1;
spin_unlock_irqrestore(&p0->lock, flags); spin_unlock_irqrestore(&pme->lock, flags);
} }
#endif /* CONFIG_PPC_SPLPAR */ #endif /* CONFIG_PPC_SPLPAR */
......
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