ehca: reworked irq handler to avoid/reduce missed irq events
PATCH 1/5 ehca: reworked irq handler to avoid/reduce missed irq events
reworked irq handler to avoid/reduce missed irq events
Signed-off-by Hoang-Nam Nguyen <[email protected]>
---
ehca_classes.h | 18 +++- ehca_eq.c | 1 ehca_irq.c | 214 +++++++++++++++++++++++++++++++++++---------------------- ehca_irq.h | 1 ehca_main.c | 28 +++++-- ipz_pt_fn.h | 11 ++ 6 files changed, 182 insertions(+), 91 deletions(-)
drivers/infiniband/hw/ehca/ehca_classes.h +13 -5
@@ -42,8 +42,6 @@#ifndef __EHCA_CLASSES_H__#define __EHCA_CLASSES_H__ -#include "ehca_classes.h" -#include "ipz_pt_fn.h" struct ehca_module ;struct ehca_qp ;
@@ -54,14 +52,22 @@ struct ehca_mw;struct ehca_pd ;struct ehca_av ; +#include <rdma/ib_verbs.h> +#include <rdma/ib_user_verbs.h> +#ifdef CONFIG_PPC64 #include "ehca_classes_pSeries.h" #endif +#include "ipz_pt_fn.h" +#include "ehca_qes.h" +#include "ehca_irq.h" -#include <rdma/ib_verbs.h> -#include <rdma/ib_user_verbs.h> +#define EHCA_EQE_CACHE_SIZE 20 -#include "ehca_irq.h" +struct ehca_eqe_cache_entry { +struct ehca_eqe *eqe; +struct ehca_cq *cq; +};struct ehca_eq {u32 length;
@@ -74,6 +80,8 @@ struct ehca_eq {spinlock_t spinlock;struct tasklet_struct interrupt_task;u32 ist; +spinlock_t irq_spinlock; +struct ehca_eqe_cache_entry eqe_cache[EHCA_EQE_CACHE_SIZE ]; };struct ehca_sport {
drivers/infiniband/hw/ehca/ehca_eq.c +1 -0
@@ -61,6 +61,7 @@ int ehca_create_eq(struct ehca_shca *shcstruct ib_device *ib_dev = &shca->ib_device;spin_lock_init (&eq->spinlock); +spin_lock_init (&eq->irq_spinlock); eq->is_initialized =0 ;if (type !=EHCA_EQ && type !=EHCA_NEQ ) {
drivers/infiniband/hw/ehca/ehca_irq.c +135 -79
254 lines not on this page · raw message
drivers/infiniband/hw/ehca/ehca_irq.h +1 -0
@@ -56,6 +56,7 @@ void ehca_tasklet_neq(unsigned long datairqreturn_t ehca_interrupt_eq (int irq,void *dev_id);void ehca_tasklet_eq (unsigned long data); +void ehca_process_eq (struct ehca_shca *shca,int is_irq);struct ehca_cpu_comp_task {wait_queue_head_t wait_queue;
drivers/infiniband/hw/ehca/ehca_main.c +22 -6
@@ -52,7 +52,7 @@MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Christoph Raisch <[email protected]>" );MODULE_DESCRIPTION ("IBM eServer HCA InfiniBand Device Driver" ); -MODULE_VERSION ("SVNEHCA_0020" ); +MODULE_VERSION ("SVNEHCA_0021" );int ehca_open_aqp1 =0 ;int ehca_debug_level =0 ;
@@ -432,8 +432,8 @@ static int ehca_destroy_aqp1(struct ehcastatic ssize_t ehca_show_debug_level (struct device_driver *ddp,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%d\n" , - ehca_debug_level); +return snprintf (buf,PAGE_SIZE ,"%d\n" , + ehca_debug_level); } static ssize_t ehca_store_debug_level(struct device_driver *ddp,
@@ -778,8 +778,24 @@ void ehca_poll_eqs(unsigned long data)spin_lock (&shca_list_lock);list_for_each_entry (shca, &shca_list, shca_list) { -if (shca->eq.is_initialized) -ehca_tasklet_eq ((unsigned long )(void *)shca); +if (shca->eq.is_initialized) { +/* call deadman proc only if eq ptr does not change */ +struct ehca_eq *eq = &shca->eq; +int max =3 ; +volatile u64 q_ofs, q_ofs2; +u64 flags; +spin_lock_irqsave (&eq->spinlock, flags); + q_ofs = eq->ipz_queue.current_q_offset; +spin_unlock_irqrestore (&eq->spinlock, flags); +do { +spin_lock_irqsave (&eq->spinlock, flags); + q_ofs2 = eq->ipz_queue.current_q_offset; +spin_unlock_irqrestore (&eq->spinlock, flags); + max--; + }while (q_ofs == q_ofs2 && max >0 ); +if (q_ofs == q_ofs2) +ehca_process_eq (shca,0 ); + } }mod_timer (&poll_eqs_timer, jiffies +HZ );spin_unlock (&shca_list_lock);
@@ -790,7 +806,7 @@ int __init ehca_module_init(void)int ret;printk (KERN_INFO "eHCA Infiniband Device Driver " -"(Rel.: SVNEHCA_0020)\n" ); +"(Rel.: SVNEHCA_0021)\n" );idr_init (&ehca_qp_idr);idr_init (&ehca_cq_idr);spin_lock_init (&ehca_qp_idr_lock);
drivers/infiniband/hw/ehca/ipz_pt_fn.h +10 -1
@@ -79,7 +79,7 @@ static inline void *ipz_qeit_calc(structif (q_offset >= queue->queue_length)return NULL ; current_page = (queue->queue_pages)[q_offset >>EHCA_PAGESHIFT ]; -return ¤t_page->entries[q_offset & (EHCA_PAGESIZE -1 )]; +return ¤t_page->entries[q_offset & (EHCA_PAGESIZE -1 )]; }/*
@@ -247,6 +247,15 @@ static inline void *ipz_eqit_eq_get_inc_return ret; } +static inline void *ipz_eqit_eq_peek_valid (struct ipz_queue *queue) +{ +void *ret =ipz_qeit_get (queue); +u32 qe = *(u8 *) ret; +if ((qe >>7 ) != (queue->toggle_state &1 )) +return NULL ; +return ret; +} +/* returns address (GX) of first queue entry */ static inline u64 ipz_qpt_get_firstpage (struct ipz_qpt *qpt) {