From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Subject: Re: [PATCH bpf-next] samples/bpf: fix kprobe attachment issue on x64
Date: Sun, 29 Apr 2018 16:20:33 -0700
Message-ID: <20180429232031.5p2y4s274inymf4b@ast-mbp>
References: <20180429220631.2925150-1-yhs@fb.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: ast@fb.com, daniel@iogearbox.net, netdev@vger.kernel.org,
        kernel-team@fb.com
To: Yonghong Song <yhs@fb.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-pg0-f68.google.com ([74.125.83.68]:40755 "EHLO
        mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754359AbeD2XUh (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sun, 29 Apr 2018 19:20:37 -0400
Received: by mail-pg0-f68.google.com with SMTP id l2-v6so5114466pgc.7
        for <netdev@vger.kernel.org>; Sun, 29 Apr 2018 16:20:37 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <20180429220631.2925150-1-yhs@fb.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Sun, Apr 29, 2018 at 03:06:31PM -0700, Yonghong Song wrote:
> Commit d5a00528b58c ("syscalls/core, syscalls/x86: Rename
> struct pt_regs-based sys_*() to __x64_sys_*()") renamed a lot
> of syscall function sys_*() to __x64_sys_*().
> This caused several kprobe based samples/bpf tests failing.
> 
> This patch fixed the problem by using __x64_sys_*(),
> instead of sys_*(), in bpf program SEC annotations if
> the target arch is __TARGET_ARCH_x86.
> 
> Fixes: d5a00528b58c ("syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*()")
> Signed-off-by: Yonghong Song <yhs@fb.com>
> ---
>  samples/bpf/map_perf_test_kern.c                  | 32 +++++++++++++++++++++++
>  samples/bpf/test_current_task_under_cgroup_kern.c |  4 +++
>  samples/bpf/test_map_in_map_kern.c                |  4 +++
>  samples/bpf/test_probe_write_user_kern.c          |  4 +++
>  samples/bpf/trace_output_kern.c                   |  4 +++
>  samples/bpf/tracex2_kern.c                        |  4 +++
>  6 files changed, 52 insertions(+)
> 
> diff --git a/samples/bpf/map_perf_test_kern.c b/samples/bpf/map_perf_test_kern.c
> index 2b2ffb9..79f4320 100644
> --- a/samples/bpf/map_perf_test_kern.c
> +++ b/samples/bpf/map_perf_test_kern.c
> @@ -95,7 +95,11 @@ struct bpf_map_def SEC("maps") lru_hash_lookup_map = {
>  	.max_entries = MAX_ENTRIES,
>  };
>  
> +#ifdef __TARGET_ARCH_x86
> +SEC("kprobe/__x64_sys_getuid")
> +#else
>  SEC("kprobe/sys_getuid")
> +#endif

I think it would be better to hack bpf_load.c to add __x64_
automatically when it matches "sys_" in the beginning of kprobe name.