* [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched()
@ 2010-06-03 19:32 Oleg Nesterov
2010-06-03 19:53 ` Frederic Weisbecker
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Oleg Nesterov @ 2010-06-03 19:32 UTC (permalink / raw)
To: Andrew Morton
Cc: Arjan van de Ven, Frederic Weisbecker, Ingo Molnar,
Roland McGrath, Vegard Nossum, linux-kernel
Cleanup. Factor the common code in save_stack_address() and
save_stack_address_nosched().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
arch/x86/kernel/stacktrace.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
--- 34-rc1/arch/x86/kernel/stacktrace.c~UNIFY_SAVE_STACKS 2010-06-03 21:29:52.000000000 +0200
+++ 34-rc1/arch/x86/kernel/stacktrace.c 2010-06-03 21:30:57.000000000 +0200
@@ -23,13 +23,16 @@ static int save_stack_stack(void *data,
return 0;
}
-static void save_stack_address(void *data, unsigned long addr, int reliable)
+static void
+__save_stack_address(void *data, unsigned long addr, bool reliable, bool nosched)
{
struct stack_trace *trace = data;
#ifdef CONFIG_FRAME_POINTER
if (!reliable)
return;
#endif
+ if (nosched && in_sched_functions(addr))
+ return;
if (trace->skip > 0) {
trace->skip--;
return;
@@ -38,22 +41,15 @@ static void save_stack_address(void *dat
trace->entries[trace->nr_entries++] = addr;
}
+static void save_stack_address(void *data, unsigned long addr, int reliable)
+{
+ return __save_stack_address(data, addr, reliable, false);
+}
+
static void
save_stack_address_nosched(void *data, unsigned long addr, int reliable)
{
- struct stack_trace *trace = data;
-#ifdef CONFIG_FRAME_POINTER
- if (!reliable)
- return;
-#endif
- if (in_sched_functions(addr))
- return;
- if (trace->skip > 0) {
- trace->skip--;
- return;
- }
- if (trace->nr_entries < trace->max_entries)
- trace->entries[trace->nr_entries++] = addr;
+ return __save_stack_address(data, addr, reliable, true);
}
static const struct stacktrace_ops save_stack_ops = {
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched()
2010-06-03 19:32 [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched() Oleg Nesterov
@ 2010-06-03 19:53 ` Frederic Weisbecker
2010-06-03 23:01 ` Roland McGrath
2010-06-09 18:17 ` [tip:perf/core] x86: Unify " tip-bot for Oleg Nesterov
2 siblings, 0 replies; 4+ messages in thread
From: Frederic Weisbecker @ 2010-06-03 19:53 UTC (permalink / raw)
To: Oleg Nesterov
Cc: Andrew Morton, Arjan van de Ven, Ingo Molnar, Roland McGrath,
Vegard Nossum, linux-kernel
On Thu, Jun 03, 2010 at 09:32:43PM +0200, Oleg Nesterov wrote:
> Cleanup. Factor the common code in save_stack_address() and
> save_stack_address_nosched().
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
> ---
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched()
2010-06-03 19:32 [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched() Oleg Nesterov
2010-06-03 19:53 ` Frederic Weisbecker
@ 2010-06-03 23:01 ` Roland McGrath
2010-06-09 18:17 ` [tip:perf/core] x86: Unify " tip-bot for Oleg Nesterov
2 siblings, 0 replies; 4+ messages in thread
From: Roland McGrath @ 2010-06-03 23:01 UTC (permalink / raw)
To: Oleg Nesterov
Cc: Andrew Morton, Arjan van de Ven, Frederic Weisbecker, Ingo Molnar,
Vegard Nossum, linux-kernel
Acked-by: Roland McGrath <roland@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:perf/core] x86: Unify save_stack_address() and save_stack_address_nosched()
2010-06-03 19:32 [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched() Oleg Nesterov
2010-06-03 19:53 ` Frederic Weisbecker
2010-06-03 23:01 ` Roland McGrath
@ 2010-06-09 18:17 ` tip-bot for Oleg Nesterov
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Oleg Nesterov @ 2010-06-09 18:17 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, arjan, vegard.nossum, fweisbec, roland,
tglx, oleg, mingo
Commit-ID: 018378c55b03f88ff513aba4e0e93b8d4a9cf241
Gitweb: http://git.kernel.org/tip/018378c55b03f88ff513aba4e0e93b8d4a9cf241
Author: Oleg Nesterov <oleg@redhat.com>
AuthorDate: Thu, 3 Jun 2010 21:32:43 +0200
Committer: Frederic Weisbecker <fweisbec@gmail.com>
CommitDate: Wed, 9 Jun 2010 17:32:19 +0200
x86: Unify save_stack_address() and save_stack_address_nosched()
Cleanup. Factor the common code in save_stack_address() and
save_stack_address_nosched().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <20100603193243.GA31534@redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
arch/x86/kernel/stacktrace.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index abc321d..b53c525 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -23,13 +23,16 @@ static int save_stack_stack(void *data, char *name)
return 0;
}
-static void save_stack_address(void *data, unsigned long addr, int reliable)
+static void
+__save_stack_address(void *data, unsigned long addr, bool reliable, bool nosched)
{
struct stack_trace *trace = data;
#ifdef CONFIG_FRAME_POINTER
if (!reliable)
return;
#endif
+ if (nosched && in_sched_functions(addr))
+ return;
if (trace->skip > 0) {
trace->skip--;
return;
@@ -38,22 +41,15 @@ static void save_stack_address(void *data, unsigned long addr, int reliable)
trace->entries[trace->nr_entries++] = addr;
}
+static void save_stack_address(void *data, unsigned long addr, int reliable)
+{
+ return __save_stack_address(data, addr, reliable, false);
+}
+
static void
save_stack_address_nosched(void *data, unsigned long addr, int reliable)
{
- struct stack_trace *trace = data;
-#ifdef CONFIG_FRAME_POINTER
- if (!reliable)
- return;
-#endif
- if (in_sched_functions(addr))
- return;
- if (trace->skip > 0) {
- trace->skip--;
- return;
- }
- if (trace->nr_entries < trace->max_entries)
- trace->entries[trace->nr_entries++] = addr;
+ return __save_stack_address(data, addr, reliable, true);
}
static const struct stacktrace_ops save_stack_ops = {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-09 18:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-03 19:32 [PATCH 2/2] x86: unify save_stack_address() and save_stack_address_nosched() Oleg Nesterov
2010-06-03 19:53 ` Frederic Weisbecker
2010-06-03 23:01 ` Roland McGrath
2010-06-09 18:17 ` [tip:perf/core] x86: Unify " tip-bot for Oleg Nesterov
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).