From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Ian Munsie <imunsie@au1.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Jason Baron <jbaron@redhat.com>,
linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>, Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 3/4] ftrace syscalls: Allow arch specific syscall symbol matching
Date: Fri, 14 May 2010 09:54:56 +1000 [thread overview]
Message-ID: <1273794896.21352.203.camel@pasglop> (raw)
In-Reply-To: <1273736594-19320-4-git-send-email-imunsie@au1.ibm.com>
On Thu, 2010-05-13 at 17:43 +1000, Ian Munsie wrote:
> From: Ian Munsie <imunsie@au1.ibm.com>
>
> Some architectures have unusual symbol names and the generic code to
> match the symbol name with the function name for the syscall metadata
> will fail. For example, symbols on PPC64 start with a period and the
> generic code will fail to match them.
>
> This patch splits out the match logic into a standalone weak function
> that can be overridden on archs with unusual symbol names.
>
> Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
> ---
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
Ian, I assume you will implement the support for the "special" ppc_*
syscalls via a subsequent patch and not a respin of this one right ?
Cheers,
Ben.
> Documentation/trace/ftrace-design.txt | 3 +++
> include/linux/ftrace.h | 1 +
> kernel/trace/trace_syscalls.c | 19 ++++++++++++-------
> 3 files changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/trace/ftrace-design.txt b/Documentation/trace/ftrace-design.txt
> index 8369a1c..3936d5f 100644
> --- a/Documentation/trace/ftrace-design.txt
> +++ b/Documentation/trace/ftrace-design.txt
> @@ -247,6 +247,9 @@ You need very few things to get the syscalls tracing in an arch.
> - If the system call table on this arch is more complicated than a simple array
> of addresses of the system calls, implement an arch_syscall_addr to return
> the address of a given system call.
> +- If the symbol names of the system calls do not match the function names on
> + this arch, implement an arch_syscall_match_sym_name with the appropriate
> + logic to return true if the function name corresponds with the symbol name.
> - Tag this arch as HAVE_SYSCALL_TRACEPOINTS.
>
>
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index e0ae83b..26ad1f5 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -534,6 +534,7 @@ static inline void trace_hw_branch_oops(void) {}
> #ifdef CONFIG_FTRACE_SYSCALLS
>
> unsigned long arch_syscall_addr(int nr);
> +bool arch_syscall_match_sym_name(const char *sym, const char *name);
>
> #endif /* CONFIG_FTRACE_SYSCALLS */
>
> diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
> index 1c231d0..ebbc74d 100644
> --- a/kernel/trace/trace_syscalls.c
> +++ b/kernel/trace/trace_syscalls.c
> @@ -32,13 +32,7 @@ static struct syscall_metadata *find_syscall_meta(unsigned long syscall)
> kallsyms_lookup(syscall, NULL, NULL, NULL, str);
>
> for ( ; start < stop; start++) {
> - /*
> - * Only compare after the "sys" prefix. Archs that use
> - * syscall wrappers may have syscalls symbols aliases prefixed
> - * with "SyS" instead of "sys", leading to an unwanted
> - * mismatch.
> - */
> - if (start->name && !strcmp(start->name + 3, str + 3))
> + if (start->name && arch_syscall_match_sym_name(str, start->name))
> return start;
> }
> return NULL;
> @@ -408,6 +402,17 @@ unsigned long __init __weak arch_syscall_addr(int nr)
> return (unsigned long)sys_call_table[nr];
> }
>
> +bool __weak arch_syscall_match_sym_name(const char *sym, const char *name)
> +{
> + /*
> + * Only compare after the "sys" prefix. Archs that use
> + * syscall wrappers may have syscalls symbols aliases prefixed
> + * with "SyS" instead of "sys", leading to an unwanted
> + * mismatch.
> + */
> + return (!strcmp(sym + 3, name + 3));
> +}
> +
> int __init init_ftrace_syscalls(void)
> {
> struct syscall_metadata *meta;
next prev parent reply other threads:[~2010-05-14 0:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 7:43 ftrace syscalls, PowerPC: Fixes and PowerPC raw syscall tracepoint implementation Ian Munsie
2010-05-13 7:43 ` [PATCH 1/4] ftrace syscalls: don't add events for unmapped syscalls Ian Munsie
2010-05-13 7:43 ` [PATCH 2/4] ftrace syscalls: Make arch_syscall_addr weak Ian Munsie
2010-05-13 7:43 ` [PATCH 3/4] ftrace syscalls: Allow arch specific syscall symbol matching Ian Munsie
2010-05-13 23:54 ` Benjamin Herrenschmidt [this message]
2010-05-14 2:06 ` Ian Munsie
2010-05-13 7:43 ` [PATCH 4/4] trace, powerpc: Implement raw syscall tracepoints on PowerPC Ian Munsie
2010-05-13 12:09 ` Michael Ellerman
2010-05-14 2:03 ` Ian Munsie
2010-05-14 8:41 ` [PATCH v2] " Ian Munsie
2010-05-13 16:06 ` ftrace syscalls, PowerPC: Fixes and PowerPC raw syscall tracepoint implementation Steven Rostedt
2010-05-13 16:12 ` Frederic Weisbecker
2010-05-13 23:55 ` Benjamin Herrenschmidt
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=1273794896.21352.203.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=fweisbec@gmail.com \
--cc=imunsie@au1.ibm.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).