path: root/include
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-11 19:47:45 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-11 19:47:45 (GMT)
commitddb321a8dd158520d97ed1cbade1d4ac36b6af31 (patch)
tree842f5550c5947d4aebff56dcd1091950b0cc0f82 /include
parent1e6c3e8f8fb94a8914a380e02a7e8ad81d47273e (diff)
parent5306c31c5733cb4a79cc002e0c3ad256fd439614 (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "Mostly tooling fixes, but also some kernel side fixes: uncore PMU driver fix, user regs sampling fix and an instruction decoder fix that unbreaks PEBS precise sampling" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/uncore/hsw-ep: Handle systems with only two SBOXes perf/x86_64: Improve user regs sampling perf: Move task_pt_regs sampling into arch code x86: Fix off-by-one in instruction decoder perf hists browser: Fix segfault when showing callchain perf callchain: Free callchains when hist entries are deleted perf hists: Fix children sort key behavior perf diff: Fix to sort by baseline field by default perf list: Fix --raw-dump option perf probe: Fix crash in dwarf_getcfi_elf perf probe: Fix to fall back to find probe point in symbols perf callchain: Append callchains only when requested perf ui/tui: Print backtrace symbols when segfault occurs perf report: Show progress bar for output resorting
Diffstat (limited to 'include')
2 files changed, 23 insertions, 5 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 486e84c..4f7a61c 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -79,11 +79,6 @@ struct perf_branch_stack {
struct perf_branch_entry entries[0];
-struct perf_regs {
- __u64 abi;
- struct pt_regs *regs;
struct task_struct;
@@ -610,7 +605,14 @@ struct perf_sample_data {
u32 reserved;
} cpu_entry;
struct perf_callchain_entry *callchain;
+ /*
+ * regs_user may point to task_pt_regs or to regs_user_copy, depending
+ * on arch details.
+ */
struct perf_regs regs_user;
+ struct pt_regs regs_user_copy;
struct perf_regs regs_intr;
u64 stack_user_size;
} ____cacheline_aligned;
diff --git a/include/linux/perf_regs.h b/include/linux/perf_regs.h
index 3c73d5f..a5f98d5 100644
--- a/include/linux/perf_regs.h
+++ b/include/linux/perf_regs.h
@@ -1,11 +1,19 @@
+struct perf_regs {
+ __u64 abi;
+ struct pt_regs *regs;
#include <asm/perf_regs.h>
u64 perf_reg_value(struct pt_regs *regs, int idx);
int perf_reg_validate(u64 mask);
u64 perf_reg_abi(struct task_struct *task);
+void perf_get_regs_user(struct perf_regs *regs_user,
+ struct pt_regs *regs,
+ struct pt_regs *regs_user_copy);
static inline u64 perf_reg_value(struct pt_regs *regs, int idx)
@@ -21,5 +29,13 @@ static inline u64 perf_reg_abi(struct task_struct *task)
+static inline void perf_get_regs_user(struct perf_regs *regs_user,
+ struct pt_regs *regs,
+ struct pt_regs *regs_user_copy)
+ regs_user->regs = task_pt_regs(current);
+ regs_user->abi = perf_reg_abi(current);
#endif /* _LINUX_PERF_REGS_H */

Privacy Policy