Skip to contentSkip to conversation

btf: Some structs are doubled because of struct ring_buffer

RFC Jiri Olsa 4 participants 16 messages Dec 13, 2019 – Dec 18, 2019

Subsystems (9)
lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

hi,
the current BTF vmlinux file have some of the structs doubled:

  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep task_struct
  [150] STRUCT 'task_struct' size=11008 vlen=205
  [12262] STRUCT 'task_struct' size=11008 vlen=205
  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep "STRUCT 'perf_event'"
  [1666] STRUCT 'perf_event' size=1160 vlen=70
  [12301] STRUCT 'perf_event' size=1160 vlen=70

The reason seems to be that we have two distinct 'struct ring_buffer' objects used in kernel: one in perf subsystem and one in kernel trace subsystem.

When we compile kernel/trace/ring_buffer.c we have 'struct task_struct', which references 'struct ring_buffer', which is at that compile time defined in kernel/trace/ring_buffer.c.

While when we compile kernel/events/core.c we have 'struct task_struct', which references ring buffer, which is at that compile time defined in kernel/events/internal.h.

So we end up with 2 different 'struct task_struct' objects, and few other objects which are on the way to the 'struct ring_buffer' field, like:

	[1666] STRUCT 'perf_event' size=1160 vlen=70
		...
		'rb' type_id=2289 bits_offset=5632
		...

		[2289] PTR '(anon)' type_id=10872

			-> trace ring buffer

			[10872] STRUCT 'ring_buffer' size=184 vlen=12
				'flags' type_id=10 bits_offset=0
				'cpus' type_id=22 bits_offset=32
				'record_disabled' type_id=81 bits_offset=64
				...

	[12301] STRUCT 'perf_event' size=1160 vlen=70
		...
		'rb' type_id=13148 bits_offset=5632
		...

		[13148] PTR '(anon)' type_id=13147

			-> perf ring buffer

			[13147] STRUCT 'ring_buffer' size=240 vlen=33
				'refcount' type_id=795 bits_offset=0
				'callback_head' type_id=90 bits_offset=64
				'nr_pages' type_id=22 bits_offset=192
				'overwrite' type_id=22 bits_offset=224
				'paused' type_id=22 bits_offset=256
				...

I don't think dedup algorithm can handle this and I'm not sure if there's some way in pahole to detect/prevent this.

I only found that if I rename the ring_buffer objects to have distinct names, it will help:

  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep task_struct
  [150] STRUCT 'task_struct' size=11008 vlen=205
  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep "STRUCT 'perf_event'"
  [1665] STRUCT 'perf_event' size=1160 vlen=70

also the BTF data get smaller ;-) before:

  $ ll /sys/kernel/btf/vmlinux
  -r--r--r--. 1 root root 2067432 Dec 13 22:56 /sys/kernel/btf/vmlinux

after:

  $ ll /sys/kernel/btf/vmlinux
  -r--r--r--. 1 root root 1984345 Dec 13 23:02 /sys/kernel/btf/vmlinux

Peter, Steven,
if above is correct and there's no other better solution, would it be possible to straighten up the namespace and user some distinct names for perf and ftrace ring buffers?

thoughts?
jirka

maintainer
#1 lore raw
Quoted 18 lines · On Fri, 13 Dec 2019 16:35:53 +0100 Jiri Olsa <[email protected]> wrote:

I don't think dedup algorithm can handle this and I'm not sure if there's some way in pahole to detect/prevent this.

I only found that if I rename the ring_buffer objects to have distinct names, it will help:

  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep task_struct
  [150] STRUCT 'task_struct' size=11008 vlen=205
  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep "STRUCT 'perf_event'"
  [1665] STRUCT 'perf_event' size=1160 vlen=70

also the BTF data get smaller ;-) before:

  $ ll /sys/kernel/btf/vmlinux
  -r--r--r--. 1 root root 2067432 Dec 13 22:56 /sys/kernel/btf/vmlinux

after:

Quoted 8 lines
  $ ll /sys/kernel/btf/vmlinux
  -r--r--r--. 1 root root 1984345 Dec 13 23:02 /sys/kernel/btf/vmlinux

Peter, Steven,
if above is correct and there's no other better solution, would it be possible to straighten up the namespace and user some distinct names for perf and ftrace ring buffers?

Now, the ring buffer that ftrace uses is not specific for ftrace or even tracing for that matter. It is a stand alone ring buffer (oprofile uses it), and can be used by anyone else.

As the perf ring buffer is very coupled with perf (or perf events), and unless something changed, I was never able to pull the perf ring buffer out as a stand alone ring buffer.

As the ring buffer in the tracing directory is more generic, and not to mention around longer, if one is to change the name, I would suggest it be the perf ring buffer.

-- Steve

#2 lore raw
Quoted 34 lines · Steven Rostedt
Quoted 18 lines · On Fri, 13 Dec 2019 16:35:53 +0100 Jiri Olsa <[email protected]> wrote:

I don't think dedup algorithm can handle this and I'm not sure if there's some way in pahole to detect/prevent this.

I only found that if I rename the ring_buffer objects to have distinct names, it will help:

  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep task_struct
  [150] STRUCT 'task_struct' size=11008 vlen=205
  $ bpftool btf dump file /sys/kernel/btf/vmlinux | grep "STRUCT 'perf_event'"
  [1665] STRUCT 'perf_event' size=1160 vlen=70

also the BTF data get smaller ;-) before:

  $ ll /sys/kernel/btf/vmlinux
  -r--r--r--. 1 root root 2067432 Dec 13 22:56 /sys/kernel/btf/vmlinux

after:

Quoted 8 lines
  $ ll /sys/kernel/btf/vmlinux
  -r--r--r--. 1 root root 1984345 Dec 13 23:02 /sys/kernel/btf/vmlinux

Peter, Steven,
if above is correct and there's no other better solution, would it be possible to straighten up the namespace and user some distinct names for perf and ftrace ring buffers?

Now, the ring buffer that ftrace uses is not specific for ftrace or even tracing for that matter. It is a stand alone ring buffer (oprofile uses it), and can be used by anyone else.

Quoted 7 lines

As the perf ring buffer is very coupled with perf (or perf events), and unless something changed, I was never able to pull the perf ring buffer out as a stand alone ring buffer.

As the ring buffer in the tracing directory is more generic, and not to mention around longer, if one is to change the name, I would suggest it be the perf ring buffer.

Thanks Jiri to bring it up.
Technically the kernel is written in valid C, but it's imo the case where C standard isn't doing that great.

To rephrase what Jiri said...
If include/linux/perf_event.h instead of saying 'struct ring_buffer;' would have done #include <kernel/events/internal.h>
the kernel/trace/ring_buffer.c would have had build error.
Even now sizeof(*perf_event->rb) would return different values depending whether it's used in kernel/trace/ring_buffer.c or anywhere in kernel/events/. dwarf/btf and gcc cannot deal with it nicely. It's a valid C.

'gdb vmlinux' for sizeof(struct ring_buffer) will pick perf ring buffer. It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

maintainer
#3 lore raw
Quoted 4 lines · On Fri, 13 Dec 2019 08:51:57 -0800 Alexei Starovoitov…

It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

Because of the sort algorithm. But from a technical perspective, the ring buffer that ftrace uses is generic, where the perf ring buffer can only be used for perf. Call it "event_ring_buffer" or whatever, but it's not generic and should not have a generic name.

-- Steve

#4 lore raw
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · On Fri, 13 Dec 2019 08:51:57 -0800 Alexei Starovoitov…

It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

Quoted 4 lines

Because of the sort algorithm. But from a technical perspective, the ring buffer that ftrace uses is generic, where the perf ring buffer can only be used for perf. Call it "event_ring_buffer" or whatever, but it's not generic and should not have a generic name.

I don't mind whichever way. Just saying it would be good to rename :)

author
#5 lore raw
Quoted 9 lines · Alexei Starovoitov
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · On Fri, 13 Dec 2019 08:51:57 -0800 Alexei Starovoitov…

It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

Quoted 7 lines
Quoted 4 lines

Because of the sort algorithm. But from a technical perspective, the ring buffer that ftrace uses is generic, where the perf ring buffer can only be used for perf. Call it "event_ring_buffer" or whatever, but it's not generic and should not have a generic name.

I don't mind whichever way. Just saying it would be good to rename :)

Peter,
any chance we could use the 'struct perf_buffer' for perf?

thanks,
jirka

maintainer
#6 lore raw
In reply to Steven Rostedt
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · On Fri, 13 Dec 2019 08:51:57 -0800 Alexei Starovoitov…

It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

Quoted 4 lines

Because of the sort algorithm. But from a technical perspective, the ring buffer that ftrace uses is generic, where the perf ring buffer can only be used for perf. Call it "event_ring_buffer" or whatever, but it's not generic and should not have a generic name.

Your ring buffer was so generic that I gave up trying to use it after trying for days :-( (the fundamental problem was that it was impossible to have a single cpu buffer; afaik that is still true today)

Nor is the perf buffer fundamentally specific to perf, but there not being another user means there has been very little effort to remove perf specific things from it.

There are major design differences between them, which is unquestionably, but I don't think it is fair to say one is more or less generic.

How about we rename both? I'm a bit adverse to long names, so how about we rename the perf one to perf_buffer and the trace one to trace_buffer?

maintainer
#7 lore raw
Quoted 9 lines · On Fri, 13 Dec 2019 19:02:23 +0100 Peter Zijlstra <[email protected]> wrote:
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · On Fri, 13 Dec 2019 08:51:57 -0800 Alexei Starovoitov…

It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

Quoted 8 lines
Quoted 4 lines

Because of the sort algorithm. But from a technical perspective, the ring buffer that ftrace uses is generic, where the perf ring buffer can only be used for perf. Call it "event_ring_buffer" or whatever, but it's not generic and should not have a generic name.

Your ring buffer was so generic that I gave up trying to use it after trying for days :-( (the fundamental problem was that it was impossible to have a single cpu buffer; afaik that is still true today)

Yeah, but that could have been fixed, and the only reason it's not today, is because it requires more overhead to do so.

IIRC, the main reason that you didn't use it then, is because it wasn't fully lockless at the time (it is today), and you couldn't use it from NMI context.

Quoted 4 lines

Nor is the perf buffer fundamentally specific to perf, but there not being another user means there has been very little effort to remove perf specific things from it.

I took a look at doing so, and it was not a trivial task.

Quoted 7 lines

There are major design differences between them, which is unquestionably, but I don't think it is fair to say one is more or less generic.

How about we rename both? I'm a bit adverse to long names, so how about we rename the perf one to perf_buffer and the trace one to trace_buffer?

I'm fine with this idea! Now what do we call the ring buffer that tracing uses, as it is not specific for tracing, it was optimized for splicing. But sure, I can rename it to trace_buffer. I just finished renaming perf's...

Thinking about this, perhaps we should remove the word "ring" from both. That is:

perf_buffer and trace_buffer ?

Anyway, here's the perf update, I can go ahead and rewrite the tracing one too, and perhaps one day we can make a truly generic ring buffer!

-- Steve

From b457e9fe8366eef0ba00937e2a9a21899ca06e06 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
Date: Fri, 13 Dec 2019 13:21:30 -0500
Subject: [PATCH] perf: Make struct ring_buffer less ambiguous

eBPF requires needing to know the size of the perf ring buffer structure. But it unfortunately has the same name as the generic ring buffer used by tracing and oprofile. To make it less ambiguous, rename the perf ring buffer structure to "perf_ring_buffer".

Now the reason to rename the ring buffer in perf and not the one used by tracing and oprofile, is for the following reasons:

1) The perf ring buffer is very coupled to perf.
The ring buffer assumes that it is used for perf, and perf alone. It requires to be read by perf mmapping, and reqires the perf interface
to read it.

The ring buffer used by tracing is stand a lone, and has no references to tracing. This is why oprofile was able to use it as well.

2) The perf ring buffer is quite contained.
It is only used within the kernel/events directory. Only four files reference it, and only three require to know its
contant (include/linux/perf_event.h just declares the reference)

3) The perf ring buffer came after the generic ring buffer. When this ring buffer was added, it appeared that it was only going to be local as it used the same name as one that already existed.

The main reason to rename the perf ring buffer is because of #1 above. It is not a generic ring buffer at all, and other parts of the ring buffer code has "perf_" as the prefix, it only makes sense to give the ring buffer the "perf_" prefix as well.

---
 include/linux/perf_event.h  |  6 ++---
 kernel/events/core.c        | 42 ++++++++++++++---------------
 kernel/events/internal.h    | 34 +++++++++++------------
 kernel/events/ring_buffer.c | 54 ++++++++++++++++++-------------------
 4 files changed, 68 insertions(+), 68 deletions(-)
include/linux/perf_event.h +3 -3
index 6d4c22aee384..b9adf826c393 100644
@@ -582,7 +582,7 @@ struct swevent_hlist {
 #define PERF_ATTACH_ITRACE	0x10
 
 struct perf_cgroup;
-struct ring_buffer;
+struct perf_ring_buffer;
 
 struct pmu_event_list {
 	raw_spinlock_t		lock;
@@ -694,7 +694,7 @@ struct perf_event {
 	struct mutex			mmap_mutex;
 	atomic_t			mmap_count;
 
-	struct ring_buffer		*rb;
+	struct perf_ring_buffer		*rb;
 	struct list_head		rb_entry;
 	unsigned long			rcu_batches;
 	int				rcu_pending;
@@ -854,7 +854,7 @@ struct perf_cpu_context {
 
 struct perf_output_handle {
 	struct perf_event		*event;
-	struct ring_buffer		*rb;
+	struct perf_ring_buffer		*rb;
 	unsigned long			wakeup;
 	unsigned long			size;
 	u64				aux_flags;
kernel/events/core.c +21 -21

160 lines not on this page · raw message

kernel/events/internal.h +17 -17
index 747d67f130cb..820edf227747 100644
@@ -10,7 +10,7 @@
 
 #define RING_BUFFER_WRITABLE		0x01
 
-struct ring_buffer {
+struct perf_ring_buffer {
 	refcount_t			refcount;
 	struct rcu_head			rcu_head;
 #ifdef CONFIG_PERF_USE_VMALLOC
@@ -58,17 +58,17 @@ struct ring_buffer {
 	void				*data_pages[0];
 };
 
-extern void rb_free(struct ring_buffer *rb);
+extern void rb_free(struct perf_ring_buffer *rb);
 
 static inline void rb_free_rcu(struct rcu_head *rcu_head)
 {
-	struct ring_buffer *rb;
+	struct perf_ring_buffer *rb;
 
-	rb = container_of(rcu_head, struct ring_buffer, rcu_head);
+	rb = container_of(rcu_head, struct perf_ring_buffer, rcu_head);
 	rb_free(rb);
 }
 
-static inline void rb_toggle_paused(struct ring_buffer *rb, bool pause)
+static inline void rb_toggle_paused(struct perf_ring_buffer *rb, bool pause)
 {
 	if (!pause && rb->nr_pages)
 		rb->paused = 0;
@@ -76,16 +76,16 @@ static inline void rb_toggle_paused(struct ring_buffer *rb, bool pause)
 		rb->paused = 1;
 }
 
-extern struct ring_buffer *
+extern struct perf_ring_buffer *
 rb_alloc(int nr_pages, long watermark, int cpu, int flags);
 extern void perf_event_wakeup(struct perf_event *event);
-extern int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
+extern int rb_alloc_aux(struct perf_ring_buffer *rb, struct perf_event *event,
 			pgoff_t pgoff, int nr_pages, long watermark, int flags);
-extern void rb_free_aux(struct ring_buffer *rb);
-extern struct ring_buffer *ring_buffer_get(struct perf_event *event);
-extern void ring_buffer_put(struct ring_buffer *rb);
+extern void rb_free_aux(struct perf_ring_buffer *rb);
+extern struct perf_ring_buffer *ring_buffer_get(struct perf_event *event);
+extern void ring_buffer_put(struct perf_ring_buffer *rb);
 
-static inline bool rb_has_aux(struct ring_buffer *rb)
+static inline bool rb_has_aux(struct perf_ring_buffer *rb)
 {
 	return !!rb->aux_nr_pages;
 }
@@ -94,7 +94,7 @@ void perf_event_aux_event(struct perf_event *event, unsigned long head,
 			  unsigned long size, u64 flags);
 
 extern struct page *
-perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff);
+perf_mmap_to_page(struct perf_ring_buffer *rb, unsigned long pgoff);
 
 #ifdef CONFIG_PERF_USE_VMALLOC
 /*
@@ -103,25 +103,25 @@ perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff);
  * Required for architectures that have d-cache aliasing issues.
  */
 
-static inline int page_order(struct ring_buffer *rb)
+static inline int page_order(struct perf_ring_buffer *rb)
 {
 	return rb->page_order;
 }
 
 #else
 
-static inline int page_order(struct ring_buffer *rb)
+static inline int page_order(struct perf_ring_buffer *rb)
 {
 	return 0;
 }
 #endif
 
-static inline unsigned long perf_data_size(struct ring_buffer *rb)
+static inline unsigned long perf_data_size(struct perf_ring_buffer *rb)
 {
 	return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
 }
 
-static inline unsigned long perf_aux_size(struct ring_buffer *rb)
+static inline unsigned long perf_aux_size(struct perf_ring_buffer *rb)
 {
 	return rb->aux_nr_pages << PAGE_SHIFT;
 }
@@ -141,7 +141,7 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
 			buf += written;					\
 		handle->size -= written;				\
 		if (!handle->size) {					\
-			struct ring_buffer *rb = handle->rb;		\
+			struct perf_ring_buffer *rb = handle->rb;	\
 									\
 			handle->page++;					\
 			handle->page &= rb->nr_pages - 1;		\
kernel/events/ring_buffer.c +27 -27

195 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#8 lore raw
Quoted 48 lines · Steven Rostedt
Quoted 9 lines · On Fri, 13 Dec 2019 19:02:23 +0100 Peter Zijlstra <[email protected]> wrote:
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · On Fri, 13 Dec 2019 08:51:57 -0800 Alexei Starovoitov…

It had two choices. Both valid. I don't know why gdb picked this one. So yeah I think renaming 'ring_buffer' either in ftrace or in perf would be good. I think renaming ftrace one would be better, since gdb picked perf one for whatever reason.

Quoted 8 lines
Quoted 4 lines

Because of the sort algorithm. But from a technical perspective, the ring buffer that ftrace uses is generic, where the perf ring buffer can only be used for perf. Call it "event_ring_buffer" or whatever, but it's not generic and should not have a generic name.

Your ring buffer was so generic that I gave up trying to use it after trying for days :-( (the fundamental problem was that it was impossible to have a single cpu buffer; afaik that is still true today)

Yeah, but that could have been fixed, and the only reason it's not today, is because it requires more overhead to do so.

IIRC, the main reason that you didn't use it then, is because it wasn't fully lockless at the time (it is today), and you couldn't use it from NMI context.

Quoted 4 lines

Nor is the perf buffer fundamentally specific to perf, but there not being another user means there has been very little effort to remove perf specific things from it.

I took a look at doing so, and it was not a trivial task.

Quoted 7 lines

There are major design differences between them, which is unquestionably, but I don't think it is fair to say one is more or less generic.

How about we rename both? I'm a bit adverse to long names, so how about we rename the perf one to perf_buffer and the trace one to trace_buffer?

I'm fine with this idea! Now what do we call the ring buffer that tracing uses, as it is not specific for tracing, it was optimized for splicing. But sure, I can rename it to trace_buffer. I just finished renaming perf's...

Quoted 4 lines

Thinking about this, perhaps we should remove the word "ring" from both. That is:

perf_buffer and trace_buffer ?

sounds good to me.. and too good to be true ;-) please let me know if I should send the perf change

thanks,
jirka

maintainer
#9 lore raw
Quoted 7 lines · On Fri, 13 Dec 2019 19:36:46 +0100 Jiri Olsa <[email protected]> wrote:
Quoted 4 lines

Thinking about this, perhaps we should remove the word "ring" from both. That is:

perf_buffer and trace_buffer ?

sounds good to me.. and too good to be true ;-) please let me know if I should send the perf change

Note, changing the other one is a lot more invasive. It's not as easy as I thought. I forgot that even blktrace uses it. And a lot of the trace event code is tied to the ring buffer code, as well as every tracer.

-- Steve

maintainer
#10 lore raw
In reply to Steven Rostedt
Quoted 7 lines · Steven Rostedt
Quoted 3 lines · On Fri, 13 Dec 2019 19:02:23 +0100 Peter Zijlstra <[email protected]> wrote:

Your ring buffer was so generic that I gave up trying to use it after trying for days :-( (the fundamental problem was that it was impossible to have a single cpu buffer; afaik that is still true today)

Quoted 6 lines

Yeah, but that could have been fixed, and the only reason it's not today, is because it requires more overhead to do so.

IIRC, the main reason that you didn't use it then, is because it wasn't fully lockless at the time (it is today), and you couldn't use it from NMI context.

What I remember is that I couldn't get a single cpu buffer, the whole per-cpu stuff was mangled in at the wrong layer. But who knows, my memory is faulty.

Quoted 8 lines
Quoted 2 lines

How about we rename both? I'm a bit adverse to long names, so how about we rename the perf one to perf_buffer and the trace one to trace_buffer?

I'm fine with this idea! Now what do we call the ring buffer that tracing uses, as it is not specific for tracing, it was optimized for splicing. But sure, I can rename it to trace_buffer. I just finished renaming perf's...

Quoted 4 lines

Thinking about this, perhaps we should remove the word "ring" from both. That is:

perf_buffer and trace_buffer ?

That's what I just proposed, right? So ACK on that ;-)

maintainer Acked-by Peter Zijlstra
#11 lore raw
Quoted 3 lines · On Fri, 13 Dec 2019 19:46:21 +0100 Peter Zijlstra <[email protected]> wrote:
Quoted 1 line

perf_buffer and trace_buffer ?

That's what I just proposed, right? So ACK on that ;-)

Anyway, here's v2, followed by the tracing one, which has the diffstat of:

 drivers/oprofile/cpu_buffer.c        |   2 +-
 include/linux/ring_buffer.h          | 110 ++++++++++++------------
 include/linux/trace_events.h         |   4 +-
 include/trace/trace_events.h         |   2 +-
 kernel/trace/blktrace.c              |   4 +-
 kernel/trace/ring_buffer.c           | 124 +++++++++++++--------------
 kernel/trace/ring_buffer_benchmark.c |   2 +-
 kernel/trace/trace.c                 |  70 +++++++--------
 kernel/trace/trace.h                 |  22 ++---
 kernel/trace/trace_branch.c          |   2 +-
 kernel/trace/trace_events.c          |   2 +-
 kernel/trace/trace_events_hist.c     |   2 +-
 kernel/trace/trace_functions_graph.c |   4 +-
 kernel/trace/trace_hwlat.c           |   2 +-
 kernel/trace/trace_kprobe.c          |   4 +-
 kernel/trace/trace_mmiotrace.c       |   4 +-
 kernel/trace/trace_sched_wakeup.c    |   4 +-
 kernel/trace/trace_syscalls.c        |   4 +-
 kernel/trace/trace_uprobe.c          |   2 +-
 19 files changed, 185 insertions(+), 185 deletions(-)

-- Steve

From d15abd76c3d39741fd53e7e5846b07001f3cd895 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
Date: Fri, 13 Dec 2019 13:21:30 -0500
Subject: [PATCH] perf: Make struct ring_buffer less ambiguous

eBPF requires needing to know the size of the perf ring buffer structure. But it unfortunately has the same name as the generic ring buffer used by tracing and oprofile. To make it less ambiguous, rename the perf ring buffer structure to "perf_buffer".

As other parts of the ring buffer code has "perf_" as the prefix, it only makes sense to give the ring buffer the "perf_" prefix as well.

---
 include/linux/perf_event.h  |  6 ++---
 kernel/events/core.c        | 42 ++++++++++++++---------------
 kernel/events/internal.h    | 34 +++++++++++------------
 kernel/events/ring_buffer.c | 54 ++++++++++++++++++-------------------
 4 files changed, 68 insertions(+), 68 deletions(-)
include/linux/perf_event.h +3 -3
index 6d4c22aee384..cf65763af0cb 100644
@@ -582,7 +582,7 @@ struct swevent_hlist {
 #define PERF_ATTACH_ITRACE	0x10
 
 struct perf_cgroup;
-struct ring_buffer;
+struct perf_buffer;
 
 struct pmu_event_list {
 	raw_spinlock_t		lock;
@@ -694,7 +694,7 @@ struct perf_event {
 	struct mutex			mmap_mutex;
 	atomic_t			mmap_count;
 
-	struct ring_buffer		*rb;
+	struct perf_buffer		*rb;
 	struct list_head		rb_entry;
 	unsigned long			rcu_batches;
 	int				rcu_pending;
@@ -854,7 +854,7 @@ struct perf_cpu_context {
 
 struct perf_output_handle {
 	struct perf_event		*event;
-	struct ring_buffer		*rb;
+	struct perf_buffer		*rb;
 	unsigned long			wakeup;
 	unsigned long			size;
 	u64				aux_flags;
kernel/events/core.c +21 -21

160 lines not on this page · raw message

kernel/events/internal.h +17 -17
index 747d67f130cb..f16f66b6b655 100644
@@ -10,7 +10,7 @@
 
 #define RING_BUFFER_WRITABLE		0x01
 
-struct ring_buffer {
+struct perf_buffer {
 	refcount_t			refcount;
 	struct rcu_head			rcu_head;
 #ifdef CONFIG_PERF_USE_VMALLOC
@@ -58,17 +58,17 @@ struct ring_buffer {
 	void				*data_pages[0];
 };
 
-extern void rb_free(struct ring_buffer *rb);
+extern void rb_free(struct perf_buffer *rb);
 
 static inline void rb_free_rcu(struct rcu_head *rcu_head)
 {
-	struct ring_buffer *rb;
+	struct perf_buffer *rb;
 
-	rb = container_of(rcu_head, struct ring_buffer, rcu_head);
+	rb = container_of(rcu_head, struct perf_buffer, rcu_head);
 	rb_free(rb);
 }
 
-static inline void rb_toggle_paused(struct ring_buffer *rb, bool pause)
+static inline void rb_toggle_paused(struct perf_buffer *rb, bool pause)
 {
 	if (!pause && rb->nr_pages)
 		rb->paused = 0;
@@ -76,16 +76,16 @@ static inline void rb_toggle_paused(struct ring_buffer *rb, bool pause)
 		rb->paused = 1;
 }
 
-extern struct ring_buffer *
+extern struct perf_buffer *
 rb_alloc(int nr_pages, long watermark, int cpu, int flags);
 extern void perf_event_wakeup(struct perf_event *event);
-extern int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
+extern int rb_alloc_aux(struct perf_buffer *rb, struct perf_event *event,
 			pgoff_t pgoff, int nr_pages, long watermark, int flags);
-extern void rb_free_aux(struct ring_buffer *rb);
-extern struct ring_buffer *ring_buffer_get(struct perf_event *event);
-extern void ring_buffer_put(struct ring_buffer *rb);
+extern void rb_free_aux(struct perf_buffer *rb);
+extern struct perf_buffer *ring_buffer_get(struct perf_event *event);
+extern void ring_buffer_put(struct perf_buffer *rb);
 
-static inline bool rb_has_aux(struct ring_buffer *rb)
+static inline bool rb_has_aux(struct perf_buffer *rb)
 {
 	return !!rb->aux_nr_pages;
 }
@@ -94,7 +94,7 @@ void perf_event_aux_event(struct perf_event *event, unsigned long head,
 			  unsigned long size, u64 flags);
 
 extern struct page *
-perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff);
+perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff);
 
 #ifdef CONFIG_PERF_USE_VMALLOC
 /*
@@ -103,25 +103,25 @@ perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff);
  * Required for architectures that have d-cache aliasing issues.
  */
 
-static inline int page_order(struct ring_buffer *rb)
+static inline int page_order(struct perf_buffer *rb)
 {
 	return rb->page_order;
 }
 
 #else
 
-static inline int page_order(struct ring_buffer *rb)
+static inline int page_order(struct perf_buffer *rb)
 {
 	return 0;
 }
 #endif
 
-static inline unsigned long perf_data_size(struct ring_buffer *rb)
+static inline unsigned long perf_data_size(struct perf_buffer *rb)
 {
 	return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
 }
 
-static inline unsigned long perf_aux_size(struct ring_buffer *rb)
+static inline unsigned long perf_aux_size(struct perf_buffer *rb)
 {
 	return rb->aux_nr_pages << PAGE_SHIFT;
 }
@@ -141,7 +141,7 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
 			buf += written;					\
 		handle->size -= written;				\
 		if (!handle->size) {					\
-			struct ring_buffer *rb = handle->rb;		\
+			struct perf_buffer *rb = handle->rb;	\
 									\
 			handle->page++;					\
 			handle->page &= rb->nr_pages - 1;		\
kernel/events/ring_buffer.c +27 -27

195 lines not on this page · raw message

Signature · 1 line
2.20.1
maintainer
#12 lore raw
Quoted 8 lines · On Fri, 13 Dec 2019 14:03:49 -0500 Steven Rostedt <[email protected]> wrote:
Quoted 3 lines · On Fri, 13 Dec 2019 19:46:21 +0100 Peter Zijlstra <[email protected]> wrote:
Quoted 1 line

perf_buffer and trace_buffer ?

That's what I just proposed, right? So ACK on that ;-)

Anyway, here's v2, followed by the tracing one,

And here's the one for tracing. If you want to take the first patch (I can send it again as a proper stand alone patch), then I'll take this one.

-- Steve

From 81bc7202413e3194f035562054c6947984010711 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
Date: Fri, 13 Dec 2019 13:58:57 -0500
Subject: [PATCH] tracing: Make struct ring_buffer less ambiguous

As there's two struct ring_buffers in the kernel, it causes some confusion. The other one being the perf ring buffer. It was agreed upon that as neither of the ring buffers are generic enough to be used globally, they should be renamed as:

perf's ring_buffer -> perf_buffer
ftrace's ring_buffer -> trace_buffer

This implements the changes to the ring buffer that ftrace uses.

---
 drivers/oprofile/cpu_buffer.c        |   2 +-
 include/linux/ring_buffer.h          | 110 ++++++++++++------------
 include/linux/trace_events.h         |   4 +-
 include/trace/trace_events.h         |   2 +-
 kernel/trace/blktrace.c              |   4 +-
 kernel/trace/ring_buffer.c           | 124 +++++++++++++--------------
 kernel/trace/ring_buffer_benchmark.c |   2 +-
 kernel/trace/trace.c                 |  70 +++++++--------
 kernel/trace/trace.h                 |  22 ++---
 kernel/trace/trace_branch.c          |   2 +-
 kernel/trace/trace_events.c          |   2 +-
 kernel/trace/trace_events_hist.c     |   2 +-
 kernel/trace/trace_functions_graph.c |   4 +-
 kernel/trace/trace_hwlat.c           |   2 +-
 kernel/trace/trace_kprobe.c          |   4 +-
 kernel/trace/trace_mmiotrace.c       |   4 +-
 kernel/trace/trace_sched_wakeup.c    |   4 +-
 kernel/trace/trace_syscalls.c        |   4 +-
 kernel/trace/trace_uprobe.c          |   2 +-
 19 files changed, 185 insertions(+), 185 deletions(-)
drivers/oprofile/cpu_buffer.c +1 -1
index eda2633a393d..9210a95cb4e6 100644
@@ -32,7 +32,7 @@
 
 #define OP_BUFFER_FLAGS	0
 
-static struct ring_buffer *op_ring_buffer;
+static struct trace_buffer *op_ring_buffer;
 DEFINE_PER_CPU(struct oprofile_cpu_buffer, op_cpu_buffer);
 
 static void wq_sync_buffer(struct work_struct *work);
include/linux/ring_buffer.h +55 -55

172 lines not on this page · raw message

include/linux/trace_events.h +2 -2
index 4c6e15605766..f20ce342400f 100644
@@ -153,7 +153,7 @@ void tracing_generic_entry_update(struct trace_entry *entry,
 struct trace_event_file;
 
 struct ring_buffer_event *
-trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer,
+trace_event_buffer_lock_reserve(struct trace_buffer **current_buffer,
 				struct trace_event_file *trace_file,
 				int type, unsigned long len,
 				unsigned long flags, int pc);
@@ -210,7 +210,7 @@ extern int trace_event_reg(struct trace_event_call *event,
 			    enum trace_reg type, void *data);
 
 struct trace_event_buffer {
-	struct ring_buffer		*buffer;
+	struct trace_buffer		*buffer;
 	struct ring_buffer_event	*event;
 	struct trace_event_file		*trace_file;
 	void				*entry;
include/trace/trace_events.h +1 -1
index 472b33d23a10..13a58d453992 100644
@@ -570,7 +570,7 @@ static inline notrace int trace_event_get_offsets_##call(		\
  *	enum event_trigger_type __tt = ETT_NONE;
  *	struct ring_buffer_event *event;
  *	struct trace_event_raw_<call> *entry; <-- defined in stage 1
- *	struct ring_buffer *buffer;
+ *	struct trace_buffer *buffer;
  *	unsigned long irq_flags;
  *	int __data_size;
  *	int pc;
kernel/trace/blktrace.c +2 -2
index 2d6e93ab0478..4ee9b78b87cc 100644
@@ -69,7 +69,7 @@ static void trace_note(struct blk_trace *bt, pid_t pid, int action,
 {
 	struct blk_io_trace *t;
 	struct ring_buffer_event *event = NULL;
-	struct ring_buffer *buffer = NULL;
+	struct trace_buffer *buffer = NULL;
 	int pc = 0;
 	int cpu = smp_processor_id();
 	bool blk_tracer = blk_tracer_enabled;
@@ -216,7 +216,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
 {
 	struct task_struct *tsk = current;
 	struct ring_buffer_event *event = NULL;
-	struct ring_buffer *buffer = NULL;
+	struct trace_buffer *buffer = NULL;
 	struct blk_io_trace *t;
 	unsigned long flags = 0;
 	unsigned long *sequence;
kernel/trace/ring_buffer.c +62 -62

480 lines not on this page · raw message

kernel/trace/ring_buffer_benchmark.c +1 -1
index 32149e46551c..8df0aa810950 100644
@@ -29,7 +29,7 @@ static int reader_finish;
 static DECLARE_COMPLETION(read_start);
 static DECLARE_COMPLETION(read_done);
 
-static struct ring_buffer *buffer;
+static struct trace_buffer *buffer;
 static struct task_struct *producer;
 static struct task_struct *consumer;
 static unsigned long read;
kernel/trace/trace.c +35 -35

270 lines not on this page · raw message

kernel/trace/trace.h +11 -11
index 63bf60f79398..308fcd673102 100644
@@ -178,7 +178,7 @@ struct trace_option_dentry;
 
 struct trace_buffer {
 	struct trace_array		*tr;
-	struct ring_buffer		*buffer;
+	struct trace_buffer		*buffer;
 	struct trace_array_cpu __percpu	*data;
 	u64				time_start;
 	int				cpu;
@@ -705,7 +705,7 @@ struct dentry *tracing_init_dentry(void);
 struct ring_buffer_event;
 
 struct ring_buffer_event *
-trace_buffer_lock_reserve(struct ring_buffer *buffer,
+trace_buffer_lock_reserve(struct trace_buffer *buffer,
 			  int type,
 			  unsigned long len,
 			  unsigned long flags,
@@ -717,7 +717,7 @@ struct trace_entry *tracing_get_trace_entry(struct trace_array *tr,
 struct trace_entry *trace_find_next_entry(struct trace_iterator *iter,
 					  int *ent_cpu, u64 *ent_ts);
 
-void trace_buffer_unlock_commit_nostack(struct ring_buffer *buffer,
+void trace_buffer_unlock_commit_nostack(struct trace_buffer *buffer,
 					struct ring_buffer_event *event);
 
 int trace_empty(struct trace_iterator *iter);
@@ -873,7 +873,7 @@ trace_vprintk(unsigned long ip, const char *fmt, va_list args);
 extern int
 trace_array_vprintk(struct trace_array *tr,
 		    unsigned long ip, const char *fmt, va_list args);
-int trace_array_printk_buf(struct ring_buffer *buffer,
+int trace_array_printk_buf(struct trace_buffer *buffer,
 			   unsigned long ip, const char *fmt, ...);
 void trace_printk_seq(struct trace_seq *s);
 enum print_line_t print_trace_line(struct trace_iterator *iter);
@@ -1367,17 +1367,17 @@ struct trace_subsystem_dir {
 };
 
 extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
-				     struct ring_buffer *buffer,
+				     struct trace_buffer *buffer,
 				     struct ring_buffer_event *event);
 
 void trace_buffer_unlock_commit_regs(struct trace_array *tr,
-				     struct ring_buffer *buffer,
+				     struct trace_buffer *buffer,
 				     struct ring_buffer_event *event,
 				     unsigned long flags, int pc,
 				     struct pt_regs *regs);
 
 static inline void trace_buffer_unlock_commit(struct trace_array *tr,
-					      struct ring_buffer *buffer,
+					      struct trace_buffer *buffer,
 					      struct ring_buffer_event *event,
 					      unsigned long flags, int pc)
 {
@@ -1390,7 +1390,7 @@ void trace_buffered_event_disable(void);
 void trace_buffered_event_enable(void);
 
 static inline void
-__trace_event_discard_commit(struct ring_buffer *buffer,
+__trace_event_discard_commit(struct trace_buffer *buffer,
 			     struct ring_buffer_event *event)
 {
 	if (this_cpu_read(trace_buffered_event) == event) {
@@ -1416,7 +1416,7 @@ __trace_event_discard_commit(struct ring_buffer *buffer,
  */
 static inline bool
 __event_trigger_test_discard(struct trace_event_file *file,
-			     struct ring_buffer *buffer,
+			     struct trace_buffer *buffer,
 			     struct ring_buffer_event *event,
 			     void *entry,
 			     enum event_trigger_type *tt)
@@ -1451,7 +1451,7 @@ __event_trigger_test_discard(struct trace_event_file *file,
  */
 static inline void
 event_trigger_unlock_commit(struct trace_event_file *file,
-			    struct ring_buffer *buffer,
+			    struct trace_buffer *buffer,
 			    struct ring_buffer_event *event,
 			    void *entry, unsigned long irq_flags, int pc)
 {
@@ -1482,7 +1482,7 @@ event_trigger_unlock_commit(struct trace_event_file *file,
  */
 static inline void
 event_trigger_unlock_commit_regs(struct trace_event_file *file,
-				 struct ring_buffer *buffer,
+				 struct trace_buffer *buffer,
 				 struct ring_buffer_event *event,
 				 void *entry, unsigned long irq_flags, int pc,
 				 struct pt_regs *regs)
kernel/trace/trace_branch.c +1 -1
index 88e158d27965..b291e0422191 100644
@@ -32,10 +32,10 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect)
 {
 	struct trace_event_call *call = &event_branch;
 	struct trace_array *tr = branch_tracer;
+	struct trace_buffer *buffer;
 	struct trace_array_cpu *data;
 	struct ring_buffer_event *event;
 	struct trace_branch *entry;
-	struct ring_buffer *buffer;
 	unsigned long flags;
 	int pc;
 	const char *p;
kernel/trace/trace_events.c +1 -1
index c6de3cebc127..fbf49873888d 100644
@@ -3391,8 +3391,8 @@ static void __init
 function_test_events_call(unsigned long ip, unsigned long parent_ip,
 			  struct ftrace_ops *op, struct pt_regs *pt_regs)
 {
+	struct trace_buffer *buffer;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer;
 	struct ftrace_entry *entry;
 	unsigned long flags;
 	long disabled;
kernel/trace/trace_events_hist.c +1 -1
index f49d1a36d3ae..df009a251c05 100644
@@ -879,7 +879,7 @@ static notrace void trace_event_raw_event_synth(void *__data,
 	struct trace_event_file *trace_file = __data;
 	struct synth_trace_event *entry;
 	struct trace_event_buffer fbuffer;
-	struct ring_buffer *buffer;
+	struct trace_buffer *buffer;
 	struct synth_event *event;
 	unsigned int i, n_u64;
 	int fields_size = 0;
kernel/trace/trace_functions_graph.c +2 -2
index 78af97163147..e6b9b1169a48 100644
@@ -101,7 +101,7 @@ int __trace_graph_entry(struct trace_array *tr,
 {
 	struct trace_event_call *call = &event_funcgraph_entry;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	struct ftrace_graph_ent_entry *entry;
 
 	event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_ENT,
@@ -221,7 +221,7 @@ void __trace_graph_return(struct trace_array *tr,
 {
 	struct trace_event_call *call = &event_funcgraph_exit;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	struct ftrace_graph_ret_entry *entry;
 
 	event = trace_buffer_lock_reserve(buffer, TRACE_GRAPH_RET,
kernel/trace/trace_hwlat.c +1 -1
index 6638d63f0921..cb8da2a20f59 100644
@@ -104,7 +104,7 @@ static void trace_hwlat_sample(struct hwlat_sample *sample)
 {
 	struct trace_array *tr = hwlat_trace;
 	struct trace_event_call *call = &event_hwlat;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	struct ring_buffer_event *event;
 	struct hwlat_entry *entry;
 	unsigned long flags;
kernel/trace/trace_kprobe.c +2 -2
index 7f890262c8a3..477b6b011e7d 100644
@@ -1175,8 +1175,8 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
 		    struct trace_event_file *trace_file)
 {
 	struct kprobe_trace_entry_head *entry;
+	struct trace_buffer *buffer;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer;
 	int size, dsize, pc;
 	unsigned long irq_flags;
 	struct trace_event_call *call = trace_probe_event_call(&tk->tp);
@@ -1223,8 +1223,8 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
 		       struct trace_event_file *trace_file)
 {
 	struct kretprobe_trace_entry_head *entry;
+	struct trace_buffer *buffer;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer;
 	int size, pc, dsize;
 	unsigned long irq_flags;
 	struct trace_event_call *call = trace_probe_event_call(&tk->tp);
kernel/trace/trace_mmiotrace.c +2 -2
index b0388016b687..a03e8859e094 100644
@@ -297,7 +297,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
 				struct mmiotrace_rw *rw)
 {
 	struct trace_event_call *call = &event_mmiotrace_rw;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	struct ring_buffer_event *event;
 	struct trace_mmiotrace_rw *entry;
 	int pc = preempt_count();
@@ -327,7 +327,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
 				struct mmiotrace_map *map)
 {
 	struct trace_event_call *call = &event_mmiotrace_map;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	struct ring_buffer_event *event;
 	struct trace_mmiotrace_map *entry;
 	int pc = preempt_count();
kernel/trace/trace_sched_wakeup.c +2 -2
index 5e43b9664eca..0fe78a8b2e86 100644
@@ -378,7 +378,7 @@ tracing_sched_switch_trace(struct trace_array *tr,
 			   unsigned long flags, int pc)
 {
 	struct trace_event_call *call = &event_context_switch;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	struct ring_buffer_event *event;
 	struct ctx_switch_entry *entry;
 
@@ -408,7 +408,7 @@ tracing_sched_wakeup_trace(struct trace_array *tr,
 	struct trace_event_call *call = &event_wakeup;
 	struct ring_buffer_event *event;
 	struct ctx_switch_entry *entry;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 
 	event = trace_buffer_lock_reserve(buffer, TRACE_WAKE,
 					  sizeof(*entry), flags, pc);
kernel/trace/trace_syscalls.c +2 -2
index 16fa218556fa..581b4a11b657 100644
@@ -317,7 +317,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
 	struct syscall_trace_enter *entry;
 	struct syscall_metadata *sys_data;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer;
+	struct trace_buffer *buffer;
 	unsigned long irq_flags;
 	unsigned long args[6];
 	int pc;
@@ -367,7 +367,7 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
 	struct syscall_trace_exit *entry;
 	struct syscall_metadata *sys_data;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer;
+	struct trace_buffer *buffer;
 	unsigned long irq_flags;
 	int pc;
 	int syscall_nr;
kernel/trace/trace_uprobe.c +1 -1
index 352073d36585..6c75d94f5c2f 100644
@@ -938,8 +938,8 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
 				struct trace_event_file *trace_file)
 {
 	struct uprobe_trace_entry_head *entry;
+	struct trace_buffer *buffer;
 	struct ring_buffer_event *event;
-	struct ring_buffer *buffer;
 	void *data;
 	int size, esize;
 	struct trace_event_call *call = trace_probe_event_call(&tu->tp);
Signature · 1 line
2.20.1
author
#13 lore raw

On Fri, Dec 13, 2019 at 02:05:31PM -0500, Steven Rostedt wrote:

SNIP

Quoted 11 lines
kernel/trace/trace.c +1 -1
 	struct trace_array *tr = filp->private_data;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	unsigned long val;
 	int ret;
kernel/trace/trace.h +0 -0
index 63bf60f79398..308fcd673102 100644

kernel/trace/trace.h struct trace_option_dentry; · line 181

Quoted 5 lines
kernel/trace/trace.h +1 -1
@@ -178,7 +178,7 @@ struct trace_option_dentry;
 
 struct trace_buffer {
 	struct trace_array		*tr;
-	struct ring_buffer		*buffer;
+	struct trace_buffer		*buffer;

perf change is fine, but 'trace_buffer' won't work because we already have 'struct trace_buffer' defined in here

maybe we could change this name to trace_buffer_array?

thanks,
jirka

author
#14 lore raw
Quoted 24 lines · Jiri Olsa

On Fri, Dec 13, 2019 at 02:05:31PM -0500, Steven Rostedt wrote:

SNIP

Quoted 11 lines
(quoted diff) +1 -1
 	struct trace_array *tr = filp->private_data;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	unsigned long val;
 	int ret;
kernel/trace/trace.h +0 -0
index 63bf60f79398..308fcd673102 100644

kernel/trace/trace.h struct trace_option_dentry; · line 181

Quoted 5 lines
kernel/trace/trace.h +1 -1
@@ -178,7 +178,7 @@ struct trace_option_dentry;
 
 struct trace_buffer {
 	struct trace_array		*tr;
-	struct ring_buffer		*buffer;
+	struct trace_buffer		*buffer;

perf change is fine, but 'trace_buffer' won't work because we already have 'struct trace_buffer' defined in here

Quoted 1 line

maybe we could change this name to trace_buffer_array?

..like in patch below? it's independent of your previous changes

jirka

---

include/linux/trace_events.h +1 -1
index 4c6e15605766..05588dafd3dc 100644
@@ -79,7 +79,7 @@ struct trace_entry {
 struct trace_iterator {
 	struct trace_array	*tr;
 	struct tracer		*trace;
-	struct trace_buffer	*trace_buffer;
+	struct trace_buffer_array *trace_buffer;
 	void			*private;
 	int			cpu_file;
 	struct mutex		mutex;
kernel/trace/trace.c +21 -21

144 lines not on this page · raw message

kernel/trace/trace.h +7 -7
index 63bf60f79398..01d0ab7de131 100644
@@ -176,7 +176,7 @@ struct trace_array_cpu {
 struct tracer;
 struct trace_option_dentry;
 
-struct trace_buffer {
+struct trace_buffer_array {
 	struct trace_array		*tr;
 	struct ring_buffer		*buffer;
 	struct trace_array_cpu __percpu	*data;
@@ -247,9 +247,9 @@ struct cond_snapshot {
  * They have on/off state as well:
  */
 struct trace_array {
-	struct list_head	list;
-	char			*name;
-	struct trace_buffer	trace_buffer;
+	struct list_head		list;
+	char				*name;
+	struct trace_buffer_array	trace_buffer;
 #ifdef CONFIG_TRACER_MAX_TRACE
 	/*
 	 * The max_buffer is used to snapshot the trace when a maximum
@@ -262,8 +262,8 @@ struct trace_array {
 	 * with the buffer of the trace_buffer and the buffers are reset for
 	 * the trace_buffer so the tracing can continue.
 	 */
-	struct trace_buffer	max_buffer;
-	bool			allocated_snapshot;
+	struct trace_buffer_array	max_buffer;
+	bool				allocated_snapshot;
 #endif
 #if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
 	unsigned long		max_latency;
@@ -685,7 +685,7 @@ trace_buffer_iter(struct trace_iterator *iter, int cpu)
 
 int tracer_init(struct tracer *t, struct trace_array *tr);
 int tracing_is_enabled(void);
-void tracing_reset_online_cpus(struct trace_buffer *buf);
+void tracing_reset_online_cpus(struct trace_buffer_array *buf);
 void tracing_reset_current(int cpu);
 void tracing_reset_all_online_cpus(void);
 int tracing_open_generic(struct inode *inode, struct file *filp);
kernel/trace/trace_selftest.c +2 -2
index 69ee8ef12cee..d9fc1e0cd8d1 100644
@@ -23,7 +23,7 @@ static inline int trace_valid_entry(struct trace_entry *entry)
 	return 0;
 }
 
-static int trace_test_buffer_cpu(struct trace_buffer *buf, int cpu)
+static int trace_test_buffer_cpu(struct trace_buffer_array *buf, int cpu)
 {
 	struct ring_buffer_event *event;
 	struct trace_entry *entry;
@@ -60,7 +60,7 @@ static int trace_test_buffer_cpu(struct trace_buffer *buf, int cpu)
  * Test the trace buffer to see if all the elements
  * are still sane.
  */
-static int __maybe_unused trace_test_buffer(struct trace_buffer *buf, unsigned long *count)
+static int __maybe_unused trace_test_buffer(struct trace_buffer_array *buf, unsigned long *count)
 {
 	unsigned long flags, cnt = 0;
 	int cpu, ret = 0;
maintainer
#15 lore raw
Quoted 25 lines · On Wed, 18 Dec 2019 17:14:01 +0100 Jiri Olsa <[email protected]> wrote:
Quoted 24 lines · Jiri Olsa

On Fri, Dec 13, 2019 at 02:05:31PM -0500, Steven Rostedt wrote:

SNIP

Quoted 11 lines
(quoted diff) +1 -1
 	struct trace_array *tr = filp->private_data;
-	struct ring_buffer *buffer = tr->trace_buffer.buffer;
+	struct trace_buffer *buffer = tr->trace_buffer.buffer;
 	unsigned long val;
 	int ret;
kernel/trace/trace.h +0 -0
index 63bf60f79398..308fcd673102 100644

kernel/trace/trace.h struct trace_option_dentry; · line 181

Quoted 5 lines
kernel/trace/trace.h +1 -1
@@ -178,7 +178,7 @@ struct trace_option_dentry;
 
 struct trace_buffer {
 	struct trace_array		*tr;
-	struct ring_buffer		*buffer;
+	struct trace_buffer		*buffer;  

perf change is fine, but 'trace_buffer' won't work because we already have 'struct trace_buffer' defined in here

Quoted 5 lines
Quoted 1 line

maybe we could change this name to trace_buffer_array?

..like in patch below? it's independent of your previous changes

Actually, I would prefer to call it either trace_array_buffer, or just array_buffer.

-- Steve