InfiniBand updates for 2.6.17-rc3
Subsystems (2)
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
The changes and patch are:
Ralph Campbell:
IB: Fix display of 4-bit port counters in sysfs
Roland Dreier:
IB/srp: Fix tracking of pending requests during error handling IB/mthca: Fix race in reference counting
drivers/infiniband/core/sysfs.c | 2 drivers/infiniband/hw/mthca/mthca_cq.c | 41 +++-- drivers/infiniband/hw/mthca/mthca_dev.h | 2 drivers/infiniband/hw/mthca/mthca_provider.h | 22 ++- drivers/infiniband/hw/mthca/mthca_qp.c | 31 +++- drivers/infiniband/hw/mthca/mthca_srq.c | 23 ++- drivers/infiniband/ulp/srp/ib_srp.c | 195 +++++++++++++++----------- drivers/infiniband/ulp/srp/ib_srp.h | 4 - 8 files changed, 190 insertions(+), 130 deletions(-)
drivers/infiniband/core/sysfs.c +1 -1
@@ -336,7 +336,7 @@ static ssize_t show_pma_counter(struct iswitch (width) {case 4 : ret =sprintf (buf,"%u\n" , (out_mad->data[40 + offset /8 ] >> - (offset %4 )) &0xf ); + (4 - (offset %8 ))) &0xf );break ;case 8 : ret =sprintf (buf,"%u\n" , out_mad->data[40 + offset /8 ]);
drivers/infiniband/hw/mthca/mthca_cq.c +21 -20
103 lines not on this page · raw message
drivers/infiniband/hw/mthca/mthca_dev.h +1 -1
@@ -496,7 +496,7 @@ void mthca_free_cq(struct mthca_dev *devvoid mthca_cq_completion (struct mthca_dev *dev,u32 cqn);void mthca_cq_event (struct mthca_dev *dev,u32 cqn,enum ib_event_type event_type); -void mthca_cq_clean (struct mthca_dev *dev,u32 cqn,u32 qpn, +void mthca_cq_clean (struct mthca_dev *dev,struct mthca_cq *cq,u32 qpn,struct mthca_srq *srq);void mthca_cq_resize_copy_cqes (struct mthca_cq *cq);int mthca_alloc_cq_buf (struct mthca_dev *dev,struct mthca_cq_buf *buf,int nent);
drivers/infiniband/hw/mthca/mthca_provider.h +12 -10
@@ -139,11 +139,12 @@ struct mthca_ah {* a qp may be locked, with the send cq locked first. No other * nesting should be done. * -* Each struct mthca_cq/qp also has an atomic_t ref count. The -* pointer from the cq/qp_table to the struct counts as one reference. -* This reference also is good for access through the consumer API, so -* modifying the CQ/QP etc doesn't need to take another reference. -* Access because of a completion being polled does need a reference. +* Each struct mthca_cq/qp also has an ref count, protected by the +* corresponding table lock. The pointer from the cq/qp_table to the +* struct counts as one reference. This reference also is good for +* access through the consumer API, so modifying the CQ/QP etc doesn't +* need to take another reference. Access to a QP because of a +* completion being polled does not need a reference either. * * Finally, each struct mthca_cq/qp has a wait_queue_head_t for the * destroy function to sleep on.
@@ -159,8 +160,9 @@ struct mthca_ah {* - decrement ref count; if zero, wake up waiters * * To destroy a CQ/QP, we can do the following: -* - lock cq/qp_table, remove pointer, unlock cq/qp_table lock -* - decrement ref count +* - lock cq/qp_table +* - remove pointer and decrement ref count +* - unlock cq/qp_table lock * - wait_event until ref count is zero * * It is the consumer's responsibilty to make sure that no QP
@@ -197,7 +199,7 @@ struct mthca_cq_resize {struct mthca_cq {struct ib_cq ibcq;spinlock_t lock; -atomic_t refcount; +int refcount;int cqn;u32 cons_index;struct mthca_cq_buf buf;
@@ -217,7 +219,7 @@ struct mthca_cq {struct mthca_srq {struct ib_srq ibsrq;spinlock_t lock; -atomic_t refcount; +int refcount;int srqn;int max;int max_gs;
@@ -254,7 +256,7 @@ struct mthca_wq {struct mthca_qp {struct ib_qp ibqp; -atomic_t refcount; +int refcount;u32 qpn;int is_direct;u8 port;/* for SQP and memfree use only */
drivers/infiniband/hw/mthca/mthca_qp.c +22 -9
@@ -240,7 +240,7 @@ void mthca_qp_event(struct mthca_dev *despin_lock (&dev->qp_table.lock); qp =mthca_array_get (&dev->qp_table.qp, qpn & (dev->limits.num_qps -1 ));if (qp) -atomic_inc (&qp->refcount); + ++qp->refcount;spin_unlock (&dev->qp_table.lock);if (!qp) {
@@ -257,8 +257,10 @@ void mthca_qp_event(struct mthca_dev *deif (qp->ibqp.event_handler) qp->ibqp.event_handler (&event, qp->ibqp.qp_context); -if (atomic_dec_and_test (&qp->refcount)) +spin_lock (&dev->qp_table.lock); +if (!--qp->refcount)wake_up (&qp->wait); +spin_unlock (&dev->qp_table.lock); }static int to_mthca_state (enum ib_qp_state ib_state)
@@ -833,10 +835,10 @@ int mthca_modify_qp(struct ib_qp *ibqp,* entries and reinitialize the QP. */ if (new_state ==IB_QPS_RESET && !qp->ibqp.uobject) { -mthca_cq_clean (dev,to_mcq (qp->ibqp.send_cq)->cqn, qp->qpn, +mthca_cq_clean (dev,to_mcq (qp->ibqp.send_cq), qp->qpn, qp->ibqp.srq ?to_msrq (qp->ibqp.srq) :NULL );if (qp->ibqp.send_cq != qp->ibqp.recv_cq) -mthca_cq_clean (dev,to_mcq (qp->ibqp.recv_cq)->cqn, qp->qpn, +mthca_cq_clean (dev,to_mcq (qp->ibqp.recv_cq), qp->qpn, qp->ibqp.srq ?to_msrq (qp->ibqp.srq) :NULL );mthca_wq_init (&qp->sq);
@@ -1096,7 +1098,7 @@ static int mthca_alloc_qp_common(structint ret;int i; -atomic_set (&qp->refcount,1 ); + qp->refcount =1 ;init_waitqueue_head (&qp->wait); qp->state =IB_QPS_RESET ; qp->atomic_rd_en =0 ;
@@ -1318,6 +1320,17 @@ int mthca_alloc_sqp(struct mthca_dev *dereturn err; } +static inline int get_qp_refcount (struct mthca_dev *dev,struct mthca_qp *qp) +{ +int c; + +spin_lock_irq (&dev->qp_table.lock); + c = qp->refcount; +spin_unlock_irq (&dev->qp_table.lock); + +return c; +} +void mthca_free_qp (struct mthca_dev *dev,struct mthca_qp *qp) {
@@ -1339,14 +1352,14 @@ void mthca_free_qp(struct mthca_dev *devspin_lock (&dev->qp_table.lock);mthca_array_clear (&dev->qp_table.qp, qp->qpn & (dev->limits.num_qps -1 )); + --qp->refcount;spin_unlock (&dev->qp_table.lock);if (send_cq != recv_cq)spin_unlock (&recv_cq->lock);spin_unlock_irq (&send_cq->lock); -atomic_dec (&qp->refcount); -wait_event (qp->wait, !atomic_read (&qp->refcount)); +wait_event (qp->wait, !get_qp_refcount (dev, qp));if (qp->state !=IB_QPS_RESET ) mthca_MODIFY_QP(dev, qp->state, IB_QPS_RESET, qp->qpn, 0,
@@ -1358,10 +1371,10 @@ void mthca_free_qp(struct mthca_dev *dev* unref the mem-free tables and free the QPN in our table. */ if (!qp->ibqp.uobject) { -mthca_cq_clean (dev,to_mcq (qp->ibqp.send_cq)->cqn, qp->qpn, +mthca_cq_clean (dev,to_mcq (qp->ibqp.send_cq), qp->qpn, qp->ibqp.srq ?to_msrq (qp->ibqp.srq) :NULL );if (qp->ibqp.send_cq != qp->ibqp.recv_cq) -mthca_cq_clean (dev,to_mcq (qp->ibqp.recv_cq)->cqn, qp->qpn, +mthca_cq_clean (dev,to_mcq (qp->ibqp.recv_cq), qp->qpn, qp->ibqp.srq ?to_msrq (qp->ibqp.srq) :NULL );mthca_free_memfree (dev, qp);
drivers/infiniband/hw/mthca/mthca_srq.c +18 -5
@@ -241,7 +241,7 @@ int mthca_alloc_srq(struct mthca_dev *de goto err_out_mailbox;spin_lock_init (&srq->lock); -atomic_set (&srq->refcount,1 ); + srq->refcount =1 ;init_waitqueue_head (&srq->wait);if (mthca_is_memfree (dev))
@@ -308,6 +308,17 @@ err_out:return err; } +static inline int get_srq_refcount (struct mthca_dev *dev,struct mthca_srq *srq) +{ +int c; + +spin_lock_irq (&dev->srq_table.lock); + c = srq->refcount; +spin_unlock_irq (&dev->srq_table.lock); + +return c; +} +void mthca_free_srq (struct mthca_dev *dev,struct mthca_srq *srq) {struct mthca_mailbox *mailbox;
@@ -329,10 +340,10 @@ void mthca_free_srq(struct mthca_dev *despin_lock_irq (&dev->srq_table.lock);mthca_array_clear (&dev->srq_table.srq, srq->srqn & (dev->limits.num_srqs -1 )); + --srq->refcount;spin_unlock_irq (&dev->srq_table.lock); -atomic_dec (&srq->refcount); -wait_event (srq->wait, !atomic_read (&srq->refcount)); +wait_event (srq->wait, !get_srq_refcount (dev, srq));if (!srq->ibsrq.uobject) {mthca_free_srq_buf (dev, srq);
@@ -414,7 +425,7 @@ void mthca_srq_event(struct mthca_dev *dspin_lock (&dev->srq_table.lock); srq =mthca_array_get (&dev->srq_table.srq, srqn & (dev->limits.num_srqs -1 ));if (srq) -atomic_inc (&srq->refcount); + ++srq->refcount;spin_unlock (&dev->srq_table.lock);if (!srq) {
@@ -431,8 +442,10 @@ void mthca_srq_event(struct mthca_dev *d srq->ibsrq.event_handler (&event, srq->ibsrq.srq_context); out: -if (atomic_dec_and_test (&srq->refcount)) +spin_lock (&dev->srq_table.lock); +if (!--srq->refcount)wake_up (&srq->wait); +spin_unlock (&dev->srq_table.lock); }/*
drivers/infiniband/ulp/srp/ib_srp.c +113 -82
320 lines not on this page · raw message
drivers/infiniband/ulp/srp/ib_srp.h +2 -2
@@ -101,7 +101,7 @@ struct srp_request {*/ struct scatterlist fake_sg;struct completion done; -short next; +short index;u8 cmd_done;u8 tsk_status; };
@@ -133,7 +133,7 @@ struct srp_target_port {unsigned tx_tail;struct srp_iu *tx_ring[SRP_SQ_SIZE +1 ]; -int req_head; +struct list_head free_reqs;struct list_head req_queue;struct srp_request req_ring[SRP_SQ_SIZE ];