Skip to content

Commit 4ecaf7e

Browse files
committed
tracing: Have memmapped ring buffer use ioctl of "R" range 0x20-2F
To prevent conflicts with other ioctl numbers to allow strace to have an idea of what is happening, add the range of ioctls for the trace buffer mapping from _IO("T", 0x1) to the range of "R" 0x20 - 0x2F. Link: https://lore.kernel.org/linux-trace-kernel/20240630105322.GA17573@altlinux.org/ Link: https://lore.kernel.org/linux-trace-kernel/20240630213626.GA23566@altlinux.org/ Cc: Jonathan Corbet <corbet@lwn.net> Fixes: cf9f0f7 ("tracing: Allow user-space mapping of the ring-buffer") Link: https://lore.kernel.org/20240702153354.367861db@rorschach.local.home Reported-by: "Dmitry V. Levin" <ldv@strace.io> Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 22a40d1 commit 4ecaf7e

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ Code Seq# Include File Comments
186186
'Q' all linux/soundcard.h
187187
'R' 00-1F linux/random.h conflict!
188188
'R' 01 linux/rfkill.h conflict!
189+
'R' 20-2F linux/trace_mmap.h
189190
'R' C0-DF net/bluetooth/rfcomm.h
190191
'R' E0 uapi/linux/fsl_mc.h
191192
'S' all linux/cdrom.h conflict!

include/uapi/linux/trace_mmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ struct trace_buffer_meta {
4343
__u64 Reserved2;
4444
};
4545

46-
#define TRACE_MMAP_IOCTL_GET_READER _IO('T', 0x1)
46+
#define TRACE_MMAP_IOCTL_GET_READER _IO('R', 0x20)
4747

4848
#endif /* _TRACE_MMAP_H_ */

0 commit comments

Comments
 (0)