lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 269/296] bpf, offload: Reorder offload callback prepare in verifier
    Date
    From: Yinjun Zhang <yinjun.zhang@corigine.com>

    [ Upstream commit ceb11679d9fcf3fdb358a310a38760fcbe9b63ed ]

    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>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: Song Liu <songliubraving@fb.com>
    Link: https://lore.kernel.org/bpf/20210520085834.15023-1-simon.horman@netronome.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 21247e49fe82..b186d852fe3d 100644
    --- a/kernel/bpf/verifier.c
    +++ b/kernel/bpf/verifier.c
    @@ -12714,12 +12714,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);
    @@ -12743,6 +12737,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.30.2


    \
     
     \ /
      Last update: 2021-05-31 18:49    [W:4.032 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site