From: Dario Faggioli <dario.faggioli@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Anshul Makkar <anshul.makkar@citrix.com>,
George Dunlap <george.dunlap@citrix.com>,
David Vrabel <david.vrabel@citrix.com>
Subject: [PATCH v2 07/11] xen: credit2: add yet some more tracing
Date: Fri, 15 Jul 2016 16:49:56 +0200 [thread overview]
Message-ID: <146859419689.10217.257677956053735988.stgit@Solace.fritz.box> (raw)
In-Reply-To: <146859397891.10217.10155969474613302167.stgit@Solace.fritz.box>
(and fix the style of two labels as well.)
Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
---
Cc: Anshul Makkar <anshul.makkar@citrix.com>
Cc: David Vrabel <david.vrabel@citrix.com>
---
xen/common/sched_credit2.c | 58 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 54 insertions(+), 4 deletions(-)
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index d72f530..a4aec73 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -51,6 +51,9 @@
#define TRC_CSCHED2_TICKLE_NEW TRC_SCHED_CLASS_EVT(CSCHED2, 13)
#define TRC_CSCHED2_RUNQ_MAX_WEIGHT TRC_SCHED_CLASS_EVT(CSCHED2, 14)
#define TRC_CSCHED2_MIGRATE TRC_SCHED_CLASS_EVT(CSCHED2, 15)
+#define TRC_CSCHED2_LOAD_CHECK TRC_SCHED_CLASS_EVT(CSCHED2, 16)
+#define TRC_CSCHED2_LOAD_BALANCE TRC_SCHED_CLASS_EVT(CSCHED2, 17)
+#define TRC_CSCHED2_PICKED_CPU TRC_SCHED_CLASS_EVT(CSCHED2, 19)
/*
* WARNING: This is still in an experimental phase. Status and work can be found at the
@@ -711,6 +714,8 @@ update_load(const struct scheduler *ops,
struct csched2_runqueue_data *rqd,
struct csched2_vcpu *svc, int change, s_time_t now)
{
+ trace_var(TRC_CSCHED2_UPDATE_LOAD, 1, 0, NULL);
+
__update_runq_load(ops, rqd, change, now);
if ( svc )
__update_svc_load(ops, svc, change, now);
@@ -1486,6 +1491,23 @@ csched2_cpu_pick(const struct scheduler *ops, struct vcpu *vc)
out_up:
spin_unlock(&prv->lock);
+ /* TRACE */
+ {
+ struct {
+ uint64_t b_avgload;
+ unsigned vcpu:16, dom:16;
+ unsigned rq_id:16, new_cpu:16;
+ } d;
+ d.b_avgload = prv->rqd[min_rqi].b_avgload;
+ d.dom = vc->domain->domain_id;
+ d.vcpu = vc->vcpu_id;
+ d.rq_id = c2r(ops, new_cpu);
+ d.new_cpu = new_cpu;
+ trace_var(TRC_CSCHED2_PICKED_CPU, 1,
+ sizeof(d),
+ (unsigned char *)&d);
+ }
+
return new_cpu;
}
@@ -1611,7 +1633,7 @@ static void balance_load(const struct scheduler *ops, int cpu, s_time_t now)
bool_t inner_load_updated = 0;
balance_state_t st = { .best_push_svc = NULL, .best_pull_svc = NULL };
-
+
/*
* Basic algorithm: Push, pull, or swap.
* - Find the runqueue with the furthest load distance
@@ -1676,6 +1698,20 @@ retry:
if ( i > cpus_max )
cpus_max = i;
+ /* TRACE */
+ {
+ struct {
+ unsigned lrq_id:16, orq_id:16;
+ unsigned load_delta;
+ } d;
+ d.lrq_id = st.lrqd->id;
+ d.orq_id = st.orqd->id;
+ d.load_delta = st.load_delta;
+ trace_var(TRC_CSCHED2_LOAD_CHECK, 1,
+ sizeof(d),
+ (unsigned char *)&d);
+ }
+
/*
* If we're under 100% capacaty, only shift if load difference
* is > 1. otherwise, shift if under 12.5%
@@ -1704,6 +1740,21 @@ retry:
if ( unlikely(st.orqd->id < 0) )
goto out_up;
+ /* TRACE */
+ {
+ struct {
+ uint64_t lb_avgload, ob_avgload;
+ unsigned lrq_id:16, orq_id:16;
+ } d;
+ d.lrq_id = st.lrqd->id;
+ d.lb_avgload = st.lrqd->b_avgload;
+ d.orq_id = st.orqd->id;
+ d.ob_avgload = st.orqd->b_avgload;
+ trace_var(TRC_CSCHED2_LOAD_BALANCE, 1,
+ sizeof(d),
+ (unsigned char *)&d);
+ }
+
/* Look for "swap" which gives the best load average
* FIXME: O(n^2)! */
@@ -1753,10 +1804,9 @@ retry:
if ( st.best_pull_svc )
migrate(ops, st.best_pull_svc, st.lrqd, now);
-out_up:
+ out_up:
spin_unlock(&st.orqd->lock);
-
-out:
+ out:
return;
}
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-15 14:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 14:49 [PATCH v2 00/11] xen: sched: assorted fixes and improvements to Credit2 Dario Faggioli
2016-07-15 14:49 ` [PATCH v2 01/11] xen: sched: leave CPUs doing tasklet work alone Dario Faggioli
2016-07-18 14:35 ` George Dunlap
2016-07-15 14:49 ` [PATCH v2 02/11] xen: credit2: prevent load balancing to go mad if time goes backwards Dario Faggioli
2016-07-15 14:49 ` [PATCH v2 03/11] xen: credit2: rework load tracking logic Dario Faggioli
2016-07-18 14:46 ` George Dunlap
2016-07-18 14:51 ` Dario Faggioli
2016-07-15 14:49 ` [PATCH v2 04/11] xen/tools: improve tracing of Credit2 load tracking events Dario Faggioli
2016-07-18 15:38 ` Wei Liu
2016-07-15 14:49 ` [PATCH v2 05/11] xen: credit2: use non-atomic cpumask and bit operations Dario Faggioli
2016-07-15 14:49 ` [PATCH v2 06/11] xen: credit2: make the code less experimental Dario Faggioli
2016-07-18 15:04 ` George Dunlap
2016-07-15 14:49 ` Dario Faggioli [this message]
2016-07-15 14:50 ` [PATCH v2 08/11] xen: credit2: only marshall trace point arguments if tracing enabled Dario Faggioli
2016-07-18 15:10 ` George Dunlap
2016-07-15 14:50 ` [PATCH v2 09/11] tools: tracing: deal with new Credit2 events Dario Faggioli
2016-07-18 15:39 ` Wei Liu
2016-07-15 14:50 ` [PATCH v2 10/11] xen: credit2: the private scheduler lock can be an rwlock Dario Faggioli
2016-07-15 14:50 ` [PATCH v2 11/11] xen: credit2: implement true SMT support Dario Faggioli
2016-07-18 16:48 ` George Dunlap
2016-07-18 17:24 ` Dario Faggioli
2016-07-19 9:39 ` George Dunlap
2016-07-19 9:57 ` Dario Faggioli
2016-07-19 10:05 ` George Dunlap
2016-07-19 10:19 ` Dario Faggioli
2016-07-18 17:21 ` [PATCH v2 00/11] xen: sched: assorted fixes and improvements to Credit2 George Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=146859419689.10217.257677956053735988.stgit@Solace.fritz.box \
--to=dario.faggioli@citrix.com \
--cc=anshul.makkar@citrix.com \
--cc=david.vrabel@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).