diff options
| author | Dave Marchevsky <davemarchevsky@fb.com> | 2023-08-21 22:33:08 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2023-08-25 19:23:16 +0300 |
| commit | ba2464c86f182c6fdb69fe2f77a3d04c19a72357 (patch) | |
| tree | 4dc3981ac37deba804bac01c5e6469dbeb21384a /kernel/bpf | |
| parent | 7e26cd12ad1c8f3e55d32542c7e4708a9e6a3c02 (diff) | |
| download | linux-ba2464c86f182c6fdb69fe2f77a3d04c19a72357.tar.xz | |
bpf: Reenable bpf_refcount_acquire
Now that all reported issues are fixed, bpf_refcount_acquire can be
turned back on. Also reenable all bpf_refcount-related tests which were
disabled.
This a revert of:
* commit f3514a5d6740 ("selftests/bpf: Disable newly-added 'owner' field test until refcount re-enabled")
* commit 7deca5eae833 ("bpf: Disable bpf_refcount_acquire kfunc calls until race conditions are fixed")
Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20230821193311.3290257-5-davemarchevsky@fb.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/verifier.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 5a610896202a..b875f511c3b7 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -11217,10 +11217,7 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ verbose(env, "arg#%d doesn't point to a type with bpf_refcount field\n", i); return -EINVAL; } - if (rec->refcount_off >= 0) { - verbose(env, "bpf_refcount_acquire calls are disabled for now\n"); - return -EINVAL; - } + meta->arg_btf = reg->btf; meta->arg_btf_id = reg->btf_id; break; |