Skip to content

ring-buffer: atomic: ring-buffer: Fix infinite recursion on some 32bit archs

Steven Rostedt lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2ring-buffer: Do not allow events in NMI with generic atomic64 cmpxchg()kernel/trace/ring_buffer.c+7 -20 replies
2/2atomic64: Use arch_spin_locks instead of raw_spin_lockslib/atomic64.c+48 -304 replies

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchMasami Hiramatsu (Google)
1/2R-b
2/2R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [for-next][PATCH 0/2] ring-buffer: atomic: ring-buffer: Fix infinite recursion on some 32bit archs

It was reported[1] that the tracing ring buffer code would cause an infinite recursion and crash on risc32 and sparc32 architectures. The reason is that they use the generic atomic64 operations which call raw_spin_locks. As raw_spin_locks can be traced this would cause an infinite recursion, because the atomic64 operations call raw_spin_locks. Instead, the generic atomic64 operations should be calling arch_spin_locks as this is architecture specific implementation and the locks that are taken should never have any other locks taken while they are held, and are always taking with interrupts disabled. This means they do not need to be tested by lockdep either.

Another issue was that locks should not be taken in NMI context and the ring buffer can be called in NMI. If the arch uses the generic atomic64 operations, do not allow events to be recorded in NMI as the atomic64 operations are not safe in NMI context.

[1] https://lore.kernel.org/all/[email protected]/

git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
ring-buffer/for-next

Head SHA1: b71b3c12081866affb87c641019473cdee8a8f8c

Steven Rostedt (2):
ring-buffer: Do not allow events in NMI with generic atomic64 cmpxchg()
atomic64: Use arch_spin_locks instead of raw_spin_locks

----

 kernel/trace/ring_buffer.c |  9 ++++--
 lib/atomic64.c             | 78 ++++++++++++++++++++++++++++------------------
 2 files changed, 55 insertions(+), 32 deletions(-)