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/gianfar.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/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 280b114e253f..a06d8d1aaceb 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -119,9 +119,9 @@ struct sk_buff *gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp); | |||
119 | static struct net_device_stats *gfar_get_stats(struct net_device *dev); | 119 | static struct net_device_stats *gfar_get_stats(struct net_device *dev); |
120 | static int gfar_set_mac_address(struct net_device *dev); | 120 | static int gfar_set_mac_address(struct net_device *dev); |
121 | static int gfar_change_mtu(struct net_device *dev, int new_mtu); | 121 | static int gfar_change_mtu(struct net_device *dev, int new_mtu); |
122 | static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs); | 122 | static irqreturn_t gfar_error(int irq, void *dev_id); |
123 | static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs); | 123 | static irqreturn_t gfar_transmit(int irq, void *dev_id); |
124 | static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 124 | static irqreturn_t gfar_interrupt(int irq, void *dev_id); |
125 | static void adjust_link(struct net_device *dev); | 125 | static void adjust_link(struct net_device *dev); |
126 | static void init_registers(struct net_device *dev); | 126 | static void init_registers(struct net_device *dev); |
127 | static int init_phy(struct net_device *dev); | 127 | static int init_phy(struct net_device *dev); |
@@ -1173,7 +1173,7 @@ static void gfar_timeout(struct net_device *dev) | |||
1173 | } | 1173 | } |
1174 | 1174 | ||
1175 | /* Interrupt Handler for Transmit complete */ | 1175 | /* Interrupt Handler for Transmit complete */ |
1176 | static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs) | 1176 | static irqreturn_t gfar_transmit(int irq, void *dev_id) |
1177 | { | 1177 | { |
1178 | struct net_device *dev = (struct net_device *) dev_id; | 1178 | struct net_device *dev = (struct net_device *) dev_id; |
1179 | struct gfar_private *priv = netdev_priv(dev); | 1179 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1305,7 +1305,7 @@ static inline void count_errors(unsigned short status, struct gfar_private *priv | |||
1305 | } | 1305 | } |
1306 | } | 1306 | } |
1307 | 1307 | ||
1308 | irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | 1308 | irqreturn_t gfar_receive(int irq, void *dev_id) |
1309 | { | 1309 | { |
1310 | struct net_device *dev = (struct net_device *) dev_id; | 1310 | struct net_device *dev = (struct net_device *) dev_id; |
1311 | struct gfar_private *priv = netdev_priv(dev); | 1311 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1537,7 +1537,7 @@ static int gfar_poll(struct net_device *dev, int *budget) | |||
1537 | #endif | 1537 | #endif |
1538 | 1538 | ||
1539 | /* The interrupt handler for devices with one interrupt */ | 1539 | /* The interrupt handler for devices with one interrupt */ |
1540 | static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1540 | static irqreturn_t gfar_interrupt(int irq, void *dev_id) |
1541 | { | 1541 | { |
1542 | struct net_device *dev = dev_id; | 1542 | struct net_device *dev = dev_id; |
1543 | struct gfar_private *priv = netdev_priv(dev); | 1543 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1550,11 +1550,11 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1550 | 1550 | ||
1551 | /* Check for reception */ | 1551 | /* Check for reception */ |
1552 | if ((events & IEVENT_RXF0) || (events & IEVENT_RXB0)) | 1552 | if ((events & IEVENT_RXF0) || (events & IEVENT_RXB0)) |
1553 | gfar_receive(irq, dev_id, regs); | 1553 | gfar_receive(irq, dev_id); |
1554 | 1554 | ||
1555 | /* Check for transmit completion */ | 1555 | /* Check for transmit completion */ |
1556 | if ((events & IEVENT_TXF) || (events & IEVENT_TXB)) | 1556 | if ((events & IEVENT_TXF) || (events & IEVENT_TXB)) |
1557 | gfar_transmit(irq, dev_id, regs); | 1557 | gfar_transmit(irq, dev_id); |
1558 | 1558 | ||
1559 | /* Update error statistics */ | 1559 | /* Update error statistics */ |
1560 | if (events & IEVENT_TXE) { | 1560 | if (events & IEVENT_TXE) { |
@@ -1578,7 +1578,7 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1578 | priv->stats.rx_errors++; | 1578 | priv->stats.rx_errors++; |
1579 | priv->extra_stats.rx_bsy++; | 1579 | priv->extra_stats.rx_bsy++; |
1580 | 1580 | ||
1581 | gfar_receive(irq, dev_id, regs); | 1581 | gfar_receive(irq, dev_id); |
1582 | 1582 | ||
1583 | #ifndef CONFIG_GFAR_NAPI | 1583 | #ifndef CONFIG_GFAR_NAPI |
1584 | /* Clear the halt bit in RSTAT */ | 1584 | /* Clear the halt bit in RSTAT */ |
@@ -1857,7 +1857,7 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr) | |||
1857 | } | 1857 | } |
1858 | 1858 | ||
1859 | /* GFAR error interrupt handler */ | 1859 | /* GFAR error interrupt handler */ |
1860 | static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | 1860 | static irqreturn_t gfar_error(int irq, void *dev_id) |
1861 | { | 1861 | { |
1862 | struct net_device *dev = dev_id; | 1862 | struct net_device *dev = dev_id; |
1863 | struct gfar_private *priv = netdev_priv(dev); | 1863 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1898,7 +1898,7 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | |||
1898 | priv->stats.rx_errors++; | 1898 | priv->stats.rx_errors++; |
1899 | priv->extra_stats.rx_bsy++; | 1899 | priv->extra_stats.rx_bsy++; |
1900 | 1900 | ||
1901 | gfar_receive(irq, dev_id, regs); | 1901 | gfar_receive(irq, dev_id); |
1902 | 1902 | ||
1903 | #ifndef CONFIG_GFAR_NAPI | 1903 | #ifndef CONFIG_GFAR_NAPI |
1904 | /* Clear the halt bit in RSTAT */ | 1904 | /* Clear the halt bit in RSTAT */ |