Commit 06ab6a50 authored by Lorenz Bauer's avatar Lorenz Bauer Committed by Alexei Starovoitov

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: default avatarLorenz Bauer <lmb@cloudflare.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210429134656.122225-3-lmb@cloudflare.com
parent c69431aa
...@@ -926,16 +926,13 @@ static int copy_verifier_state(struct bpf_verifier_state *dst_state, ...@@ -926,16 +926,13 @@ static int copy_verifier_state(struct bpf_verifier_state *dst_state,
const struct bpf_verifier_state *src) const struct bpf_verifier_state *src)
{ {
struct bpf_func_state *dst; struct bpf_func_state *dst;
u32 jmp_sz = sizeof(struct bpf_idx_pair) * src->jmp_history_cnt;
int i, err; int i, err;
if (dst_state->jmp_history_cnt < src->jmp_history_cnt) { dst_state->jmp_history = copy_array(dst_state->jmp_history, src->jmp_history,
kfree(dst_state->jmp_history); src->jmp_history_cnt, sizeof(struct bpf_idx_pair),
dst_state->jmp_history = kmalloc(jmp_sz, GFP_USER); GFP_USER);
if (!dst_state->jmp_history) if (!dst_state->jmp_history)
return -ENOMEM; return -ENOMEM;
}
memcpy(dst_state->jmp_history, src->jmp_history, jmp_sz);
dst_state->jmp_history_cnt = src->jmp_history_cnt; dst_state->jmp_history_cnt = src->jmp_history_cnt;
/* if dst has more stack frames then src frame, free them */ /* if dst has more stack frames then src frame, free them */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment