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/net/pcmcia/axnet_cs.c | |
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/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index a8891a9000ac..e5f366910914 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -92,7 +92,7 @@ static int axnet_open(struct net_device *dev); | |||
92 | static int axnet_close(struct net_device *dev); | 92 | static int axnet_close(struct net_device *dev); |
93 | static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 93 | static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
94 | static const struct ethtool_ops netdev_ethtool_ops; | 94 | static const struct ethtool_ops netdev_ethtool_ops; |
95 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); | 95 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id); |
96 | static void ei_watchdog(u_long arg); | 96 | static void ei_watchdog(u_long arg); |
97 | static void axnet_reset_8390(struct net_device *dev); | 97 | static void axnet_reset_8390(struct net_device *dev); |
98 | 98 | ||
@@ -112,7 +112,7 @@ static void axdev_setup(struct net_device *dev); | |||
112 | static void AX88190_init(struct net_device *dev, int startp); | 112 | static void AX88190_init(struct net_device *dev, int startp); |
113 | static int ax_open(struct net_device *dev); | 113 | static int ax_open(struct net_device *dev); |
114 | static int ax_close(struct net_device *dev); | 114 | static int ax_close(struct net_device *dev); |
115 | static irqreturn_t ax_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 115 | static irqreturn_t ax_interrupt(int irq, void *dev_id); |
116 | 116 | ||
117 | /*====================================================================*/ | 117 | /*====================================================================*/ |
118 | 118 | ||
@@ -599,11 +599,11 @@ static void axnet_reset_8390(struct net_device *dev) | |||
599 | 599 | ||
600 | /*====================================================================*/ | 600 | /*====================================================================*/ |
601 | 601 | ||
602 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs) | 602 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id) |
603 | { | 603 | { |
604 | struct net_device *dev = dev_id; | 604 | struct net_device *dev = dev_id; |
605 | PRIV(dev)->stale = 0; | 605 | PRIV(dev)->stale = 0; |
606 | return ax_interrupt(irq, dev_id, regs); | 606 | return ax_interrupt(irq, dev_id); |
607 | } | 607 | } |
608 | 608 | ||
609 | static void ei_watchdog(u_long arg) | 609 | static void ei_watchdog(u_long arg) |
@@ -621,7 +621,7 @@ static void ei_watchdog(u_long arg) | |||
621 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { | 621 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { |
622 | if (!info->fast_poll) | 622 | if (!info->fast_poll) |
623 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); | 623 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); |
624 | ei_irq_wrapper(dev->irq, dev, NULL); | 624 | ei_irq_wrapper(dev->irq, dev); |
625 | info->fast_poll = HZ; | 625 | info->fast_poll = HZ; |
626 | } | 626 | } |
627 | if (info->fast_poll) { | 627 | if (info->fast_poll) { |
@@ -1193,7 +1193,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1193 | * needed. | 1193 | * needed. |
1194 | */ | 1194 | */ |
1195 | 1195 | ||
1196 | static irqreturn_t ax_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 1196 | static irqreturn_t ax_interrupt(int irq, void *dev_id) |
1197 | { | 1197 | { |
1198 | struct net_device *dev = dev_id; | 1198 | struct net_device *dev = dev_id; |
1199 | long e8390_base; | 1199 | long e8390_base; |