Skip to content

Commit 640a604

Browse files
Hou TaoMartin KaFai Lau
authored andcommitted
bpf, cpumap: Make sure kthread is running before map update returns
The following warning was reported when running stress-mode enabled xdp_redirect_cpu with some RT threads: ------------[ cut here ]------------ WARNING: CPU: 4 PID: 65 at kernel/bpf/cpumap.c:135 CPU: 4 PID: 65 Comm: kworker/4:1 Not tainted 6.5.0-rc2+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Workqueue: events cpu_map_kthread_stop RIP: 0010:put_cpu_map_entry+0xda/0x220 ...... Call Trace: <TASK> ? show_regs+0x65/0x70 ? __warn+0xa5/0x240 ...... ? put_cpu_map_entry+0xda/0x220 cpu_map_kthread_stop+0x41/0x60 process_one_work+0x6b0/0xb80 worker_thread+0x96/0x720 kthread+0x1a5/0x1f0 ret_from_fork+0x3a/0x70 ret_from_fork_asm+0x1b/0x30 </TASK> The root cause is the same as commit 4369016 ("bpf: cpumap: Fix memory leak in cpu_map_update_elem"). The kthread is stopped prematurely by kthread_stop() in cpu_map_kthread_stop(), and kthread() doesn't call cpu_map_kthread_run() at all but XDP program has already queued some frames or skbs into ptr_ring. So when __cpu_map_ring_cleanup() checks the ptr_ring, it will find it was not emptied and report a warning. An alternative fix is to use __cpu_map_ring_cleanup() to drop these pending frames or skbs when kthread_stop() returns -EINTR, but it may confuse the user, because these frames or skbs have been handled correctly by XDP program. So instead of dropping these frames or skbs, just make sure the per-cpu kthread is running before __cpu_map_entry_alloc() returns. After apply the fix, the error handle for kthread_stop() will be unnecessary because it will always return 0, so just remove it. Fixes: 6710e11 ("bpf: introduce new bpf cpu map type BPF_MAP_TYPE_CPUMAP") Signed-off-by: Hou Tao <houtao1@huawei.com> Reviewed-by: Pu Lehui <pulehui@huawei.com> Acked-by: Jesper Dangaard Brouer <hawk@kernel.org> Link: https://lore.kernel.org/r/20230729095107.1722450-2-houtao@huaweicloud.com Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
1 parent bcc29b7 commit 640a604

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

kernel/bpf/cpumap.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/sched.h>
2929
#include <linux/workqueue.h>
3030
#include <linux/kthread.h>
31+
#include <linux/completion.h>
3132
#include <trace/events/xdp.h>
3233
#include <linux/btf_ids.h>
3334

@@ -73,6 +74,7 @@ struct bpf_cpu_map_entry {
7374
struct rcu_head rcu;
7475

7576
struct work_struct kthread_stop_wq;
77+
struct completion kthread_running;
7678
};
7779

7880
struct bpf_cpu_map {
@@ -153,7 +155,6 @@ static void put_cpu_map_entry(struct bpf_cpu_map_entry *rcpu)
153155
static void cpu_map_kthread_stop(struct work_struct *work)
154156
{
155157
struct bpf_cpu_map_entry *rcpu;
156-
int err;
157158

158159
rcpu = container_of(work, struct bpf_cpu_map_entry, kthread_stop_wq);
159160

@@ -163,14 +164,7 @@ static void cpu_map_kthread_stop(struct work_struct *work)
163164
rcu_barrier();
164165

165166
/* kthread_stop will wake_up_process and wait for it to complete */
166-
err = kthread_stop(rcpu->kthread);
167-
if (err) {
168-
/* kthread_stop may be called before cpu_map_kthread_run
169-
* is executed, so we need to release the memory related
170-
* to rcpu.
171-
*/
172-
put_cpu_map_entry(rcpu);
173-
}
167+
kthread_stop(rcpu->kthread);
174168
}
175169

176170
static void cpu_map_bpf_prog_run_skb(struct bpf_cpu_map_entry *rcpu,
@@ -298,11 +292,11 @@ static int cpu_map_bpf_prog_run(struct bpf_cpu_map_entry *rcpu, void **frames,
298292
return nframes;
299293
}
300294

301-
302295
static int cpu_map_kthread_run(void *data)
303296
{
304297
struct bpf_cpu_map_entry *rcpu = data;
305298

299+
complete(&rcpu->kthread_running);
306300
set_current_state(TASK_INTERRUPTIBLE);
307301

308302
/* When kthread gives stop order, then rcpu have been disconnected
@@ -467,6 +461,7 @@ __cpu_map_entry_alloc(struct bpf_map *map, struct bpf_cpumap_val *value,
467461
goto free_ptr_ring;
468462

469463
/* Setup kthread */
464+
init_completion(&rcpu->kthread_running);
470465
rcpu->kthread = kthread_create_on_node(cpu_map_kthread_run, rcpu, numa,
471466
"cpumap/%d/map:%d", cpu,
472467
map->id);
@@ -480,6 +475,12 @@ __cpu_map_entry_alloc(struct bpf_map *map, struct bpf_cpumap_val *value,
480475
kthread_bind(rcpu->kthread, cpu);
481476
wake_up_process(rcpu->kthread);
482477

478+
/* Make sure kthread has been running, so kthread_stop() will not
479+
* stop the kthread prematurely and all pending frames or skbs
480+
* will be handled by the kthread before kthread_stop() returns.
481+
*/
482+
wait_for_completion(&rcpu->kthread_running);
483+
483484
return rcpu;
484485

485486
free_prog:

0 commit comments

Comments
 (0)