History

ftrace, perf: Add open/close tracepoint perf registration actions

Adding TRACE_REG_PERF_OPEN and TRACE_REG_PERF_CLOSE to differentiate register/unregister from open/close actions. The register/unregister actions are invoked for the first/last tracepoint user when opening/closing the event. The open/close actions are invoked for each tracepoint user when opening/closing the event. Link: http://lkml.kernel.org/r/1329317514-8131-3-git-send-email-jolsa@redhat.com

Jiri Olsa committed 14 years ago

Commit ceec0b61 parent e2484915 files · +101 −51Browse files

Showing the changes to kernel (4 of 5 files). Show all

Unified · Split

4 files
  1. kernel/trace/trace_event_perf.c +75 −41
  2. kernel/trace/trace_events.c +7 −3
  3. kernel/trace/trace_kprobe.c +5 −1
  4. kernel/trace/trace_syscalls.c +10 −4
kernel/trace/trace_event_perf.c+75−41
@@ -44,23 +44,17 @@ static int perf_trace_event_perm(struct ftrace_event_call *tp_event, · 43 unmodified lines
4444 return 0;
4545 }
4646
47−static int perf_trace_event_init(struct ftrace_event_call *tp_event,
48− struct perf_event *p_event)
47+static int perf_trace_event_reg(struct ftrace_event_call *tp_event,
48+ struct perf_event *p_event)
4949 {
5050 struct hlist_head __percpu *list;
51− int ret;
51+ int ret = -ENOMEM;
5252 int cpu;
5353
54− ret = perf_trace_event_perm(tp_event, p_event);
55− if (ret)
56− return ret;
57−
5854 p_event->tp_event = tp_event;
5955 if (tp_event->perf_refcount++ > 0)
6056 return 0;
6157
62− ret = -ENOMEM;
63−
6458 list = alloc_percpu(struct hlist_head);
6559 if (!list)
6660 goto fail;
@@ -83,7 +77,7 @@ static int perf_trace_event_init(struct ftrace_event_call *tp_event, · 16 unmodified lines
8377 }
8478 }
8579
86− ret = tp_event->class->reg(tp_event, TRACE_REG_PERF_REGISTER);
80+ ret = tp_event->class->reg(tp_event, TRACE_REG_PERF_REGISTER, NULL);
8781 if (ret)
8882 goto fail;
8983
@@ -108,6 +102,69 @@ fail: · 18 unmodified lines
108102 return ret;
109103 }
110104
105+static void perf_trace_event_unreg(struct perf_event *p_event)
106+{
107+ struct ftrace_event_call *tp_event = p_event->tp_event;
108+ int i;
109+
110+ if (--tp_event->perf_refcount > 0)
111+ goto out;
112+
113+ tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER, NULL);
114+
115+ /*
116+ * Ensure our callback won't be called anymore. The buffers
117+ * will be freed after that.
118+ */
119+ tracepoint_synchronize_unregister();
120+
121+ free_percpu(tp_event->perf_events);
122+ tp_event->perf_events = NULL;
123+
124+ if (!--total_ref_count) {
125+ for (i = 0; i < PERF_NR_CONTEXTS; i++) {
126+ free_percpu(perf_trace_buf[i]);
127+ perf_trace_buf[i] = NULL;
128+ }
129+ }
130+out:
131+ module_put(tp_event->mod);
132+}
133+
134+static int perf_trace_event_open(struct perf_event *p_event)
135+{
136+ struct ftrace_event_call *tp_event = p_event->tp_event;
137+ return tp_event->class->reg(tp_event, TRACE_REG_PERF_OPEN, p_event);
138+}
139+
140+static void perf_trace_event_close(struct perf_event *p_event)
141+{
142+ struct ftrace_event_call *tp_event = p_event->tp_event;
143+ tp_event->class->reg(tp_event, TRACE_REG_PERF_CLOSE, p_event);
144+}
145+
146+static int perf_trace_event_init(struct ftrace_event_call *tp_event,
147+ struct perf_event *p_event)
148+{
149+ int ret;
150+
151+ ret = perf_trace_event_perm(tp_event, p_event);
152+ if (ret)
153+ return ret;
154+
155+ ret = perf_trace_event_reg(tp_event, p_event);
156+ if (ret)
157+ return ret;
158+
159+ ret = perf_trace_event_open(p_event);
160+ if (ret) {
161+ perf_trace_event_unreg(p_event);
162+ return ret;
163+ }
164+
165+ return 0;
166+}
167+
111168 int perf_trace_init(struct perf_event *p_event)
112169 {
113170 struct ftrace_event_call *tp_event;
@@ -130,6 +187,14 @@ int perf_trace_init(struct perf_event *p_event) · 16 unmodified lines
130187 return ret;
131188 }
132189
190+void perf_trace_destroy(struct perf_event *p_event)
191+{
192+ mutex_lock(&event_mutex);
193+ perf_trace_event_close(p_event);
194+ perf_trace_event_unreg(p_event);
195+ mutex_unlock(&event_mutex);
196+}
197+
133198 int perf_trace_add(struct perf_event *p_event, int flags)
134199 {
135200 struct ftrace_event_call *tp_event = p_event->tp_event;
@@ -154,37 +219,6 @@ void perf_trace_del(struct perf_event *p_event, int flags) · 18 unmodified lines
154219 hlist_del_rcu(&p_event->hlist_entry);
155220 }
156221
157−void perf_trace_destroy(struct perf_event *p_event)
158−{
159− struct ftrace_event_call *tp_event = p_event->tp_event;
160− int i;
161−
162− mutex_lock(&event_mutex);
163− if (--tp_event->perf_refcount > 0)
164− goto out;
165−
166− tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER);
167−
168− /*
169− * Ensure our callback won't be called anymore. The buffers
170− * will be freed after that.
171− */
172− tracepoint_synchronize_unregister();
173−
174− free_percpu(tp_event->perf_events);
175− tp_event->perf_events = NULL;
176−
177− if (!--total_ref_count) {
178− for (i = 0; i < PERF_NR_CONTEXTS; i++) {
179− free_percpu(perf_trace_buf[i]);
180− perf_trace_buf[i] = NULL;
181− }
182− }
183−out:
184− module_put(tp_event->mod);
185− mutex_unlock(&event_mutex);
186−}
187−
188222 __kprobes void *perf_trace_buf_prepare(int size, unsigned short type,
189223 struct pt_regs *regs, int *rctxp)
190224 {
kernel/trace/trace_events.c+7−3
@@ -147,7 +147,8 @@ int trace_event_raw_init(struct ftrace_event_call *call) · 146 unmodified lines
147147 }
148148 EXPORT_SYMBOL_GPL(trace_event_raw_init);
149149
150−int ftrace_event_reg(struct ftrace_event_call *call, enum trace_reg type)
150+int ftrace_event_reg(struct ftrace_event_call *call,
151+ enum trace_reg type, void *data)
151152 {
152153 switch (type) {
153154 case TRACE_REG_REGISTER:
@@ -170,6 +171,9 @@ int ftrace_event_reg(struct ftrace_event_call *call, enum trace_reg type) · 16 unmodified lines
170171 call->class->perf_probe,
171172 call);
172173 return 0;
174+ case TRACE_REG_PERF_OPEN:
175+ case TRACE_REG_PERF_CLOSE:
176+ return 0;
173177 #endif
174178 }
175179 return 0;
@@ -209,7 +213,7 @@ static int ftrace_event_enable_disable(struct ftrace_event_call *call, · 33 unmodified lines
209213 tracing_stop_cmdline_record();
210214 call->flags &= ~TRACE_EVENT_FL_RECORDED_CMD;
211215 }
212− call->class->reg(call, TRACE_REG_UNREGISTER);
216+ call->class->reg(call, TRACE_REG_UNREGISTER, NULL);
213217 }
214218 break;
215219 case 1:
@@ -218,7 +222,7 @@ static int ftrace_event_enable_disable(struct ftrace_event_call *call, · 2 unmodified lines
218222 tracing_start_cmdline_record();
219223 call->flags |= TRACE_EVENT_FL_RECORDED_CMD;
220224 }
221− ret = call->class->reg(call, TRACE_REG_REGISTER);
225+ ret = call->class->reg(call, TRACE_REG_REGISTER, NULL);
222226 if (ret) {
223227 tracing_stop_cmdline_record();
224228 pr_info("event trace: Could not enable event "
kernel/trace/trace_kprobe.c+5−1
@@ -1892,7 +1892,8 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri, · 1891 unmodified lines
18921892 #endif /* CONFIG_PERF_EVENTS */
18931893
18941894 static __kprobes
1895−int kprobe_register(struct ftrace_event_call *event, enum trace_reg type)
1895+int kprobe_register(struct ftrace_event_call *event,
1896+ enum trace_reg type, void *data)
18961897 {
18971898 struct trace_probe *tp = (struct trace_probe *)event->data;
18981899
@@ -1909,6 +1910,9 @@ int kprobe_register(struct ftrace_event_call *event, enum trace_reg type) · 10 unmodified lines
19091910 case TRACE_REG_PERF_UNREGISTER:
19101911 disable_trace_probe(tp, TP_FLAG_PROFILE);
19111912 return 0;
1913+ case TRACE_REG_PERF_OPEN:
1914+ case TRACE_REG_PERF_CLOSE:
1915+ return 0;
19121916 #endif
19131917 }
19141918 return 0;
kernel/trace/trace_syscalls.c+10−4
@@ -17,9 +17,9 @@ static DECLARE_BITMAP(enabled_enter_syscalls, NR_syscalls); · 16 unmodified lines
1717 static DECLARE_BITMAP(enabled_exit_syscalls, NR_syscalls);
1818
1919 static int syscall_enter_register(struct ftrace_event_call *event,
20− enum trace_reg type);
20+ enum trace_reg type, void *data);
2121 static int syscall_exit_register(struct ftrace_event_call *event,
22− enum trace_reg type);
22+ enum trace_reg type, void *data);
2323
2424 static int syscall_enter_define_fields(struct ftrace_event_call *call);
2525 static int syscall_exit_define_fields(struct ftrace_event_call *call);
@@ -649,7 +649,7 @@ void perf_sysexit_disable(struct ftrace_event_call *call) · 623 unmodified lines
649649 #endif /* CONFIG_PERF_EVENTS */
650650
651651 static int syscall_enter_register(struct ftrace_event_call *event,
652− enum trace_reg type)
652+ enum trace_reg type, void *data)
653653 {
654654 switch (type) {
655655 case TRACE_REG_REGISTER:
@@ -664,13 +664,16 @@ static int syscall_enter_register(struct ftrace_event_call *event, · 8 unmodified lines
664664 case TRACE_REG_PERF_UNREGISTER:
665665 perf_sysenter_disable(event);
666666 return 0;
667+ case TRACE_REG_PERF_OPEN:
668+ case TRACE_REG_PERF_CLOSE:
669+ return 0;
667670 #endif
668671 }
669672 return 0;
670673 }
671674
672675 static int syscall_exit_register(struct ftrace_event_call *event,
673− enum trace_reg type)
676+ enum trace_reg type, void *data)
674677 {
675678 switch (type) {
676679 case TRACE_REG_REGISTER:
@@ -685,6 +688,9 @@ static int syscall_exit_register(struct ftrace_event_call *event, · 8 unmodified lines
685688 case TRACE_REG_PERF_UNREGISTER:
686689 perf_sysexit_disable(event);
687690 return 0;
691+ case TRACE_REG_PERF_OPEN:
692+ case TRACE_REG_PERF_CLOSE:
693+ return 0;
688694 #endif
689695 }
690696 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t