Received-SPF: pass (google.com: domain of linux-kernel+bounces-215931-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Sun, 16 Jun 2024 01:19:11 +0900
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>, Steven Rostedt <rostedt@goodmis.org>,
 Andrii Nakryiko <andrii@kernel.org>, linux-kernel@vger.kernel.org,
 linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org
Subject: Re: [PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall
 test
Message-Id: <20240616011911.009492d917999c380320fd1b@kernel.org>
In-Reply-To: <20240616001920.0662473b0c3211e1dbd4b6f5@kernel.org>
References: <20240614101509.764664-1-jolsa@kernel.org>
	<20240616001920.0662473b0c3211e1dbd4b6f5@kernel.org>
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Sun, 16 Jun 2024 00:19:20 +0900
Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote:

> On Fri, 14 Jun 2024 12:15:09 +0200
> Jiri Olsa <jolsa@kernel.org> wrote:
> 
> > Fixing the __NR_uretprobe number in uprobe_syscall test,
> > because it changed due to merge conflict.
> > 
> 
> Ah, it is not enough, since Stephen's change is just a temporary fix on
> next tree. OK, Let me update it.

Hm, I thought I need to change all NR_uretprobe, but it makes NR_syscalls
list sparse. This may need to be solved on linus tree in merge window,
or I should merge (or rebase on) vfs-brauner tree before sending
probes/for-next.

Steve, do you have any idea? we talked about conflict on next tree[0].

[0] https://lore.kernel.org/all/20240613114243.2a50059b@canb.auug.org.au/

Thanks,

> 
> Thanks,
> 
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
> > index c8517c8f5313..bd8c75b620c2 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
> > @@ -216,7 +216,7 @@ static void test_uretprobe_regs_change(void)
> >  }
> >  
> >  #ifndef __NR_uretprobe
> > -#define __NR_uretprobe 463
> > +#define __NR_uretprobe 467
> >  #endif
> >  
> >  __naked unsigned long uretprobe_syscall_call_1(void)
> > -- 
> > 2.45.1
> > 
> 
> 
> -- 
> Masami Hiramatsu (Google) <mhiramat@kernel.org>


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>