From: Kui-Feng Lee <sinquersw@gmail.com>
To: Jordan Rife <jrife@google.com>
Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
netdev@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Eduard Zingerman <eddyz87@gmail.com>, Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Mykola Lysenko <mykolal@fb.com>,
Shuah Khan <shuah@kernel.org>,
Kui-Feng Lee <thinker.li@gmail.com>,
Artem Savkov <asavkov@redhat.com>,
Dave Marchevsky <davemarchevsky@fb.com>,
Menglong Dong <imagedong@tencent.com>, Daniel Xu <dxu@dxuuu.xyz>,
David Vernet <void@manifault.com>,
Daan De Meyer <daan.j.demeyer@gmail.com>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Subject: Re: [PATCH v2 bpf-next 1/6] selftests/bpf: Fix bind program for big endian systems
Date: Fri, 12 Apr 2024 18:28:34 -0700 [thread overview]
Message-ID: <76467c84-3c6b-4859-a815-bee018b3364d@gmail.com> (raw)
In-Reply-To: <CADKFtnR4qtPV4OP_Y04+ON+bKc8uPxxLZF3cTj-0YCupD6y06A@mail.gmail.com>
On 4/12/24 18:17, Jordan Rife wrote:
> Kui-Feng,
>
> You are right. Maybe simply "load_word" and "load_byte" would be a
> better name here. WDYT?
Agree!
>
> -Jordan
>
>
> On Fri, Apr 12, 2024 at 6:01 PM Kui-Feng Lee <sinquersw@gmail.com
> <mailto:sinquersw@gmail.com>> wrote:
>
>
>
> On 4/12/24 09:52, Jordan Rife wrote:
> > Without this fix, the bind4 and bind6 programs will reject bind
> attempts
> > on big endian systems. This patch ensures that CI tests pass for the
> > s390x architecture.
> >
> > Signed-off-by: Jordan Rife <jrife@google.com
> <mailto:jrife@google.com>>
> > ---
> > .../testing/selftests/bpf/progs/bind4_prog.c | 18
> ++++++++++--------
> > .../testing/selftests/bpf/progs/bind6_prog.c | 18
> ++++++++++--------
> > tools/testing/selftests/bpf/progs/bind_prog.h | 19
> +++++++++++++++++++
> > 3 files changed, 39 insertions(+), 16 deletions(-)
> > create mode 100644 tools/testing/selftests/bpf/progs/bind_prog.h
> >
> > diff --git a/tools/testing/selftests/bpf/progs/bind4_prog.c
> b/tools/testing/selftests/bpf/progs/bind4_prog.c
> > index a487f60b73ac4..2bc052ecb6eef 100644
> > --- a/tools/testing/selftests/bpf/progs/bind4_prog.c
> > +++ b/tools/testing/selftests/bpf/progs/bind4_prog.c
> > @@ -12,6 +12,8 @@
> > #include <bpf/bpf_helpers.h>
> > #include <bpf/bpf_endian.h>
> >
> > +#include "bind_prog.h"
> > +
> > #define SERV4_IP 0xc0a801feU /* 192.168.1.254 */
> > #define SERV4_PORT 4040
> > #define SERV4_REWRITE_IP 0x7f000001U /* 127.0.0.1 */
> > @@ -118,23 +120,23 @@ int bind_v4_prog(struct bpf_sock_addr *ctx)
> >
> > // u8 narrow loads:
> > user_ip4 = 0;
> > - user_ip4 |= ((volatile __u8 *)&ctx->user_ip4)[0] << 0;
> > - user_ip4 |= ((volatile __u8 *)&ctx->user_ip4)[1] << 8;
> > - user_ip4 |= ((volatile __u8 *)&ctx->user_ip4)[2] << 16;
> > - user_ip4 |= ((volatile __u8 *)&ctx->user_ip4)[3] << 24;
> > + user_ip4 |= load_byte_ntoh(ctx->user_ip4, 0, sizeof(user_ip4));
> > + user_ip4 |= load_byte_ntoh(ctx->user_ip4, 1, sizeof(user_ip4));
> > + user_ip4 |= load_byte_ntoh(ctx->user_ip4, 2, sizeof(user_ip4));
> > + user_ip4 |= load_byte_ntoh(ctx->user_ip4, 3, sizeof(user_ip4));
> > if (ctx->user_ip4 != user_ip4)
> > return 0;
> >
> > user_port = 0;
> > - user_port |= ((volatile __u8 *)&ctx->user_port)[0] << 0;
> > - user_port |= ((volatile __u8 *)&ctx->user_port)[1] << 8;
> > + user_port |= load_byte_ntoh(ctx->user_port, 0,
> sizeof(user_port));
> > + user_port |= load_byte_ntoh(ctx->user_port, 1,
> sizeof(user_port));
> > if (ctx->user_port != user_port)
> > return 0;
> >
> > // u16 narrow loads:
> > user_ip4 = 0;
> > - user_ip4 |= ((volatile __u16 *)&ctx->user_ip4)[0] << 0;
> > - user_ip4 |= ((volatile __u16 *)&ctx->user_ip4)[1] << 16;
> > + user_ip4 |= load_word_ntoh(ctx->user_ip4, 0, sizeof(user_ip4));
> > + user_ip4 |= load_word_ntoh(ctx->user_ip4, 1, sizeof(user_ip4));
> > if (ctx->user_ip4 != user_ip4)
> > return 0;
> >
> > diff --git a/tools/testing/selftests/bpf/progs/bind6_prog.c
> b/tools/testing/selftests/bpf/progs/bind6_prog.c
> > index d62cd9e9cf0ea..194583e3375bf 100644
> > --- a/tools/testing/selftests/bpf/progs/bind6_prog.c
> > +++ b/tools/testing/selftests/bpf/progs/bind6_prog.c
> > @@ -12,6 +12,8 @@
> > #include <bpf/bpf_helpers.h>
> > #include <bpf/bpf_endian.h>
> >
> > +#include "bind_prog.h"
> > +
> > #define SERV6_IP_0 0xfaceb00c /*
> face:b00c:1234:5678::abcd */
> > #define SERV6_IP_1 0x12345678
> > #define SERV6_IP_2 0x00000000
> > @@ -129,25 +131,25 @@ int bind_v6_prog(struct bpf_sock_addr *ctx)
> > // u8 narrow loads:
> > for (i = 0; i < 4; i++) {
> > user_ip6 = 0;
> > - user_ip6 |= ((volatile __u8 *)&ctx->user_ip6[i])[0]
> << 0;
> > - user_ip6 |= ((volatile __u8 *)&ctx->user_ip6[i])[1]
> << 8;
> > - user_ip6 |= ((volatile __u8 *)&ctx->user_ip6[i])[2]
> << 16;
> > - user_ip6 |= ((volatile __u8 *)&ctx->user_ip6[i])[3]
> << 24;
> > + user_ip6 |= load_byte_ntoh(ctx->user_ip6[i], 0,
> sizeof(user_ip6));
> > + user_ip6 |= load_byte_ntoh(ctx->user_ip6[i], 1,
> sizeof(user_ip6));
> > + user_ip6 |= load_byte_ntoh(ctx->user_ip6[i], 2,
> sizeof(user_ip6));
> > + user_ip6 |= load_byte_ntoh(ctx->user_ip6[i], 3,
> sizeof(user_ip6));
> > if (ctx->user_ip6[i] != user_ip6)
> > return 0;
> > }
> >
> > user_port = 0;
> > - user_port |= ((volatile __u8 *)&ctx->user_port)[0] << 0;
> > - user_port |= ((volatile __u8 *)&ctx->user_port)[1] << 8;
> > + user_port |= load_byte_ntoh(ctx->user_port, 0,
> sizeof(user_port));
> > + user_port |= load_byte_ntoh(ctx->user_port, 1,
> sizeof(user_port));
> > if (ctx->user_port != user_port)
> > return 0;
> >
> > // u16 narrow loads:
> > for (i = 0; i < 4; i++) {
> > user_ip6 = 0;
> > - user_ip6 |= ((volatile __u16
> *)&ctx->user_ip6[i])[0] << 0;
> > - user_ip6 |= ((volatile __u16
> *)&ctx->user_ip6[i])[1] << 16;
> > + user_ip6 |= load_word_ntoh(ctx->user_ip6[i], 0,
> sizeof(user_ip6));
> > + user_ip6 |= load_word_ntoh(ctx->user_ip6[i], 1,
> sizeof(user_ip6));
> > if (ctx->user_ip6[i] != user_ip6)
> > return 0;
> > }
> > diff --git a/tools/testing/selftests/bpf/progs/bind_prog.h
> b/tools/testing/selftests/bpf/progs/bind_prog.h
> > new file mode 100644
> > index 0000000000000..0fdc466aec346
> > --- /dev/null
> > +++ b/tools/testing/selftests/bpf/progs/bind_prog.h
> > @@ -0,0 +1,19 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +#ifndef __BIND_PROG_H__
> > +#define __BIND_PROG_H__
> > +
> > +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
> > +#define load_byte_ntoh(src, b, s) \
> > + (((volatile __u8 *)&(src))[b] << 8 * b)
> > +#define load_word_ntoh(src, w, s) \
> > + (((volatile __u16 *)&(src))[w] << 16 * w)
> > +#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
> > +#define load_byte_ntoh(src, b, s) \
> > + (((volatile __u8 *)&(src))[(b) + (sizeof(src) - (s))] << 8
> * ((s) - (b) - 1))
> > +#define load_word_ntoh(src, w, s) \
> > + (((volatile __u16 *)&(src))[w] << 16 * (((s) / 2) - (w) - 1))
> These names, load_byte_ntoh() and load_word_ntoh(), are miss-leading.
>
> They don't actually do byte-order conversion from network order to host
> order. Network order is big endian. 0xdeadbeef in u32 should be stored
> as the sequence of
>
> 0xde, 0xad, 0xbe, 0xef
>
> The little endian implementation of load_word_ntoh() provided here will
> return 0xadde and 0xefbe0000. However, a network order to host order
> conversion should return 0xbeef and 0xdead0000 for little endian.
>
> The little endian implementation of load_byte_ntoh() here returns 0xde,
> 0xad00, 0xbe0000, and 0xef000000. However, a network to host order
> conversion should return 0xef, 0xbe00, 0xad0000, and 0xde00000.
>
> So, they just access raw data following the host byte order, not
> providing any byte order conversion.
>
>
> > +#else
> > +# error "Fix your compiler's __BYTE_ORDER__?!"
> > +#endif
> > +
> > +#endif
>
next prev parent reply other threads:[~2024-04-13 1:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 16:52 [PATCH v2 bpf-next 0/6] selftests/bpf: Add sockaddr tests for kernel networking Jordan Rife
2024-04-12 16:52 ` [PATCH v2 bpf-next 1/6] selftests/bpf: Fix bind program for big endian systems Jordan Rife
2024-04-13 1:01 ` Kui-Feng Lee
2024-04-13 1:19 ` Jordan Rife
[not found] ` <CADKFtnR4qtPV4OP_Y04+ON+bKc8uPxxLZF3cTj-0YCupD6y06A@mail.gmail.com>
2024-04-13 1:28 ` Kui-Feng Lee [this message]
2024-04-12 16:52 ` [PATCH v2 bpf-next 2/6] selftests/bpf: Implement socket kfuncs for bpf_testmod Jordan Rife
2024-04-13 1:26 ` Kui-Feng Lee
2024-04-15 15:34 ` Jordan Rife
2024-04-16 6:43 ` Martin KaFai Lau
2024-04-17 16:59 ` Jordan Rife
2024-05-01 21:54 ` Kui-Feng Lee
2024-04-12 16:52 ` [PATCH v2 bpf-next 3/6] selftests/bpf: Implement BPF programs for kernel socket operations Jordan Rife
2024-04-12 16:52 ` [PATCH v2 bpf-next 4/6] selftests/bpf: Add IPv4 and IPv6 sockaddr test cases Jordan Rife
2024-04-16 6:07 ` Martin KaFai Lau
2024-04-16 6:47 ` Martin KaFai Lau
2024-04-17 17:08 ` Jordan Rife
2024-04-18 0:49 ` Martin KaFai Lau
2024-04-18 16:37 ` Jordan Rife
2024-04-22 21:14 ` Martin KaFai Lau
2024-04-28 17:47 ` Jordan Rife
2024-04-29 17:40 ` Martin KaFai Lau
2024-04-29 21:47 ` Jordan Rife
2024-04-12 16:52 ` [PATCH v2 bpf-next 5/6] selftests/bpf: Make sock configurable for each test case Jordan Rife
2024-04-12 16:52 ` [PATCH v2 bpf-next 6/6] selftests/bpf: Add kernel socket operation tests Jordan Rife
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=76467c84-3c6b-4859-a815-bee018b3364d@gmail.com \
--to=sinquersw@gmail.com \
--cc=andrii@kernel.org \
--cc=asavkov@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daan.j.demeyer@gmail.com \
--cc=daniel@iogearbox.net \
--cc=davemarchevsky@fb.com \
--cc=dxu@dxuuu.xyz \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=imagedong@tencent.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=jrife@google.com \
--cc=kpsingh@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=thinker.li@gmail.com \
--cc=void@manifault.com \
--cc=willemdebruijn.kernel@gmail.com \
--cc=yonghong.song@linux.dev \
/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).