On Wed, 2011-01-26 at 13:43 -0200, Glauber Costa wrote:
> yes, but once this delta is subtracted from rq->clock_task, this value is not
> used to dictate power, unless I am mistaken.
>
> power is adjusted according to scale_rt_power(), which does it using the
> values of rq->rt_avg, rq->age_stamp, and rq->clock.
>
> So whatever I store into rq->clock_task, but not rq->clock (which
> correct me if I'm wrong, is expected to be walltime), will not be used
> to adjust cpu power, which is what I'm trying to achieve.
No, see the below, it uses a per-cpu virt_steal_time() clock which is
expected to return steal-time in ns.
All time not accounted to ->clock_task is accumulated in lost, and
passed into sched_rt_avg_update() and thus affects the cpu_power.
If it finds that 50% of the (recent) time is steal time, its cpu_power
will be 50%.
---
kernel/sched.c | 44 ++++++++++++++++++++++++++++----------------
kernel/sched_features.h | 2 +-
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 18d38e4..c71384c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -523,6 +523,9 @@ struct rq {
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
u64 prev_irq_time;
#endif
+#ifdef CONFIG_SCHED_PARAVIRT
+ u64 prev_steal_time;
+#endif
/* calc_load related fields */
unsigned long calc_load_update;
@@ -1888,11 +1891,15 @@ void account_system_vtime(struct task_struct *curr)
}
EXPORT_SYMBOL_GPL(account_system_vtime);
+#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
+
static void update_rq_clock_task(struct rq *rq, s64 delta)
{
- s64 irq_delta;
+ s64 lost_delta __maybe_unused;
+ s64 lost = 0;
- irq_delta = irq_time_read(cpu_of(rq)) - rq->prev_irq_time;
+#ifdef CONFIG_IRQ_TIME_ACCOUNTING
+ lost_delta = irq_time_read(cpu_of(rq)) - rq->prev_irq_time;
/*
* Since irq_time is only updated on {soft,}irq_exit, we might run into
@@ -1909,26 +1916,31 @@ static void update_rq_clock_task(struct rq *rq, s64 delta)
* the current rq->clock timestamp, except that would require using
* atomic ops.
*/
- if (irq_delta > delta)
- irq_delta = delta;
+ if (lost_delta > delta)
+ lost_delta = delta;
- rq->prev_irq_time += irq_delta;
- delta -= irq_delta;
- rq->clock_task += delta;
+ rq->prev_irq_time += lost_delta;
+ lost += lost_delta;
+#endif
+#ifdef CONFIG_SCHED_PARAVIRT
+ lost_delta = virt_steal_time(cpu_of(rq)) - rq->prev_steal_time;
+
+ /*
+ * unlikely, unless steal_time accounting is iffy
+ */
+ if (lost + lost_delta > delta)
+ lost_delta = delta - lost;
- if (irq_delta && sched_feat(NONIRQ_POWER))
- sched_rt_avg_update(rq, irq_delta);
-}
+ rq->prev_steal_time += lost_delta;
+ lost += lost_delta
+#endif
-#else /* CONFIG_IRQ_TIME_ACCOUNTING */
+ rq->clock_task += delta - lost;
-static void update_rq_clock_task(struct rq *rq, s64 delta)
-{
- rq->clock_task += delta;
+ if (lost && sched_feat(NONTASK_POWER))
+ sched_rt_avg_update(rq, lost);
}
-#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
-
#include "sched_idletask.c"
#include "sched_fair.c"
#include "sched_rt.c"
diff --git a/kernel/sched_features.h b/kernel/sched_features.h
index 68e69ac..b334a2d 100644
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
@@ -63,4 +63,4 @@ SCHED_FEAT(OWNER_SPIN, 1)
/*
* Decrement CPU power based on irq activity
*/
-SCHED_FEAT(NONIRQ_POWER, 1)
+SCHED_FEAT(NONTASK_POWER, 1)
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
