diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-11-14 17:43:41 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-11-14 17:43:41 -0800 |
| commit | e47b68bda4de6a848a8b6c79316542326a8fb3ca (patch) | |
| tree | bb1300a3177f5c92e2698fab42178f160f41316e /kernel/trace/ring_buffer.c | |
| parent | ef2c0b2e56ad710a2b5a85b678a6c685756e03a4 (diff) | |
| parent | 7a0892d2836e12cc61b6823f888629a3eb64e268 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+
Cross-merge BPF and other fixes after downstream PR.
Minor conflict in kernel/bpf/helpers.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1244d2c5c384..afcd3747264d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -7344,6 +7344,10 @@ consume: goto out; } + /* Did the reader catch up with the writer? */ + if (cpu_buffer->reader_page == cpu_buffer->commit_page) + goto out; + reader = rb_get_reader_page(cpu_buffer); if (WARN_ON(!reader)) goto out; |