From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>, bpf <bpf@vger.kernel.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>
Subject: Re: [PATCH bpf] selftests/bpf: fix "bind{4,6} deny specific IP & port" on s390
Date: Tue, 13 Aug 2019 12:53:28 -0700 [thread overview]
Message-ID: <CAEf4BzaVOC3Sx_XkDPiv=b4xq7ieXE1Vh9iqGqbWy_Wb2+b4Ag@mail.gmail.com> (raw)
In-Reply-To: <20190813162118.17957-1-iii@linux.ibm.com>
On Tue, Aug 13, 2019 at 9:22 AM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> "bind4 allow specific IP & port" and "bind6 deny specific IP & port"
> fail on s390 because of endianness issue: the 4 IP address bytes are
> loaded as a word and compared with a constant, but the value of this
> constant should be different on big- and little- endian machines, which
> is not the case right now.
>
> Use __constant_ntohl to generate proper value based on machine
> endianness.
>
> Fixes: 1d436885b23b ("selftests/bpf: Selftest for sys_bind post-hooks.")
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> tools/testing/selftests/bpf/test_sock.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c
> index fb679ac3d4b0..5c092a85125f 100644
> --- a/tools/testing/selftests/bpf/test_sock.c
> +++ b/tools/testing/selftests/bpf/test_sock.c
> @@ -8,6 +8,7 @@
> #include <sys/types.h>
> #include <sys/socket.h>
>
> +#include <asm/byteorder.h>
Maybe use bpf_endian.h and bpf_ntohl instead, sticking to BPF stuff
already used by other tests?
> #include <linux/filter.h>
>
> #include <bpf/bpf.h>
> @@ -232,7 +233,8 @@ static struct sock_test tests[] = {
> /* if (ip == expected && port == expected) */
> BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
> offsetof(struct bpf_sock, src_ip6[3])),
> - BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x01000000, 4),
> + BPF_JMP_IMM(BPF_JNE, BPF_REG_7,
> + __constant_ntohl(0x00000001), 4),
> BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
> offsetof(struct bpf_sock, src_port)),
> BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x2001, 2),
> @@ -261,7 +263,8 @@ static struct sock_test tests[] = {
> /* if (ip == expected && port == expected) */
> BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
> offsetof(struct bpf_sock, src_ip4)),
> - BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x0100007F, 4),
> + BPF_JMP_IMM(BPF_JNE, BPF_REG_7,
> + __constant_ntohl(0x7F000001), 4),
> BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
> offsetof(struct bpf_sock, src_port)),
> BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x1002, 2),
> --
> 2.21.0
>
prev parent reply other threads:[~2019-08-13 19:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 16:21 [PATCH bpf] selftests/bpf: fix "bind{4,6} deny specific IP & port" on s390 Ilya Leoshkevich
2019-08-13 19:53 ` Andrii Nakryiko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEf4BzaVOC3Sx_XkDPiv=b4xq7ieXE1Vh9iqGqbWy_Wb2+b4Ag@mail.gmail.com' \
--to=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gor@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=iii@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).