aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-10-05 09:55:46 -0400
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>2006-10-05 10:10:12 -0400
commit7d12e780e003f93433d49ce78cfedf4b4c52adc5 (patch)
tree6748550400445c11a306b132009f3001e3525df8 /arch/mips/kernel
parentda482792a6d1a3fbaaa25fae867b343fb4db3246 (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 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/irq.c4
-rw-r--r--arch/mips/kernel/time.c24
2 files changed, 17 insertions, 11 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index d955aaefbb8e..a00b0e7ab9b1 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -55,13 +55,15 @@ unsigned long irq_hwmask[NR_IRQS];
55 */ 55 */
56asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs) 56asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs)
57{ 57{
58 struct pt_regs *old_regs = set_irq_regs(regs);
58 irq_enter(); 59 irq_enter();
59 60
60 __DO_IRQ_SMTC_HOOK(); 61 __DO_IRQ_SMTC_HOOK();
61 __do_IRQ(irq, regs); 62 __do_IRQ(irq);
62 63
63 irq_exit(); 64 irq_exit();
64 65
66 set_irq_regs(old_regs);
65 return 1; 67 return 1;
66} 68}
67 69
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index a8340802f2d7..d349eb9e4ffb 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -322,18 +322,18 @@ static long last_rtc_update;
322 * a broadcasted inter-processor interrupt which itself is triggered 322 * a broadcasted inter-processor interrupt which itself is triggered
323 * by the global timer interrupt. 323 * by the global timer interrupt.
324 */ 324 */
325void local_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 325void local_timer_interrupt(int irq, void *dev_id)
326{ 326{
327 if (current->pid) 327 if (current->pid)
328 profile_tick(CPU_PROFILING, regs); 328 profile_tick(CPU_PROFILING);
329 update_process_times(user_mode(regs)); 329 update_process_times(user_mode(get_irq_regs()));
330} 330}
331 331
332/* 332/*
333 * High-level timer interrupt service routines. This function 333 * High-level timer interrupt service routines. This function
334 * is set as irqaction->handler and is invoked through do_IRQ. 334 * is set as irqaction->handler and is invoked through do_IRQ.
335 */ 335 */
336irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 336irqreturn_t timer_interrupt(int irq, void *dev_id)
337{ 337{
338 unsigned long j; 338 unsigned long j;
339 unsigned int count; 339 unsigned int count;
@@ -419,23 +419,24 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
419 * In SMP mode, local_timer_interrupt() is invoked by appropriate 419 * In SMP mode, local_timer_interrupt() is invoked by appropriate
420 * low-level local timer interrupt handler. 420 * low-level local timer interrupt handler.
421 */ 421 */
422 local_timer_interrupt(irq, dev_id, regs); 422 local_timer_interrupt(irq, dev_id);
423 423
424 return IRQ_HANDLED; 424 return IRQ_HANDLED;
425} 425}
426 426
427int null_perf_irq(struct pt_regs *regs) 427int null_perf_irq(void)
428{ 428{
429 return 0; 429 return 0;
430} 430}
431 431
432int (*perf_irq)(struct pt_regs *regs) = null_perf_irq; 432int (*perf_irq)(void) = null_perf_irq;
433 433
434EXPORT_SYMBOL(null_perf_irq); 434EXPORT_SYMBOL(null_perf_irq);
435EXPORT_SYMBOL(perf_irq); 435EXPORT_SYMBOL(perf_irq);
436 436
437asmlinkage void ll_timer_interrupt(int irq, struct pt_regs *regs) 437asmlinkage void ll_timer_interrupt(int irq, struct pt_regs *regs)
438{ 438{
439 struct pt_regs *old_regs = set_irq_regs(regs);
439 int r2 = cpu_has_mips_r2; 440 int r2 = cpu_has_mips_r2;
440 441
441 irq_enter(); 442 irq_enter();
@@ -448,27 +449,30 @@ asmlinkage void ll_timer_interrupt(int irq, struct pt_regs *regs)
448 * performance counter interrupt handler anyway. 449 * performance counter interrupt handler anyway.
449 */ 450 */
450 if (!r2 || (read_c0_cause() & (1 << 26))) 451 if (!r2 || (read_c0_cause() & (1 << 26)))
451 if (perf_irq(regs)) 452 if (perf_irq())
452 goto out; 453 goto out;
453 454
454 /* we keep interrupt disabled all the time */ 455 /* we keep interrupt disabled all the time */
455 if (!r2 || (read_c0_cause() & (1 << 30))) 456 if (!r2 || (read_c0_cause() & (1 << 30)))
456 timer_interrupt(irq, NULL, regs); 457 timer_interrupt(irq, NULL);
457 458
458out: 459out:
459 irq_exit(); 460 irq_exit();
461 set_irq_regs(old_regs);
460} 462}
461 463
462asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs) 464asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs)
463{ 465{
466 struct pt_regs *old_regs = set_irq_regs(regs);
464 irq_enter(); 467 irq_enter();
465 if (smp_processor_id() != 0) 468 if (smp_processor_id() != 0)
466 kstat_this_cpu.irqs[irq]++; 469 kstat_this_cpu.irqs[irq]++;
467 470
468 /* we keep interrupt disabled all the time */ 471 /* we keep interrupt disabled all the time */
469 local_timer_interrupt(irq, NULL, regs); 472 local_timer_interrupt(irq, NULL);
470 473
471 irq_exit(); 474 irq_exit();
475 set_irq_regs(old_regs);
472} 476}
473 477
474/* 478/*