aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/mpsc.c
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 /drivers/serial/mpsc.c
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 'drivers/serial/mpsc.c')
-rw-r--r--drivers/serial/mpsc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 704243c9f78a..8eea69f29989 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -992,7 +992,7 @@ mpsc_make_ready(struct mpsc_port_info *pi)
992 */ 992 */
993 993
994static inline int 994static inline int
995mpsc_rx_intr(struct mpsc_port_info *pi, struct pt_regs *regs) 995mpsc_rx_intr(struct mpsc_port_info *pi)
996{ 996{
997 struct mpsc_rx_desc *rxre; 997 struct mpsc_rx_desc *rxre;
998 struct tty_struct *tty = pi->port.info->tty; 998 struct tty_struct *tty = pi->port.info->tty;
@@ -1072,7 +1072,7 @@ mpsc_rx_intr(struct mpsc_port_info *pi, struct pt_regs *regs)
1072 flag = TTY_PARITY; 1072 flag = TTY_PARITY;
1073 } 1073 }
1074 1074
1075 if (uart_handle_sysrq_char(&pi->port, *bp, regs)) { 1075 if (uart_handle_sysrq_char(&pi->port, *bp)) {
1076 bp++; 1076 bp++;
1077 bytes_in--; 1077 bytes_in--;
1078 goto next_frame; 1078 goto next_frame;
@@ -1257,7 +1257,7 @@ mpsc_tx_intr(struct mpsc_port_info *pi)
1257 * handling those descriptors, we restart the Rx/Tx engines if they're stopped. 1257 * handling those descriptors, we restart the Rx/Tx engines if they're stopped.
1258 */ 1258 */
1259static irqreturn_t 1259static irqreturn_t
1260mpsc_sdma_intr(int irq, void *dev_id, struct pt_regs *regs) 1260mpsc_sdma_intr(int irq, void *dev_id)
1261{ 1261{
1262 struct mpsc_port_info *pi = dev_id; 1262 struct mpsc_port_info *pi = dev_id;
1263 ulong iflags; 1263 ulong iflags;
@@ -1267,7 +1267,7 @@ mpsc_sdma_intr(int irq, void *dev_id, struct pt_regs *regs)
1267 1267
1268 spin_lock_irqsave(&pi->port.lock, iflags); 1268 spin_lock_irqsave(&pi->port.lock, iflags);
1269 mpsc_sdma_intr_ack(pi); 1269 mpsc_sdma_intr_ack(pi);
1270 if (mpsc_rx_intr(pi, regs)) 1270 if (mpsc_rx_intr(pi))
1271 rc = IRQ_HANDLED; 1271 rc = IRQ_HANDLED;
1272 if (mpsc_tx_intr(pi)) 1272 if (mpsc_tx_intr(pi))
1273 rc = IRQ_HANDLED; 1273 rc = IRQ_HANDLED;