Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Thomas Gleixner <tglx@linutronix.de>
To:     Konstantin Khlebnikov <khlebnikov@yandex-team.ru>,
        Brian Gerst <brgerst@gmail.com>, linux-kernel@vger.kernel.org
Cc:     Dominik Brodowski <linux@dominikbrodowski.net>,
        Andy Lutomirski <luto@kernel.org>
Subject: Re: [PATCH] tracing/x86: fix trace event registration for syscalls without arguments
In-Reply-To: <158636958997.7900.16485049455470033557.stgit@buzz>
References: <158636958997.7900.16485049455470033557.stgit@buzz>
Date:   Mon, 27 Apr 2020 16:44:44 +0200
Message-ID: <87368pq97n.fsf@nanos.tec.linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Konstantin Khlebnikov <khlebnikov@yandex-team.ru> writes:

> Syscalls without arguments now has no ABI subs, instead of that macro

What is 'ABI subs'? 

> SYSCALL_DEFINE0() defines __abi_sys_name as aliase to __do_sys_name.
>
> As a result in find_syscall_meta() kallsyms_lookup() returns
> "__do_sys_name" which does not match with declared trace event.
>
> Also see commit 1c758a2202a6 ("tracing/x86: Update syscall trace events
> to handle new prefixed syscall func names")
>
> Fixes: d2b5de495ee9 ("x86/entry: Refactor SYSCALL_DEFINE0 macros")
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> ---
>  arch/x86/include/asm/ftrace.h |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
> index 85be2f506272..70b96cae5b42 100644
> --- a/arch/x86/include/asm/ftrace.h
> +++ b/arch/x86/include/asm/ftrace.h
> @@ -61,11 +61,12 @@ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name
>  {
>  	/*
>  	 * Compare the symbol name with the system call name. Skip the
> -	 * "__x64_sys", "__ia32_sys" or simple "sys" prefix.
> +	 * "__x64_sys", "__ia32_sys", "__do_sys" or simple "sys" prefix.
>  	 */
>  	return !strcmp(sym + 3, name + 3) ||
>  		(!strncmp(sym, "__x64_", 6) && !strcmp(sym + 9, name + 3)) ||
> -		(!strncmp(sym, "__ia32_", 7) && !strcmp(sym + 10, name + 3));
> +		(!strncmp(sym, "__ia32_", 7) && !strcmp(sym + 10, name + 3)) ||
> +		(!strncmp(sym, "__do_sys", 8) && !strcmp(sym + 8, name + 3));
>  }
>  
>  #ifndef COMPILE_OFFSETS