Skip to contentSkip to conversation

tracing: Have memmapped ring buffer use ioctl of "R" range 0x20-2F

PATCH In review Steven Rostedt 3 participants 4 messages Jul 2, 2024

Subsystems (2)
lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

PATCH 1/1 tracing: Have memmapped ring buffer use ioctl of "R" range 0x20-2F

From: "Steven Rostedt (Google)" <[email protected]>

To prevent conflicts with other ioctl numbers to allow strace to have an idea of what is happening, add the rang of ioctls for the trace buffer mapping from _IO("T", 0x1) to the range of "R" 0x20 - 0x2F.

---
 Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
 include/uapi/linux/trace_mmap.h                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Documentation/userspace-api/ioctl/ioctl-number.rst +1 -0
index a141e8e65c5d..9a97030c6c8d 100644
@@ -186,6 +186,7 @@ Code  Seq#    Include File                                           Comments
 'Q'   all    linux/soundcard.h
 'R'   00-1F  linux/random.h                                          conflict!
 'R'   01     linux/rfkill.h                                          conflict!
+'R'   20-2F  linux/trace_mmap.h
 'R'   C0-DF  net/bluetooth/rfcomm.h
 'R'   E0     uapi/linux/fsl_mc.h
 'S'   all    linux/cdrom.h                                           conflict!
include/uapi/linux/trace_mmap.h +1 -1
index bd1066754220..c102ef35d11e 100644
@@ -43,6 +43,6 @@ struct trace_buffer_meta {
 	__u64	Reserved2;
 };
 
-#define TRACE_MMAP_IOCTL_GET_READER		_IO('T', 0x1)
+#define TRACE_MMAP_IOCTL_GET_READER		_IO('R', 0x20)
 
 #endif /* _TRACE_MMAP_H_ */
Signature · 1 line
2.43.0
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Steven Rostedt

From: "Steven Rostedt (Google)" <[email protected]>

To prevent conflicts with other ioctl numbers to allow strace to have an idea of what is happening, add the rang of ioctls for the trace buffer mapping from _IO("T", 0x1) to the range of "R" 0x20 - 0x2F.

Quoted 29 lines
---
  Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
  include/uapi/linux/trace_mmap.h                    | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
Documentation/userspace-api/ioctl/ioctl-number.rst +1 -0
index a141e8e65c5d..9a97030c6c8d 100644
@@ -186,6 +186,7 @@ Code  Seq#    Include File                                           Comments
  'Q'   all    linux/soundcard.h
  'R'   00-1F  linux/random.h                                          conflict!
  'R'   01     linux/rfkill.h                                          conflict!
+'R'   20-2F  linux/trace_mmap.h
  'R'   C0-DF  net/bluetooth/rfcomm.h
  'R'   E0     uapi/linux/fsl_mc.h
  'S'   all    linux/cdrom.h                                           conflict!
include/uapi/linux/trace_mmap.h +1 -1
index bd1066754220..c102ef35d11e 100644
@@ -43,6 +43,6 @@ struct trace_buffer_meta {
  	__u64	Reserved2;
  };
 
-#define TRACE_MMAP_IOCTL_GET_READER		_IO('T', 0x1)
+#define TRACE_MMAP_IOCTL_GET_READER		_IO('R', 0x20)
 
  #endif /* _TRACE_MMAP_H_ */
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
https://www.efficios.com
author maintainer
#2 lore raw
Quoted 5 lines · On Tue, 2 Jul 2024 15:38:10 -0400 Mathieu Desnoyers…
Quoted 4 lines · Steven Rostedt

From: "Steven Rostedt (Google)" <[email protected]>

To prevent conflicts with other ioctl numbers to allow strace to have an idea of what is happening, add the rang of ioctls for the trace buffer

Hmm, someone "rang an ioctl" ;-)

I'll update the change log before pulling this in.

Quoted 8 lines
Quoted 6 lines

mapping from _IO("T", 0x1) to the range of "R" 0x20 - 0x2F.

Thanks,

-- Steve

maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Steven Rostedt
Quoted 10 lines · On Tue, 2 Jul 2024 15:33:54 -0400 Steven Rostedt <[email protected]> wrote:

From: "Steven Rostedt (Google)" <[email protected]>

To prevent conflicts with other ioctl numbers to allow strace to have an idea of what is happening, add the rang of ioctls for the trace buffer mapping from _IO("T", 0x1) to the range of "R" 0x20 - 0x2F.

Looks good to me.

Thanks,

Quoted 32 lines
---
 Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
 include/uapi/linux/trace_mmap.h                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Documentation/userspace-api/ioctl/ioctl-number.rst +1 -0
index a141e8e65c5d..9a97030c6c8d 100644
@@ -186,6 +186,7 @@ Code  Seq#    Include File                                           Comments
 'Q'   all    linux/soundcard.h
 'R'   00-1F  linux/random.h                                          conflict!
 'R'   01     linux/rfkill.h                                          conflict!
+'R'   20-2F  linux/trace_mmap.h
 'R'   C0-DF  net/bluetooth/rfcomm.h
 'R'   E0     uapi/linux/fsl_mc.h
 'S'   all    linux/cdrom.h                                           conflict!
include/uapi/linux/trace_mmap.h +1 -1
index bd1066754220..c102ef35d11e 100644
@@ -43,6 +43,6 @@ struct trace_buffer_meta {
 	__u64	Reserved2;
 };
 
-#define TRACE_MMAP_IOCTL_GET_READER		_IO('T', 0x1)
+#define TRACE_MMAP_IOCTL_GET_READER		_IO('R', 0x20)
 
 #endif /* _TRACE_MMAP_H_ */
Signature · 1 line
2.43.0
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>