aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/sn_console.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/sn_console.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/sn_console.c')
-rw-r--r--drivers/serial/sn_console.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 2f148e5b9255..709f93a6c18c 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -447,7 +447,6 @@ static int sn_debug_printf(const char *fmt, ...)
447/** 447/**
448 * sn_receive_chars - Grab characters, pass them to tty layer 448 * sn_receive_chars - Grab characters, pass them to tty layer
449 * @port: Port to operate on 449 * @port: Port to operate on
450 * @regs: Saved registers (needed by uart_handle_sysrq_char)
451 * @flags: irq flags 450 * @flags: irq flags
452 * 451 *
453 * Note: If we're not registered with the serial core infrastructure yet, 452 * Note: If we're not registered with the serial core infrastructure yet,
@@ -455,8 +454,7 @@ static int sn_debug_printf(const char *fmt, ...)
455 * 454 *
456 */ 455 */
457static void 456static void
458sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs, 457sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
459 unsigned long flags)
460{ 458{
461 int ch; 459 int ch;
462 struct tty_struct *tty; 460 struct tty_struct *tty;
@@ -494,7 +492,7 @@ sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs,
494 sysrq_requested = 0; 492 sysrq_requested = 0;
495 if (ch && time_before(jiffies, sysrq_timeout)) { 493 if (ch && time_before(jiffies, sysrq_timeout)) {
496 spin_unlock_irqrestore(&port->sc_port.lock, flags); 494 spin_unlock_irqrestore(&port->sc_port.lock, flags);
497 handle_sysrq(ch, regs, NULL); 495 handle_sysrq(ch, NULL);
498 spin_lock_irqsave(&port->sc_port.lock, flags); 496 spin_lock_irqsave(&port->sc_port.lock, flags);
499 /* ignore actual sysrq command char */ 497 /* ignore actual sysrq command char */
500 continue; 498 continue;
@@ -615,10 +613,9 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
615 * sn_sal_interrupt - Handle console interrupts 613 * sn_sal_interrupt - Handle console interrupts
616 * @irq: irq #, useful for debug statements 614 * @irq: irq #, useful for debug statements
617 * @dev_id: our pointer to our port (sn_cons_port which contains the uart port) 615 * @dev_id: our pointer to our port (sn_cons_port which contains the uart port)
618 * @regs: Saved registers, used by sn_receive_chars for uart_handle_sysrq_char
619 * 616 *
620 */ 617 */
621static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs) 618static irqreturn_t sn_sal_interrupt(int irq, void *dev_id)
622{ 619{
623 struct sn_cons_port *port = (struct sn_cons_port *)dev_id; 620 struct sn_cons_port *port = (struct sn_cons_port *)dev_id;
624 unsigned long flags; 621 unsigned long flags;
@@ -629,7 +626,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
629 626
630 spin_lock_irqsave(&port->sc_port.lock, flags); 627 spin_lock_irqsave(&port->sc_port.lock, flags);
631 if (status & SAL_CONSOLE_INTR_RECV) { 628 if (status & SAL_CONSOLE_INTR_RECV) {
632 sn_receive_chars(port, regs, flags); 629 sn_receive_chars(port, flags);
633 } 630 }
634 if (status & SAL_CONSOLE_INTR_XMIT) { 631 if (status & SAL_CONSOLE_INTR_XMIT) {
635 sn_transmit_chars(port, TRANSMIT_BUFFERED); 632 sn_transmit_chars(port, TRANSMIT_BUFFERED);