[PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test

[PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test

[Jiri Olsa]

Fixing the __NR_uretprobe number in uprobe_syscall test,
because it changed due to merge conflict.

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

Re: [PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test

[Masami Hiramatsu]

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.

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>

Re: [PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test

[Masami Hiramatsu]

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>

Re: [PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test

[Jiri Olsa]

On Sun, Jun 16, 2024 at 01:19:11AM +0900, Masami Hiramatsu wrote:
> 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/

hi,
I have one more fix to send [1] for this, please let me know which tree
I should based that on

thanks,
jirka


[1] https://lore.kernel.org/bpf/ZmyZgzqsowkGyqmH@krava/

> 
> 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>

Re: [PATCH] bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test

[Jiri Olsa]

On Sun, Jun 16, 2024 at 09:51:18PM +0200, Jiri Olsa wrote:
> On Sun, Jun 16, 2024 at 01:19:11AM +0900, Masami Hiramatsu wrote:
> > 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/
> 
> hi,
> I have one more fix to send [1] for this, please let me know which tree
> I should based that on

hi,
any news on this?

thanks,
jirka

> 
> thanks,
> jirka
> 
> 
> [1] https://lore.kernel.org/bpf/ZmyZgzqsowkGyqmH@krava/
> 
> > 
> > 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>