* [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390
@ 2020-09-15 11:55 Ilya Leoshkevich
2020-09-16 1:00 ` Andrii Nakryiko
2020-09-18 23:09 ` Daniel Borkmann
0 siblings, 2 replies; 4+ messages in thread
From: Ilya Leoshkevich @ 2020-09-15 11:55 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann
Cc: bpf, Heiko Carstens, Vasily Gorbik, Song Liu, Ilya Leoshkevich
s390 uses socketcall multiplexer instead of individual socket syscalls.
Therefore, "kprobe/" SYSCALL(sys_connect) does not trigger and
test_map_in_map fails. Fix by using "kprobe/__sys_connect" instead.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
Previous discussion:
https://lore.kernel.org/bpf/20200728120059.132256-3-iii@linux.ibm.com
samples/bpf/test_map_in_map_kern.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/samples/bpf/test_map_in_map_kern.c b/samples/bpf/test_map_in_map_kern.c
index 8def45c5b697..b0200c8eac09 100644
--- a/samples/bpf/test_map_in_map_kern.c
+++ b/samples/bpf/test_map_in_map_kern.c
@@ -103,10 +103,9 @@ static __always_inline int do_inline_hash_lookup(void *inner_map, u32 port)
return result ? *result : -ENOENT;
}
-SEC("kprobe/" SYSCALL(sys_connect))
+SEC("kprobe/__sys_connect")
int trace_sys_connect(struct pt_regs *ctx)
{
- struct pt_regs *real_regs = (struct pt_regs *)PT_REGS_PARM1_CORE(ctx);
struct sockaddr_in6 *in6;
u16 test_case, port, dst6[8];
int addrlen, ret, inline_ret, ret_key = 0;
@@ -114,8 +113,8 @@ int trace_sys_connect(struct pt_regs *ctx)
void *outer_map, *inner_map;
bool inline_hash = false;
- in6 = (struct sockaddr_in6 *)PT_REGS_PARM2_CORE(real_regs);
- addrlen = (int)PT_REGS_PARM3_CORE(real_regs);
+ in6 = (struct sockaddr_in6 *)PT_REGS_PARM2_CORE(ctx);
+ addrlen = (int)PT_REGS_PARM3_CORE(ctx);
if (addrlen != sizeof(*in6))
return 0;
--
2.25.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390
2020-09-15 11:55 [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390 Ilya Leoshkevich
@ 2020-09-16 1:00 ` Andrii Nakryiko
2020-09-17 22:02 ` Song Liu
2020-09-18 23:09 ` Daniel Borkmann
1 sibling, 1 reply; 4+ messages in thread
From: Andrii Nakryiko @ 2020-09-16 1:00 UTC (permalink / raw)
To: Ilya Leoshkevich
Cc: Alexei Starovoitov, Daniel Borkmann, bpf, Heiko Carstens,
Vasily Gorbik, Song Liu
On Tue, Sep 15, 2020 at 5:42 PM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> s390 uses socketcall multiplexer instead of individual socket syscalls.
> Therefore, "kprobe/" SYSCALL(sys_connect) does not trigger and
> test_map_in_map fails. Fix by using "kprobe/__sys_connect" instead.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
>
LGTM.
Acked-by: Andrii Nakryiko <andriin@fb.com>
> Previous discussion:
> https://lore.kernel.org/bpf/20200728120059.132256-3-iii@linux.ibm.com
>
> samples/bpf/test_map_in_map_kern.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
[...]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390
2020-09-16 1:00 ` Andrii Nakryiko
@ 2020-09-17 22:02 ` Song Liu
0 siblings, 0 replies; 4+ messages in thread
From: Song Liu @ 2020-09-17 22:02 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Ilya Leoshkevich, Alexei Starovoitov, Daniel Borkmann, bpf,
Heiko Carstens, Vasily Gorbik
On Tue, Sep 15, 2020 at 6:00 PM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Tue, Sep 15, 2020 at 5:42 PM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
> >
> > s390 uses socketcall multiplexer instead of individual socket syscalls.
> > Therefore, "kprobe/" SYSCALL(sys_connect) does not trigger and
> > test_map_in_map fails. Fix by using "kprobe/__sys_connect" instead.
> >
> > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> > ---
> >
>
> LGTM.
>
> Acked-by: Andrii Nakryiko <andriin@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390
2020-09-15 11:55 [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390 Ilya Leoshkevich
2020-09-16 1:00 ` Andrii Nakryiko
@ 2020-09-18 23:09 ` Daniel Borkmann
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Borkmann @ 2020-09-18 23:09 UTC (permalink / raw)
To: Ilya Leoshkevich, Alexei Starovoitov
Cc: bpf, Heiko Carstens, Vasily Gorbik, Song Liu
On 9/15/20 1:55 PM, Ilya Leoshkevich wrote:
> s390 uses socketcall multiplexer instead of individual socket syscalls.
> Therefore, "kprobe/" SYSCALL(sys_connect) does not trigger and
> test_map_in_map fails. Fix by using "kprobe/__sys_connect" instead.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-18 23:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-15 11:55 [PATCH RESEND bpf-next] samples/bpf: Fix test_map_in_map on s390 Ilya Leoshkevich
2020-09-16 1:00 ` Andrii Nakryiko
2020-09-17 22:02 ` Song Liu
2020-09-18 23:09 ` Daniel Borkmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.