diff options
author | David Howells <dhowells@redhat.com> | 2006-10-05 09:55:46 -0400 |
---|---|---|
committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-10-05 10:10:12 -0400 |
commit | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (patch) | |
tree | 6748550400445c11a306b132009f3001e3525df8 /include/linux/irq.h | |
parent | da482792a6d1a3fbaaa25fae867b343fb4db3246 (diff) |
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r-- | include/linux/irq.h | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index b947d46e4b1..c64f3cc7e87 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -21,11 +21,11 @@ | |||
21 | 21 | ||
22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
23 | #include <asm/ptrace.h> | 23 | #include <asm/ptrace.h> |
24 | #include <asm/irq_regs.h> | ||
24 | 25 | ||
25 | struct irq_desc; | 26 | struct irq_desc; |
26 | typedef void fastcall (*irq_flow_handler_t)(unsigned int irq, | 27 | typedef void fastcall (*irq_flow_handler_t)(unsigned int irq, |
27 | struct irq_desc *desc, | 28 | struct irq_desc *desc); |
28 | struct pt_regs *regs); | ||
29 | 29 | ||
30 | 30 | ||
31 | /* | 31 | /* |
@@ -258,28 +258,18 @@ static inline int select_smp_affinity(unsigned int irq) | |||
258 | extern int no_irq_affinity; | 258 | extern int no_irq_affinity; |
259 | 259 | ||
260 | /* Handle irq action chains: */ | 260 | /* Handle irq action chains: */ |
261 | extern int handle_IRQ_event(unsigned int irq, struct pt_regs *regs, | 261 | extern int handle_IRQ_event(unsigned int irq, struct irqaction *action); |
262 | struct irqaction *action); | ||
263 | 262 | ||
264 | /* | 263 | /* |
265 | * Built-in IRQ handlers for various IRQ types, | 264 | * Built-in IRQ handlers for various IRQ types, |
266 | * callable via desc->chip->handle_irq() | 265 | * callable via desc->chip->handle_irq() |
267 | */ | 266 | */ |
268 | extern void fastcall | 267 | extern void fastcall handle_level_irq(unsigned int irq, struct irq_desc *desc); |
269 | handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs); | 268 | extern void fastcall handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc); |
270 | extern void fastcall | 269 | extern void fastcall handle_edge_irq(unsigned int irq, struct irq_desc *desc); |
271 | handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc, | 270 | extern void fastcall handle_simple_irq(unsigned int irq, struct irq_desc *desc); |
272 | struct pt_regs *regs); | 271 | extern void fastcall handle_percpu_irq(unsigned int irq, struct irq_desc *desc); |
273 | extern void fastcall | 272 | extern void fastcall handle_bad_irq(unsigned int irq, struct irq_desc *desc); |
274 | handle_edge_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs); | ||
275 | extern void fastcall | ||
276 | handle_simple_irq(unsigned int irq, struct irq_desc *desc, | ||
277 | struct pt_regs *regs); | ||
278 | extern void fastcall | ||
279 | handle_percpu_irq(unsigned int irq, struct irq_desc *desc, | ||
280 | struct pt_regs *regs); | ||
281 | extern void fastcall | ||
282 | handle_bad_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs); | ||
283 | 273 | ||
284 | /* | 274 | /* |
285 | * Get a descriptive string for the highlevel handler, for | 275 | * Get a descriptive string for the highlevel handler, for |
@@ -292,7 +282,7 @@ extern const char *handle_irq_name(irq_flow_handler_t handle); | |||
292 | * (is an explicit fastcall, because i386 4KSTACKS calls it from assembly) | 282 | * (is an explicit fastcall, because i386 4KSTACKS calls it from assembly) |
293 | */ | 283 | */ |
294 | #ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ | 284 | #ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ |
295 | extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs); | 285 | extern fastcall unsigned int __do_IRQ(unsigned int irq); |
296 | #endif | 286 | #endif |
297 | 287 | ||
298 | /* | 288 | /* |
@@ -301,23 +291,23 @@ extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs); | |||
301 | * irqchip-style controller then we call the ->handle_irq() handler, | 291 | * irqchip-style controller then we call the ->handle_irq() handler, |
302 | * and it calls __do_IRQ() if it's attached to an irqtype-style controller. | 292 | * and it calls __do_IRQ() if it's attached to an irqtype-style controller. |
303 | */ | 293 | */ |
304 | static inline void generic_handle_irq(unsigned int irq, struct pt_regs *regs) | 294 | static inline void generic_handle_irq(unsigned int irq) |
305 | { | 295 | { |
306 | struct irq_desc *desc = irq_desc + irq; | 296 | struct irq_desc *desc = irq_desc + irq; |
307 | 297 | ||
308 | #ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ | 298 | #ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ |
309 | desc->handle_irq(irq, desc, regs); | 299 | desc->handle_irq(irq, desc); |
310 | #else | 300 | #else |
311 | if (likely(desc->handle_irq)) | 301 | if (likely(desc->handle_irq)) |
312 | desc->handle_irq(irq, desc, regs); | 302 | desc->handle_irq(irq, desc); |
313 | else | 303 | else |
314 | __do_IRQ(irq, regs); | 304 | __do_IRQ(irq); |
315 | #endif | 305 | #endif |
316 | } | 306 | } |
317 | 307 | ||
318 | /* Handling of unhandled and spurious interrupts: */ | 308 | /* Handling of unhandled and spurious interrupts: */ |
319 | extern void note_interrupt(unsigned int irq, struct irq_desc *desc, | 309 | extern void note_interrupt(unsigned int irq, struct irq_desc *desc, |
320 | int action_ret, struct pt_regs *regs); | 310 | int action_ret); |
321 | 311 | ||
322 | /* Resending of interrupts :*/ | 312 | /* Resending of interrupts :*/ |
323 | void check_irq_resend(struct irq_desc *desc, unsigned int irq); | 313 | void check_irq_resend(struct irq_desc *desc, unsigned int irq); |