* linux-next: build failure after merge of the tip tree
@ 2010-03-12 4:00 Stephen Rothwell
2010-03-12 5:50 ` [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs Frederic Weisbecker
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2010-03-12 4:00 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Frederic Weisbecker
[-- Attachment #1: Type: text/plain, Size: 797 bytes --]
Hi all,
After merging the tip tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined!
ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined!
Caused by commit 5331d7b84613b8325362dde53dc2bff2fb87d351 ("perf:
Introduce new perf_fetch_caller_regs() for hot regs snapshot") from the
tip tree. Presumably commit 639fe4b12f92b54c9c3b38c82cdafaa38cfd3e63
("perf: export perf_trace_regs and perf_arch_fetch_caller_regs") should
have exported the weak version as well as the x86 one.
I have used the version of the tip tree from next-20100311 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs 2010-03-12 4:00 linux-next: build failure after merge of the tip tree Stephen Rothwell @ 2010-03-12 5:50 ` Frederic Weisbecker 2010-03-12 6:20 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Frederic Weisbecker @ 2010-03-12 5:50 UTC (permalink / raw) To: Stephen Rothwell, Ingo Molnar Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next, linux-kernel On Fri, Mar 12, 2010 at 03:00:03PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the tip tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! > ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! > > Caused by commit 5331d7b84613b8325362dde53dc2bff2fb87d351 ("perf: > Introduce new perf_fetch_caller_regs() for hot regs snapshot") from the > tip tree. Presumably commit 639fe4b12f92b54c9c3b38c82cdafaa38cfd3e63 > ("perf: export perf_trace_regs and perf_arch_fetch_caller_regs") should > have exported the weak version as well as the x86 one. > > I have used the version of the tip tree from next-20100311 for today. Does that fixes the issue? Sorry I can not test for now... Thanks! --- >From 0b21e01edb23b4725d20a9e5fddb6df7fedd16e1 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker <fweisbec@gmail.com> Date: Fri, 12 Mar 2010 06:23:22 +0100 Subject: [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs perf_arch_fetch_caller_regs() is exported in x86 but not for other archs that use the weak version. Export it only once from the generic code, it will apply to either weak/overriden version. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> --- arch/x86/kernel/cpu/perf_event.c | 1 - kernel/perf_event.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index a6d92c3..a3aff76 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1691,4 +1691,3 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski regs->cs = __KERNEL_CS; local_save_flags(regs->flags); } -EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 8bf6127..7aea58d 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -2794,6 +2794,7 @@ __weak void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) { } +EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); /* * Output -- 1.6.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs 2010-03-12 5:50 ` [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs Frederic Weisbecker @ 2010-03-12 6:20 ` Stephen Rothwell 2010-03-12 6:26 ` Stephen Rothwell 2010-03-14 9:23 ` [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs Frederic Weisbecker 0 siblings, 2 replies; 10+ messages in thread From: Stephen Rothwell @ 2010-03-12 6:20 UTC (permalink / raw) To: Frederic Weisbecker Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 431 bytes --] Hi Frederic, On Fri, 12 Mar 2010 06:50:44 +0100 Frederic Weisbecker <fweisbec@gmail.com> wrote: > > Does that fixes the issue? Sorry I can not test for now... I can't test it right now, sorry, but I have heard that EXPORT_SYMBOL's for weak symbols must be in a different file from the actual symbol definition. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs 2010-03-12 6:20 ` Stephen Rothwell @ 2010-03-12 6:26 ` Stephen Rothwell 2010-03-15 21:00 ` [PATCH] perf: Fix unexported generic perf_arch_fetch_caller_regs Frederic Weisbecker 2010-03-14 9:23 ` [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs Frederic Weisbecker 1 sibling, 1 reply; 10+ messages in thread From: Stephen Rothwell @ 2010-03-12 6:26 UTC (permalink / raw) To: Frederic Weisbecker Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next, linux-kernel [-- Attachment #1: Type: text/plain, Size: 571 bytes --] Hi Frederic, On Fri, 12 Mar 2010 17:20:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > On Fri, 12 Mar 2010 06:50:44 +0100 Frederic Weisbecker <fweisbec@gmail.com> wrote: > > > > Does that fixes the issue? Sorry I can not test for now... > > I can't test it right now, sorry, but I have heard that EXPORT_SYMBOL's > for weak symbols must be in a different file from the actual symbol > definition. See http://lkml.org/lkml/2010/2/17/467 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] perf: Fix unexported generic perf_arch_fetch_caller_regs 2010-03-12 6:26 ` Stephen Rothwell @ 2010-03-15 21:00 ` Frederic Weisbecker 2010-03-15 22:17 ` [PATCH v2] " Frederic Weisbecker 0 siblings, 1 reply; 10+ messages in thread From: Frederic Weisbecker @ 2010-03-15 21:00 UTC (permalink / raw) To: Ingo Molnar Cc: LKML, Frederic Weisbecker, \ " H . Peter Anvin \ ", Thomas Gleixner, Linux Next, Stephen Rothwell, Peter Zijlstra, Xiao Guangrong, Paul Mackerras perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! And also only build it if trace events are enabled. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Cc: Paul Mackerras <paulus@samba.org> --- arch/x86/kernel/cpu/perf_event.c | 1 - kernel/trace/trace_event_perf.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 7645fae..5fb490c 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1713,4 +1713,3 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski regs->cs = __KERNEL_CS; local_save_flags(regs->flags); } -EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 0709e4f..7d79a10 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -12,6 +12,8 @@ DEFINE_PER_CPU(struct pt_regs, perf_trace_regs); EXPORT_PER_CPU_SYMBOL_GPL(perf_trace_regs); +EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); + static char *perf_trace_buf; static char *perf_trace_buf_nmi; -- 1.6.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2] perf: Fix unexported generic perf_arch_fetch_caller_regs 2010-03-15 21:00 ` [PATCH] perf: Fix unexported generic perf_arch_fetch_caller_regs Frederic Weisbecker @ 2010-03-15 22:17 ` Frederic Weisbecker 2010-03-15 22:33 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Frederic Weisbecker @ 2010-03-15 22:17 UTC (permalink / raw) To: Ingo Molnar Cc: LKML, Frederic Weisbecker, \ " H . Peter Anvin \ ", Thomas Gleixner, Linux Next, Stephen Rothwell, Peter Zijlstra, Xiao Guangrong, Paul Mackerras perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! v2: And also only build it if trace events are enabled. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Cc: Paul Mackerras <paulus@samba.org> --- arch/x86/kernel/cpu/perf_event.c | 3 ++- kernel/perf_event.c | 2 ++ kernel/trace/trace_event_perf.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 7645fae..60398a0 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1702,6 +1702,7 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) return entry; } +#ifdef CONFIG_EVENT_TRACING void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) { regs->ip = ip; @@ -1713,4 +1714,4 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski regs->cs = __KERNEL_CS; local_save_flags(regs->flags); } -EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); +#endif diff --git a/kernel/perf_event.c b/kernel/perf_event.c index fb3031c..574ee58 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -2786,10 +2786,12 @@ __weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) return NULL; } +#ifdef CONFIG_EVENT_TRACING __weak void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) { } +#endif /* * Output diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 0709e4f..7d79a10 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -12,6 +12,8 @@ DEFINE_PER_CPU(struct pt_regs, perf_trace_regs); EXPORT_PER_CPU_SYMBOL_GPL(perf_trace_regs); +EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); + static char *perf_trace_buf; static char *perf_trace_buf_nmi; -- 1.6.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] perf: Fix unexported generic perf_arch_fetch_caller_regs 2010-03-15 22:17 ` [PATCH v2] " Frederic Weisbecker @ 2010-03-15 22:33 ` Stephen Rothwell 2010-03-15 23:54 ` Frederic Weisbecker 2010-03-16 0:05 ` [PATCH v3] " Frederic Weisbecker 0 siblings, 2 replies; 10+ messages in thread From: Stephen Rothwell @ 2010-03-15 22:33 UTC (permalink / raw) To: Frederic Weisbecker Cc: Ingo Molnar, LKML, \ " H . Peter Anvin \ ", Thomas Gleixner, Linux Next, Peter Zijlstra, Xiao Guangrong, Paul Mackerras [-- Attachment #1: Type: text/plain, Size: 634 bytes --] Hi Frederic, On Mon, 15 Mar 2010 23:17:22 +0100 Frederic Weisbecker <fweisbec@gmail.com> wrote: > > perf_arch_fetch_caller_regs() is exported for the overriden x86 > version, but not for the generic weak version. > As a general rule, weak functions should have their symbol exported ^ "not" > in the same file they are defined. > > So let's export it on trace_event_perf.c as it is used by trace > events only. Otherwise, looks good (though I haven't tested it). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] perf: Fix unexported generic perf_arch_fetch_caller_regs 2010-03-15 22:33 ` Stephen Rothwell @ 2010-03-15 23:54 ` Frederic Weisbecker 2010-03-16 0:05 ` [PATCH v3] " Frederic Weisbecker 1 sibling, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2010-03-15 23:54 UTC (permalink / raw) To: Stephen Rothwell Cc: Ingo Molnar, LKML, H . Peter Anvin , Thomas Gleixner, Linux Next, Peter Zijlstra, Xiao Guangrong, Paul Mackerras On Tue, Mar 16, 2010 at 09:33:55AM +1100, Stephen Rothwell wrote: > Hi Frederic, > > On Mon, 15 Mar 2010 23:17:22 +0100 Frederic Weisbecker <fweisbec@gmail.com> wrote: > > > > perf_arch_fetch_caller_regs() is exported for the overriden x86 > > version, but not for the generic weak version. > > As a general rule, weak functions should have their symbol exported > ^ > "not" Ooh, right. > > in the same file they are defined. > > > > So let's export it on trace_event_perf.c as it is used by trace > > events only. > > Otherwise, looks good (though I haven't tested it). I've tested with some trace event built as module and it looks fine so far. Thanks. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3] perf: Fix unexported generic perf_arch_fetch_caller_regs 2010-03-15 22:33 ` Stephen Rothwell 2010-03-15 23:54 ` Frederic Weisbecker @ 2010-03-16 0:05 ` Frederic Weisbecker 1 sibling, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2010-03-16 0:05 UTC (permalink / raw) To: Ingo Molnar Cc: LKML, Frederic Weisbecker, \ " H . Peter Anvin \ ", Thomas Gleixner, Linux Next, Stephen Rothwell, Peter Zijlstra, Xiao Guangrong, Paul Mackerras perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should not have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! v2: And also only build it if trace events are enabled. v3: Fix changelog mistake Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Cc: Paul Mackerras <paulus@samba.org> --- arch/x86/kernel/cpu/perf_event.c | 3 ++- kernel/perf_event.c | 2 ++ kernel/trace/trace_event_perf.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 7645fae..60398a0 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1702,6 +1702,7 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) return entry; } +#ifdef CONFIG_EVENT_TRACING void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) { regs->ip = ip; @@ -1713,4 +1714,4 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski regs->cs = __KERNEL_CS; local_save_flags(regs->flags); } -EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); +#endif diff --git a/kernel/perf_event.c b/kernel/perf_event.c index fb3031c..574ee58 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -2786,10 +2786,12 @@ __weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) return NULL; } +#ifdef CONFIG_EVENT_TRACING __weak void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) { } +#endif /* * Output diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 0709e4f..7d79a10 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -12,6 +12,8 @@ DEFINE_PER_CPU(struct pt_regs, perf_trace_regs); EXPORT_PER_CPU_SYMBOL_GPL(perf_trace_regs); +EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); + static char *perf_trace_buf; static char *perf_trace_buf_nmi; -- 1.6.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs 2010-03-12 6:20 ` Stephen Rothwell 2010-03-12 6:26 ` Stephen Rothwell @ 2010-03-14 9:23 ` Frederic Weisbecker 1 sibling, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2010-03-14 9:23 UTC (permalink / raw) To: Stephen Rothwell Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next, linux-kernel On Fri, Mar 12, 2010 at 05:20:43PM +1100, Stephen Rothwell wrote: > Hi Frederic, > > On Fri, 12 Mar 2010 06:50:44 +0100 Frederic Weisbecker <fweisbec@gmail.com> wrote: > > > > Does that fixes the issue? Sorry I can not test for now... > > I can't test it right now, sorry, but I have heard that EXPORT_SYMBOL's > for weak symbols must be in a different file from the actual symbol > definition. Hmm. Ok, kernel/trace/trace_event_perf.c must be the right place then, as the only users of this helper are trace events. Will send a fix once I get this tested, thanks for the pointer! ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-03-16 0:04 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-03-12 4:00 linux-next: build failure after merge of the tip tree Stephen Rothwell 2010-03-12 5:50 ` [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs Frederic Weisbecker 2010-03-12 6:20 ` Stephen Rothwell 2010-03-12 6:26 ` Stephen Rothwell 2010-03-15 21:00 ` [PATCH] perf: Fix unexported generic perf_arch_fetch_caller_regs Frederic Weisbecker 2010-03-15 22:17 ` [PATCH v2] " Frederic Weisbecker 2010-03-15 22:33 ` Stephen Rothwell 2010-03-15 23:54 ` Frederic Weisbecker 2010-03-16 0:05 ` [PATCH v3] " Frederic Weisbecker 2010-03-14 9:23 ` [PATCH] perf: Also export the weak version of perf_arch_fetch_caller_regs Frederic Weisbecker
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).