mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] staging: tracing/kprobe: filter kprobe based perf event
@ 2019-09-18  5:24 jinshan.xiong
  2019-09-18  5:51 ` Yonghong Song
  0 siblings, 1 reply; 5+ messages in thread
From: jinshan.xiong @ 2019-09-18  5:24 UTC (permalink / raw)
  To: linux-kernel, rostedt, mingo; +Cc: yhs, jinshan.xiong, Jinshan Xiong

From: Jinshan Xiong <jinshan.xiong@gmail.com>

Invoking bpf program only if kprobe based perf_event has been added into
the percpu list. This is essential to make event tracing for cgroup to work
properly.

Signed-off-by: Jinshan Xiong <jinshan.xiong@gmail.com>
---
 kernel/trace/trace_kprobe.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 9d483ad9bb6c..40ef0f1945f7 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1171,11 +1171,18 @@ static int
 kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
 {
 	struct trace_event_call *call = trace_probe_event_call(&tk->tp);
+	struct hlist_head *head = this_cpu_ptr(call->perf_events);
 	struct kprobe_trace_entry_head *entry;
-	struct hlist_head *head;
 	int size, __size, dsize;
 	int rctx;
 
+	/*
+	 * If head is empty, the process currently running on this cpu is not
+	 * interested by kprobe perf PMU.
+	 */
+	if (hlist_empty(head))
+		return 0;
+
 	if (bpf_prog_array_valid(call)) {
 		unsigned long orig_ip = instruction_pointer(regs);
 		int ret;
@@ -1193,10 +1200,6 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
 			return 0;
 	}
 
-	head = this_cpu_ptr(call->perf_events);
-	if (hlist_empty(head))
-		return 0;
-
 	dsize = __get_data_size(&tk->tp, regs);
 	__size = sizeof(*entry) + tk->tp.size + dsize;
 	size = ALIGN(__size + sizeof(u32), sizeof(u64));

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-09-19  2:41 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-18  5:24 [PATCH] staging: tracing/kprobe: filter kprobe based perf event jinshan.xiong
2019-09-18  5:51 ` Yonghong Song
2019-09-18 14:32   ` Alexei Starovoitov
     [not found]     ` <CA+-8EHRk6aAuDQ=S9O7h6T2fhyz2z+zQduN2yiDNWMOWt2-t_A@mail.gmail.com>
2019-09-18 20:22       ` Alexei Starovoitov
2019-09-19  2:41         ` Jinshan Xiong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®