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 /drivers/scsi/arm | |
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 'drivers/scsi/arm')
-rw-r--r-- | drivers/scsi/arm/acornscsi.c | 5 | ||||
-rw-r--r-- | drivers/scsi/arm/cumana_2.c | 3 | ||||
-rw-r--r-- | drivers/scsi/arm/eesox.c | 3 | ||||
-rw-r--r-- | drivers/scsi/arm/powertec.c | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 0525d672e1e6..9cf902b7a126 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c | |||
@@ -2461,14 +2461,13 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2461 | } | 2461 | } |
2462 | 2462 | ||
2463 | /* | 2463 | /* |
2464 | * Prototype: void acornscsi_intr(int irq, void *dev_id, struct pt_regs *regs) | 2464 | * Prototype: void acornscsi_intr(int irq, void *dev_id) |
2465 | * Purpose : handle interrupts from Acorn SCSI card | 2465 | * Purpose : handle interrupts from Acorn SCSI card |
2466 | * Params : irq - interrupt number | 2466 | * Params : irq - interrupt number |
2467 | * dev_id - device specific data (AS_Host structure) | 2467 | * dev_id - device specific data (AS_Host structure) |
2468 | * regs - processor registers when interrupt occurred | ||
2469 | */ | 2468 | */ |
2470 | static irqreturn_t | 2469 | static irqreturn_t |
2471 | acornscsi_intr(int irq, void *dev_id, struct pt_regs *regs) | 2470 | acornscsi_intr(int irq, void *dev_id) |
2472 | { | 2471 | { |
2473 | AS_Host *host = (AS_Host *)dev_id; | 2472 | AS_Host *host = (AS_Host *)dev_id; |
2474 | intr_ret_t ret; | 2473 | intr_ret_t ret; |
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 719af0dcc0e5..19edd9c853d9 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c | |||
@@ -137,10 +137,9 @@ cumanascsi_2_terminator_ctl(struct Scsi_Host *host, int on_off) | |||
137 | * Purpose : handle interrupts from Cumana SCSI 2 card | 137 | * Purpose : handle interrupts from Cumana SCSI 2 card |
138 | * Params : irq - interrupt number | 138 | * Params : irq - interrupt number |
139 | * dev_id - user-defined (Scsi_Host structure) | 139 | * dev_id - user-defined (Scsi_Host structure) |
140 | * regs - processor registers at interrupt | ||
141 | */ | 140 | */ |
142 | static irqreturn_t | 141 | static irqreturn_t |
143 | cumanascsi_2_intr(int irq, void *dev_id, struct pt_regs *regs) | 142 | cumanascsi_2_intr(int irq, void *dev_id) |
144 | { | 143 | { |
145 | struct cumanascsi2_info *info = dev_id; | 144 | struct cumanascsi2_info *info = dev_id; |
146 | 145 | ||
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index dcbb4b2b3fe0..3f876fb75469 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c | |||
@@ -138,10 +138,9 @@ eesoxscsi_terminator_ctl(struct Scsi_Host *host, int on_off) | |||
138 | * Purpose : handle interrupts from EESOX SCSI card | 138 | * Purpose : handle interrupts from EESOX SCSI card |
139 | * Params : irq - interrupt number | 139 | * Params : irq - interrupt number |
140 | * dev_id - user-defined (Scsi_Host structure) | 140 | * dev_id - user-defined (Scsi_Host structure) |
141 | * regs - processor registers at interrupt | ||
142 | */ | 141 | */ |
143 | static irqreturn_t | 142 | static irqreturn_t |
144 | eesoxscsi_intr(int irq, void *dev_id, struct pt_regs *regs) | 143 | eesoxscsi_intr(int irq, void *dev_id) |
145 | { | 144 | { |
146 | struct eesoxscsi_info *info = dev_id; | 145 | struct eesoxscsi_info *info = dev_id; |
147 | 146 | ||
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index b2c346a47052..ce159c15bc86 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c | |||
@@ -112,10 +112,8 @@ powertecscsi_terminator_ctl(struct Scsi_Host *host, int on_off) | |||
112 | * Purpose : handle interrupts from Powertec SCSI card | 112 | * Purpose : handle interrupts from Powertec SCSI card |
113 | * Params : irq - interrupt number | 113 | * Params : irq - interrupt number |
114 | * dev_id - user-defined (Scsi_Host structure) | 114 | * dev_id - user-defined (Scsi_Host structure) |
115 | * regs - processor registers at interrupt | ||
116 | */ | 115 | */ |
117 | static irqreturn_t | 116 | static irqreturn_t powertecscsi_intr(int irq, void *dev_id) |
118 | powertecscsi_intr(int irq, void *dev_id, struct pt_regs *regs) | ||
119 | { | 117 | { |
120 | struct powertec_info *info = dev_id; | 118 | struct powertec_info *info = dev_id; |
121 | 119 | ||