From: Dario Faggioli <dario.faggioli@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Stefano Stabellini <sstabellini@kernel.org>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Tim Deegan <tim@xen.org>, Jan Beulich <jbeulich@suse.com>
Subject: [PATCH 14/15] xen: trace timers
Date: Thu, 01 Jun 2017 19:35:16 +0200 [thread overview]
Message-ID: <149633851685.12814.14195195446339149924.stgit@Solace.fritz.box> (raw)
In-Reply-To: <149633614204.12814.14390287626133023934.stgit@Solace.fritz.box>
Making it possible generate events showing the
activity and the behavior of timers.
Gate this with its specific Kconfig option (under
CONFIG_TRACING), and keep it in disabled state by
default.
---
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Tim Deegan <tim@xen.org>
---
xen/Kconfig.debug | 9 +++
xen/common/timer.c | 158 ++++++++++++++++++++++++++++++++++++++++++--
xen/include/public/trace.h | 12 +++
3 files changed, 173 insertions(+), 6 deletions(-)
diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
index f7b2e06..e363435 100644
--- a/xen/Kconfig.debug
+++ b/xen/Kconfig.debug
@@ -140,6 +140,15 @@ config TRACE_TASKLETS
Make it possible to generate events related to scheduling,
queueing and running of tasklets within Xen.
++config TRACE_TIMERS
+ bool "Trace when timers are armed and fires" if EXPERT = "y"
+ default n
+ depends on TRACING
+ ---help---
+ Makes it possible to generate events related to the timers
+ subsystems, such as, creation, initialization, queueing,
+ firing and removal of timers.
+
config VERBOSE_DEBUG
bool "Verbose debug messages"
default DEBUG
diff --git a/xen/common/timer.c b/xen/common/timer.c
index d9ff669..8daeeb3 100644
--- a/xen/common/timer.c
+++ b/xen/common/timer.c
@@ -43,6 +43,136 @@ static DEFINE_RCU_READ_LOCK(timer_cpu_read_lock);
DEFINE_PER_CPU(s_time_t, timer_deadline);
+#ifdef CONFIG_TRACE_TIMERS
+static inline void trace_rm_entry(const struct timer *t)
+{
+ struct {
+ uint64_t addr;
+ uint16_t status, cpu;
+ } d;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ d.addr = (uint64_t)t;
+ d.cpu = t->cpu;
+ d.status = t->status;
+ __trace_var(TRC_XEN_TIMER_RMENTRY, 0, sizeof(d), &d);
+}
+static inline void trace_add_entry(const struct timer *t)
+{
+ struct {
+ uint64_t addr;
+ uint16_t status, cpu;
+ } d;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ d.addr = (uint64_t)t;
+ d.cpu = t->cpu;
+ d.status = t->status;
+ __trace_var(TRC_XEN_TIMER_ADDENTRY, 0, sizeof(d), &d);
+}
+static inline void trace_set(const struct timer *t)
+{
+ struct {
+ uint64_t addr, addr_fn;
+ int64_t expires_in;
+ } d;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ d.addr = (uint64_t)t;
+ d.addr_fn = (uint64_t)t->function;
+ d.expires_in = t->expires - NOW();
+ __trace_var(TRC_XEN_TIMER_SET, 1, sizeof(d), &d);
+}
+static inline void trace_stop(const struct timer *t)
+{
+ uint64_t addr;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ addr = (uint64_t)t;
+ __trace_var(TRC_XEN_TIMER_STOP, 0, sizeof(addr), &addr);
+}
+static inline void trace_migrate(const struct timer *t, unsigned int cpu)
+{
+ struct {
+ uint64_t addr;
+ uint16_t new_cpu, old_cpu;
+ } d;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ d.addr = (uint64_t)t;
+ d.old_cpu = t->cpu;
+ d.new_cpu = cpu;
+ __trace_var(TRC_XEN_TIMER_MIGRATE, 0, sizeof(d), &d);
+}
+static inline void trace_kill(const struct timer *t)
+{
+ uint64_t addr;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ addr = (uint64_t)t;
+ __trace_var(TRC_XEN_TIMER_KILL, 0, sizeof(addr), &addr);
+}
+static inline void trace_exec(const struct timer *t)
+{
+ struct {
+ uint64_t addr;
+ int64_t tardiness;
+ } d;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ d.addr = (uint64_t)t;
+ d.tardiness = NOW() - t->expires;
+ __trace_var(TRC_XEN_TIMER_EXEC, 1, sizeof(d), &d);
+}
+static inline void trace_reprogr(s_time_t n, s_time_t d)
+{
+ uint64_t deadline = d - n;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ __trace_var(TRC_XEN_TIMER_REPRGR, 1, sizeof(deadline), &deadline);
+}
+static inline void trace_hoverfl(unsigned int old_lim, unsigned int new_lim)
+{
+ struct {
+ uint16_t new_limit, old_limit;
+ } d;
+
+ if ( likely(!tb_init_done) )
+ return;
+
+ d.old_limit = old_lim;
+ d.new_limit = new_lim;
+ __trace_var(TRC_XEN_TIMER_EXEC, 0, sizeof(d), &d);
+}
+#define trace_hoverfl(o, n) TRACE_2D(TRC_XEN_TIMER_HOVERFL, o, n)
+#else /* !TRACE_TIMERS */
+#define trace_rm_entry(t) do {} while ( 0 )
+#define trace_add_entry(t) do {} while ( 0 )
+#define trace_set(t) do {} while ( 0 )
+#define trace_stop(t) do {} while ( 0 )
+#define trace_migrate(t, c) do {} while ( 0 )
+#define trace_kill(t) do {} while ( 0 )
+#define trace_exec(t) do {} while ( 0 )
+#define trace_reprogr(n, d) do {} while ( 0 )
+#define trace_hoverfl(o, n) do {} while ( 0 )
+#endif /* TRACE_TIMERS */
+
/****************************************************************************
* HEAP OPERATIONS.
*/
@@ -175,6 +305,8 @@ static int remove_entry(struct timer *t)
struct timers *timers = &per_cpu(timers, t->cpu);
int rc;
+ trace_rm_entry(t);
+
switch ( t->status )
{
case TIMER_STATUS_in_heap:
@@ -204,11 +336,14 @@ static int add_entry(struct timer *t)
t->status = TIMER_STATUS_in_heap;
rc = add_to_heap(timers->heap, t);
if ( t->heap_offset != 0 )
- return rc;
+ goto out;
/* Fall back to adding to the slower linked list. */
t->status = TIMER_STATUS_in_list;
- return add_to_list(&timers->list, t);
+ rc = add_to_list(&timers->list, t);
+ out:
+ trace_add_entry(t);
+ return rc;
}
static inline void activate_timer(struct timer *timer)
@@ -307,6 +442,8 @@ void set_timer(struct timer *timer, s_time_t expires)
if ( !timer_lock_irqsave(timer, flags) )
return;
+ trace_set(timer);
+
if ( active_timer(timer) )
deactivate_timer(timer);
@@ -325,6 +462,8 @@ void stop_timer(struct timer *timer)
if ( !timer_lock_irqsave(timer, flags) )
return;
+ trace_stop(timer);
+
if ( active_timer(timer) )
deactivate_timer(timer);
@@ -335,7 +474,6 @@ void stop_timer(struct timer *timer)
void migrate_timer(struct timer *timer, unsigned int new_cpu)
{
unsigned int old_cpu;
- bool_t active;
unsigned long flags;
rcu_read_lock(&timer_cpu_read_lock);
@@ -369,15 +507,16 @@ void migrate_timer(struct timer *timer, unsigned int new_cpu)
rcu_read_unlock(&timer_cpu_read_lock);
- active = active_timer(timer);
- if ( active )
+ trace_migrate(timer, new_cpu);
+
+ if ( active_timer(timer) )
deactivate_timer(timer);
list_del(&timer->inactive);
write_atomic(&timer->cpu, new_cpu);
list_add(&timer->inactive, &per_cpu(timers, new_cpu).inactive);
- if ( active )
+ if ( active_timer(timer) )
activate_timer(timer);
spin_unlock(&per_cpu(timers, old_cpu).lock);
@@ -395,6 +534,8 @@ void kill_timer(struct timer *timer)
if ( !timer_lock_irqsave(timer, flags) )
return;
+ trace_kill(timer);
+
if ( active_timer(timer) )
deactivate_timer(timer);
@@ -421,6 +562,7 @@ static void execute_timer(struct timers *ts, struct timer *t)
ts->running = t;
spin_unlock_irq(&ts->lock);
+ trace_exec(t);
(*fn)(data);
spin_lock_irq(&ts->lock);
ts->running = NULL;
@@ -443,6 +585,7 @@ static void timer_softirq_action(void)
int old_limit = GET_HEAP_LIMIT(heap);
int new_limit = ((old_limit + 1) << 4) - 1;
struct timer **newheap = xmalloc_array(struct timer *, new_limit + 1);
+
if ( newheap != NULL )
{
spin_lock_irq(&ts->lock);
@@ -454,6 +597,7 @@ static void timer_softirq_action(void)
xfree(heap);
heap = newheap;
}
+ trace_hoverfl(old_limit, new_limit);
}
spin_lock_irq(&ts->lock);
@@ -495,6 +639,8 @@ static void timer_softirq_action(void)
this_cpu(timer_deadline) =
(deadline == STIME_MAX) ? 0 : MAX(deadline, now + timer_slop);
+ trace_reprogr(now, this_cpu(timer_deadline));
+
if ( !reprogram_timer(this_cpu(timer_deadline)) )
raise_softirq(TIMER_SOFTIRQ);
diff --git a/xen/include/public/trace.h b/xen/include/public/trace.h
index acee7d5..9983ce8 100644
--- a/xen/include/public/trace.h
+++ b/xen/include/public/trace.h
@@ -97,6 +97,7 @@
#define TRC_XEN_RCU 0x01001000 /* RCU traces */
#define TRC_XEN_SIRQ 0x01002000 /* Traces relating to softirqs */
#define TRC_XEN_TSKLT 0x01004000 /* Traces relating to tasklets */
+#define TRC_XEN_TIMER 0x01008000 /* Trace relating to timer events */
/* Trace events per class */
#define TRC_LOST_RECORDS (TRC_GEN + 1)
@@ -308,6 +309,17 @@
#define TRC_XEN_TASKLET_INIT (TRC_XEN_TSKLT + 0x5)
#define TRC_XEN_TASKLET_MIGR (TRC_XEN_TSKLT + 0x6)
+/* Trace events for timers */
+#define TRC_XEN_TIMER_RMENTRY (TRC_XEN_TIMER + 0x1)
+#define TRC_XEN_TIMER_ADDENTRY (TRC_XEN_TIMER + 0x2)
+#define TRC_XEN_TIMER_SET (TRC_XEN_TIMER + 0x3)
+#define TRC_XEN_TIMER_STOP (TRC_XEN_TIMER + 0x4)
+#define TRC_XEN_TIMER_MIGRATE (TRC_XEN_TIMER + 0x5)
+#define TRC_XEN_TIMER_KILL (TRC_XEN_TIMER + 0x6)
+#define TRC_XEN_TIMER_EXEC (TRC_XEN_TIMER + 0x7)
+#define TRC_XEN_TIMER_REPRGR (TRC_XEN_TIMER + 0x8)
+#define TRC_XEN_TIMER_HOVERFL (TRC_XEN_TIMER + 0x9)
+
/*
* Event Flags
*
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-06-01 17:35 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-01 17:33 [PATCH 00/15] xen/tools: add tracing to various Xen subsystems Dario Faggioli
2017-06-01 17:33 ` [PATCH 01/15] xen: in do_softirq() sample smp_processor_id() once and for all Dario Faggioli
2017-06-07 14:38 ` Jan Beulich
2017-06-08 14:12 ` George Dunlap
2017-06-08 14:20 ` George Dunlap
2017-06-08 14:42 ` Jan Beulich
2017-06-01 17:33 ` [PATCH 02/15] xen: tracing: avoid checking tb_init_done multiple times Dario Faggioli
2017-06-01 17:53 ` Andrew Cooper
2017-06-01 23:08 ` Dario Faggioli
2017-06-07 14:46 ` Jan Beulich
2017-06-07 15:55 ` Dario Faggioli
2017-06-07 16:06 ` Jan Beulich
2017-06-08 14:34 ` George Dunlap
2017-06-08 14:37 ` George Dunlap
2017-06-01 17:33 ` [PATCH 03/15] xen/tools: tracing: several improvements on IRQs tracing Dario Faggioli
2017-06-01 18:02 ` Andrew Cooper
2017-06-01 23:12 ` Dario Faggioli
2017-06-07 15:05 ` Jan Beulich
2017-06-07 15:45 ` Dario Faggioli
2017-06-07 15:58 ` Jan Beulich
2017-06-08 14:53 ` George Dunlap
2017-06-08 15:34 ` Jan Beulich
2017-06-08 14:59 ` George Dunlap
2017-06-01 17:34 ` [PATCH 04/15] tools: xenalyze: fix dumping of PM_IDLE events Dario Faggioli
2017-06-08 15:06 ` George Dunlap
2017-06-01 17:34 ` [PATCH 05/15] xen: make it possible to disable tracing in Kconfig Dario Faggioli
2017-06-01 18:43 ` Andrew Cooper
2017-06-07 11:01 ` Julien Grall
2017-06-07 15:14 ` Jan Beulich
2017-06-08 15:16 ` George Dunlap
2017-06-08 15:35 ` Jan Beulich
2017-06-08 15:37 ` George Dunlap
2017-06-08 15:44 ` Jan Beulich
2017-06-08 15:17 ` George Dunlap
2017-06-01 17:34 ` [PATCH 06/15] xen: trace IRQ enabling/disabling Dario Faggioli
2017-06-01 19:08 ` Andrew Cooper
2017-06-01 23:42 ` Dario Faggioli
2017-06-08 15:51 ` George Dunlap
2017-06-08 16:05 ` Jan Beulich
2017-06-07 11:16 ` Julien Grall
2017-06-07 15:22 ` Dario Faggioli
2017-06-09 10:51 ` Julien Grall
2017-06-09 10:53 ` Julien Grall
2017-06-09 10:55 ` George Dunlap
2017-06-09 11:00 ` Julien Grall
2017-06-08 16:01 ` George Dunlap
2017-06-08 16:11 ` Dario Faggioli
2017-06-09 10:41 ` Jan Beulich
2017-06-01 17:34 ` [PATCH 07/15] tools: tracing: handle IRQs on/off events in xentrace and xenalyze Dario Faggioli
2017-06-13 15:58 ` George Dunlap
2017-06-01 17:34 ` [PATCH 08/15] xen: trace RCU behavior Dario Faggioli
2017-06-09 10:48 ` Jan Beulich
2017-06-13 16:05 ` George Dunlap
2017-06-01 17:34 ` [PATCH 09/15] tools: tracing: handle RCU events in xentrace and xenalyze Dario Faggioli
2017-06-13 16:12 ` George Dunlap
2017-06-01 17:34 ` [PATCH 10/15] xen: trace softirqs Dario Faggioli
2017-06-09 10:51 ` Jan Beulich
2017-06-01 17:34 ` [PATCH 11/15] tools: tracing: handle RCU events in xentrace and xenalyze Dario Faggioli
2017-06-01 17:35 ` [PATCH 12/15] xen: trace tasklets Dario Faggioli
2017-06-09 10:59 ` Jan Beulich
2017-06-09 11:17 ` Dario Faggioli
2017-06-09 11:29 ` Jan Beulich
2017-06-01 17:35 ` [PATCH 13/15] tools: tracing: handle tasklets events in xentrace and xenalyze Dario Faggioli
2017-06-01 17:35 ` Dario Faggioli [this message]
2017-06-01 17:35 ` [PATCH 15/15] tools: tracing: handle timers " Dario Faggioli
2017-06-07 14:13 ` [PATCH 00/15] xen/tools: add tracing to various Xen subsystems Konrad Rzeszutek Wilk
2017-06-08 16:45 ` Dario Faggioli
2017-06-13 16:34 ` 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=149633851685.12814.14195195446339149924.stgit@Solace.fritz.box \
--to=dario.faggioli@citrix.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=sstabellini@kernel.org \
--cc=tim@xen.org \
--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).