public inbox for bpf@vger.kernel.org
 help / color / mirror / Atom feed
From: Yonghong Song <yonghong.song@linux.dev>
To: Eduard Zingerman <eddyz87@gmail.com>,
	bpf@vger.kernel.org, ast@kernel.org
Cc: andrii@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev,
	kernel-team@fb.com, jose.marchesi@oracle.com
Subject: Re: [PATCH bpf-next v2 5/5] selftests/bpf: check if bpf_fastcall is recognized for kfuncs
Date: Wed, 21 Aug 2024 18:38:41 -0700	[thread overview]
Message-ID: <e080afa6-5bc2-43e4-95d6-91c2c142696e@linux.dev> (raw)
In-Reply-To: <20240817015140.1039351-6-eddyz87@gmail.com>


On 8/16/24 6:51 PM, Eduard Zingerman wrote:
> Use kfunc_bpf_cast_to_kern_ctx() and kfunc_bpf_rdonly_cast() to verify
> that bpf_fastcall pattern is recognized for kfunc calls.
>
> Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>

LGTM with a nit below.

Acked-by: Yonghong Song <yonghong.song@linux.dev>

> ---
>   .../bpf/progs/verifier_bpf_fastcall.c         | 50 +++++++++++++++++++
>   1 file changed, 50 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c b/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c
> index f75cd5e3fffe..97c2420ccb38 100644
> --- a/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c
> +++ b/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c
> @@ -2,8 +2,11 @@
>   
>   #include <linux/bpf.h>
>   #include <bpf/bpf_helpers.h>
> +#include <bpf/bpf_core_read.h>
>   #include "../../../include/linux/filter.h"
>   #include "bpf_misc.h"
> +#include <stdbool.h>
> +#include "bpf_kfuncs.h"
>   
>   SEC("raw_tp")
>   __arch_x86_64
> @@ -793,4 +796,51 @@ __naked int bpf_fastcall_max_stack_fail(void)
>   	);
>   }
>   
> +SEC("cgroup/getsockname_unix")
> +__xlated("0: r2 = 1")
> +/* bpf_cast_to_kern_ctx is replaced by a single assignment */
> +__xlated("1: r0 = r1")
> +__xlated("2: r0 = r2")
> +__xlated("3: exit")
> +__success
> +__naked void kfunc_bpf_cast_to_kern_ctx(void)
> +{
> +	asm volatile (
> +	"r2 = 1;"
> +	"*(u64 *)(r10 - 32) = r2;"
> +	"call %[bpf_cast_to_kern_ctx];"
> +	"r2 = *(u64 *)(r10 - 32);"
> +	"r0 = r2;"
> +	"exit;"
> +	:
> +	: __imm(bpf_cast_to_kern_ctx)
> +	: __clobber_all);
> +}
> +
> +SEC("raw_tp")
> +__xlated("3: r3 = 1")
> +/* bpf_rdonly_cast is replaced by a single assignment */
> +__xlated("4: r0 = r1")
> +__xlated("5: r0 = r3")
> +void kfunc_bpf_rdonly_cast(void)
> +{
> +	asm volatile (
> +	"r2 = %[btf_id];"
> +	"r3 = 1;"
> +	"*(u64 *)(r10 - 32) = r3;"
> +	"call %[bpf_rdonly_cast];"
> +	"r3 = *(u64 *)(r10 - 32);"
> +	"r0 = r3;"
> +	:
> +	: __imm(bpf_rdonly_cast),
> +	 [btf_id]"r"(bpf_core_type_id_kernel(union bpf_attr))
> +	: __clobber_common);
> +}
> +
> +void kfunc_root(void)

It would be good to add some comments for this function to indicate that
this func intends to enable BTF generation for kfuncs bpf_cast_to_kern_ctx()
and bpf_rdonly_cast() which are necessary for the above two programs.

> +{
> +	bpf_cast_to_kern_ctx(0);
> +	bpf_rdonly_cast(0, 0);
> +}
> +
>   char _license[] SEC("license") = "GPL";

      reply	other threads:[~2024-08-22  1:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-17  1:51 [PATCH bpf-next v2 0/5] support bpf_fastcall patterns for calls to kfuncs Eduard Zingerman
2024-08-17  1:51 ` [PATCH bpf-next v2 1/5] bpf: rename nocsr -> bpf_fastcall in verifier Eduard Zingerman
2024-08-22  1:14   ` Yonghong Song
2024-08-22  1:17   ` Yonghong Song
2024-08-22  1:43     ` Eduard Zingerman
2024-08-17  1:51 ` [PATCH bpf-next v2 2/5] selftests/bpf: rename nocsr -> bpf_fastcall in selftests Eduard Zingerman
2024-08-22  1:20   ` Yonghong Song
2024-08-17  1:51 ` [PATCH bpf-next v2 3/5] bpf: support bpf_fastcall patterns for kfuncs Eduard Zingerman
2024-08-17 20:09   ` kernel test robot
2024-08-18  2:50     ` Eduard Zingerman
2024-08-22  1:23   ` Yonghong Song
2024-08-17  1:51 ` [PATCH bpf-next v2 4/5] bpf: allow bpf_fastcall for bpf_cast_to_kern_ctx and bpf_rdonly_cast Eduard Zingerman
2024-08-22  1:23   ` Yonghong Song
2024-08-17  1:51 ` [PATCH bpf-next v2 5/5] selftests/bpf: check if bpf_fastcall is recognized for kfuncs Eduard Zingerman
2024-08-22  1:38   ` Yonghong Song [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=e080afa6-5bc2-43e4-95d6-91c2c142696e@linux.dev \
    --to=yonghong.song@linux.dev \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=eddyz87@gmail.com \
    --cc=jose.marchesi@oracle.com \
    --cc=kernel-team@fb.com \
    --cc=martin.lau@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