| Message ID | 20210826193922.66204-15-jolsa@kernel.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | x86/ftrace/bpf: Add batch support for direct/tracing attach | expand |
| Context | Check | Description |
|---|---|---|
| bpf/vmtest | fail | Kernel LATEST + selftests |
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | fail | Series longer than 15 patches |
| netdev/tree_selection | success | Clearly marked for bpf-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: kpsingh@kernel.org andrii@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 40 this patch: 40 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: From:/Signed-off-by: email address mismatch: 'From: Jiri Olsa <jolsa@redhat.com>' != 'Signed-off-by: Jiri Olsa <jolsa@kernel.org>' |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 40 this patch: 40 |
| netdev/header_inline | success | Link |
| bpf/vmtest-bpf-next | fail | Kernel LATEST + selftests |
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index e667d392cc33..537687664bdf 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2793,8 +2793,8 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, goto out_unlock; tr = bpf_trampoline_get(key, &tgt_info); - if (!tr) { - err = -ENOMEM; + if (IS_ERR(tr)) { + err = PTR_ERR(tr); goto out_unlock; } } else { diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c index 8aa0aca38b3a..c9794e9f24ee 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -97,8 +97,10 @@ static struct bpf_trampoline *bpf_trampoline_lookup(u64 key) goto out; } tr = kzalloc(sizeof(*tr), GFP_KERNEL); - if (!tr) + if (!tr) { + tr = ERR_PTR(-ENOMEM); goto out; + } bpf_trampoline_init(tr, key); head = &trampoline_table[hash_64(key, TRAMPOLINE_HASH_BITS)]; hlist_add_head(&tr->hlist, head); @@ -508,8 +510,8 @@ struct bpf_trampoline *bpf_trampoline_get(u64 key, struct bpf_trampoline *tr; tr = bpf_trampoline_lookup(key); - if (!tr) - return NULL; + if (IS_ERR(tr)) + return tr; mutex_lock(&tr->mutex); if (tr->func.addr) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index e9e84adfb974..ad410e1222e4 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -13642,8 +13642,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) key = bpf_trampoline_compute_key(tgt_prog, prog->aux->attach_btf, btf_id); tr = bpf_trampoline_get(key, &tgt_info); - if (!tr) - return -ENOMEM; + if (IS_ERR(tr)) + return PTR_ERR(tr); prog->aux->dst_trampoline = tr; return 0;
Changing bpf_trampoline_get to return error pointer, so we can return other than ENOMEM error in following changes. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- kernel/bpf/syscall.c | 4 ++-- kernel/bpf/trampoline.c | 8 +++++--- kernel/bpf/verifier.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-)