aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
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/atm
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/atm')
-rw-r--r--drivers/atm/ambassador.c4
-rw-r--r--drivers/atm/eni.c2
-rw-r--r--drivers/atm/firestream.c2
-rw-r--r--drivers/atm/fore200e.c2
-rw-r--r--drivers/atm/he.c4
-rw-r--r--drivers/atm/horizon.c4
-rw-r--r--drivers/atm/idt77252.c2
-rw-r--r--drivers/atm/iphase.c2
-rw-r--r--drivers/atm/lanai.c4
-rw-r--r--drivers/atm/nicstar.c4
-rw-r--r--drivers/atm/zatm.c2
11 files changed, 14 insertions, 18 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index da599e6e9d34..8ff5c4e50823 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -861,10 +861,8 @@ static inline void interrupts_off (amb_dev * dev) {
861 861
862/********** interrupt handling **********/ 862/********** interrupt handling **********/
863 863
864static irqreturn_t interrupt_handler(int irq, void *dev_id, 864static irqreturn_t interrupt_handler(int irq, void *dev_id) {
865 struct pt_regs *pt_regs) {
866 amb_dev * dev = (amb_dev *) dev_id; 865 amb_dev * dev = (amb_dev *) dev_id;
867 (void) pt_regs;
868 866
869 PRINTD (DBG_IRQ|DBG_FLOW, "interrupt_handler: %p", dev_id); 867 PRINTD (DBG_IRQ|DBG_FLOW, "interrupt_handler: %p", dev_id);
870 868
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index df359a6c14f6..bc1b13c8f5d7 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1488,7 +1488,7 @@ static void bug_int(struct atm_dev *dev,unsigned long reason)
1488} 1488}
1489 1489
1490 1490
1491static irqreturn_t eni_int(int irq,void *dev_id,struct pt_regs *regs) 1491static irqreturn_t eni_int(int irq,void *dev_id)
1492{ 1492{
1493 struct atm_dev *dev; 1493 struct atm_dev *dev;
1494 struct eni_dev *eni_dev; 1494 struct eni_dev *eni_dev;
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 5f25e5efefcd..40ab9b65fae9 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1546,7 +1546,7 @@ static void __devexit free_freepool (struct fs_dev *dev, struct freepool *fp)
1546 1546
1547 1547
1548 1548
1549static irqreturn_t fs_irq (int irq, void *dev_id, struct pt_regs * pt_regs) 1549static irqreturn_t fs_irq (int irq, void *dev_id)
1550{ 1550{
1551 int i; 1551 int i;
1552 u32 status; 1552 u32 status;
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 98622130de5b..3a7b21ff30a5 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1328,7 +1328,7 @@ fore200e_irq(struct fore200e* fore200e)
1328 1328
1329 1329
1330static irqreturn_t 1330static irqreturn_t
1331fore200e_interrupt(int irq, void* dev, struct pt_regs* regs) 1331fore200e_interrupt(int irq, void* dev)
1332{ 1332{
1333 struct fore200e* fore200e = FORE200E_DEV((struct atm_dev*)dev); 1333 struct fore200e* fore200e = FORE200E_DEV((struct atm_dev*)dev);
1334 1334
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index b22a9142b240..c7314a79da0f 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -109,7 +109,7 @@ static int he_open(struct atm_vcc *vcc);
109static void he_close(struct atm_vcc *vcc); 109static void he_close(struct atm_vcc *vcc);
110static int he_send(struct atm_vcc *vcc, struct sk_buff *skb); 110static int he_send(struct atm_vcc *vcc, struct sk_buff *skb);
111static int he_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg); 111static int he_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg);
112static irqreturn_t he_irq_handler(int irq, void *dev_id, struct pt_regs *regs); 112static irqreturn_t he_irq_handler(int irq, void *dev_id);
113static void he_tasklet(unsigned long data); 113static void he_tasklet(unsigned long data);
114static int he_proc_read(struct atm_dev *dev,loff_t *pos,char *page); 114static int he_proc_read(struct atm_dev *dev,loff_t *pos,char *page);
115static int he_start(struct atm_dev *dev); 115static int he_start(struct atm_dev *dev);
@@ -2216,7 +2216,7 @@ he_tasklet(unsigned long data)
2216} 2216}
2217 2217
2218static irqreturn_t 2218static irqreturn_t
2219he_irq_handler(int irq, void *dev_id, struct pt_regs *regs) 2219he_irq_handler(int irq, void *dev_id)
2220{ 2220{
2221 unsigned long flags; 2221 unsigned long flags;
2222 struct he_dev *he_dev = (struct he_dev * )dev_id; 2222 struct he_dev *he_dev = (struct he_dev * )dev_id;
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 209dba1c70da..33e9ee47392b 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -1382,12 +1382,10 @@ static inline void rx_data_av_handler (hrz_dev * dev) {
1382 1382
1383/********** interrupt handler **********/ 1383/********** interrupt handler **********/
1384 1384
1385static irqreturn_t interrupt_handler(int irq, void *dev_id, 1385static irqreturn_t interrupt_handler(int irq, void *dev_id) {
1386 struct pt_regs *pt_regs) {
1387 hrz_dev * dev = (hrz_dev *) dev_id; 1386 hrz_dev * dev = (hrz_dev *) dev_id;
1388 u32 int_source; 1387 u32 int_source;
1389 unsigned int irq_ok; 1388 unsigned int irq_ok;
1390 (void) pt_regs;
1391 1389
1392 PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id); 1390 PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id);
1393 1391
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 7487f0ad68e9..87b17c33b3f9 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -2774,7 +2774,7 @@ idt77252_collect_stat(struct idt77252_dev *card)
2774} 2774}
2775 2775
2776static irqreturn_t 2776static irqreturn_t
2777idt77252_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) 2777idt77252_interrupt(int irq, void *dev_id)
2778{ 2778{
2779 struct idt77252_dev *card = dev_id; 2779 struct idt77252_dev *card = dev_id;
2780 u32 stat; 2780 u32 stat;
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index f20b0b2c06c6..9ed1c60048f0 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2195,7 +2195,7 @@ err_out:
2195 return -ENOMEM; 2195 return -ENOMEM;
2196} 2196}
2197 2197
2198static irqreturn_t ia_int(int irq, void *dev_id, struct pt_regs *regs) 2198static irqreturn_t ia_int(int irq, void *dev_id)
2199{ 2199{
2200 struct atm_dev *dev; 2200 struct atm_dev *dev;
2201 IADEV *iadev; 2201 IADEV *iadev;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index b9568e10965a..8895f026bea7 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1890,12 +1890,12 @@ static inline void lanai_int_1(struct lanai_dev *lanai, u32 reason)
1890 reg_write(lanai, ack, IntAck_Reg); 1890 reg_write(lanai, ack, IntAck_Reg);
1891} 1891}
1892 1892
1893static irqreturn_t lanai_int(int irq, void *devid, struct pt_regs *regs) 1893static irqreturn_t lanai_int(int irq, void *devid)
1894{ 1894{
1895 struct lanai_dev *lanai = (struct lanai_dev *) devid; 1895 struct lanai_dev *lanai = (struct lanai_dev *) devid;
1896 u32 reason; 1896 u32 reason;
1897 1897
1898 (void) irq; (void) regs; /* unused variables */ 1898 (void) irq; /* unused variables */
1899 1899
1900#ifdef USE_POWERDOWN 1900#ifdef USE_POWERDOWN
1901 /* 1901 /*
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index b8036899e56f..632ede552761 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -214,7 +214,7 @@ static void __devinit ns_init_card_error(ns_dev *card, int error);
214static scq_info *get_scq(int size, u32 scd); 214static scq_info *get_scq(int size, u32 scd);
215static void free_scq(scq_info *scq, struct atm_vcc *vcc); 215static void free_scq(scq_info *scq, struct atm_vcc *vcc);
216static void push_rxbufs(ns_dev *, struct sk_buff *); 216static void push_rxbufs(ns_dev *, struct sk_buff *);
217static irqreturn_t ns_irq_handler(int irq, void *dev_id, struct pt_regs *regs); 217static irqreturn_t ns_irq_handler(int irq, void *dev_id);
218static int ns_open(struct atm_vcc *vcc); 218static int ns_open(struct atm_vcc *vcc);
219static void ns_close(struct atm_vcc *vcc); 219static void ns_close(struct atm_vcc *vcc);
220static void fill_tst(ns_dev *card, int n, vc_map *vc); 220static void fill_tst(ns_dev *card, int n, vc_map *vc);
@@ -1194,7 +1194,7 @@ static void push_rxbufs(ns_dev *card, struct sk_buff *skb)
1194 1194
1195 1195
1196 1196
1197static irqreturn_t ns_irq_handler(int irq, void *dev_id, struct pt_regs *regs) 1197static irqreturn_t ns_irq_handler(int irq, void *dev_id)
1198{ 1198{
1199 u32 stat_r; 1199 u32 stat_r;
1200 ns_dev *card; 1200 ns_dev *card;
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 083c5d3f2e18..7df0f373188e 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1012,7 +1012,7 @@ static int start_tx(struct atm_dev *dev)
1012/*------------------------------- interrupts --------------------------------*/ 1012/*------------------------------- interrupts --------------------------------*/
1013 1013
1014 1014
1015static irqreturn_t zatm_int(int irq,void *dev_id,struct pt_regs *regs) 1015static irqreturn_t zatm_int(int irq,void *dev_id)
1016{ 1016{
1017 struct atm_dev *dev; 1017 struct atm_dev *dev;
1018 struct zatm_dev *zatm_dev; 1018 struct zatm_dev *zatm_dev;