2008-03-27 13:31:11

by Mathieu Desnoyers

[permalink] [raw]
Subject: [patch for 2.6.26 0/7] Architecture Independent Markers

Hi Andrew,

After a few RFC rounds, I propose these markers for 2.6.26. They include
work done after comments from the memory management community. Most of them have
been used by the LTTng project for about 2 years.

The first patch in the patchset does a small addition to the markers API : it
allows marker sites to declare a _trace_mark marker. I forces use of a marker
which does not rely on an instruction modification mechanism to enable itself.
It's required in some kernel code paths (lockdep, printk, some traps, __init and
__exit code). I would prefer to get this in before the immediate values, since
the immediate values optimization, which depends on the rework of x86
alternatives, paravirt and kprobes currently being merged, takes longer than
expected.

I do not expect this marker set to cover every bits of the kernel (and this is
not its purpose). It's just a good start that has proven to be very useful to
the LTTng community in the past 2 years.

This patchset applies over 2.6.25-rc7 in this order :

markers-define-non-optimized-marker.patch
lttng-instrumentation-fs.patch
lttng-instrumentation-ipc.patch
lttng-instrumentation-kernel.patch
lttng-instrumentation-mm.patch
lttng-instrumentation-net.patch
lttng-instrumentation-lib.patch

Mathieu

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68


2008-03-27 15:41:32

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* Mathieu Desnoyers <[email protected]> wrote:

> Hi Andrew,
>
> After a few RFC rounds, I propose these markers for 2.6.26. They
> include work done after comments from the memory management community.
> Most of them have been used by the LTTng project for about 2 years.

very strong NACK. When markers went into 2.6.24 i initially believed
your claims that my earlier objections about markers have been resolved
and that it's a lightweight, useful facility.

so we optimistically used markers in ftrace (see sched-devel.git) for
the scheduler, and i was shocked about marker impact:

just 3 ftrace markers in the scheduler plus their support code bloated
the kernel by 5k (!), 288 bytes for only 3 markers in the scheduler
itself, the rest in support code to manage the markers - that's 96 bytes
added per every marker (44 (!) bytes of that in the fastpath!).

44 bytes per marker per fastpast is _NOT_ acceptable in any way, shape
or form. Those 3 limited markers have the same cache cost as adding
mcount callbacks for dyn-ftrace to the _whole_ scheduler ...

as i told you many, many moons ago, repeatedly: acceptable cost is a 5
bytes callout that is patched to a NOP, and _maybe_ a little bit more to
prepare parameters for the function calls. Not 44 bytes. Not 96 bytes.
Not 5K total cost. Paravirt ops are super-lightweight in comparison.

and this stuff _can_ be done sanely and cheaply and in fact we have done
it: see ftrace in sched-devel.git, and compare its cost.

see further details in the tongue-in-cheek commit below.

Ingo

--------------------->
Subject: sched: reintroduce markers
From: Ingo Molnar <[email protected]>

Scheduler markers are seriously bloated - so lets add them:

text data bss dec hex filename
7209664 852020 1634872 9696556 93f52c vmlinux.before
7214679 852188 1634872 9701739 94096b vmlinux.after

5K more bloat!

but that's not just bloat in the slowpath and tracer bloat, it's
also fastpath bloat:

text data bss dec hex filename
37642 7014 384 45040 aff0 sched.o.before
37930 7134 384 45448 b188 sched.o.after

288 bytes for only 3 markers in the scheduler - that's 96 bytes added
per every marker (44 bytes of that in the fastpath).

and the tracer codepath is now slower and more complex as well.

A classic lose-lose situation, so let's apply this patch. Not!

NACK-ed-by: Ingo Molnar <[email protected]>
---
include/linux/sched.h | 36 --------
kernel/sched.c | 11 +-
kernel/trace/trace.h | 12 --
kernel/trace/trace_functions.c | 2
kernel/trace/trace_sched_switch.c | 163 +++++++++++++++++++++++++++++++++++---
kernel/trace/trace_sched_wakeup.c | 146 +++++++++++++++++++++++++++++++---
6 files changed, 299 insertions(+), 71 deletions(-)

Index: linux/include/linux/sched.h
===================================================================
--- linux.orig/include/linux/sched.h
+++ linux/include/linux/sched.h
@@ -2031,42 +2031,6 @@ extern int sched_mc_power_savings, sched

extern void normalize_rt_tasks(void);

-#ifdef CONFIG_CONTEXT_SWITCH_TRACER
-extern void
-ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next);
-#else
-static inline void
-ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next)
-{
-}
-#endif
-
-#ifdef CONFIG_SCHED_TRACER
-extern void
-ftrace_wake_up_task(struct task_struct *wakee, struct task_struct *curr);
-extern void
-ftrace_wake_up_new_task(struct task_struct *wakee, struct task_struct *curr);
-#else
-static inline void
-ftrace_wake_up_task(struct task_struct *wakee, struct task_struct *curr)
-{
-}
-static inline void
-ftrace_wake_up_new_task(struct task_struct *wakee, struct task_struct *curr)
-{
-}
-#endif
-
-#ifdef CONFIG_CONTEXT_SWITCH_TRACER
-extern void
-ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next);
-#else
-static inline void
-ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next)
-{
-}
-#endif
-
#ifdef CONFIG_FAIR_GROUP_SCHED

extern struct task_group init_task_group;
Index: linux/kernel/sched.c
===================================================================
--- linux.orig/kernel/sched.c
+++ linux/kernel/sched.c
@@ -1886,7 +1886,9 @@ static int try_to_wake_up(struct task_st

out_activate:
#endif /* CONFIG_SMP */
- ftrace_wake_up_task(p, rq->curr);
+ trace_mark(kernel_sched_wakeup,
+ "p %p rq->curr %p",
+ p, rq->curr);

schedstat_inc(p, se.nr_wakeups);
if (sync)
@@ -2028,7 +2030,9 @@ void fastcall wake_up_new_task(struct ta
p->sched_class->task_new(rq, p);
inc_nr_running(rq);
}
- ftrace_wake_up_new_task(p, rq->curr);
+ trace_mark(kernel_sched_wakeup_new,
+ "p %p rq->curr %p",
+ p, rq->curr);

check_preempt_curr(rq, p);
#ifdef CONFIG_SMP
@@ -2202,7 +2206,8 @@ context_switch(struct rq *rq, struct tas
struct mm_struct *mm, *oldmm;

prepare_task_switch(rq, prev, next);
- ftrace_ctx_switch(prev, next);
+ trace_mark(kernel_sched_schedule,
+ "prev %p next %p", prev, next);
mm = next->mm;
oldmm = prev->active_mm;
/*
Index: linux/kernel/trace/trace.h
===================================================================
--- linux.orig/kernel/trace/trace.h
+++ linux/kernel/trace/trace.h
@@ -134,6 +134,8 @@ void tracing_start_function_trace(void);
void tracing_stop_function_trace(void);
int register_tracer(struct tracer *type);
void unregister_tracer(struct tracer *type);
+void tracing_start_sched_switch(void);
+void tracing_stop_sched_switch(void);

extern int tracing_sched_switch_enabled;
extern unsigned long tracing_max_latency;
@@ -148,16 +150,6 @@ static inline notrace cycle_t now(int cp
return cpu_clock(cpu);
}

-#ifdef CONFIG_SCHED_TRACER
-extern void notrace
-wakeup_sched_switch(struct task_struct *prev, struct task_struct *next);
-#else
-static inline void
-wakeup_sched_switch(struct task_struct *prev, struct task_struct *next)
-{
-}
-#endif
-
#ifdef CONFIG_CONTEXT_SWITCH_TRACER
typedef void
(*tracer_switch_func_t)(void *private,
Index: linux/kernel/trace/trace_functions.c
===================================================================
--- linux.orig/kernel/trace/trace_functions.c
+++ linux/kernel/trace/trace_functions.c
@@ -30,10 +30,12 @@ static notrace void start_function_trace
{
function_reset(tr);
tracing_start_function_trace();
+ tracing_start_sched_switch();
}

static notrace void stop_function_trace(struct trace_array *tr)
{
+ tracing_stop_sched_switch();
tracing_stop_function_trace();
}

Index: linux/kernel/trace/trace_sched_switch.c
===================================================================
--- linux.orig/kernel/trace/trace_sched_switch.c
+++ linux/kernel/trace/trace_sched_switch.c
@@ -16,12 +16,17 @@

static struct trace_array *ctx_trace;
static int __read_mostly tracer_enabled;
+static atomic_t sched_ref;
int __read_mostly tracing_sched_switch_enabled;

+static DEFINE_SPINLOCK(sched_switch_func_lock);
+
static void notrace
-ctx_switch_func(struct task_struct *prev, struct task_struct *next)
+sched_switch_func(void *private, struct task_struct *prev,
+ struct task_struct *next)
{
- struct trace_array *tr = ctx_trace;
+ struct trace_array **ptr = private;
+ struct trace_array *tr = *ptr;
struct trace_array_cpu *data;
unsigned long flags;
long disabled;
@@ -42,20 +47,115 @@ ctx_switch_func(struct task_struct *prev
raw_local_irq_restore(flags);
}

-void ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next)
+static struct tracer_switch_ops sched_switch_ops __read_mostly =
+{
+ .func = sched_switch_func,
+ .private = &ctx_trace,
+};
+
+static tracer_switch_func_t __read_mostly
+ tracer_switch_func = sched_switch_func;
+
+static struct tracer_switch_ops __read_mostly
+ *tracer_switch_func_ops = &sched_switch_ops;
+
+static void notrace
+sched_switch_func_loop(void *private, struct task_struct *prev,
+ struct task_struct *next)
{
- tracing_record_cmdline(prev);
+ struct tracer_switch_ops *ops = tracer_switch_func_ops;
+
+ /* take care of alpha acting funny */
+ read_barrier_depends();

+ for (; ops != NULL; ops = ops->next) {
+ /* silly alpha */
+ read_barrier_depends();
+ ops->func(ops->private, prev, next);
+ }
+}
+
+notrace int register_tracer_switch(struct tracer_switch_ops *ops)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&sched_switch_func_lock, flags);
+ ops->next = tracer_switch_func_ops;
/*
- * If tracer_switch_func only points to the local
- * switch func, it still needs the ptr passed to it.
+ * We are entering ops into the switch list but another
+ * CPU might be walking that list. We need to make sure
+ * the ops->next pointer is valid before another CPU sees
+ * the ops pointer included into the switch list.
*/
- ctx_switch_func(prev, next);
+ smp_wmb();
+ tracer_switch_func_ops = ops;
+
+ if (ops->next == &sched_switch_ops)
+ tracer_switch_func = sched_switch_func_loop;
+
+ spin_unlock_irqrestore(&sched_switch_func_lock, flags);
+
+ return 0;
+}
+
+notrace int unregister_tracer_switch(struct tracer_switch_ops *ops)
+{
+ unsigned long flags;
+ struct tracer_switch_ops **p = &tracer_switch_func_ops;
+ int ret;
+
+ spin_lock_irqsave(&sched_switch_func_lock, flags);

/*
- * Chain to the wakeup tracer (this is a NOP if disabled):
+ * If the sched_switch is the only one left, then
+ * only call that function.
*/
- wakeup_sched_switch(prev, next);
+ if (*p == ops && ops->next == &sched_switch_ops) {
+ tracer_switch_func = sched_switch_func;
+ tracer_switch_func_ops = &sched_switch_ops;
+ goto out;
+ }
+
+ for (; *p != &sched_switch_ops; p = &(*p)->next)
+ if (*p == ops)
+ break;
+
+ if (*p != ops) {
+ ret = -1;
+ goto out;
+ }
+
+ *p = (*p)->next;
+
+ out:
+ spin_unlock_irqrestore(&sched_switch_func_lock, flags);
+
+ return 0;
+}
+
+static notrace void
+sched_switch_callback(const struct marker *mdata, void *private_data,
+ const char *format, ...)
+{
+ struct task_struct *prev;
+ struct task_struct *next;
+ va_list ap;
+
+ if (!atomic_read(&sched_ref))
+ return;
+
+ tracing_record_cmdline(current);
+
+ va_start(ap, format);
+ prev = va_arg(ap, typeof(prev));
+ next = va_arg(ap, typeof(next));
+ va_end(ap);
+
+ /*
+ * If tracer_switch_func only points to the local
+ * switch func, it still needs the ptr passed to it.
+ */
+ tracer_switch_func(mdata->private, prev, next);
}

static notrace void sched_switch_reset(struct trace_array *tr)
@@ -72,10 +172,12 @@ static notrace void start_sched_trace(st
{
sched_switch_reset(tr);
tracer_enabled = 1;
+ tracing_start_sched_switch();
}

static notrace void stop_sched_trace(struct trace_array *tr)
{
+ tracing_stop_sched_switch();
tracer_enabled = 0;
}

@@ -110,6 +212,35 @@ static struct tracer sched_switch_trace
.ctrl_update = sched_switch_trace_ctrl_update,
};

+static int tracing_sched_arm(void)
+{
+ int ret;
+
+ ret = marker_arm("kernel_sched_schedule");
+ if (ret)
+ pr_info("sched trace: Couldn't arm probe switch_to\n");
+
+ return ret;
+}
+
+void tracing_start_sched_switch(void)
+{
+ long ref;
+
+ ref = atomic_inc_return(&sched_ref);
+ if (tracing_sched_switch_enabled && ref == 1)
+ tracing_sched_arm();
+}
+
+void tracing_stop_sched_switch(void)
+{
+ long ref;
+
+ ref = atomic_dec_and_test(&sched_ref);
+ if (tracing_sched_switch_enabled && ref)
+ marker_disarm("kernel_sched_schedule");
+}
+
__init static int init_sched_switch_trace(void)
{
int ret;
@@ -118,8 +249,22 @@ __init static int init_sched_switch_trac
if (ret)
return ret;

+ ret = marker_probe_register("kernel_sched_schedule",
+ "prev %p next %p",
+ sched_switch_callback,
+ &ctx_trace);
+ if (ret) {
+ pr_info("sched trace: Couldn't add marker"
+ " probe to switch_to\n");
+ goto out;
+ }
+
+ if (atomic_read(&sched_ref))
+ ret = tracing_sched_arm();
+
tracing_sched_switch_enabled = 1;

+out:
return ret;
}
device_initcall(init_sched_switch_trace);
Index: linux/kernel/trace/trace_sched_wakeup.c
===================================================================
--- linux.orig/kernel/trace/trace_sched_wakeup.c
+++ linux/kernel/trace/trace_sched_wakeup.c
@@ -44,12 +44,66 @@ static int notrace report_latency(cycle_
return 1;
}

-void notrace
-wakeup_sched_switch(struct task_struct *prev, struct task_struct *next)
+#ifdef CONFIG_FTRACE
+/* irqsoff uses its own function trace to keep the overhead down */
+static void notrace
+wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)
{
- unsigned long latency = 0, t0 = 0, t1 = 0;
struct trace_array *tr = wakeup_trace;
struct trace_array_cpu *data;
+ unsigned long flags;
+ long disabled;
+ int resched;
+ int tcpu;
+ int cpu;
+
+ if (likely(!tracer_enabled) || !tr)
+ return;
+
+ resched = need_resched();
+ preempt_disable_notrace();
+
+ cpu = raw_smp_processor_id();
+
+ data = tr->data[cpu];
+ disabled = atomic_inc_return(&data->disabled);
+ if (likely(disabled != 1))
+ goto out;
+
+ spin_lock_irqsave(&wakeup_lock, flags);
+ if (wakeup_task)
+ tcpu = task_cpu(wakeup_task);
+ else
+ tcpu = -1;
+ spin_unlock_irqrestore(&wakeup_lock, flags);
+
+ if (cpu == tcpu)
+ ftrace(tr, data, ip, parent_ip, flags);
+
+out:
+ atomic_dec(&data->disabled);
+
+ /* prevent recursion with scheduler */
+ if (resched)
+ preempt_enable_no_resched_notrace();
+ else
+ preempt_enable_notrace();
+}
+
+static struct ftrace_ops trace_ops __read_mostly =
+{
+ .func = wakeup_tracer_call,
+};
+#endif /* CONFIG_FTRACE */
+
+static void notrace
+wakeup_sched_switch(void *private, struct task_struct *prev,
+ struct task_struct *next)
+{
+ unsigned long latency = 0, t0 = 0, t1 = 0;
+ struct trace_array **ptr = private;
+ struct trace_array *tr = *ptr;
+ struct trace_array_cpu *data;
cycle_t T0, T1, delta;
unsigned long flags;
long disabled;
@@ -130,8 +184,14 @@ out_unlock:
spin_unlock_irqrestore(&wakeup_lock, flags);
out:
atomic_dec(&tr->data[cpu]->disabled);
+
}

+static struct tracer_switch_ops switch_ops __read_mostly = {
+ .func = wakeup_sched_switch,
+ .private = &wakeup_trace,
+};
+
static void notrace __wakeup_reset(struct trace_array *tr)
{
struct trace_array_cpu *data;
@@ -206,26 +266,51 @@ out:
atomic_dec(&tr->data[cpu]->disabled);
}

-notrace void
-ftrace_wake_up_task(struct task_struct *wakee, struct task_struct *curr)
+static notrace void
+wake_up_callback(const struct marker *mdata, void *private_data,
+ const char *format, ...)
{
+ struct trace_array **ptr = mdata->private;
+ struct trace_array *tr = *ptr;
+ struct task_struct *curr;
+ struct task_struct *p;
+ va_list ap;
+
if (likely(!tracer_enabled))
return;

- wakeup_check_start(wakeup_trace, wakee, curr);
-}
+ va_start(ap, format);

-notrace void
-ftrace_wake_up_new_task(struct task_struct *wakee, struct task_struct *curr)
-{
- if (likely(!tracer_enabled))
- return;
+ /* now get the meat: "p %p rq->curr %p" */
+ p = va_arg(ap, typeof(p));
+ curr = va_arg(ap, typeof(curr));
+
+ va_end(ap);

- wakeup_check_start(wakeup_trace, wakee, curr);
+ wakeup_check_start(tr, p, curr);
}

static notrace void start_wakeup_tracer(struct trace_array *tr)
{
+ int ret;
+
+ ret = marker_arm("kernel_sched_wakeup");
+ if (ret) {
+ pr_info("wakeup trace: Couldn't arm probe"
+ " kernel_sched_wakeup\n");
+ return;
+ }
+
+ ret = marker_arm("kernel_sched_wakeup_new");
+ if (ret) {
+ pr_info("wakeup trace: Couldn't arm probe"
+ " kernel_sched_wakeup_new\n");
+ goto out;
+ }
+
+ register_tracer_switch(&switch_ops);
+ tracing_start_sched_switch();
+
wakeup_reset(tr);

/*
@@ -238,13 +323,22 @@ static notrace void start_wakeup_tracer(
smp_wmb();

tracer_enabled = 1;
+ register_ftrace_function(&trace_ops);

return;
+
+out:
+ marker_disarm("kernel_sched_wakeup");
}

static notrace void stop_wakeup_tracer(struct trace_array *tr)
{
tracer_enabled = 0;
+ tracing_stop_sched_switch();
+ unregister_tracer_switch(&switch_ops);
+ marker_disarm("kernel_sched_wakeup");
+ marker_disarm("kernel_sched_wakeup_new");
+ unregister_ftrace_function(&trace_ops);
}

static notrace void wakeup_tracer_init(struct trace_array *tr)
@@ -305,6 +399,32 @@ __init static int init_wakeup_tracer(voi
if (ret)
return ret;

+ ret = marker_probe_register("kernel_sched_wakeup",
+ "p %p rq->curr %p",
+ wake_up_callback,
+ &wakeup_trace);
+ if (ret) {
+ pr_info("wakeup trace: Couldn't add marker"
+ " probe to kernel_sched_wakeup\n");
+ goto fail;
+ }
+
+ ret = marker_probe_register("kernel_sched_wakeup_new",
+ "p %p rq->curr %p",
+ wake_up_callback,
+ &wakeup_trace);
+ if (ret) {
+ pr_info("wakeup trace: Couldn't add marker"
+ " probe to kernel_sched_wakeup_new\n");
+ goto fail_deprobe;
+ }
+
+ return 0;
+
+fail_deprobe:
+ marker_probe_unregister("kernel_sched_wakeup");
+fail:
+ unregister_tracer(&wakeup_tracer);
return 0;
}
device_initcall(init_wakeup_tracer);

2008-03-27 17:08:55

by KOSAKI Motohiro

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

Hi

> text data bss dec hex filename
> 37642 7014 384 45040 aff0 sched.o.before
> 37930 7134 384 45448 b188 sched.o.after
>
> 288 bytes for only 3 markers in the scheduler - that's 96 bytes added
> per every marker (44 bytes of that in the fastpath).
>
> and the tracer codepath is now slower and more complex as well.
>
> A classic lose-lose situation, so let's apply this patch. Not!
>
> NACK-ed-by: Ingo Molnar <[email protected]>

I wonder why nobody doesn't fix this serious problem until now.
and I am interesting to what difference to ftrace and marker.

if I have time at next week, I will investigate the marker problem.

2008-03-27 20:39:40

by Mathieu Desnoyers

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

* Ingo Molnar ([email protected]) wrote:
>
> * Mathieu Desnoyers <[email protected]> wrote:
>
> > Hi Andrew,
> >
> > After a few RFC rounds, I propose these markers for 2.6.26. They
> > include work done after comments from the memory management community.
> > Most of them have been used by the LTTng project for about 2 years.
>
> very strong NACK. When markers went into 2.6.24 i initially believed
> your claims that my earlier objections about markers have been resolved
> and that it's a lightweight, useful facility.
>
> so we optimistically used markers in ftrace (see sched-devel.git) for
> the scheduler, and i was shocked about marker impact:
>
> just 3 ftrace markers in the scheduler plus their support code bloated
> the kernel by 5k (!), 288 bytes for only 3 markers in the scheduler
> itself, the rest in support code to manage the markers - that's 96 bytes
> added per every marker (44 (!) bytes of that in the fastpath!).
>
> 44 bytes per marker per fastpast is _NOT_ acceptable in any way, shape
> or form. Those 3 limited markers have the same cache cost as adding
> mcount callbacks for dyn-ftrace to the _whole_ scheduler ...
>
> as i told you many, many moons ago, repeatedly: acceptable cost is a 5
> bytes callout that is patched to a NOP, and _maybe_ a little bit more to
> prepare parameters for the function calls. Not 44 bytes. Not 96 bytes.
> Not 5K total cost. Paravirt ops are super-lightweight in comparison.
>
> and this stuff _can_ be done sanely and cheaply and in fact we have done
> it: see ftrace in sched-devel.git, and compare its cost.
>
> see further details in the tongue-in-cheek commit below.
>

Hi Ingo,

Let's compare one marker against one ftrace statement in sched.o on the
sched-dev tree on x86_32 and see where your "bloat" impression about markers
comes from. I think it's mostly due to the different metrics we use.


sched.o w/o CONFIG_CONTEXT_SWITCH_TRACER
text data bss dec hex filename
46564 2924 200 49688 c218 kernel/sched.o

Let's get an idea of CONFIG_CONTEXT_SWITCH_TRACER impact on sched.o :

sched.o with CONFIG_CONTEXT_SWITCH_TRACER

text data bss dec hex filename
46788 2924 200 49912 c2f8 kernel/sched.o

224 bytes added for 6 ftrace_*(). This is partly due to the helper function
ftrace_all_fair_tasks(). So let's be fair and not take it in account.

Only the cost for one ftrace_*(). All the others commented out, leaving this
one :

static inline void
context_switch(struct rq *rq, struct task_struct *prev,
struct task_struct *next)
{
struct mm_struct *mm, *oldmm;

prepare_task_switch(rq, prev, next);
ftrace_ctx_switch(rq, prev, next);
...

text data bss dec hex filename
46644 2924 200 49768 c268 kernel/sched.o

Commenting this one out :

text data bss dec hex filename
46628 2924 200 49752 c258 kernel/sched.o

For an extra 16 bytes (13 + alignment).

Due to this addition to schedule fast path :

movl %ebx, %ecx
movl -48(%ebp), %edx
movl -40(%ebp), %eax
call ftrace_ctx_switch

corresponding to :

38c: 89 d9 mov %ebx,%ecx
38e: 8b 55 d0 mov -0x30(%ebp),%edx
391: 8b 45 d8 mov -0x28(%ebp),%eax
394: e8 fc ff ff ff call 395 <schedule+0x12c>

Which adds 13 bytes to the fast path. It reads the stack to populate the
registers even when the code is dynamically disabled. The size of this code
directly depends on the number of parameters passed to the tracer. It would also
have to dereference pointers from memory if there would happen to be some data
not present on the stack. All this when disabled. I suppose you patch a no-op
instead of the call to dynamically disable it.

Changing this for a trace_mark :

trace_mark(ctx_switch, "rq %p prev %p next %p", rq, prev, next);

Adds this to schedule fast path :
(this is without immediate values)

cmpb $0, __mark_ctx_switch.33881+8
jne .L2164

corresponding to :

38c: 80 3d 08 00 00 00 00 cmpb $0x0,0x8
393: 0f 85 0c 03 00 00 jne 6a5 <schedule+0x43c>

(13 bytes in the fast path, including a memory reference)

With immediate values optimization, we do better :

mov $0,%al
testb %al, %al
jne .L2164

Corresponding to :

389: b0 00 mov $0x0,%al
38b: 84 c0 test %al,%al
38d: 0f 85 0c 03 00 00 jne 69f <schedule+0x436>

(10 bytes in the fast path instead of 13, and we remove any memory reference)


Near the end of schedule, we find the jump target :


.L2164:
movl %ebx, 20(%esp)
movl -48(%ebp), %edx
movl %edx, 16(%esp)
movl %ecx, 12(%esp)
movl $.LC108, 8(%esp)
movl $0, 4(%esp)
movl $__mark_ctx_switch.33881, (%esp)
call *__mark_ctx_switch.33881+12
jmp .L2126


6a5: 89 5c 24 14 mov %ebx,0x14(%esp)
6a9: 8b 55 d0 mov -0x30(%ebp),%edx
6ac: 89 54 24 10 mov %edx,0x10(%esp)
6b0: 89 4c 24 0c mov %ecx,0xc(%esp)
6b4: c7 44 24 08 f7 04 00 movl $0x4f7,0x8(%esp)
6bb: 00
6bc: c7 44 24 04 00 00 00 movl $0x0,0x4(%esp)
6c3: 00
6c4: c7 04 24 00 00 00 00 movl $0x0,(%esp)
6cb: ff 15 0c 00 00 00 call *0xc
6d1: e9 c3 fc ff ff jmp 399 <schedule+0x130>

Which adds an extra 50 bytes.

With immediate values optimization, we have a total size of

text data bss dec hex filename
46767 2956 200 49923 c303 kernel/sched.o

(baseline)

text data bss dec hex filename
46638 2924 200 49762 c262 kernel/sched.o

We add 129 bytes of text here. Which does not balance. We should add 60 bytes. I
guess some code alignment is the cause. Let's look at the size of schedule()
instead, since this is the only code I touch :

With immediate values optimization, with the marker :
00000269 <schedule>
...
0000086c <cond_resched_softirq>
1539 bytes

And without the marker :
00000269 <schedule>
...
0000082d <cond_resched_softirq>
1476 bytes

For an added 63 bytes to schedule, which balances modulo some alignment.

If we look at the surrounding of the added 50 bytes (label .L2164) at the end of
schedule(), we see the assembly :

....
.L2103:
movl -32(%ebp), %eax
testl %eax, %eax
je .L2101
movl $0, 68(%esi)
jmp .L2089
.L2106:
movl $0, -32(%ebp)
.p2align 4,,3
jmp .L2089
.L2164:
movl %ebx, 20(%esp)
movl -48(%ebp), %edx
movl %edx, 16(%esp)
movl %ecx, 12(%esp)
movl $.LC108, 8(%esp)
movl $0, 4(%esp)
movl $__mark_ctx_switch.33909, (%esp)
call *__mark_ctx_switch.33909+12
jmp .L2126
.L2124:
movl -40(%ebp), %eax
call _spin_unlock_irq
.p2align 4,,6
jmp .L2141
.L2161:
movl $1, %ecx
movl $2, %eax
call profile_hits
.p2align 4,,4
jmp .L2069
.L2160:
movl -48(%ebp), %edx
movl 192(%edx), %eax
testl %eax, %eax
jne .L2066
movl %edx, %eax
call __schedule_bug
jmp .L2066
....

Which are all targets of "unlikely" branches. Therefore, it shares a cache line
with these targets on architectures with associative L1 i-cache. I don't see
how this could be considered as "fast path".

Therefore, on a 3 arguments marker (with immediate values), the marker seems
to outperform ftrace on the following items :

- Adds 10 bytes to the fast path instead of 13.
- No memory read is required on the fast path when the marker is dynamically
disabled.
- The added fast path code size does not depend on the number of parameters
passed.
- The runtime cost, when dynamically disabled, does not depend on the number of
parameters passed.

However, you are right in that the _total_ code size of the ftrace statement is
smaller, but since it is all located and executed in the fast path, even when
dynamically disabled, I don't see this as an overall improvement.

About the cost of code size required to handle the data afterward : it will be
amortized by a common infrastructure such as LTTng, where the same code will
translate the data received as parameter into a trace.

Regards,

Mathieu

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68

2008-03-27 21:51:28

by Frank Ch. Eigler

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

Ingo Molnar <[email protected]> writes:

>> After a few RFC rounds, I propose these markers for 2.6.26. They
>> include work done after comments from the memory management community.
>> Most of them have been used by the LTTng project for about 2 years.
>
> [...]
> so we optimistically used markers in ftrace (see sched-devel.git) for
> the scheduler, and i was shocked about marker impact:

Do you have any *time* measurements?


- FChE

2008-03-28 00:03:36

by Denys Vlasenko

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

On Thursday 27 March 2008 14:20, Mathieu Desnoyers wrote:
> Hi Andrew,
>
> After a few RFC rounds, I propose these markers for 2.6.26. They include
> work done after comments from the memory management community. Most of them have
> been used by the LTTng project for about 2 years.

Not in this patch, but I noticed:

#define __trace_mark(name, call_private, format, args...) \
do { \
static const char __mstrtab_##name[] \
__attribute__((section("__markers_strings"))) \
= #name "\0" format; \
static struct marker __mark_##name \
__attribute__((section("__markers"), aligned(8))) = \
{ __mstrtab_##name, &__mstrtab_##name[sizeof(#name)], \
0, 0, marker_probe_cb, \
{ __mark_empty_function, NULL}, NULL }; \
__mark_check_format(format, ## args); \
if (unlikely(__mark_##name.state)) { \
(*__mark_##name.call) \
(&__mark_##name, call_private, \
format, ## args); \
} \
} while (0)

In this call:

(*__mark_##name.call) \
(&__mark_##name, call_private, \
format, ## args); \

you make gcc allocate duplicate format string. You can use
&__mstrtab_##name[sizeof(#name)] instead since it holds the same string,
or drop ", format," above and "const char *fmt" from here:

void (*call)(const struct marker *mdata, /* Probe wrapper */
void *call_private, const char *fmt, ...);

since mdata->format is the same and all callees which need it can take it there.
--
vda

2008-03-28 01:02:35

by Mathieu Desnoyers

[permalink] [raw]
Subject: [PATCH] Markers - remove extra format argument

Denys Vlasenko <[email protected]> :

> Not in this patch, but I noticed:
>
> #define __trace_mark(name, call_private, format, args...) \
> do { \
> static const char __mstrtab_##name[] \
> __attribute__((section("__markers_strings"))) \
> = #name "\0" format; \
> static struct marker __mark_##name \
> __attribute__((section("__markers"), aligned(8))) = \
> { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)], \
> 0, 0, marker_probe_cb, \
> { __mark_empty_function, NULL}, NULL }; \
> __mark_check_format(format, ## args); \
> if (unlikely(__mark_##name.state)) { \
> (*__mark_##name.call) \
> (&__mark_##name, call_private, \
> format, ## args); \
> } \
> } while (0)
>
> In this call:
>
> (*__mark_##name.call) \
> (&__mark_##name, call_private, \
> format, ## args); \
>
> you make gcc allocate duplicate format string. You can use
> &__mstrtab_##name[sizeof(#name)] instead since it holds the same string,
> or drop ", format," above and "const char *fmt" from here:
>
> void (*call)(const struct marker *mdata, /* Probe wrapper */
> void *call_private, const char *fmt, ...);
>
> since mdata->format is the same and all callees which need it can take it there.

Very good point. I actually thought about dropping it, since it would
remove an unnecessary argument from the stack. And actually, since I now
have the marker_probe_cb sitting between the marker site and the
callbacks, there is no API change required. Thanks :)

Mathieu

Signed-off-by: Mathieu Desnoyers <[email protected]>
CC: Denys Vlasenko <[email protected]>
---
include/linux/marker.h | 11 +++++------
kernel/marker.c | 30 ++++++++++++++----------------
2 files changed, 19 insertions(+), 22 deletions(-)

Index: linux-2.6-lttng/include/linux/marker.h
===================================================================
--- linux-2.6-lttng.orig/include/linux/marker.h 2008-03-27 20:51:34.000000000 -0400
+++ linux-2.6-lttng/include/linux/marker.h 2008-03-27 20:54:55.000000000 -0400
@@ -44,8 +44,8 @@ struct marker {
*/
char state; /* Marker state. */
char ptype; /* probe type : 0 : single, 1 : multi */
- void (*call)(const struct marker *mdata, /* Probe wrapper */
- void *call_private, const char *fmt, ...);
+ /* Probe wrapper */
+ void (*call)(const struct marker *mdata, void *call_private, ...);
struct marker_probe_closure single;
struct marker_probe_closure *multi;
} __attribute__((aligned(8)));
@@ -72,8 +72,7 @@ struct marker {
__mark_check_format(format, ## args); \
if (unlikely(__mark_##name.state)) { \
(*__mark_##name.call) \
- (&__mark_##name, call_private, \
- format, ## args); \
+ (&__mark_##name, call_private, ## args);\
} \
} while (0)

@@ -117,9 +116,9 @@ static inline void __printf(1, 2) ___mar
extern marker_probe_func __mark_empty_function;

extern void marker_probe_cb(const struct marker *mdata,
- void *call_private, const char *fmt, ...);
+ void *call_private, ...);
extern void marker_probe_cb_noarg(const struct marker *mdata,
- void *call_private, const char *fmt, ...);
+ void *call_private, ...);

/*
* Connect a probe to a marker.
Index: linux-2.6-lttng/kernel/marker.c
===================================================================
--- linux-2.6-lttng.orig/kernel/marker.c 2008-03-27 20:52:09.000000000 -0400
+++ linux-2.6-lttng/kernel/marker.c 2008-03-27 20:56:13.000000000 -0400
@@ -54,8 +54,8 @@ static DEFINE_MUTEX(markers_mutex);
struct marker_entry {
struct hlist_node hlist;
char *format;
- void (*call)(const struct marker *mdata, /* Probe wrapper */
- void *call_private, const char *fmt, ...);
+ /* Probe wrapper */
+ void (*call)(const struct marker *mdata, void *call_private, ...);
struct marker_probe_closure single;
struct marker_probe_closure *multi;
int refcount; /* Number of times armed. 0 if disarmed. */
@@ -90,15 +90,13 @@ EXPORT_SYMBOL_GPL(__mark_empty_function)
* marker_probe_cb Callback that prepares the variable argument list for probes.
* @mdata: pointer of type struct marker
* @call_private: caller site private data
- * @fmt: format string
* @...: Variable argument list.
*
* Since we do not use "typical" pointer based RCU in the 1 argument case, we
* need to put a full smp_rmb() in this branch. This is why we do not use
* rcu_dereference() for the pointer read.
*/
-void marker_probe_cb(const struct marker *mdata, void *call_private,
- const char *fmt, ...)
+void marker_probe_cb(const struct marker *mdata, void *call_private, ...)
{
va_list args;
char ptype;
@@ -119,8 +117,9 @@ void marker_probe_cb(const struct marker
/* Must read the ptr before private data. They are not data
* dependant, so we put an explicit smp_rmb() here. */
smp_rmb();
- va_start(args, fmt);
- func(mdata->single.probe_private, call_private, fmt, &args);
+ va_start(args, call_private);
+ func(mdata->single.probe_private, call_private, mdata->format,
+ &args);
va_end(args);
} else {
struct marker_probe_closure *multi;
@@ -135,9 +134,9 @@ void marker_probe_cb(const struct marker
smp_read_barrier_depends();
multi = mdata->multi;
for (i = 0; multi[i].func; i++) {
- va_start(args, fmt);
- multi[i].func(multi[i].probe_private, call_private, fmt,
- &args);
+ va_start(args, call_private);
+ multi[i].func(multi[i].probe_private, call_private,
+ mdata->format, &args);
va_end(args);
}
}
@@ -149,13 +148,11 @@ EXPORT_SYMBOL_GPL(marker_probe_cb);
* marker_probe_cb Callback that does not prepare the variable argument list.
* @mdata: pointer of type struct marker
* @call_private: caller site private data
- * @fmt: format string
* @...: Variable argument list.
*
* Should be connected to markers "MARK_NOARGS".
*/
-void marker_probe_cb_noarg(const struct marker *mdata,
- void *call_private, const char *fmt, ...)
+void marker_probe_cb_noarg(const struct marker *mdata, void *call_private, ...)
{
va_list args; /* not initialized */
char ptype;
@@ -171,7 +168,8 @@ void marker_probe_cb_noarg(const struct
/* Must read the ptr before private data. They are not data
* dependant, so we put an explicit smp_rmb() here. */
smp_rmb();
- func(mdata->single.probe_private, call_private, fmt, &args);
+ func(mdata->single.probe_private, call_private, mdata->format,
+ &args);
} else {
struct marker_probe_closure *multi;
int i;
@@ -185,8 +183,8 @@ void marker_probe_cb_noarg(const struct
smp_read_barrier_depends();
multi = mdata->multi;
for (i = 0; multi[i].func; i++)
- multi[i].func(multi[i].probe_private, call_private, fmt,
- &args);
+ multi[i].func(multi[i].probe_private, call_private,
+ mdata->format, &args);
}
preempt_enable();
}

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68

2008-03-28 01:04:56

by Mathieu Desnoyers

[permalink] [raw]
Subject: Re: [patch for 2.6.26 1/7] Markers - define non optimized marker (updated)

Markers - define non optimized marker

To support the forthcoming "immediate values" marker optimization, we must have
a way to declare markers in few code paths that does not use instruction
modification based enable. This will be the case of printk(), some traps and
eventually lockdep instrumentation.

Changelog :
- Fix reversed boolean logic of "generic".

Signed-off-by: Mathieu Desnoyers <[email protected]>
---
include/linux/marker.h | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)

Index: linux-2.6-lttng/include/linux/marker.h
===================================================================
--- linux-2.6-lttng.orig/include/linux/marker.h 2008-03-27 20:47:44.000000000 -0400
+++ linux-2.6-lttng/include/linux/marker.h 2008-03-27 20:49:04.000000000 -0400
@@ -58,8 +58,12 @@ struct marker {
* Make sure the alignment of the structure in the __markers section will
* not add unwanted padding between the beginning of the section and the
* structure. Force alignment to the same alignment as the section start.
+ *
+ * The "generic" argument controls which marker enabling mechanism must be used.
+ * If generic is true, a variable read is used.
+ * If generic is false, immediate values are used.
*/
-#define __trace_mark(name, call_private, format, args...) \
+#define __trace_mark(generic, name, call_private, format, args...) \
do { \
static const char __mstrtab_##name[] \
__attribute__((section("__markers_strings"))) \
@@ -79,7 +83,7 @@ struct marker {
extern void marker_update_probe_range(struct marker *begin,
struct marker *end);
#else /* !CONFIG_MARKERS */
-#define __trace_mark(name, call_private, format, args...) \
+#define __trace_mark(generic, name, call_private, format, args...) \
__mark_check_format(format, ## args)
static inline void marker_update_probe_range(struct marker *begin,
struct marker *end)
@@ -87,15 +91,30 @@ static inline void marker_update_probe_r
#endif /* CONFIG_MARKERS */

/**
- * trace_mark - Marker
+ * trace_mark - Marker using code patching
* @name: marker name, not quoted.
* @format: format string
* @args...: variable argument list
*
- * Places a marker.
+ * Places a marker using optimized code patching technique (imv_read())
+ * to be enabled when immediate values are present.
*/
#define trace_mark(name, format, args...) \
- __trace_mark(name, NULL, format, ## args)
+ __trace_mark(0, name, NULL, format, ## args)
+
+/**
+ * _trace_mark - Marker using variable read
+ * @name: marker name, not quoted.
+ * @format: format string
+ * @args...: variable argument list
+ *
+ * Places a marker using a standard memory read (_imv_read()) to be
+ * enabled. Should be used for markers in code paths where instruction
+ * modification based enabling is not welcome. (__init and __exit functions,
+ * lockdep, some traps, printk).
+ */
+#define _trace_mark(name, format, args...) \
+ __trace_mark(1, name, NULL, format, ## args)

/**
* MARK_NOARGS - Format string for a marker with no argument.
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68

2008-03-28 05:35:30

by Masami Hiramatsu

[permalink] [raw]
Subject: Re: [PATCH] Markers - remove extra format argument

Hi Mathieu,

Mathieu Desnoyers wrote:
> Denys Vlasenko <[email protected]> :
>> In this call:
>>
>> (*__mark_##name.call) \
>> (&__mark_##name, call_private, \
>> format, ## args); \
>>
>> you make gcc allocate duplicate format string. You can use
>> &__mstrtab_##name[sizeof(#name)] instead since it holds the same string,
>> or drop ", format," above and "const char *fmt" from here:
>>
>> void (*call)(const struct marker *mdata, /* Probe wrapper */
>> void *call_private, const char *fmt, ...);
>>
>> since mdata->format is the same and all callees which need it can take it there.
>
> Very good point. I actually thought about dropping it, since it would
> remove an unnecessary argument from the stack. And actually, since I now
> have the marker_probe_cb sitting between the marker site and the
> callbacks, there is no API change required. Thanks :)

First of all, I'm very interested in the marker, and your patches look
useful for me.

By the way, could you tell me what the call_private is for?
In your patch, that is used only from special function below.

> @@ -1844,3 +1848,22 @@ int valid_swaphandles(swp_entry_t entry,
> *offset = ++toff;
> return nr_pages? ++nr_pages: 0;
> }
> +
> +void ltt_dump_swap_files(void *call_data)
> +{
> + int type;
> + struct swap_info_struct *p = NULL;
> +
> + mutex_lock(&swapon_mutex);
> + for (type = swap_list.head; type >= 0; type = swap_info[type].next) {
> + p = swap_info + type;
> + if ((p->flags & SWP_ACTIVE) != SWP_ACTIVE)
> + continue;
> + __trace_mark(0, statedump_swap_files, call_data,
> + "filp %p vfsmount %p dname %s",
> + p->swap_file, p->swap_file->f_vfsmnt,
> + p->swap_file->f_dentry->d_name.name);
> + }
> + mutex_unlock(&swapon_mutex);
> +}
> +EXPORT_SYMBOL_GPL(ltt_dump_swap_files);
>

However, I think call_data can be passed as an argument.
If so, I think you can also drop it, like this.

void (*call)(const struct marker *mdata, ...);


Best regards,

--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division

e-mail: [email protected]

2008-03-28 09:43:55

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* Mathieu Desnoyers <[email protected]> wrote:

> Let's compare one marker against one ftrace statement in sched.o on
> the sched-dev tree on x86_32 and see where your "bloat" impression
> about markers comes from. I think it's mostly due to the different
> metrics we use.
>
> sched.o w/o CONFIG_CONTEXT_SWITCH_TRACER
> text data bss dec hex filename
> 46564 2924 200 49688 c218 kernel/sched.o
>
> Let's get an idea of CONFIG_CONTEXT_SWITCH_TRACER impact on sched.o :
>
> sched.o with CONFIG_CONTEXT_SWITCH_TRACER
>
> text data bss dec hex filename
> 46788 2924 200 49912 c2f8 kernel/sched.o
>
> 224 bytes added for 6 ftrace_*(). This is partly due to the helper function
> ftrace_all_fair_tasks(). So let's be fair and not take it in account.

it's not 6 ftrace calls, you forgot about kernel/sched_fair.c, so it's 9
tracepoints.

note that all but the 2 core trace hooks are temporary, i used them to
debug a specific scheduler problem. Especially one trace point:
ftrace_all_fair_tasks() is a totally ad-hoc trace-all-tasks-in-the-rq
heavy function.

if you want to compare apples to apples, try the patch below, which
removes the ad-hoc tracepoints.

Ingo

------------------------>
Subject: no: ad hoc ftrace points
From: Ingo Molnar <[email protected]>
Date: Fri Mar 28 10:30:37 CET 2008

Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/sched.c | 47 -----------------------------------------------
kernel/sched_fair.c | 3 ---
2 files changed, 50 deletions(-)

Index: linux/kernel/sched.c
===================================================================
--- linux.orig/kernel/sched.c
+++ linux/kernel/sched.c
@@ -2005,53 +2005,6 @@ static int sched_balance_self(int cpu, i

#endif /* CONFIG_SMP */

-#ifdef CONFIG_CONTEXT_SWITCH_TRACER
-
-void ftrace_task(struct task_struct *p, void *__tr, void *__data)
-{
-#if 0
- /*
- * trace timeline tree
- */
- __trace_special(__tr, __data,
- p->pid, p->se.vruntime, p->se.sum_exec_runtime);
-#else
- /*
- * trace balance metrics
- */
- __trace_special(__tr, __data,
- p->pid, p->se.avg_overlap, 0);
-#endif
-}
-
-void ftrace_all_fair_tasks(void *__rq, void *__tr, void *__data)
-{
- struct task_struct *p;
- struct sched_entity *se;
- struct rb_node *curr;
- struct rq *rq = __rq;
-
- if (rq->cfs.curr) {
- p = task_of(rq->cfs.curr);
- ftrace_task(p, __tr, __data);
- }
- if (rq->cfs.next) {
- p = task_of(rq->cfs.next);
- ftrace_task(p, __tr, __data);
- }
-
- for (curr = first_fair(&rq->cfs); curr; curr = rb_next(curr)) {
- se = rb_entry(curr, struct sched_entity, run_node);
- if (!entity_is_task(se))
- continue;
-
- p = task_of(se);
- ftrace_task(p, __tr, __data);
- }
-}
-
-#endif
-
/***
* try_to_wake_up - wake up a thread
* @p: the to-be-woken-up thread
Index: linux/kernel/sched_fair.c
===================================================================
--- linux.orig/kernel/sched_fair.c
+++ linux/kernel/sched_fair.c
@@ -991,8 +991,6 @@ wake_affine(struct rq *rq, struct sched_
if (!(this_sd->flags & SD_WAKE_AFFINE))
return 0;

- ftrace_special(__LINE__, curr->se.avg_overlap, sync);
- ftrace_special(__LINE__, p->se.avg_overlap, -1);
/*
* If the currently running task will sleep within
* a reasonable amount of time then attract this newly
@@ -1118,7 +1116,6 @@ static void check_preempt_wakeup(struct
if (unlikely(se == pse))
return;

- ftrace_special(__LINE__, p->pid, se->last_wakeup);
cfs_rq_of(pse)->next = pse;

/*

2008-03-28 10:16:03

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* KOSAKI Motohiro <[email protected]> wrote:

> > text data bss dec hex filename
> > 37642 7014 384 45040 aff0 sched.o.before
> > 37930 7134 384 45448 b188 sched.o.after
> >
> > 288 bytes for only 3 markers in the scheduler - that's 96 bytes added
> > per every marker (44 bytes of that in the fastpath).
> >
> > and the tracer codepath is now slower and more complex as well.
> >
> > A classic lose-lose situation, so let's apply this patch. Not!
> >
> > NACK-ed-by: Ingo Molnar <[email protected]>
>
> I wonder why nobody doesn't fix this serious problem until now. and I
> am interesting to what difference to ftrace and marker.

i warned and moaned about it ad nauseum.

furthermore, and because it's Friday again, let me remind folks that
SystemTap has an even more significant bloat problem: the fact that it
needs a huge download:

Installing:
kernel-debuginfo x86_64 2.6.25-0.163.rc7.git1.fc9
development-debuginfo 198 M
Installing for dependencies:
kernel-debuginfo-common x86_64 2.6.25-0.163.rc7.git1.fc9
development-debuginfo 30 M

Total download size: 229 M

for _every_ updated kernel. That 229 MB size reduces the user base of
SystemTap (which is otherwise a totally brilliant and cool tool) to 1%
of its potential userbase, to those truly desperate persons who really
_need_ to get their problem debugged somehow. But it's nowhere near
usable as an easy, ad-hoc kernel instrumentation tool, just due to the
sheer size it brings.

for heaven's sake, we can have 3 years of _full Linux kernel history_,
with all 87875 commits, with full changelog and dependencies and full
source code included, packed into a rather tight, 180 MB git repository
...

[ and then i havent even begun about the on-disk footprint of this
monstrum, after the packages have been installed: an additional 850 MB.
Puh-lease ... ]

there's a huge disconnect with reality here.

Ingo

2008-03-28 11:23:19

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* Ingo Molnar <[email protected]> wrote:

> if you want to compare apples to apples, try the patch below, which
> removes the ad-hoc tracepoints.

... new version of that is in sched-devel.git.

Ingo

2008-03-28 11:38:18

by Mathieu Desnoyers

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

* Ingo Molnar ([email protected]) wrote:
>
> * Mathieu Desnoyers <[email protected]> wrote:
>
> > Let's compare one marker against one ftrace statement in sched.o on
> > the sched-dev tree on x86_32 and see where your "bloat" impression
> > about markers comes from. I think it's mostly due to the different
> > metrics we use.
> >
> > sched.o w/o CONFIG_CONTEXT_SWITCH_TRACER
> > text data bss dec hex filename
> > 46564 2924 200 49688 c218 kernel/sched.o
> >
> > Let's get an idea of CONFIG_CONTEXT_SWITCH_TRACER impact on sched.o :
> >
> > sched.o with CONFIG_CONTEXT_SWITCH_TRACER
> >
> > text data bss dec hex filename
> > 46788 2924 200 49912 c2f8 kernel/sched.o
> >
> > 224 bytes added for 6 ftrace_*(). This is partly due to the helper function
> > ftrace_all_fair_tasks(). So let's be fair and not take it in account.
>
> it's not 6 ftrace calls, you forgot about kernel/sched_fair.c, so it's 9
> tracepoints.
>
> note that all but the 2 core trace hooks are temporary, i used them to
> debug a specific scheduler problem. Especially one trace point:
> ftrace_all_fair_tasks() is a totally ad-hoc trace-all-tasks-in-the-rq
> heavy function.
>
> if you want to compare apples to apples, try the patch below, which
> removes the ad-hoc tracepoints.
>

Hrm, you are only quoting my introduction, where I introduce the reason
why I do in a more in-depth analysis on a _single_ ftrace statement.

Ingo, if you care to read the rest of my email, you will discover that I
concentrated my effort on a single ftrace statement in context_switch().
Whether or not I removed the trace points from kernel/sched_fair.c does
not change the validity of the results that follow. I commented out your
ad-hoc tracepoints from sched.c by hand in my test cases, and
sched_fair.c trace points were there in every scenario, so they were
invariant and _not_ considered, except in this introduction you quoted.

Mathieu

> Ingo
>
> ------------------------>
> Subject: no: ad hoc ftrace points
> From: Ingo Molnar <[email protected]>
> Date: Fri Mar 28 10:30:37 CET 2008
>
> Signed-off-by: Ingo Molnar <[email protected]>
> ---
> kernel/sched.c | 47 -----------------------------------------------
> kernel/sched_fair.c | 3 ---
> 2 files changed, 50 deletions(-)
>
> Index: linux/kernel/sched.c
> ===================================================================
> --- linux.orig/kernel/sched.c
> +++ linux/kernel/sched.c
> @@ -2005,53 +2005,6 @@ static int sched_balance_self(int cpu, i
>
> #endif /* CONFIG_SMP */
>
> -#ifdef CONFIG_CONTEXT_SWITCH_TRACER
> -
> -void ftrace_task(struct task_struct *p, void *__tr, void *__data)
> -{
> -#if 0
> - /*
> - * trace timeline tree
> - */
> - __trace_special(__tr, __data,
> - p->pid, p->se.vruntime, p->se.sum_exec_runtime);
> -#else
> - /*
> - * trace balance metrics
> - */
> - __trace_special(__tr, __data,
> - p->pid, p->se.avg_overlap, 0);
> -#endif
> -}
> -
> -void ftrace_all_fair_tasks(void *__rq, void *__tr, void *__data)
> -{
> - struct task_struct *p;
> - struct sched_entity *se;
> - struct rb_node *curr;
> - struct rq *rq = __rq;
> -
> - if (rq->cfs.curr) {
> - p = task_of(rq->cfs.curr);
> - ftrace_task(p, __tr, __data);
> - }
> - if (rq->cfs.next) {
> - p = task_of(rq->cfs.next);
> - ftrace_task(p, __tr, __data);
> - }
> -
> - for (curr = first_fair(&rq->cfs); curr; curr = rb_next(curr)) {
> - se = rb_entry(curr, struct sched_entity, run_node);
> - if (!entity_is_task(se))
> - continue;
> -
> - p = task_of(se);
> - ftrace_task(p, __tr, __data);
> - }
> -}
> -
> -#endif
> -
> /***
> * try_to_wake_up - wake up a thread
> * @p: the to-be-woken-up thread
> Index: linux/kernel/sched_fair.c
> ===================================================================
> --- linux.orig/kernel/sched_fair.c
> +++ linux/kernel/sched_fair.c
> @@ -991,8 +991,6 @@ wake_affine(struct rq *rq, struct sched_
> if (!(this_sd->flags & SD_WAKE_AFFINE))
> return 0;
>
> - ftrace_special(__LINE__, curr->se.avg_overlap, sync);
> - ftrace_special(__LINE__, p->se.avg_overlap, -1);
> /*
> * If the currently running task will sleep within
> * a reasonable amount of time then attract this newly
> @@ -1118,7 +1116,6 @@ static void check_preempt_wakeup(struct
> if (unlikely(se == pse))
> return;
>
> - ftrace_special(__LINE__, p->pid, se->last_wakeup);
> cfs_rq_of(pse)->next = pse;
>
> /*

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68

2008-03-28 13:33:27

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* Mathieu Desnoyers <[email protected]> wrote:

> 6a5: 89 5c 24 14 mov %ebx,0x14(%esp)
> 6a9: 8b 55 d0 mov -0x30(%ebp),%edx
> 6ac: 89 54 24 10 mov %edx,0x10(%esp)
> 6b0: 89 4c 24 0c mov %ecx,0xc(%esp)
> 6b4: c7 44 24 08 f7 04 00 movl $0x4f7,0x8(%esp)
> 6bb: 00
> 6bc: c7 44 24 04 00 00 00 movl $0x0,0x4(%esp)
> 6c3: 00
> 6c4: c7 04 24 00 00 00 00 movl $0x0,(%esp)
> 6cb: ff 15 0c 00 00 00 call *0xc
> 6d1: e9 c3 fc ff ff jmp 399 <schedule+0x130>
>
> Which adds an extra 50 bytes.

you talk about 32-bit while i talk about 64-bit. All these costs go up
on 64-bit and you should know that. I measured 44 bytes in the fastpath
and 52 bytes in the slowpath, which gives 96 bytes. (with a distro
.config and likely with a different gcc)

96 bytes _per marker_ sprinkled throughout the kernel. This blows up the
cache footprint of the kernel quite substantially, because it's all
fragmented - even if this is in the 'slowpath'.

so yes, that is the bloat i'm talking about.

dont just compare it to ftrace-sched-switch, compare it to dyn-ftrace
which gives us more than 78,000 trace points in the kernel _here and
today_ at no measurable runtime cost, with a 5 byte NOP per trace point
and _zero_ instruction stream (register scheduling, etc.) intrusion. No
slowpath cost.

and the basic API approach of markers is flawed a well - the coupling to
the kernel is too strong. The correct and long-term maintainable
coupling is via ASCII symbol names, not via any binding built into the
kernel.

With dyn-ftrace (see sched-devel.git/latest) tracing filters can be
installed trivially by users, via function _symbols_, via:

/debugfs/tracing/available_filter_functions
/debugfs/tracing/set_ftrace_filter

wildcards are recognized as well, so if you do:

echo '*lock' > /debugfs/tracing/set_ftrace_filter

all functions that have 'lock' in their name will have their tracepoints
activated transparently from that point on.

even multiple names can be passed in at once:

echo 'schedule wake_up* *acpi*' > /debugfs/tracing/set_ftrace_filter

so it's trivial to use it, very powerful and we've only begun exposing
it towards users. I see no good reason why we'd patch any marker into
the kernel - it's a maintenance cost from that point on.

so yes, my argument is: tens of thousands of lightweight tracepoints in
the kernel here and today, which are configurable via function names,
each of which can be turned on and off individually, and none of which
needs any source code level changes - is an obviously superior approach.

Ingo

2008-03-28 13:38:45

by Masami Hiramatsu

[permalink] [raw]
Subject: [OT] Re: [patch for 2.6.26 0/7] Architecture Independent Markers

Ingo Molnar wrote:
> furthermore, and because it's Friday again, let me remind folks that
> SystemTap has an even more significant bloat problem: the fact that it
> needs a huge download:

Ingo, that seems very off-topic...

> Installing:
> kernel-debuginfo x86_64 2.6.25-0.163.rc7.git1.fc9
> development-debuginfo 198 M
> Installing for dependencies:
> kernel-debuginfo-common x86_64 2.6.25-0.163.rc7.git1.fc9
> development-debuginfo 30 M
>
> Total download size: 229 M
>
> for _every_ updated kernel. That 229 MB size reduces the user base of
> SystemTap (which is otherwise a totally brilliant and cool tool) to 1%
> of its potential userbase, to those truly desperate persons who really
> _need_ to get their problem debugged somehow. But it's nowhere near
> usable as an easy, ad-hoc kernel instrumentation tool, just due to the
> sheer size it brings.

Sure, it is a thorny issue especially for users of daily-kernel-updating
distribution.

However, when updating kernel from tarball, We can get full set of debuginfo
just by building kernel with CONFIG_DEBUG_INFO. I think it is enough
usable for kernel developers.

BTW, we already started working on the symbol-table based probing.
http://sources.redhat.com/bugzilla/show_bug.cgi?id=4311

> for heaven's sake, we can have 3 years of _full Linux kernel history_,
> with all 87875 commits, with full changelog and dependencies and full
> source code included, packed into a rather tight, 180 MB git repository
> ...
>
> [ and then i havent even begun about the on-disk footprint of this
> monstrum, after the packages have been installed: an additional 850 MB.
> Puh-lease ... ]

Thank for Moore's law and all storage engineers, nowadays we can buy
an 1TB(=1000GB!) HDD with less than $300!(I also surprised...)
And many other compressed filesystem can be used for saving disk space.

Best regards,

--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division

e-mail: [email protected]

2008-03-28 13:42:08

by Frank Ch. Eigler

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


>> > NACK-ed-by: Ingo Molnar <[email protected]>
>> [...]
>> I wonder why nobody doesn't fix this serious problem until now. [...]

Frankly, the "problem" has not yet been established. Ingo has failed
to respond to Mathieu's analysis of the actual instruction streams,
which cast doubt on Ingo's technique of simply counting bytes. So
far, neither Ingo nor Mathieu have published *time measurements* to
quantify the actual (as opposed to speculated) costs.


> [...] furthermore, and because it's Friday again, let me remind
> folks that SystemTap has an even more significant bloat problem: the
> fact that it needs a huge download: [...the dwarf debugging
> information...]

It's a problem, and there are a few improvements under way or being
contemplated:

- compression of the DWARF data to eliminate more duplication
- support for inserting probes only on function entry/exit points
without debugging data - relying on symbol tables and raw ABI
- a networked service to allow one machine to serve site-wide
systemtap needs

At the end of the day, lots of information will still need to be
around for those who need to put probes approximately anywhere and to
pull approximately any data out.


> for heaven's sake, we can have 3 years of _full Linux kernel
> history_, with all 87875 commits, with full changelog and
> dependencies and full source code included, packed into a rather
> tight, 180 MB git repository

It may seem counterintuitive to you, but remember that object code is
recreated from scratch new every build, yet source code only gradually
(?) changes. Try checking in 3 years' builds of stripped object
files into a git repo.


- FChE

2008-03-28 14:19:44

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* Frank Ch. Eigler <[email protected]> wrote:

>
> >> > NACK-ed-by: Ingo Molnar <[email protected]>
> >> [...]
> >> I wonder why nobody doesn't fix this serious problem until now. [...]
>
> Frankly, the "problem" has not yet been established. Ingo has failed
> to respond to Mathieu's analysis of the actual instruction streams,
> which cast doubt on Ingo's technique of simply counting bytes. [...]

uhm no. The "difference" is due to Matthieu counting on the platform
that is most favorable to his argument: 32-bit, while i counted on
64-bit where most servers operate (and where instrumentation micro-cost
actually matters).

Ingo

2008-03-28 14:51:52

by Ingo Molnar

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers


* Frank Ch. Eigler <[email protected]> wrote:

> > [...] furthermore, and because it's Friday again, let me remind
> > folks that SystemTap has an even more significant bloat problem: the
> > fact that it needs a huge download: [...the dwarf debugging
> > information...]
>
> It's a problem, and there are a few improvements under way or being
> contemplated: [...]

it's been the primary usability problem ever since SystemTap has been
incepted 3 years ago. The 229+850 MB size numbers i cited were from a
bleeding-edge (Fedora 9 beta) distro. So whatever is being contemplated,
it's not here today.

Ingo

2008-03-28 15:33:54

by Frank Ch. Eigler

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

Hi -

On Fri, Mar 28, 2008 at 03:41:16PM +0100, Ingo Molnar wrote:
> > > [...] furthermore, and because it's Friday again, let me remind
> > > folks that SystemTap has an even more significant bloat problem: the
> > > fact that it needs a huge download: [...the dwarf debugging
> > > information...]
> >
> > It's a problem, and there are a few improvements under way or being
> > contemplated: [...]
>
> it's been the primary usability problem ever since SystemTap has been
> incepted 3 years ago. [...]

This complaint is particularly rich, seeing how you constantly try to
shoot down patches that would reduce systemtap's need for this, such
as markers. And no, dyn-ftrace is not a complete substitute. See how
many of the markers in mathieu's lttng suite occur at places *other*
than function entry points. See how many require parameters other
than what may already sit in registers.

We in systemtap land have always had to make do with whatever was in
the kernel. There was very little other than kprobes 3 years ago. Of
newer facilities such as markers, ftrace, perfmon2 (I hope), and a
bunch of other little tracer thingies, all those that provide a usable
callback style interface can be exposed to systemtap. The more the
merrier, and the less we'd have to resort to the lowest-level
kprobes/dwarf stuff. Please help rather than obstruct.


- FChE

2008-03-29 17:16:46

by Mathieu Desnoyers

[permalink] [raw]
Subject: Re: [patch for 2.6.26 0/7] Architecture Independent Markers

* Ingo Molnar ([email protected]) wrote:
>
> * Mathieu Desnoyers <[email protected]> wrote:
>
> > 6a5: 89 5c 24 14 mov %ebx,0x14(%esp)
> > 6a9: 8b 55 d0 mov -0x30(%ebp),%edx
> > 6ac: 89 54 24 10 mov %edx,0x10(%esp)
> > 6b0: 89 4c 24 0c mov %ecx,0xc(%esp)
> > 6b4: c7 44 24 08 f7 04 00 movl $0x4f7,0x8(%esp)
> > 6bb: 00
> > 6bc: c7 44 24 04 00 00 00 movl $0x0,0x4(%esp)
> > 6c3: 00
> > 6c4: c7 04 24 00 00 00 00 movl $0x0,(%esp)
> > 6cb: ff 15 0c 00 00 00 call *0xc
> > 6d1: e9 c3 fc ff ff jmp 399 <schedule+0x130>
> >
> > Which adds an extra 50 bytes.
>
> you talk about 32-bit while i talk about 64-bit. All these costs go up
> on 64-bit and you should know that. I measured 44 bytes in the fastpath
> and 52 bytes in the slowpath, which gives 96 bytes. (with a distro
> .config and likely with a different gcc)
>

I did some testing with gcc -Os and -O2 on x86_64 and noticed that -Os
behaves badly in that it does not uses -freorder-blocks. This
optimization is required to have the unlikely branches moved out of the
critical path.

With -O2 :
mov $0,%al
movq %rsi, 1912(%rbx)
movq -96(%rbp), %rdi
incq (%rdi)
testb %al, %al
jne .L1785


4de: b0 00 mov $0x0,%al
4e0: 48 89 b3 78 07 00 00 mov %rsi,0x778(%rbx)
4e7: 48 8b 7d a0 mov 0xffffffffffffffa0(%rbp),%rdi
4eb: 48 ff 07 incq (%rdi)
4ee: 84 c0 test %al,%al
4f0: 0f 85 5f 03 00 00 jne 855 <thread_return+0x2b4>

So, as far as the assembly for the markers in the fast path is
concerned, it adds 10 bytes to the fast path, on x86_64. (I did not
count the %rdi stuff in this since I suppose it's unrelated to markers
and put there by the compiler which reorders instructions)

The bloc which contains the call is much lower at the end of
thread_return.

855: 49 89 f0 mov %rsi,%r8
858: 48 89 d1 mov %rdx,%rcx
85b: 31 f6 xor %esi,%esi
85d: 48 89 da mov %rbx,%rdx
860: 48 c7 c7 00 00 00 00 mov $0x0,%rdi
867: 31 c0 xor %eax,%eax
869: ff 15 00 00 00 00 callq *0(%rip) # 86f <thread_return+0x2ce>
86f: e9 82 fc ff ff jmpq 4f6 <schedule+0x166>

For an added 31 bytes.

Total size added : 41 bytes, 10 of them being in the fast path.


> 96 bytes _per marker_ sprinkled throughout the kernel. This blows up the
> cache footprint of the kernel quite substantially, because it's all
> fragmented - even if this is in the 'slowpath'.
>
> so yes, that is the bloat i'm talking about.
>

I think the very different compiler options we use change the picture
significantly.

> dont just compare it to ftrace-sched-switch, compare it to dyn-ftrace
> which gives us more than 78,000 trace points in the kernel _here and
> today_ at no measurable runtime cost, with a 5 byte NOP per trace point
> and _zero_ instruction stream (register scheduling, etc.) intrusion. No
> slowpath cost.
>

Markers and dyn-ftrace does not fulfill the same purpose, so I don't see
why we should compare them. dyn-ftrace is good at tracing function
entry/exit, so let's keep it. However, it's not designed to extract
variables at specific locations in the kernel code.

Which slowpath cost are you talking about ? When markers are disabled,
their unused function call instructions are placed carefully out of the
kernel running code, along with BUG_ONs and WARN_ONs which already use
some cache lines. You are talking about no measurable runtime cost :
have you tried to measure the runtime cost of disabled markers ? I have
not been able to measure any significant difference with the complete
LTTng marker set compiled into the kernel.

> and the basic API approach of markers is flawed a well - the coupling to
> the kernel is too strong. The correct and long-term maintainable
> coupling is via ASCII symbol names, not via any binding built into the
> kernel.
>
> With dyn-ftrace (see sched-devel.git/latest) tracing filters can be
> installed trivially by users, via function _symbols_, via:
>
> /debugfs/tracing/available_filter_functions
> /debugfs/tracing/set_ftrace_filter
>
> wildcards are recognized as well, so if you do:
>
> echo '*lock' > /debugfs/tracing/set_ftrace_filter
>
> all functions that have 'lock' in their name will have their tracepoints
> activated transparently from that point on.
>
> even multiple names can be passed in at once:
>
> echo 'schedule wake_up* *acpi*' > /debugfs/tracing/set_ftrace_filter
>
> so it's trivial to use it, very powerful and we've only begun exposing
> it towards users. I see no good reason why we'd patch any marker into
> the kernel - it's a maintenance cost from that point on.
>

I did something similar with LTTng :

cat /proc/ltt lists the available markers
echo "connect marker_name default dynamic channel_name" > /proc/ltt

Which indicates
- The type of callback to use
- Where the data must be sent (LTTng supports multiple buffers, called
"channels")

So yes, making this easy to use has been done. It's just that the marker
is one building block of the tracing infrastructure, not its entirety.

By the way, I like your tracing filters interface. It seems rather more
polished than my /proc interface. And personnally I don't care wether we
use /proc, debugfs.. as long as there is an interface to userspace.


> so yes, my argument is: tens of thousands of lightweight tracepoints in
> the kernel here and today, which are configurable via function names,
> each of which can be turned on and off individually, and none of which
> needs any source code level changes - is an obviously superior approach.
>

It's absolutely good to have that into the kernel, but it does not
_replace_ the markers, as I explained above.

Mathieu

> Ingo

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68

2008-04-01 01:43:24

by Denys Vlasenko

[permalink] [raw]
Subject: Re: [OT] Re: [patch for 2.6.26 0/7] Architecture Independent Markers

On Friday 28 March 2008 14:34, Masami Hiramatsu wrote:
> > for heaven's sake, we can have 3 years of _full Linux kernel history_,
> > with all 87875 commits, with full changelog and dependencies and full
> > source code included, packed into a rather tight, 180 MB git repository
> > ...
> >
> > [ and then i havent even begun about the on-disk footprint of this
> > monstrum, after the packages have been installed: an additional 850 MB.
> > Puh-lease ... ]
>
> Thank for Moore's law and all storage engineers, nowadays we can buy
> an 1TB(=1000GB!) HDD with less than $300!(I also surprised...)
> And many other compressed filesystem can be used for saving disk space.

This is not a valid technical reason for creating bloatware.

Bloatware's main problem is not a cost of storing it or
downloading it. The main problem that over time it becomes
an unmaintainable monstrosity nobody is willing to deal with.

I would rather try to find and fix a bug in 2000 lines of C code
than in 200 000 lines.
--
vda