|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 02/19] xen: sched: make the 'tickled' perf counter clearer
In fact, what we have right now, i.e., tickle_idlers_none
and tickle_idlers_some, is not good enough for describing
what really happens in the various tickling functions of
the various scheduler.
Switch to a more descriptive set of counters, such as:
- tickled_no_cpu: for when we don't tickle anyone
- tickled_idle_cpu: for when we tickle one or more
idler
- tickled_busy_cpu: for when we tickle one or more
non-idler
While there, fix style of an "out:" label in sched_rt.c.
Signed-off-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx>
---
Cc: George Dunlap <george.dunlap@xxxxxxxxxx>
Cc: Meng Xu <mengxu@xxxxxxxxxxxxx>
Cc: Anshul Makkar <anshul.makkar@xxxxxxxxxx>
Cc: David Vrabel <david.vrabel@xxxxxxxxxx>
---
xen/common/sched_credit.c | 10 +++++++---
xen/common/sched_credit2.c | 12 +++++-------
xen/common/sched_rt.c | 8 +++++---
xen/include/xen/perfc_defn.h | 5 +++--
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c
index a6645a2..a54bb2d 100644
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -385,7 +385,9 @@ static inline void __runq_tickle(struct csched_vcpu *new)
|| (idlers_empty && new->pri > cur->pri) )
{
if ( cur->pri != CSCHED_PRI_IDLE )
- SCHED_STAT_CRANK(tickle_idlers_none);
+ SCHED_STAT_CRANK(tickled_busy_cpu);
+ else
+ SCHED_STAT_CRANK(tickled_idle_cpu);
__cpumask_set_cpu(cpu, &mask);
}
else if ( !idlers_empty )
@@ -444,13 +446,13 @@ static inline void __runq_tickle(struct csched_vcpu *new)
set_bit(_VPF_migrating, &cur->vcpu->pause_flags);
}
/* Tickle cpu anyway, to let new preempt cur. */
- SCHED_STAT_CRANK(tickle_idlers_none);
+ SCHED_STAT_CRANK(tickled_busy_cpu);
__cpumask_set_cpu(cpu, &mask);
}
else if ( !new_idlers_empty )
{
/* Which of the idlers suitable for new shall we wake up? */
- SCHED_STAT_CRANK(tickle_idlers_some);
+ SCHED_STAT_CRANK(tickled_idle_cpu);
if ( opt_tickle_one_idle )
{
this_cpu(last_tickle_cpu) =
@@ -479,6 +481,8 @@ static inline void __runq_tickle(struct csched_vcpu *new)
/* Send scheduler interrupts to designated CPUs */
cpumask_raise_softirq(&mask, SCHEDULE_SOFTIRQ);
}
+ else
+ SCHED_STAT_CRANK(tickled_no_cpu);
}
static void
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index cf8455c..0246453 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -589,6 +589,7 @@ runq_tickle(const struct scheduler *ops, unsigned int cpu,
struct csched2_vcpu *
i = cpumask_cycle(cpu, &mask);
if ( i < nr_cpu_ids )
{
+ SCHED_STAT_CRANK(tickled_idle_cpu);
ipid = i;
goto tickle;
}
@@ -637,11 +638,12 @@ runq_tickle(const struct scheduler *ops, unsigned int
cpu, struct csched2_vcpu *
* than the migrate resistance */
if ( ipid == -1 || lowest + CSCHED2_MIGRATE_RESIST > new->credit )
{
- SCHED_STAT_CRANK(tickle_idlers_none);
- goto no_tickle;
+ SCHED_STAT_CRANK(tickled_no_cpu);
+ return;
}
-tickle:
+ SCHED_STAT_CRANK(tickled_busy_cpu);
+ tickle:
BUG_ON(ipid == -1);
/* TRACE */ {
@@ -654,11 +656,7 @@ tickle:
(unsigned char *)&d);
}
cpumask_set_cpu(ipid, &rqd->tickled);
- SCHED_STAT_CRANK(tickle_idlers_some);
cpu_raise_softirq(ipid, SCHEDULE_SOFTIRQ);
-
-no_tickle:
- return;
}
/*
diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index 5b077d7..dd1c4d3 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -1140,6 +1140,7 @@ runq_tickle(const struct scheduler *ops, struct rt_vcpu
*new)
/* 1) if new's previous cpu is idle, kick it for cache benefit */
if ( is_idle_vcpu(curr_on_cpu(new->vcpu->processor)) )
{
+ SCHED_STAT_CRANK(tickled_idle_cpu);
cpu_to_tickle = new->vcpu->processor;
goto out;
}
@@ -1151,6 +1152,7 @@ runq_tickle(const struct scheduler *ops, struct rt_vcpu
*new)
iter_vc = curr_on_cpu(cpu);
if ( is_idle_vcpu(iter_vc) )
{
+ SCHED_STAT_CRANK(tickled_idle_cpu);
cpu_to_tickle = cpu;
goto out;
}
@@ -1164,14 +1166,15 @@ runq_tickle(const struct scheduler *ops, struct rt_vcpu
*new)
if ( latest_deadline_vcpu != NULL &&
new->cur_deadline < latest_deadline_vcpu->cur_deadline )
{
+ SCHED_STAT_CRANK(tickled_busy_cpu);
cpu_to_tickle = latest_deadline_vcpu->vcpu->processor;
goto out;
}
/* didn't tickle any cpu */
- SCHED_STAT_CRANK(tickle_idlers_none);
+ SCHED_STAT_CRANK(tickled_no_cpu);
return;
-out:
+ out:
/* TRACE */
{
struct {
@@ -1185,7 +1188,6 @@ out:
}
cpumask_set_cpu(cpu_to_tickle, &prv->tickled);
- SCHED_STAT_CRANK(tickle_idlers_some);
cpu_raise_softirq(cpu_to_tickle, SCHEDULE_SOFTIRQ);
return;
}
diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
index 21c1e0b..a336c71 100644
--- a/xen/include/xen/perfc_defn.h
+++ b/xen/include/xen/perfc_defn.h
@@ -27,8 +27,9 @@ PERFCOUNTER(vcpu_wake_running, "sched:
vcpu_wake_running")
PERFCOUNTER(vcpu_wake_onrunq, "sched: vcpu_wake_onrunq")
PERFCOUNTER(vcpu_wake_runnable, "sched: vcpu_wake_runnable")
PERFCOUNTER(vcpu_wake_not_runnable, "sched: vcpu_wake_not_runnable")
-PERFCOUNTER(tickle_idlers_none, "sched: tickle_idlers_none")
-PERFCOUNTER(tickle_idlers_some, "sched: tickle_idlers_some")
+PERFCOUNTER(tickled_no_cpu, "sched: tickled_no_cpu")
+PERFCOUNTER(tickled_idle_cpu, "sched: tickled_idle_cpu")
+PERFCOUNTER(tickled_busy_cpu, "sched: tickled_busy_cpu")
PERFCOUNTER(vcpu_check, "sched: vcpu_check")
/* credit specific counters */
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |