diff mbox

powerpc/perf_counter: Add alignment-faults and emulation-faults sw events

Message ID 20090706121845.GD4391@kryten
State Superseded
Delegated to: Paul Mackerras
Headers show

Commit Message

Anton Blanchard July 6, 2009, 12:18 p.m. UTC
Hook up the alignment-faults and emulation-faults events for powerpc.

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Lots of duplication between PPC_WARN_EMULATED() and perf_swcounter_event()
here. Maybe we need to create PPC_WARN_ALIGNMENT(), use it and hide all
calls to perf_swcounter_event in the macros.

Comments

Benjamin Herrenschmidt July 27, 2009, 1:47 a.m. UTC | #1
On Mon, 2009-07-06 at 22:18 +1000, Anton Blanchard wrote:
> Hook up the alignment-faults and emulation-faults events for powerpc.
> 
> Signed-off-by: Anton Blanchard <anton@samba.org>
> ---
> 
> Lots of duplication between PPC_WARN_EMULATED() and perf_swcounter_event()
> here. Maybe we need to create PPC_WARN_ALIGNMENT(), use it and hide all
> calls to perf_swcounter_event in the macros.

Sounds good.

BTW. The patch relies on some perctr changes I don't have in my tree
(PERF_COUNT_SW_ALIGNMENT_FAULTS isn't defined for me)

Ingo, how do you want to handle that ? Should I wait til round 2 of the
merge window before putting Anton's patch in or can I merge some of your
stuff in powerpc-next as pre-reqs ? Or you can just take Anton's patch
with my:

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

And stick it in your own queue (though pls, give me a pointer to the git
tree in question so I can verify that I don't get new stuff that
conflicts before we get to the merge window).

Cheers,
Ben.

> Index: linux.trees.git/arch/powerpc/kernel/align.c
> ===================================================================
> --- linux.trees.git.orig/arch/powerpc/kernel/align.c	2009-07-06 21:50:53.000000000 +1000
> +++ linux.trees.git/arch/powerpc/kernel/align.c	2009-07-06 22:10:41.000000000 +1000
> @@ -25,6 +25,7 @@
>  #include <asm/cache.h>
>  #include <asm/cputable.h>
>  #include <asm/emulated_ops.h>
> +#include <linux/perf_counter.h>
>  
>  struct aligninfo {
>  	unsigned char len;
> @@ -707,6 +708,9 @@
>  	 */
>  	CHECK_FULL_REGS(regs);
>  
> +	perf_swcounter_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs,
> +			     regs->nip);
> +
>  	dsisr = regs->dsisr;
>  
>  	/* Some processors don't provide us with a DSISR we can use here,
> Index: linux.trees.git/arch/powerpc/kernel/traps.c
> ===================================================================
> --- linux.trees.git.orig/arch/powerpc/kernel/traps.c	2009-07-06 21:50:53.000000000 +1000
> +++ linux.trees.git/arch/powerpc/kernel/traps.c	2009-07-06 22:11:52.000000000 +1000
> @@ -34,6 +34,7 @@
>  #include <linux/bug.h>
>  #include <linux/kdebug.h>
>  #include <linux/debugfs.h>
> +#include <linux/perf_counter.h>
>  
>  #include <asm/emulated_ops.h>
>  #include <asm/pgtable.h>
> @@ -759,6 +760,8 @@
>  
>  	/* Emulate the mfspr rD, PVR. */
>  	if ((instword & PPC_INST_MFSPR_PVR_MASK) == PPC_INST_MFSPR_PVR) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(mfpvr);
>  		rd = (instword >> 21) & 0x1f;
>  		regs->gpr[rd] = mfspr(SPRN_PVR);
> @@ -767,6 +770,8 @@
>  
>  	/* Emulating the dcba insn is just a no-op.  */
>  	if ((instword & PPC_INST_DCBA_MASK) == PPC_INST_DCBA) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(dcba);
>  		return 0;
>  	}
> @@ -776,6 +781,8 @@
>  		int shift = (instword >> 21) & 0x1c;
>  		unsigned long msk = 0xf0000000UL >> shift;
>  
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(mcrxr);
>  		regs->ccr = (regs->ccr & ~msk) | ((regs->xer >> shift) & msk);
>  		regs->xer &= ~0xf0000000UL;
> @@ -784,18 +791,24 @@
>  
>  	/* Emulate load/store string insn. */
>  	if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(string);
>  		return emulate_string_inst(regs, instword);
>  	}
>  
>  	/* Emulate the popcntb (Population Count Bytes) instruction. */
>  	if ((instword & PPC_INST_POPCNTB_MASK) == PPC_INST_POPCNTB) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(popcntb);
>  		return emulate_popcntb_inst(regs, instword);
>  	}
>  
>  	/* Emulate isel (Integer Select) instruction */
>  	if ((instword & PPC_INST_ISEL_MASK) == PPC_INST_ISEL) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(isel);
>  		return emulate_isel(regs, instword);
>  	}
> @@ -994,8 +1007,11 @@
>  
>  #ifdef CONFIG_MATH_EMULATION
>  	errcode = do_mathemu(regs);
> -	if (errcode >= 0)
> +	if (errcode >= 0) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(math);
> +	}
>  
>  	switch (errcode) {
>  	case 0:
> @@ -1017,8 +1033,11 @@
>  
>  #elif defined(CONFIG_8XX_MINIMAL_FPEMU)
>  	errcode = Soft_emulate_8xx(regs);
> -	if (errcode >= 0)
> +	if (errcode >= 0) {
> +		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
> +				     regs, regs->nip);
>  		PPC_WARN_EMULATED(8xx);
> +	}
>  
>  	switch (errcode) {
>  	case 0:
> @@ -1129,6 +1148,8 @@
>  
>  	flush_altivec_to_thread(current);
>  
> +	perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs,
> +			     regs->nip);
>  	PPC_WARN_EMULATED(altivec);
>  	err = emulate_altivec(regs);
>  	if (err == 0) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
Anton Blanchard July 27, 2009, 1:51 a.m. UTC | #2
Hi Ben,

> BTW. The patch relies on some perctr changes I don't have in my tree
> (PERF_COUNT_SW_ALIGNMENT_FAULTS isn't defined for me)
> 
> Ingo, how do you want to handle that ? Should I wait til round 2 of the
> merge window before putting Anton's patch in or can I merge some of your
> stuff in powerpc-next as pre-reqs ? Or you can just take Anton's patch
> with my:
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> And stick it in your own queue (though pls, give me a pointer to the git
> tree in question so I can verify that I don't get new stuff that
> conflicts before we get to the merge window).

I've got another round of this series that I'll send out today.

Anton
Benjamin Herrenschmidt July 27, 2009, 4:57 a.m. UTC | #3
On Mon, 2009-07-27 at 11:51 +1000, Anton Blanchard wrote:
> Hi Ben,
> 
> > BTW. The patch relies on some perctr changes I don't have in my tree
> > (PERF_COUNT_SW_ALIGNMENT_FAULTS isn't defined for me)
> > 
> > Ingo, how do you want to handle that ? Should I wait til round 2 of the
> > merge window before putting Anton's patch in or can I merge some of your
> > stuff in powerpc-next as pre-reqs ? Or you can just take Anton's patch
> > with my:
> > 
> > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > 
> > And stick it in your own queue (though pls, give me a pointer to the git
> > tree in question so I can verify that I don't get new stuff that
> > conflicts before we get to the merge window).
> 
> I've got another round of this series that I'll send out today.

Ok. I've pushed some to my -test branch, please let me know ASAP if I
have to withdraw some before I move them into -next

Cheers,
Ben.
Peter Zijlstra July 27, 2009, 6:26 a.m. UTC | #4
On Mon, 2009-07-27 at 11:47 +1000, Benjamin Herrenschmidt wrote:

> Sounds good.
> 
> BTW. The patch relies on some perctr changes I don't have in my tree
> (PERF_COUNT_SW_ALIGNMENT_FAULTS isn't defined for me)
> 
> Ingo, how do you want to handle that ? Should I wait til round 2 of the
> merge window before putting Anton's patch in or can I merge some of your
> stuff in powerpc-next as pre-reqs ? Or you can just take Anton's patch
> with my:
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> And stick it in your own queue (though pls, give me a pointer to the git
> tree in question so I can verify that I don't get new stuff that
> conflicts before we get to the merge window).

Please send all missing bits to me and I'll stuff it into:

  git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf.git perf-master
Peter Zijlstra July 27, 2009, 6:27 a.m. UTC | #5
On Mon, 2009-07-27 at 08:26 +0200, Peter Zijlstra wrote:
> On Mon, 2009-07-27 at 11:47 +1000, Benjamin Herrenschmidt wrote:
> 
> > Sounds good.
> > 
> > BTW. The patch relies on some perctr changes I don't have in my tree
> > (PERF_COUNT_SW_ALIGNMENT_FAULTS isn't defined for me)
> > 
> > Ingo, how do you want to handle that ? Should I wait til round 2 of the
> > merge window before putting Anton's patch in or can I merge some of your
> > stuff in powerpc-next as pre-reqs ? Or you can just take Anton's patch
> > with my:
> > 
> > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > 
> > And stick it in your own queue (though pls, give me a pointer to the git
> > tree in question so I can verify that I don't get new stuff that
> > conflicts before we get to the merge window).
> 
> Please send all missing bits to me and I'll stuff it into:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf.git perf-master

Or if they're all PPC specific I have no objections of them going
through the PPC git tree.
diff mbox

Patch

Index: linux.trees.git/arch/powerpc/kernel/align.c
===================================================================
--- linux.trees.git.orig/arch/powerpc/kernel/align.c	2009-07-06 21:50:53.000000000 +1000
+++ linux.trees.git/arch/powerpc/kernel/align.c	2009-07-06 22:10:41.000000000 +1000
@@ -25,6 +25,7 @@ 
 #include <asm/cache.h>
 #include <asm/cputable.h>
 #include <asm/emulated_ops.h>
+#include <linux/perf_counter.h>
 
 struct aligninfo {
 	unsigned char len;
@@ -707,6 +708,9 @@ 
 	 */
 	CHECK_FULL_REGS(regs);
 
+	perf_swcounter_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs,
+			     regs->nip);
+
 	dsisr = regs->dsisr;
 
 	/* Some processors don't provide us with a DSISR we can use here,
Index: linux.trees.git/arch/powerpc/kernel/traps.c
===================================================================
--- linux.trees.git.orig/arch/powerpc/kernel/traps.c	2009-07-06 21:50:53.000000000 +1000
+++ linux.trees.git/arch/powerpc/kernel/traps.c	2009-07-06 22:11:52.000000000 +1000
@@ -34,6 +34,7 @@ 
 #include <linux/bug.h>
 #include <linux/kdebug.h>
 #include <linux/debugfs.h>
+#include <linux/perf_counter.h>
 
 #include <asm/emulated_ops.h>
 #include <asm/pgtable.h>
@@ -759,6 +760,8 @@ 
 
 	/* Emulate the mfspr rD, PVR. */
 	if ((instword & PPC_INST_MFSPR_PVR_MASK) == PPC_INST_MFSPR_PVR) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(mfpvr);
 		rd = (instword >> 21) & 0x1f;
 		regs->gpr[rd] = mfspr(SPRN_PVR);
@@ -767,6 +770,8 @@ 
 
 	/* Emulating the dcba insn is just a no-op.  */
 	if ((instword & PPC_INST_DCBA_MASK) == PPC_INST_DCBA) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(dcba);
 		return 0;
 	}
@@ -776,6 +781,8 @@ 
 		int shift = (instword >> 21) & 0x1c;
 		unsigned long msk = 0xf0000000UL >> shift;
 
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(mcrxr);
 		regs->ccr = (regs->ccr & ~msk) | ((regs->xer >> shift) & msk);
 		regs->xer &= ~0xf0000000UL;
@@ -784,18 +791,24 @@ 
 
 	/* Emulate load/store string insn. */
 	if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(string);
 		return emulate_string_inst(regs, instword);
 	}
 
 	/* Emulate the popcntb (Population Count Bytes) instruction. */
 	if ((instword & PPC_INST_POPCNTB_MASK) == PPC_INST_POPCNTB) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(popcntb);
 		return emulate_popcntb_inst(regs, instword);
 	}
 
 	/* Emulate isel (Integer Select) instruction */
 	if ((instword & PPC_INST_ISEL_MASK) == PPC_INST_ISEL) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(isel);
 		return emulate_isel(regs, instword);
 	}
@@ -994,8 +1007,11 @@ 
 
 #ifdef CONFIG_MATH_EMULATION
 	errcode = do_mathemu(regs);
-	if (errcode >= 0)
+	if (errcode >= 0) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(math);
+	}
 
 	switch (errcode) {
 	case 0:
@@ -1017,8 +1033,11 @@ 
 
 #elif defined(CONFIG_8XX_MINIMAL_FPEMU)
 	errcode = Soft_emulate_8xx(regs);
-	if (errcode >= 0)
+	if (errcode >= 0) {
+		perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0,
+				     regs, regs->nip);
 		PPC_WARN_EMULATED(8xx);
+	}
 
 	switch (errcode) {
 	case 0:
@@ -1129,6 +1148,8 @@ 
 
 	flush_altivec_to_thread(current);
 
+	perf_swcounter_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs,
+			     regs->nip);
 	PPC_WARN_EMULATED(altivec);
 	err = emulate_altivec(regs);
 	if (err == 0) {