Commit a80672d7 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann

bpf: Simplify code of destroy_mem_alloc() with kmemdup().

Use kmemdup() to simplify the code.
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarHou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/bpf/20230706033447.54696-3-alexei.starovoitov@gmail.com
parent 12c8d0f4
...@@ -499,7 +499,7 @@ static void destroy_mem_alloc(struct bpf_mem_alloc *ma, int rcu_in_progress) ...@@ -499,7 +499,7 @@ static void destroy_mem_alloc(struct bpf_mem_alloc *ma, int rcu_in_progress)
return; return;
} }
copy = kmalloc(sizeof(*ma), GFP_KERNEL); copy = kmemdup(ma, sizeof(*ma), GFP_KERNEL);
if (!copy) { if (!copy) {
/* Slow path with inline barrier-s */ /* Slow path with inline barrier-s */
free_mem_alloc(ma); free_mem_alloc(ma);
...@@ -507,10 +507,7 @@ static void destroy_mem_alloc(struct bpf_mem_alloc *ma, int rcu_in_progress) ...@@ -507,10 +507,7 @@ static void destroy_mem_alloc(struct bpf_mem_alloc *ma, int rcu_in_progress)
} }
/* Defer barriers into worker to let the rest of map memory to be freed */ /* Defer barriers into worker to let the rest of map memory to be freed */
copy->cache = ma->cache; memset(ma, 0, sizeof(*ma));
ma->cache = NULL;
copy->caches = ma->caches;
ma->caches = NULL;
INIT_WORK(&copy->work, free_mem_alloc_deferred); INIT_WORK(&copy->work, free_mem_alloc_deferred);
queue_work(system_unbound_wq, &copy->work); queue_work(system_unbound_wq, &copy->work);
} }
......
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