diff options
author | Paul Mackerras <paulus@samba.org> | 2009-01-09 00:52:19 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2009-01-09 03:48:17 -0500 |
commit | 93a6d3ce6962044fe9badf528fed46b455d58292 (patch) | |
tree | e3941058ddb4117b4598b8d94fb218cfeb9e2fa8 /arch/powerpc/kernel/irq.c | |
parent | d662ed26734473d4cb5f3d78cebfec8f9126e97c (diff) |
powerpc: Provide a way to defer perf counter work until interrupts are enabled
Because 64-bit powerpc uses lazy (soft) interrupt disabling, it is
possible for a performance monitor exception to come in when the
kernel thinks interrupts are disabled (i.e. when they are
soft-disabled but hard-enabled). In such a situation the performance
monitor exception handler might have some processing to do (such as
process wakeups) which can't be done in what is effectively an NMI
handler.
This provides a way to defer that work until interrupts get enabled,
either in raw_local_irq_restore() or by returning from an interrupt
handler to code that had interrupts enabled. We have a per-processor
flag that indicates that there is work pending to do when interrupts
subsequently get re-enabled. This flag is checked in the interrupt
return path and in raw_local_irq_restore(), and if it is set,
perf_counter_do_pending() is called to do the pending work.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index ac222d0ab12e..4efb886ea439 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -104,6 +104,13 @@ static inline notrace void set_soft_enabled(unsigned long enable) | |||
104 | : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled))); | 104 | : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled))); |
105 | } | 105 | } |
106 | 106 | ||
107 | #ifdef CONFIG_PERF_COUNTERS | ||
108 | notrace void __weak perf_counter_do_pending(void) | ||
109 | { | ||
110 | set_perf_counter_pending(0); | ||
111 | } | ||
112 | #endif | ||
113 | |||
107 | notrace void raw_local_irq_restore(unsigned long en) | 114 | notrace void raw_local_irq_restore(unsigned long en) |
108 | { | 115 | { |
109 | /* | 116 | /* |
@@ -135,6 +142,9 @@ notrace void raw_local_irq_restore(unsigned long en) | |||
135 | iseries_handle_interrupts(); | 142 | iseries_handle_interrupts(); |
136 | } | 143 | } |
137 | 144 | ||
145 | if (get_perf_counter_pending()) | ||
146 | perf_counter_do_pending(); | ||
147 | |||
138 | /* | 148 | /* |
139 | * if (get_paca()->hard_enabled) return; | 149 | * if (get_paca()->hard_enabled) return; |
140 | * But again we need to take care that gcc gets hard_enabled directly | 150 | * But again we need to take care that gcc gets hard_enabled directly |