bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrey Ignatov <rdna@fb.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"gor@linux.ibm.com" <gor@linux.ibm.com>,
	"heiko.carstens@de.ibm.com" <heiko.carstens@de.ibm.com>
Subject: Re: [PATCH bpf] selftests/bpf: fix sendmsg6_prog on s390
Date: Fri, 19 Jul 2019 16:21:30 +0000	[thread overview]
Message-ID: <20190719162128.GA36225@rdna-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20190719090611.91743-1-iii@linux.ibm.com>

Ilya Leoshkevich <iii@linux.ibm.com> [Fri, 2019-07-19 02:07 -0700]:
> "sendmsg6: rewrite IP & port (C)" fails on s390, because the code in
> sendmsg_v6_prog() assumes that (ctx->user_ip6[0] & 0xFFFF) refers to
> leading IPv6 address digits, which is not the case on big-endian
> machines.
> 
> Since checking bitwise operations doesn't seem to be the point of the
> test, replace two short comparisons with a single int comparison.
> 
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>

Acked-by: Andrey Ignatov <rdna@fb.com>

IIRC I did it this way to test 16bit loads from C program, but such
loads are already tested by asm prog in test_sock_addr.c.

Thanks for the fix!

> ---
>  tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/progs/sendmsg6_prog.c b/tools/testing/selftests/bpf/progs/sendmsg6_prog.c
> index 5aeaa284fc47..a68062820410 100644
> --- a/tools/testing/selftests/bpf/progs/sendmsg6_prog.c
> +++ b/tools/testing/selftests/bpf/progs/sendmsg6_prog.c
> @@ -41,8 +41,7 @@ int sendmsg_v6_prog(struct bpf_sock_addr *ctx)
>  	}
>  
>  	/* Rewrite destination. */
> -	if ((ctx->user_ip6[0] & 0xFFFF) == bpf_htons(0xFACE) &&
> -	     ctx->user_ip6[0] >> 16 == bpf_htons(0xB00C)) {
> +	if (ctx->user_ip6[0] == bpf_htonl(0xFACEB00C)) {
>  		ctx->user_ip6[0] = bpf_htonl(DST_REWRITE_IP6_0);
>  		ctx->user_ip6[1] = bpf_htonl(DST_REWRITE_IP6_1);
>  		ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2);
> -- 
> 2.21.0
> 

-- 
Andrey Ignatov

  reply	other threads:[~2019-07-19 16:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-19  9:06 [PATCH bpf] selftests/bpf: fix sendmsg6_prog on s390 Ilya Leoshkevich
2019-07-19 16:21 ` Andrey Ignatov [this message]
2019-07-22 14:23 ` Daniel Borkmann

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=20190719162128.GA36225@rdna-mbp.dhcp.thefacebook.com \
    --to=rdna@fb.com \
    --cc=bpf@vger.kernel.org \
    --cc=gor@linux.ibm.com \
    --cc=heiko.carstens@de.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=netdev@vger.kernel.org \
    /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).