* [PATCH bpf] bpf: offload: reorder offload callback 'prepare' in verifier
@ 2021-05-20 8:58 Simon Horman
2021-05-20 20:19 ` Song Liu
2021-05-20 22:00 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Simon Horman @ 2021-05-20 8:58 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
Cc: netdev, bpf, oss-drivers, Yinjun Zhang, Simon Horman
From: Yinjun Zhang <yinjun.zhang@corigine.com>
Commit 4976b718c355 ("bpf: Introduce pseudo_btf_id") switched the
order of resolve_pseudo_ldimm(), in which some pseudo instructions
are rewritten. Thus those rewritten instructions cannot be passed
to driver via 'prepare' offload callback.
Reorder the 'prepare' offload callback to fix it.
Fixes: 4976b718c355 ("bpf: Introduce pseudo_btf_id")
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
kernel/bpf/verifier.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index c58598ef4b5b..09849e43f035 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -13368,12 +13368,6 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr,
if (is_priv)
env->test_state_freq = attr->prog_flags & BPF_F_TEST_STATE_FREQ;
- if (bpf_prog_is_dev_bound(env->prog->aux)) {
- ret = bpf_prog_offload_verifier_prep(env->prog);
- if (ret)
- goto skip_full_check;
- }
-
env->explored_states = kvcalloc(state_htab_size(env),
sizeof(struct bpf_verifier_state_list *),
GFP_USER);
@@ -13401,6 +13395,12 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr,
if (ret < 0)
goto skip_full_check;
+ if (bpf_prog_is_dev_bound(env->prog->aux)) {
+ ret = bpf_prog_offload_verifier_prep(env->prog);
+ if (ret)
+ goto skip_full_check;
+ }
+
ret = check_cfg(env);
if (ret < 0)
goto skip_full_check;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf] bpf: offload: reorder offload callback 'prepare' in verifier
2021-05-20 8:58 [PATCH bpf] bpf: offload: reorder offload callback 'prepare' in verifier Simon Horman
@ 2021-05-20 20:19 ` Song Liu
2021-05-20 22:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Song Liu @ 2021-05-20 20:19 UTC (permalink / raw)
To: Simon Horman
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Networking,
bpf, oss-drivers, Yinjun Zhang
On Thu, May 20, 2021 at 2:01 AM Simon Horman <simon.horman@netronome.com> wrote:
>
> From: Yinjun Zhang <yinjun.zhang@corigine.com>
>
> Commit 4976b718c355 ("bpf: Introduce pseudo_btf_id") switched the
> order of resolve_pseudo_ldimm(), in which some pseudo instructions
> are rewritten. Thus those rewritten instructions cannot be passed
> to driver via 'prepare' offload callback.
>
> Reorder the 'prepare' offload callback to fix it.
>
> Fixes: 4976b718c355 ("bpf: Introduce pseudo_btf_id")
> Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
> Signed-off-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Song Liu <songliubraving@fb.com>
> ---
> kernel/bpf/verifier.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index c58598ef4b5b..09849e43f035 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -13368,12 +13368,6 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr,
> if (is_priv)
> env->test_state_freq = attr->prog_flags & BPF_F_TEST_STATE_FREQ;
>
> - if (bpf_prog_is_dev_bound(env->prog->aux)) {
> - ret = bpf_prog_offload_verifier_prep(env->prog);
> - if (ret)
> - goto skip_full_check;
> - }
> -
> env->explored_states = kvcalloc(state_htab_size(env),
> sizeof(struct bpf_verifier_state_list *),
> GFP_USER);
> @@ -13401,6 +13395,12 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr,
> if (ret < 0)
> goto skip_full_check;
>
> + if (bpf_prog_is_dev_bound(env->prog->aux)) {
> + ret = bpf_prog_offload_verifier_prep(env->prog);
> + if (ret)
> + goto skip_full_check;
> + }
> +
> ret = check_cfg(env);
> if (ret < 0)
> goto skip_full_check;
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf] bpf: offload: reorder offload callback 'prepare' in verifier
2021-05-20 8:58 [PATCH bpf] bpf: offload: reorder offload callback 'prepare' in verifier Simon Horman
2021-05-20 20:19 ` Song Liu
@ 2021-05-20 22:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-20 22:00 UTC (permalink / raw)
To: Simon Horman; +Cc: ast, daniel, andrii, netdev, bpf, oss-drivers, yinjun.zhang
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
On Thu, 20 May 2021 10:58:34 +0200 you wrote:
> From: Yinjun Zhang <yinjun.zhang@corigine.com>
>
> Commit 4976b718c355 ("bpf: Introduce pseudo_btf_id") switched the
> order of resolve_pseudo_ldimm(), in which some pseudo instructions
> are rewritten. Thus those rewritten instructions cannot be passed
> to driver via 'prepare' offload callback.
>
> [...]
Here is the summary with links:
- [bpf] bpf: offload: reorder offload callback 'prepare' in verifier
https://git.kernel.org/bpf/bpf/c/ceb11679d9fc
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-20 22:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-20 8:58 [PATCH bpf] bpf: offload: reorder offload callback 'prepare' in verifier Simon Horman
2021-05-20 20:19 ` Song Liu
2021-05-20 22:00 ` patchwork-bot+netdevbpf
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).