sparc: Add alignment and emulation fault perf events.
This mirrors commit 196f02bf90
(powerpc: perf_event: Add alignment-faults and emulation-faults software events)
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@ -20,10 +20,9 @@
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/smp.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/perf_event.h>
|
||||
#include <asm/fpumacro.h>
|
||||
|
||||
/* #define DEBUG_MNA */
|
||||
|
||||
enum direction {
|
||||
load, /* ld, ldd, ldh, ldsh */
|
||||
store, /* st, std, sth, stsh */
|
||||
@ -33,12 +32,6 @@ enum direction {
|
||||
invalid,
|
||||
};
|
||||
|
||||
#ifdef DEBUG_MNA
|
||||
static char *dirstrings[] = {
|
||||
"load", "store", "both", "fpload", "fpstore", "invalid"
|
||||
};
|
||||
#endif
|
||||
|
||||
static inline enum direction decode_direction(unsigned int insn)
|
||||
{
|
||||
unsigned long tmp = (insn >> 21) & 1;
|
||||
@ -327,12 +320,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
|
||||
|
||||
addr = compute_effective_address(regs, insn,
|
||||
((insn >> 25) & 0x1f));
|
||||
#ifdef DEBUG_MNA
|
||||
printk("KMNA: pc=%016lx [dir=%s addr=%016lx size=%d] "
|
||||
"retpc[%016lx]\n",
|
||||
regs->tpc, dirstrings[dir], addr, size,
|
||||
regs->u_regs[UREG_RETPC]);
|
||||
#endif
|
||||
perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, addr);
|
||||
switch (asi) {
|
||||
case ASI_NL:
|
||||
case ASI_AIUPL:
|
||||
@ -399,6 +387,7 @@ int handle_popc(u32 insn, struct pt_regs *regs)
|
||||
int ret, i, rd = ((insn >> 25) & 0x1f);
|
||||
int from_kernel = (regs->tstate & TSTATE_PRIV) != 0;
|
||||
|
||||
perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
|
||||
if (insn & 0x2000) {
|
||||
maybe_flush_windows(0, 0, rd, from_kernel);
|
||||
value = sign_extend_imm13(insn);
|
||||
@ -445,6 +434,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs)
|
||||
int asi = decode_asi(insn, regs);
|
||||
int flag = (freg < 32) ? FPRS_DL : FPRS_DU;
|
||||
|
||||
perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
|
||||
|
||||
save_and_clear_fpu();
|
||||
current_thread_info()->xfsr[0] &= ~0x1c000;
|
||||
if (freg & 3) {
|
||||
@ -566,6 +557,8 @@ void handle_ld_nf(u32 insn, struct pt_regs *regs)
|
||||
int from_kernel = (regs->tstate & TSTATE_PRIV) != 0;
|
||||
unsigned long *reg;
|
||||
|
||||
perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
|
||||
|
||||
maybe_flush_windows(0, 0, rd, from_kernel);
|
||||
reg = fetch_reg_addr(rd, regs);
|
||||
if (from_kernel || rd < 16) {
|
||||
@ -596,6 +589,7 @@ void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
|
||||
|
||||
if (tstate & TSTATE_PRIV)
|
||||
die_if_kernel("lddfmna from kernel", regs);
|
||||
perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, sfar);
|
||||
if (test_thread_flag(TIF_32BIT))
|
||||
pc = (u32)pc;
|
||||
if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
|
||||
@ -657,6 +651,7 @@ void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
|
||||
|
||||
if (tstate & TSTATE_PRIV)
|
||||
die_if_kernel("stdfmna from kernel", regs);
|
||||
perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, sfar);
|
||||
if (test_thread_flag(TIF_32BIT))
|
||||
pc = (u32)pc;
|
||||
if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
|
||||
|
Reference in New Issue
Block a user