From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757959AbdJLXGn (ORCPT ); Thu, 12 Oct 2017 19:06:43 -0400 Received: from mail.efficios.com ([167.114.142.141]:40538 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753697AbdJLXEC (ORCPT ); Thu, 12 Oct 2017 19:04:02 -0400 From: Mathieu Desnoyers To: "Paul E. McKenney" , Boqun Feng , Peter Zijlstra , Paul Turner , Andrew Hunter , Andy Lutomirski , Dave Watson , Josh Triplett , Will Deacon Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Thomas Gleixner , Andi Kleen , Chris Lameter , Ingo Molnar , "H. Peter Anvin" , Ben Maurer , Steven Rostedt , Linus Torvalds , Andrew Morton , Russell King , Catalin Marinas , Michael Kerrisk , linux-api@vger.kernel.org Subject: [RFC PATCH for 4.15 02/14] tracing: instrument restartable sequences Date: Thu, 12 Oct 2017 19:03:14 -0400 Message-Id: <20171012230326.19984-3-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171012230326.19984-1-mathieu.desnoyers@efficios.com> References: <20171012230326.19984-1-mathieu.desnoyers@efficios.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Mathieu Desnoyers CC: Thomas Gleixner CC: Paul Turner CC: Andrew Hunter CC: Peter Zijlstra CC: Andy Lutomirski CC: Andi Kleen CC: Dave Watson CC: Chris Lameter CC: Ingo Molnar CC: "H. Peter Anvin" CC: Ben Maurer CC: Steven Rostedt CC: "Paul E. McKenney" CC: Josh Triplett CC: Linus Torvalds CC: Andrew Morton CC: Russell King CC: Catalin Marinas CC: Will Deacon CC: Michael Kerrisk CC: Boqun Feng CC: linux-api@vger.kernel.org --- MAINTAINERS | 1 + include/trace/events/rseq.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ kernel/rseq.c | 7 +++++ 3 files changed, 72 insertions(+) create mode 100644 include/trace/events/rseq.h diff --git a/MAINTAINERS b/MAINTAINERS index f05c526fe1e8..9d6a830a8c32 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11233,6 +11233,7 @@ L: linux-kernel@vger.kernel.org S: Supported F: kernel/rseq.c F: include/uapi/linux/rseq.h +F: include/trace/events/rseq.h RFKILL M: Johannes Berg diff --git a/include/trace/events/rseq.h b/include/trace/events/rseq.h new file mode 100644 index 000000000000..63a8eb7d553d --- /dev/null +++ b/include/trace/events/rseq.h @@ -0,0 +1,64 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM rseq + +#if !defined(_TRACE_RSEQ_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_RSEQ_H + +#include +#include + +TRACE_EVENT(rseq_update, + + TP_PROTO(struct task_struct *t), + + TP_ARGS(t), + + TP_STRUCT__entry( + __field(s32, cpu_id) + __field(u32, event_counter) + ), + + TP_fast_assign( + __entry->cpu_id = raw_smp_processor_id(); + __entry->event_counter = t->rseq_event_counter; + ), + + TP_printk("cpu_id=%d event_counter=%u", + __entry->cpu_id, __entry->event_counter) +); + +TRACE_EVENT(rseq_ip_fixup, + + TP_PROTO(void __user *regs_ip, void __user *start_ip, + void __user *post_commit_ip, void __user *abort_ip, + u32 kevcount, int ret), + + TP_ARGS(regs_ip, start_ip, post_commit_ip, abort_ip, kevcount, ret), + + TP_STRUCT__entry( + __field(void __user *, regs_ip) + __field(void __user *, start_ip) + __field(void __user *, post_commit_ip) + __field(void __user *, abort_ip) + __field(u32, kevcount) + __field(int, ret) + ), + + TP_fast_assign( + __entry->regs_ip = regs_ip; + __entry->start_ip = start_ip; + __entry->post_commit_ip = post_commit_ip; + __entry->abort_ip = abort_ip; + __entry->kevcount = kevcount; + __entry->ret = ret; + ), + + TP_printk("regs_ip=%p start_ip=%p post_commit_ip=%p abort_ip=%p kevcount=%u ret=%d", + __entry->regs_ip, __entry->start_ip, __entry->post_commit_ip, + __entry->abort_ip, __entry->kevcount, __entry->ret) +); + +#endif /* _TRACE_SOCK_H */ + +/* This part must be outside protection */ +#include diff --git a/kernel/rseq.c b/kernel/rseq.c index 706a83bd885c..31582e5ff3be 100644 --- a/kernel/rseq.c +++ b/kernel/rseq.c @@ -32,6 +32,9 @@ #include #include +#define CREATE_TRACE_POINTS +#include + /* * The restartable sequences mechanism is the overlap of two distinct * restart mechanisms: a sequence counter tracking preemption and signal @@ -139,6 +142,7 @@ static bool rseq_update_cpu_id_event_counter(struct task_struct *t, t->rseq_event_counter; if (__put_user(u.v, &t->rseq->u.v)) return false; + trace_rseq_update(t); return true; } @@ -230,6 +234,9 @@ static int rseq_ip_fixup(struct pt_regs *regs) ret = rseq_get_rseq_cs(t, &start_ip, &post_commit_ip, &abort_ip, &cs_flags); + trace_rseq_ip_fixup((void __user *)instruction_pointer(regs), + start_ip, post_commit_ip, abort_ip, t->rseq_event_counter, + ret); if (!ret) return -EFAULT; -- 2.11.0