From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42480 "EHLO
        foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1730260AbeK1D5C (ORCPT <rfc822;stable@vger.kernel.org>);
        Tue, 27 Nov 2018 22:57:02 -0500
Date: Tue, 27 Nov 2018 16:58:49 +0000
From: Will Deacon <will.deacon@arm.com>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Naresh Kamboju <naresh.kamboju@linaro.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Ingo Molnar <mingo@redhat.com>,
        Masami Hiramatsu <masami.hiramatsu@linaro.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] arm64: ftrace: Fix to enable syscall events on arm64
Message-ID: <20181127165848.GA19569@arm.com>
References: <CAA93ih1-xpm1P0suT6SNCc_ARvAfyBEwb0-uKFikM5k4CvG8jg@mail.gmail.com>
 <154333618522.27355.8094935453351562295.stgit@devbox>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <154333618522.27355.8094935453351562295.stgit@devbox>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

Hi Masami,

On Wed, Nov 28, 2018 at 01:29:45AM +0900, Masami Hiramatsu wrote:
> Since commit 4378a7d4be30 ("arm64: implement syscall wrappers")
> introduced "__arm64_" prefix to all syscall wrapper symbols in
> sys_call_table, syscall tracer can not find corresponding
> metadata from syscall name. In the result, we have no syscall
> ftrace events on arm64 kernel, and some bpf testcases are failed
> on arm64.
> 
> To fix this issue, this introduces custom
> arch_syscall_match_sym_name() which skips first 8 bytes when
> comparing the syscall and symbol names.
> 
> Fixes: 4378a7d4be30 ("arm64: implement syscall wrappers")
> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: stable@vger.kernel.org
> ---
>  arch/arm64/include/asm/ftrace.h |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h
> index caa955f10e19..a710f79db442 100644
> --- a/arch/arm64/include/asm/ftrace.h
> +++ b/arch/arm64/include/asm/ftrace.h
> @@ -56,6 +56,15 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)
>  {
>  	return is_compat_task();
>  }
> +
> +#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
> +
> +static inline bool arch_syscall_match_sym_name(const char *sym,
> +					       const char *name)
> +{
> +	/* Since all syscall functions have __arm64_ prefix, we must skip it */
> +	return !strcmp(sym + 8, name);
> +}

This looks fine to me, but I'm curious about whether this is supposed to
work with compat syscalls as well, where the prefix is "__arm64_compat_".

If we broadly follow the x86 lead, we'd have:

	return (!strncmp(sym, "__arm64_", 8) && !strcmp(sym + 8, name)) ||
		(!strncmp(sym, "__arm64_compat_", 15) && !strcmp(sym + 15, name));

Do we need to handle compat (i.e. 32-bit) tasks here?

Will