| Message ID | 1472106603-23336-12-git-send-email-maddy@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Thu, 25 Aug 2016 12:00:02 +0530 Madhavan Srinivasan <maddy@linux.vnet.ibm.com> wrote: > Code to replay the Performance Monitoring Interrupts(PMI). > In the masked_interrupt handler, for PMIs we reset the MSR[EE] > and return. In the __check_irq_replay(), replay the PMI interrupt > by calling performance_monitor_common handler. > > Patch also adds a new soft_irq_set_mask() to update paca->soft_enabled. > New Kconfig is added "CONFIG_IRQ_DEBUG_SUPPORT" to add a warn_on > to alert the usage of soft_irq_set_mask() for disabling lower > bitmask interrupts. > > Have also moved the code under the CONFIG_TRACE_IRQFLAGS in > arch_local_irq_restore() to new Kconfig as suggested. Should you make a single patch out of this and patch 10? It doesn't make sense to mask perf interrupts if we can't replay them. Perhaps split the CONFIG_IRQ_DEBUG_SUPPORT change into its own patch first and have the PMU masking and replaying as a single patch? Just a suggestion.
On Thursday 25 August 2016 12:38 PM, Nicholas Piggin wrote: > On Thu, 25 Aug 2016 12:00:02 +0530 > Madhavan Srinivasan <maddy@linux.vnet.ibm.com> wrote: > >> Code to replay the Performance Monitoring Interrupts(PMI). >> In the masked_interrupt handler, for PMIs we reset the MSR[EE] >> and return. In the __check_irq_replay(), replay the PMI interrupt >> by calling performance_monitor_common handler. >> >> Patch also adds a new soft_irq_set_mask() to update paca->soft_enabled. >> New Kconfig is added "CONFIG_IRQ_DEBUG_SUPPORT" to add a warn_on >> to alert the usage of soft_irq_set_mask() for disabling lower >> bitmask interrupts. >> >> Have also moved the code under the CONFIG_TRACE_IRQFLAGS in >> arch_local_irq_restore() to new Kconfig as suggested. > Should you make a single patch out of this and patch 10? > It doesn't make sense to mask perf interrupts if we can't > replay them. > > Perhaps split the CONFIG_IRQ_DEBUG_SUPPORT change into its > own patch first and have the PMU masking and replaying as > a single patch? Make senses. Will make the changes. Maddy > > Just a suggestion. >
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 927d2ab2ce08..878f05925340 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -51,6 +51,10 @@ config TRACE_IRQFLAGS_SUPPORT bool default y +config IRQ_DEBUG_SUPPORT + bool + default n + config LOCKDEP_SUPPORT bool default y diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index 415734c07cfa..9f71559ce868 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -81,6 +81,23 @@ static inline unsigned long arch_local_irq_disable(void) return flags; } +static inline unsigned long soft_irq_set_mask(int value) +{ + unsigned long flags, zero; + +#ifdef CONFIG_IRQ_DEBUG_SUPPORT + WARN_ON(value <= IRQ_DISABLE_MASK_LINUX); +#endif + asm volatile( + "li %1,%3; lbz %0,%2(13); stb %1,%2(13)" + : "=r" (flags), "=&r" (zero) + : "i" (offsetof(struct paca_struct, soft_enabled)),\ + "i" (value) + : "memory"); + + return flags; +} + extern void arch_local_irq_restore(unsigned long); static inline void arch_local_irq_enable(void) diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 99bab5c65734..b79baff3dae4 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -933,6 +933,11 @@ restore_check_irq_replay: addi r3,r1,STACK_FRAME_OVERHEAD; bl do_IRQ b ret_from_except +1: cmpwi cr0,r3,0xf00 + bne 1f + addi r3,r1,STACK_FRAME_OVERHEAD; + bl performance_monitor_exception + b ret_from_except 1: cmpwi cr0,r3,0xe60 bne 1f addi r3,r1,STACK_FRAME_OVERHEAD; diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index bc2a838e1926..44c871324228 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -655,6 +655,8 @@ _GLOBAL(__replay_interrupt) beq decrementer_common cmpwi r3,0x500 beq hardware_interrupt_common + cmpwi r3,0xf00 + beq performance_monitor_common BEGIN_FTR_SECTION cmpwi r3,0xe80 beq h_doorbell_common diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 40af16a102bb..57343a55111e 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -159,6 +159,14 @@ notrace unsigned int __check_irq_replay(void) if ((happened & PACA_IRQ_DEC) || decrementer_check_overflow()) return 0x900; + /* + * In masked_handler() for PMI, we disable MSR[EE] and return. + * When replaying it here + */ + local_paca->irq_happened &= ~PACA_IRQ_PMI; + if (happened & PACA_IRQ_PMI) + return 0xf00; + /* Finally check if an external interrupt happened */ local_paca->irq_happened &= ~PACA_IRQ_EE; if (happened & PACA_IRQ_EE) @@ -235,7 +243,7 @@ notrace void arch_local_irq_restore(unsigned long en) */ if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) __hard_irq_disable(); -#ifdef CONFIG_TRACE_IRQFLAGS +#ifdef CONFIG_IRQ_DEBUG_SUPPORT else { /* * We should already be hard disabled here. We had bugs @@ -246,7 +254,7 @@ notrace void arch_local_irq_restore(unsigned long en) if (WARN_ON(mfmsr() & MSR_EE)) __hard_irq_disable(); } -#endif /* CONFIG_TRACE_IRQFLAGS */ +#endif /* CONFIG_IRQ_DEBUG_SUPPORT */ set_soft_enabled(IRQ_DISABLE_MASK_LINUX);
Code to replay the Performance Monitoring Interrupts(PMI). In the masked_interrupt handler, for PMIs we reset the MSR[EE] and return. In the __check_irq_replay(), replay the PMI interrupt by calling performance_monitor_common handler. Patch also adds a new soft_irq_set_mask() to update paca->soft_enabled. New Kconfig is added "CONFIG_IRQ_DEBUG_SUPPORT" to add a warn_on to alert the usage of soft_irq_set_mask() for disabling lower bitmask interrupts. Have also moved the code under the CONFIG_TRACE_IRQFLAGS in arch_local_irq_restore() to new Kconfig as suggested. Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> --- arch/powerpc/Kconfig | 4 ++++ arch/powerpc/include/asm/hw_irq.h | 17 +++++++++++++++++ arch/powerpc/kernel/entry_64.S | 5 +++++ arch/powerpc/kernel/exceptions-64s.S | 2 ++ arch/powerpc/kernel/irq.c | 12 ++++++++++-- 5 files changed, 38 insertions(+), 2 deletions(-)