diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-11-03 14:59:55 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-11-03 14:59:55 -0800 |
| commit | 5dae7453ecb5b297fe3ab4edec97389bec436019 (patch) | |
| tree | eb9c861c37dc44482ec4611b8578d5157a33aaf7 /kernel/bpf/ringbuf.c | |
| parent | e6e10c51fb17e8d0b565921a077dd878fc80aa18 (diff) | |
| parent | 6146a0f1dfae5d37442a9ddcba012add260bceb0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc4
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/ringbuf.c')
| -rw-r--r-- | kernel/bpf/ringbuf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c index cbfa109e907e..f6a075ffac63 100644 --- a/kernel/bpf/ringbuf.c +++ b/kernel/bpf/ringbuf.c @@ -226,6 +226,8 @@ static struct bpf_map *ringbuf_map_alloc(union bpf_attr *attr) static void bpf_ringbuf_free(struct bpf_ringbuf *rb) { + irq_work_sync(&rb->work); + /* copy pages pointer and nr_pages to local variable, as we are going * to unmap rb itself with vunmap() below */ |