diff options
| author |   Lorenz Bauer <lmb@cloudflare.com> | 2021-04-29 14:46:55 +0100 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2021-05-10 16:13:01 -0700 |
| commit | 06ab6a505583f9adbf5e1f05d86e7bdd7b02248e (patch) | |
| tree | 44f46a9ff657380f4be4747eccdee3998cde54a6 /kernel/bpf | |
| parent | bpf: verifier: Improve function state reallocation (diff) | |
| download | linux-dev-06ab6a505583f9adbf5e1f05d86e7bdd7b02248e.tar.xz linux-dev-06ab6a505583f9adbf5e1f05d86e7bdd7b02248e.zip | |
bpf: verifier: Use copy_array for jmp_history
Eliminate a couple needless kfree / kmalloc cycles by using
copy_array for jmp_history.
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210429134656.122225-3-lmb@cloudflare.com
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/verifier.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index a31afd04fa5d..380c8ad49b7f 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -926,16 +926,13 @@ static int copy_verifier_state(struct bpf_verifier_state *dst_state, const struct bpf_verifier_state *src) { struct bpf_func_state *dst; - u32 jmp_sz = sizeof(struct bpf_idx_pair) * src->jmp_history_cnt; int i, err; - if (dst_state->jmp_history_cnt < src->jmp_history_cnt) { - kfree(dst_state->jmp_history); - dst_state->jmp_history = kmalloc(jmp_sz, GFP_USER); - if (!dst_state->jmp_history) - return -ENOMEM; - } - memcpy(dst_state->jmp_history, src->jmp_history, jmp_sz); + dst_state->jmp_history = copy_array(dst_state->jmp_history, src->jmp_history, + src->jmp_history_cnt, sizeof(struct bpf_idx_pair), + GFP_USER); + if (!dst_state->jmp_history) + return -ENOMEM; dst_state->jmp_history_cnt = src->jmp_history_cnt; /* if dst has more stack frames then src frame, free them */ |