From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Christoph Hellwig <hch@infradead.org>,
Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Gregory Haskins <ghaskins@novell.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Thomas Gleixner <tglx@linutronix.de>,
Tim Bird <tim.bird@am.sony.com>, Sam Ravnborg <sam@ravnborg.org>,
"Frank Ch. Eigler" <fche@redhat.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
John Stultz <johnstul@us.ibm.com>,
Arjan van de Ven <arjan@infradead.org>,
Pavel Machek <pavel@ucw.cz>, Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 21/23 -v6] Add markers to various events
Date: Fri, 25 Jan 2008 23:22:13 -0500 [thread overview]
Message-ID: <20080126042804.497090913@goodmis.org> (raw)
In-Reply-To: 20080126042152.526086719@goodmis.org
[-- Attachment #1: tracer-add-event-markers.patch --]
[-- Type: text/plain, Size: 6569 bytes --]
This patch adds markers to various events in the kernel.
(interrupts, task activation and hrtimers)
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
arch/x86/kernel/apic_32.c | 2 ++
arch/x86/kernel/irq_32.c | 1 +
arch/x86/kernel/irq_64.c | 2 ++
arch/x86/kernel/traps_32.c | 2 ++
arch/x86/kernel/traps_64.c | 2 ++
arch/x86/mm/fault_32.c | 3 +++
arch/x86/mm/fault_64.c | 3 +++
kernel/hrtimer.c | 7 +++++++
kernel/sched.c | 11 +++++++++++
9 files changed, 33 insertions(+)
Index: linux-mcount.git/arch/x86/kernel/apic_32.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/apic_32.c 2008-01-25 21:47:15.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/apic_32.c 2008-01-25 21:47:38.000000000 -0500
@@ -581,6 +581,8 @@ notrace fastcall void smp_apic_timer_int
{
struct pt_regs *old_regs = set_irq_regs(regs);
+ trace_mark(arch_apic_timer, "ip %lx", regs->eip);
+
/*
* NOTE! We'd better ACK the irq immediately,
* because timer handling can be slow.
Index: linux-mcount.git/arch/x86/kernel/irq_32.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/irq_32.c 2008-01-25 21:46:48.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/irq_32.c 2008-01-25 21:47:38.000000000 -0500
@@ -85,6 +85,7 @@ fastcall unsigned int do_IRQ(struct pt_r
old_regs = set_irq_regs(regs);
irq_enter();
+ trace_mark(arch_do_irq, "ip %lx irq %d", regs->eip, irq);
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* Debugging check for stack overflow: is there less than 1KB free? */
{
Index: linux-mcount.git/arch/x86/kernel/irq_64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/irq_64.c 2008-01-25 21:46:48.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/irq_64.c 2008-01-25 21:47:38.000000000 -0500
@@ -149,6 +149,8 @@ asmlinkage unsigned int do_IRQ(struct pt
irq_enter();
irq = __get_cpu_var(vector_irq)[vector];
+ trace_mark(arch_do_irq, "ip %lx irq %d", regs->rip, irq);
+
#ifdef CONFIG_DEBUG_STACKOVERFLOW
stack_overflow_check(regs);
#endif
Index: linux-mcount.git/arch/x86/kernel/traps_32.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/traps_32.c 2008-01-25 21:47:08.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/traps_32.c 2008-01-25 21:47:38.000000000 -0500
@@ -769,6 +769,8 @@ notrace fastcall __kprobes void do_nmi(s
nmi_enter();
+ trace_mark(arch_do_nmi, "ip %lx flags %lx", regs->eip, regs->eflags);
+
cpu = smp_processor_id();
++nmi_count(cpu);
Index: linux-mcount.git/arch/x86/kernel/traps_64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/traps_64.c 2008-01-25 21:46:48.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/traps_64.c 2008-01-25 21:47:38.000000000 -0500
@@ -782,6 +782,8 @@ asmlinkage __kprobes void default_do_nmi
cpu = smp_processor_id();
+ trace_mark(arch_do_nmi, "ip %lx flags %lx", regs->rip, regs->eflags);
+
/* Only the BSP gets external NMIs from the system. */
if (!cpu)
reason = get_nmi_reason();
Index: linux-mcount.git/arch/x86/mm/fault_32.c
===================================================================
--- linux-mcount.git.orig/arch/x86/mm/fault_32.c 2008-01-25 21:46:48.000000000 -0500
+++ linux-mcount.git/arch/x86/mm/fault_32.c 2008-01-25 21:47:38.000000000 -0500
@@ -311,6 +311,9 @@ fastcall void __kprobes do_page_fault(st
/* get the address */
address = read_cr2();
+ trace_mark(arch_do_page_fault, "ip %lx err %lx addr %lx",
+ regs->eip, error_code, address);
+
tsk = current;
si_code = SEGV_MAPERR;
Index: linux-mcount.git/arch/x86/mm/fault_64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/mm/fault_64.c 2008-01-25 21:46:48.000000000 -0500
+++ linux-mcount.git/arch/x86/mm/fault_64.c 2008-01-25 21:47:38.000000000 -0500
@@ -316,6 +316,9 @@ asmlinkage void __kprobes do_page_fault(
/* get the address */
address = read_cr2();
+ trace_mark(arch_do_page_fault, "ip %lx err %lx addr %lx",
+ regs->rip, error_code, address);
+
info.si_code = SEGV_MAPERR;
Index: linux-mcount.git/kernel/hrtimer.c
===================================================================
--- linux-mcount.git.orig/kernel/hrtimer.c 2008-01-25 21:46:48.000000000 -0500
+++ linux-mcount.git/kernel/hrtimer.c 2008-01-25 21:47:38.000000000 -0500
@@ -709,6 +709,8 @@ static void enqueue_hrtimer(struct hrtim
struct hrtimer *entry;
int leftmost = 1;
+ trace_mark(kernel_hrtimer_enqueue,
+ "expires %p timer %p", &timer->expires, timer);
/*
* Find the right place in the rbtree:
*/
@@ -1130,6 +1132,7 @@ void hrtimer_interrupt(struct clock_even
retry:
now = ktime_get();
+ trace_mark(kernel_hrtimer_interrupt, "now %p", &now);
expires_next.tv64 = KTIME_MAX;
@@ -1168,6 +1171,10 @@ void hrtimer_interrupt(struct clock_even
continue;
}
+ trace_mark(kernel_hrtimer_interrupt_expire,
+ "expires %p timer %p",
+ &timer->expires, timer);
+
__run_hrtimer(timer);
}
spin_unlock(&cpu_base->lock);
Index: linux-mcount.git/kernel/sched.c
===================================================================
--- linux-mcount.git.orig/kernel/sched.c 2008-01-25 21:47:36.000000000 -0500
+++ linux-mcount.git/kernel/sched.c 2008-01-25 21:47:38.000000000 -0500
@@ -90,6 +90,11 @@ unsigned long long __attribute__((weak))
#define PRIO_TO_NICE(prio) ((prio) - MAX_RT_PRIO - 20)
#define TASK_NICE(p) PRIO_TO_NICE((p)->static_prio)
+#define __PRIO(prio) \
+ ((prio) <= 99 ? 199 - (prio) : (prio) - 120)
+
+#define PRIO(p) __PRIO((p)->prio)
+
/*
* 'User priority' is the nice value converted to something we
* can work with better when scaling various scheduler parameters,
@@ -1372,6 +1377,9 @@ static void activate_task(struct rq *rq,
if (p->state == TASK_UNINTERRUPTIBLE)
rq->nr_uninterruptible--;
+ trace_mark(kernel_sched_activate_task,
+ "pid %d prio %d nr_running %ld",
+ p->pid, PRIO(p), rq->nr_running);
enqueue_task(rq, p, wakeup);
inc_nr_running(p, rq);
}
@@ -1385,6 +1393,9 @@ static void deactivate_task(struct rq *r
rq->nr_uninterruptible++;
dequeue_task(rq, p, sleep);
+ trace_mark(kernel_sched_deactivate_task,
+ "pid %d prio %d nr_running %ld",
+ p->pid, PRIO(p), rq->nr_running);
dec_nr_running(p, rq);
}
--
next prev parent reply other threads:[~2008-01-26 4:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-26 4:21 [PATCH 00/23 -v6] mcount and latency tracing utility -v6 Steven Rostedt
2008-01-26 4:21 ` [PATCH 01/23 -v6] printk - dont wakeup klogd with interrupts disabled Steven Rostedt
2008-01-26 9:10 ` Pavel Machek
2008-01-26 9:52 ` Peter Zijlstra
2008-01-26 13:07 ` Steven Rostedt
2008-01-26 13:48 ` Steven Rostedt
2008-01-26 9:50 ` Peter Zijlstra
2008-01-26 13:03 ` Steven Rostedt
2008-01-26 4:21 ` [PATCH 02/23 -v6] Add basic support for gcc profiler instrumentation Steven Rostedt
2008-01-26 4:21 ` [PATCH 03/23 -v6] Annotate core code that should not be traced Steven Rostedt
2008-01-26 4:21 ` [PATCH 04/23 -v6] x86_64: notrace annotations Steven Rostedt
2008-01-26 4:21 ` [PATCH 05/23 -v6] add notrace annotations to vsyscall Steven Rostedt
2008-01-26 4:21 ` [PATCH 06/23 -v6] add notrace annotations for NMI routines Steven Rostedt
2008-01-26 4:21 ` [PATCH 07/23 -v6] handle accurate time keeping over long delays Steven Rostedt
2008-01-26 4:22 ` [PATCH 08/23 -v6] initialize the clock source to jiffies clock Steven Rostedt
2008-01-26 4:22 ` [PATCH 09/23 -v6] add get_monotonic_cycles Steven Rostedt
2008-01-26 4:22 ` [PATCH 10/23 -v6] add notrace annotations to timing events Steven Rostedt
2008-01-26 4:22 ` [PATCH 11/23 -v6] mcount based trace in the form of a header file library Steven Rostedt
2008-01-26 4:22 ` [PATCH 12/23 -v6] Add context switch marker to sched.c Steven Rostedt
2008-01-26 4:22 ` [PATCH 13/23 -v6] Make the task State char-string visible to all Steven Rostedt
2008-01-26 4:22 ` [PATCH 14/23 -v6] Add tracing of context switches Steven Rostedt
2008-01-26 4:22 ` [PATCH 15/23 -v6] Generic command line storage Steven Rostedt
2008-01-26 4:22 ` [PATCH 16/23 -v6] trace generic call to schedule switch Steven Rostedt
2008-01-26 4:22 ` [PATCH 17/23 -v6] Add marker in try_to_wake_up Steven Rostedt
2008-01-26 4:22 ` [PATCH 18/23 -v6] mcount tracer for wakeup latency timings Steven Rostedt
2008-01-26 4:22 ` [PATCH 19/23 -v6] Trace irq disabled critical timings Steven Rostedt
2008-01-26 4:22 ` [PATCH 20/23 -v6] trace preempt off " Steven Rostedt
2008-01-26 4:22 ` Steven Rostedt [this message]
2008-01-26 4:22 ` [PATCH 22/23 -v6] Add event tracer Steven Rostedt
2008-01-26 4:22 ` [PATCH 23/23 -v6] Critical latency timings histogram Steven Rostedt
2008-01-26 9:11 ` Pavel Machek
2008-01-26 13:00 ` Steven Rostedt
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=20080126042804.497090913@goodmis.org \
--to=rostedt@goodmis.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=akpm@linux-foundation.org \
--cc=arjan@infradead.org \
--cc=fche@redhat.com \
--cc=ghaskins@novell.com \
--cc=hch@infradead.org \
--cc=jan.kiszka@siemens.com \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--cc=pavel@ucw.cz \
--cc=sam@ravnborg.org \
--cc=srostedt@redhat.com \
--cc=tglx@linutronix.de \
--cc=tim.bird@am.sony.com \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.