aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
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/infiniband
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/infiniband')
-rw-r--r--drivers/infiniband/hw/amso1100/c2.c4
-rw-r--r--drivers/infiniband/hw/ehca/ehca_irq.c4
-rw-r--r--drivers/infiniband/hw/ehca/ehca_irq.h4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_intr.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_kernel.h2
-rw-r--r--drivers/infiniband/hw/mthca/mthca_eq.c10
6 files changed, 12 insertions, 14 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 9e9120f36019..dc1ebeac35c7 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -72,7 +72,7 @@ static int c2_down(struct net_device *netdev);
72static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev); 72static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
73static void c2_tx_interrupt(struct net_device *netdev); 73static void c2_tx_interrupt(struct net_device *netdev);
74static void c2_rx_interrupt(struct net_device *netdev); 74static void c2_rx_interrupt(struct net_device *netdev);
75static irqreturn_t c2_interrupt(int irq, void *dev_id, struct pt_regs *regs); 75static irqreturn_t c2_interrupt(int irq, void *dev_id);
76static void c2_tx_timeout(struct net_device *netdev); 76static void c2_tx_timeout(struct net_device *netdev);
77static int c2_change_mtu(struct net_device *netdev, int new_mtu); 77static int c2_change_mtu(struct net_device *netdev, int new_mtu);
78static void c2_reset(struct c2_port *c2_port); 78static void c2_reset(struct c2_port *c2_port);
@@ -544,7 +544,7 @@ static void c2_rx_interrupt(struct net_device *netdev)
544/* 544/*
545 * Handle netisr0 TX & RX interrupts. 545 * Handle netisr0 TX & RX interrupts.
546 */ 546 */
547static irqreturn_t c2_interrupt(int irq, void *dev_id, struct pt_regs *regs) 547static irqreturn_t c2_interrupt(int irq, void *dev_id)
548{ 548{
549 unsigned int netisr0, dmaisr; 549 unsigned int netisr0, dmaisr;
550 int handled = 0; 550 int handled = 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 2a65b5be1979..048cc443d1e7 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -360,7 +360,7 @@ static inline void reset_eq_pending(struct ehca_cq *cq)
360 return; 360 return;
361} 361}
362 362
363irqreturn_t ehca_interrupt_neq(int irq, void *dev_id, struct pt_regs *regs) 363irqreturn_t ehca_interrupt_neq(int irq, void *dev_id)
364{ 364{
365 struct ehca_shca *shca = (struct ehca_shca*)dev_id; 365 struct ehca_shca *shca = (struct ehca_shca*)dev_id;
366 366
@@ -393,7 +393,7 @@ void ehca_tasklet_neq(unsigned long data)
393 return; 393 return;
394} 394}
395 395
396irqreturn_t ehca_interrupt_eq(int irq, void *dev_id, struct pt_regs *regs) 396irqreturn_t ehca_interrupt_eq(int irq, void *dev_id)
397{ 397{
398 struct ehca_shca *shca = (struct ehca_shca*)dev_id; 398 struct ehca_shca *shca = (struct ehca_shca*)dev_id;
399 399
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.h b/drivers/infiniband/hw/ehca/ehca_irq.h
index 85bf1fe16fe4..be579cc0adf6 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.h
+++ b/drivers/infiniband/hw/ehca/ehca_irq.h
@@ -51,10 +51,10 @@ struct ehca_shca;
51 51
52int ehca_error_data(struct ehca_shca *shca, void *data, u64 resource); 52int ehca_error_data(struct ehca_shca *shca, void *data, u64 resource);
53 53
54irqreturn_t ehca_interrupt_neq(int irq, void *dev_id, struct pt_regs *regs); 54irqreturn_t ehca_interrupt_neq(int irq, void *dev_id);
55void ehca_tasklet_neq(unsigned long data); 55void ehca_tasklet_neq(unsigned long data);
56 56
57irqreturn_t ehca_interrupt_eq(int irq, void *dev_id, struct pt_regs *regs); 57irqreturn_t ehca_interrupt_eq(int irq, void *dev_id);
58void ehca_tasklet_eq(unsigned long data); 58void ehca_tasklet_eq(unsigned long data);
59 59
60struct ehca_cpu_comp_task { 60struct ehca_cpu_comp_task {
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index 6bee53ce5f33..d9079ee12030 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -839,7 +839,7 @@ static void handle_urcv(struct ipath_devdata *dd, u32 istat)
839 } 839 }
840} 840}
841 841
842irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) 842irqreturn_t ipath_intr(int irq, void *data)
843{ 843{
844 struct ipath_devdata *dd = data; 844 struct ipath_devdata *dd = data;
845 u32 istat, chk0rcv = 0; 845 u32 istat, chk0rcv = 0;
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index d7540b71b451..7c436697d0e4 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -606,7 +606,7 @@ struct sk_buff *ipath_alloc_skb(struct ipath_devdata *dd, gfp_t);
606 606
607extern int ipath_diag_inuse; 607extern int ipath_diag_inuse;
608 608
609irqreturn_t ipath_intr(int irq, void *devid, struct pt_regs *regs); 609irqreturn_t ipath_intr(int irq, void *devid);
610void ipath_decode_err(char *buf, size_t blen, ipath_err_t err); 610void ipath_decode_err(char *buf, size_t blen, ipath_err_t err);
611#if __IPATH_INFO || __IPATH_DBG 611#if __IPATH_INFO || __IPATH_DBG
612extern const char *ipath_ibcstatus_str[]; 612extern const char *ipath_ibcstatus_str[];
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index a29b1b6d82b1..e284e0613a94 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -405,7 +405,7 @@ static int mthca_eq_int(struct mthca_dev *dev, struct mthca_eq *eq)
405 return eqes_found; 405 return eqes_found;
406} 406}
407 407
408static irqreturn_t mthca_tavor_interrupt(int irq, void *dev_ptr, struct pt_regs *regs) 408static irqreturn_t mthca_tavor_interrupt(int irq, void *dev_ptr)
409{ 409{
410 struct mthca_dev *dev = dev_ptr; 410 struct mthca_dev *dev = dev_ptr;
411 u32 ecr; 411 u32 ecr;
@@ -432,8 +432,7 @@ static irqreturn_t mthca_tavor_interrupt(int irq, void *dev_ptr, struct pt_regs
432 return IRQ_HANDLED; 432 return IRQ_HANDLED;
433} 433}
434 434
435static irqreturn_t mthca_tavor_msi_x_interrupt(int irq, void *eq_ptr, 435static irqreturn_t mthca_tavor_msi_x_interrupt(int irq, void *eq_ptr)
436 struct pt_regs *regs)
437{ 436{
438 struct mthca_eq *eq = eq_ptr; 437 struct mthca_eq *eq = eq_ptr;
439 struct mthca_dev *dev = eq->dev; 438 struct mthca_dev *dev = eq->dev;
@@ -446,7 +445,7 @@ static irqreturn_t mthca_tavor_msi_x_interrupt(int irq, void *eq_ptr,
446 return IRQ_HANDLED; 445 return IRQ_HANDLED;
447} 446}
448 447
449static irqreturn_t mthca_arbel_interrupt(int irq, void *dev_ptr, struct pt_regs *regs) 448static irqreturn_t mthca_arbel_interrupt(int irq, void *dev_ptr)
450{ 449{
451 struct mthca_dev *dev = dev_ptr; 450 struct mthca_dev *dev = dev_ptr;
452 int work = 0; 451 int work = 0;
@@ -467,8 +466,7 @@ static irqreturn_t mthca_arbel_interrupt(int irq, void *dev_ptr, struct pt_regs
467 return IRQ_RETVAL(work); 466 return IRQ_RETVAL(work);
468} 467}
469 468
470static irqreturn_t mthca_arbel_msi_x_interrupt(int irq, void *eq_ptr, 469static irqreturn_t mthca_arbel_msi_x_interrupt(int irq, void *eq_ptr)
471 struct pt_regs *regs)
472{ 470{
473 struct mthca_eq *eq = eq_ptr; 471 struct mthca_eq *eq = eq_ptr;
474 struct mthca_dev *dev = eq->dev; 472 struct mthca_dev *dev = eq->dev;