bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test
Subsystems (4)
Jiri Olsa
reviewerPATCH 1/1 bpf/selftests: Fix __NR_uretprobe in uprobe_syscall test
Fixing the __NR_uretprobe number in uprobe_syscall test, because it changed due to merge conflict.
--- tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +1 -1
@@ -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 )
Signature · 1 line
2.45.1
Masami Hiramatsu (Google)
maintainerQuoted 3 lines · On Fri, 14 Jun 2024 12:15:09 +0200 Jiri Olsa <[email protected]> wrote:
Fixing the
__NR_uretprobenumber inuprobe_syscalltest, 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,
Quoted 21 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +1
-1@@ -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 )Signature · 1 line
2.45.1
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerQuoted 9 lines · On Sun, 16 Jun 2024 00:19:20 +0900 Masami Hiramatsu (Google)…
Quoted 3 lines · On Fri, 14 Jun 2024 12:15:09 +0200 Jiri Olsa <[email protected]> wrote:
Fixing the
__NR_uretprobenumber inuprobe_syscalltest, 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/[email protected]/
Thanks,
Quoted 28 lines
Thanks,
Quoted 21 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +1
-1@@ -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 )Signature · 1 line
2.45.1Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 13 lines · Masami Hiramatsu
Quoted 9 lines · On Sun, 16 Jun 2024 00:19:20 +0900 Masami Hiramatsu (Google)…
Quoted 3 lines · On Fri, 14 Jun 2024 12:15:09 +0200 Jiri Olsa <[email protected]> wrote:
Fixing the
__NR_uretprobenumber inuprobe_syscalltest, 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.
Quoted 8 lines
Hm, I thought I need to change all
NR_uretprobe, but it makesNR_syscallslist 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].
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/
Quoted 35 lines
Thanks,
Quoted 28 lines
Thanks,
Quoted 21 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +1
-1@@ -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 )Signature · 1 line
2.45.1Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 19 lines · Jiri Olsa
Quoted 18 lines · Masami Hiramatsu
Quoted 9 lines · On Sun, 16 Jun 2024 00:19:20 +0900 Masami Hiramatsu (Google)…
Quoted 3 lines · On Fri, 14 Jun 2024 12:15:09 +0200 Jiri Olsa <[email protected]> wrote:
Fixing the
__NR_uretprobenumber inuprobe_syscalltest, 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 makesNR_syscallslist 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.
Quoted 7 lines
Quoted 3 lines
Steve, do you have any idea? we talked about conflict on next tree[0].
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
Quoted 42 lines
thanks,
jirka[1] https://lore.kernel.org/bpf/ZmyZgzqsowkGyqmH@krava/
Quoted 35 lines
Thanks,
Quoted 28 lines
Thanks,
Quoted 21 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +1
-1@@ -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 )Signature · 1 line
2.45.1Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>