bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yonghong Song <yhs@fb.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: <bpf@vger.kernel.org>, Vasily Gorbik <gor@linux.ibm.com>
Subject: Re: [PATCH v3 bpf-next] selftests/bpf: Use the last page in test_snprintf_btf on s390
Date: Fri, 26 Feb 2021 19:47:02 -0800	[thread overview]
Message-ID: <21c13c15-0dbc-8430-9e04-0932f6f913f0@fb.com> (raw)
In-Reply-To: <20210226190908.115706-1-iii@linux.ibm.com>



On 2/26/21 11:09 AM, Ilya Leoshkevich wrote:
> test_snprintf_btf fails on s390, because NULL points to a readable
> struct lowcore there. Fix by using the last page instead.
> 
> Error message example:
> 
>      printing 0000000000000000 should generate error, got (361)
> 
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> 
> v1: https://lore.kernel.org/bpf/20210226135923.114211-1-iii@linux.ibm.com/
> v1 -> v2: Yonghong suggested to add the pointer value to the error
>            message.
>            I've noticed that I've been passing BADPTR as flags, therefore
>            the fix worked only by accident. Put it into p.ptr where it
>            belongs.
> 
> v2: https://lore.kernel.org/bpf/20210226182014.115347-1-iii@linux.ibm.com/
> v2 -> v3: Heiko mentioned that using _REGION1_SIZE is not future-proof.
>            We had a private discussion and came to the conclusion that
>            the the last page is good enough.

Heiko, could you ack the patch if it is okay? Thanks!

> 
>   .../testing/selftests/bpf/progs/netif_receive_skb.c | 13 ++++++++++---
>   1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/progs/netif_receive_skb.c b/tools/testing/selftests/bpf/progs/netif_receive_skb.c
> index 6b670039ea67..c3669967067e 100644
> --- a/tools/testing/selftests/bpf/progs/netif_receive_skb.c
> +++ b/tools/testing/selftests/bpf/progs/netif_receive_skb.c
> @@ -16,6 +16,13 @@ bool skip = false;
>   #define STRSIZE			2048
>   #define EXPECTED_STRSIZE	256
>   
> +#if defined(bpf_target_s390)
> +/* NULL points to a readable struct lowcore on s390, so take the last page */
> +#define BADPTR			((void *)0xFFFFFFFFFFFFF000ULL)
> +#else
> +#define BADPTR			0
> +#endif
> +
>   #ifndef ARRAY_SIZE
>   #define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
>   #endif
> @@ -113,11 +120,11 @@ int BPF_PROG(trace_netif_receive_skb, struct sk_buff *skb)
>   	}
>   
>   	/* Check invalid ptr value */
> -	p.ptr = 0;
> +	p.ptr = BADPTR;
>   	__ret = bpf_snprintf_btf(str, STRSIZE, &p, sizeof(p), 0);
>   	if (__ret >= 0) {
> -		bpf_printk("printing NULL should generate error, got (%d)",
> -			   __ret);
> +		bpf_printk("printing %p should generate error, got (%d)",
> +			   BADPTR, __ret);

 From https://www.kernel.org/doc/Documentation/printk-formats.txt:

Pointers printed without a specifier extension (i.e unadorned %p) are
hashed to give a unique identifier without leaking kernel addresses to user
space. On 64 bit machines the first 32 bits are zeroed. If you _really_
want the address see %px below.

I think it is okay to use %px here.

>   		ret = -ERANGE;
>   	}
>   
> 

  reply	other threads:[~2021-02-27  3:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-26 19:09 [PATCH v3 bpf-next] selftests/bpf: Use the last page in test_snprintf_btf on s390 Ilya Leoshkevich
2021-02-27  3:47 ` Yonghong Song [this message]
2021-02-27  5:13   ` Ilya Leoshkevich
2021-02-28  8:02   ` Heiko Carstens

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=21c13c15-0dbc-8430-9e04-0932f6f913f0@fb.com \
    --to=yhs@fb.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).