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/qla2xxx | |
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/qla2xxx')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_gbl.h | 6 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_inline.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 9 |
4 files changed, 8 insertions, 11 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index c37a30aa2146..bab33f6d0bdb 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -2009,7 +2009,7 @@ struct isp_operations { | |||
2009 | char * (*pci_info_str) (struct scsi_qla_host *, char *); | 2009 | char * (*pci_info_str) (struct scsi_qla_host *, char *); |
2010 | char * (*fw_version_str) (struct scsi_qla_host *, char *); | 2010 | char * (*fw_version_str) (struct scsi_qla_host *, char *); |
2011 | 2011 | ||
2012 | irqreturn_t (*intr_handler) (int, void *, struct pt_regs *); | 2012 | irq_handler_t intr_handler; |
2013 | void (*enable_intrs) (struct scsi_qla_host *); | 2013 | void (*enable_intrs) (struct scsi_qla_host *); |
2014 | void (*disable_intrs) (struct scsi_qla_host *); | 2014 | void (*disable_intrs) (struct scsi_qla_host *); |
2015 | 2015 | ||
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index bef7011378c6..75138109b139 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h | |||
@@ -217,9 +217,9 @@ qla2x00_set_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t *); | |||
217 | /* | 217 | /* |
218 | * Global Function Prototypes in qla_isr.c source file. | 218 | * Global Function Prototypes in qla_isr.c source file. |
219 | */ | 219 | */ |
220 | extern irqreturn_t qla2100_intr_handler(int, void *, struct pt_regs *); | 220 | extern irqreturn_t qla2100_intr_handler(int, void *); |
221 | extern irqreturn_t qla2300_intr_handler(int, void *, struct pt_regs *); | 221 | extern irqreturn_t qla2300_intr_handler(int, void *); |
222 | extern irqreturn_t qla24xx_intr_handler(int, void *, struct pt_regs *); | 222 | extern irqreturn_t qla24xx_intr_handler(int, void *); |
223 | extern void qla2x00_process_response_queue(struct scsi_qla_host *); | 223 | extern void qla2x00_process_response_queue(struct scsi_qla_host *); |
224 | extern void qla24xx_process_response_queue(struct scsi_qla_host *); | 224 | extern void qla24xx_process_response_queue(struct scsi_qla_host *); |
225 | 225 | ||
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index 45007ee58067..d3023338628f 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h | |||
@@ -104,7 +104,7 @@ static __inline__ void qla2x00_poll(scsi_qla_host_t *); | |||
104 | static inline void | 104 | static inline void |
105 | qla2x00_poll(scsi_qla_host_t *ha) | 105 | qla2x00_poll(scsi_qla_host_t *ha) |
106 | { | 106 | { |
107 | ha->isp_ops.intr_handler(0, ha, NULL); | 107 | ha->isp_ops.intr_handler(0, ha); |
108 | } | 108 | } |
109 | 109 | ||
110 | static __inline__ void qla2x00_check_fabric_devices(scsi_qla_host_t *); | 110 | static __inline__ void qla2x00_check_fabric_devices(scsi_qla_host_t *); |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 5fa933cda992..626c7178a434 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -20,14 +20,13 @@ static void qla24xx_ms_entry(scsi_qla_host_t *, struct ct_entry_24xx *); | |||
20 | * qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200. | 20 | * qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200. |
21 | * @irq: | 21 | * @irq: |
22 | * @dev_id: SCSI driver HA context | 22 | * @dev_id: SCSI driver HA context |
23 | * @regs: | ||
24 | * | 23 | * |
25 | * Called by system whenever the host adapter generates an interrupt. | 24 | * Called by system whenever the host adapter generates an interrupt. |
26 | * | 25 | * |
27 | * Returns handled flag. | 26 | * Returns handled flag. |
28 | */ | 27 | */ |
29 | irqreturn_t | 28 | irqreturn_t |
30 | qla2100_intr_handler(int irq, void *dev_id, struct pt_regs *regs) | 29 | qla2100_intr_handler(int irq, void *dev_id) |
31 | { | 30 | { |
32 | scsi_qla_host_t *ha; | 31 | scsi_qla_host_t *ha; |
33 | struct device_reg_2xxx __iomem *reg; | 32 | struct device_reg_2xxx __iomem *reg; |
@@ -100,14 +99,13 @@ qla2100_intr_handler(int irq, void *dev_id, struct pt_regs *regs) | |||
100 | * qla2300_intr_handler() - Process interrupts for the ISP23xx and ISP63xx. | 99 | * qla2300_intr_handler() - Process interrupts for the ISP23xx and ISP63xx. |
101 | * @irq: | 100 | * @irq: |
102 | * @dev_id: SCSI driver HA context | 101 | * @dev_id: SCSI driver HA context |
103 | * @regs: | ||
104 | * | 102 | * |
105 | * Called by system whenever the host adapter generates an interrupt. | 103 | * Called by system whenever the host adapter generates an interrupt. |
106 | * | 104 | * |
107 | * Returns handled flag. | 105 | * Returns handled flag. |
108 | */ | 106 | */ |
109 | irqreturn_t | 107 | irqreturn_t |
110 | qla2300_intr_handler(int irq, void *dev_id, struct pt_regs *regs) | 108 | qla2300_intr_handler(int irq, void *dev_id) |
111 | { | 109 | { |
112 | scsi_qla_host_t *ha; | 110 | scsi_qla_host_t *ha; |
113 | struct device_reg_2xxx __iomem *reg; | 111 | struct device_reg_2xxx __iomem *reg; |
@@ -1338,14 +1336,13 @@ qla24xx_process_response_queue(struct scsi_qla_host *ha) | |||
1338 | * qla24xx_intr_handler() - Process interrupts for the ISP23xx and ISP63xx. | 1336 | * qla24xx_intr_handler() - Process interrupts for the ISP23xx and ISP63xx. |
1339 | * @irq: | 1337 | * @irq: |
1340 | * @dev_id: SCSI driver HA context | 1338 | * @dev_id: SCSI driver HA context |
1341 | * @regs: | ||
1342 | * | 1339 | * |
1343 | * Called by system whenever the host adapter generates an interrupt. | 1340 | * Called by system whenever the host adapter generates an interrupt. |
1344 | * | 1341 | * |
1345 | * Returns handled flag. | 1342 | * Returns handled flag. |
1346 | */ | 1343 | */ |
1347 | irqreturn_t | 1344 | irqreturn_t |
1348 | qla24xx_intr_handler(int irq, void *dev_id, struct pt_regs *regs) | 1345 | qla24xx_intr_handler(int irq, void *dev_id) |
1349 | { | 1346 | { |
1350 | scsi_qla_host_t *ha; | 1347 | scsi_qla_host_t *ha; |
1351 | struct device_reg_24xx __iomem *reg; | 1348 | struct device_reg_24xx __iomem *reg; |