please pull infiniband.git
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
A few small fixes here and there:
Erez Zilber (1):
IB/iser: Return error code when PDUs may not be sent
Jack Morgenstein (1):
IB/mthca: Fix PRM compliance problem in atomic-send completions
Michael S. Tsirkin (1):
IB/mthca: Fix off-by-one in FMR handling on memfree
Sean Hefty (2):
RDMA/ucma: Fix struct ucma_event leak when backlog is full RDMA/ucma: Don't report events with invalid user context
Steve Wise (1):
RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects
drivers/infiniband/core/cma.c | 17 ++++++++++++++--- drivers/infiniband/core/ucma.c | 11 +++++++++++ drivers/infiniband/hw/mthca/mthca_cq.c | 8 ++++++-- drivers/infiniband/hw/mthca/mthca_memfree.c | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 4 ++-- drivers/infiniband/ulp/iser/iser_initiator.c | 26 ++++++++++++-------------- 6 files changed, 46 insertions(+), 22 deletions(-)
drivers/infiniband/core/cma.c +14 -3
@@ -1088,10 +1088,21 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event) *sin = iw_event->local_addr; sin = (struct sockaddr_in *) &id_priv->id.route.addr.dst_addr; *sin = iw_event->remote_addr; -if (iw_event->status) - event.event =RDMA_CM_EVENT_REJECTED ; -else +switch (iw_event->status) { +case 0 : event.event =RDMA_CM_EVENT_ESTABLISHED ; +break ; +case -ECONNRESET : +case -ECONNREFUSED : + event.event =RDMA_CM_EVENT_REJECTED ; +break ; +case -ETIMEDOUT : + event.event =RDMA_CM_EVENT_UNREACHABLE ; +break ; +default : + event.event =RDMA_CM_EVENT_CONNECT_ERROR ; +break ; + }break ;case IW_CM_EVENT_ESTABLISHED : event.event =RDMA_CM_EVENT_ESTABLISHED ;
drivers/infiniband/core/ucma.c +11 -0
@@ -209,10 +209,21 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id,if (event->event ==RDMA_CM_EVENT_CONNECT_REQUEST ) {if (!ctx->backlog) { ret = -EDQUOT ; +kfree (uevent); goto out; } ctx->backlog--; + }else if (!ctx->uid) { +/* +* We ignore events for new connections until userspace has set +* their context. This can only happen if an error occurs on a +* new connection before the user accepts it. This is okay, +* since the accept will just fail later. +*/ +kfree (uevent); + goto out; } +list_add_tail (&uevent->list, &ctx->file->event_list);wake_up_interruptible (&ctx->file->poll_wait); out:
drivers/infiniband/hw/mthca/mthca_cq.c +6 -2
@@ -54,6 +54,10 @@ enum { MTHCA_CQ_ENTRY_SIZE = 0x20 }; +enum { +MTHCA_ATOMIC_BYTE_LEN =8 +}; +/* * Must be packed because start is 64 bits but only aligned to 32 bits. */
@@ -599,11 +603,11 @@ static inline int mthca_poll_one(struct mthca_dev *dev,break ;case MTHCA_OPCODE_ATOMIC_CS : entry->opcode =IB_WC_COMP_SWAP ; - entry->byte_len =be32_to_cpu (cqe->byte_cnt); + entry->byte_len =MTHCA_ATOMIC_BYTE_LEN ;break ;case MTHCA_OPCODE_ATOMIC_FA : entry->opcode =IB_WC_FETCH_ADD ; - entry->byte_len =be32_to_cpu (cqe->byte_cnt); + entry->byte_len =MTHCA_ATOMIC_BYTE_LEN ;break ;case MTHCA_OPCODE_BIND_MW : entry->opcode =IB_WC_BIND_MW ;
drivers/infiniband/hw/mthca/mthca_memfree.c +1 -1
@@ -232,7 +232,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj)list_for_each_entry (chunk, &icm->chunk_list, list) {for (i =0 ; i < chunk->npages; ++i) { -if (chunk->mem[i].length >= offset) { +if (chunk->mem[i].length > offset) { page = chunk->mem[i].page; goto out; }
drivers/infiniband/ulp/iser/iscsi_iser.c +2 -2
@@ -177,7 +177,7 @@ iscsi_iser_mtask_xmit(struct iscsi_conn *conn,* - if yes, the mtask is recycled at iscsi_complete_pdu * - if no, the mtask is recycled at iser_snd_completion */ -if (error && error != -EAGAIN ) +if (error && error != -ENOBUFS )iscsi_conn_failure (conn,ISCSI_ERR_CONN_FAILED );return error;
@@ -241,7 +241,7 @@ iscsi_iser_ctask_xmit(struct iscsi_conn *conn, error =iscsi_iser_ctask_xmit_unsol_data (conn, ctask); iscsi_iser_ctask_xmit_exit: -if (error && error != -EAGAIN ) +if (error && error != -ENOBUFS )iscsi_conn_failure (conn,ISCSI_ERR_CONN_FAILED );return error; }
drivers/infiniband/ulp/iser/iser_initiator.c +12 -14
@@ -304,18 +304,14 @@ int iser_conn_set_full_featured_mode(struct iscsi_conn *conn)static int iser_check_xmit (struct iscsi_conn *conn,void *task) { -int rc =0 ;struct iscsi_iser_conn *iser_conn = conn->dd_data; -write_lock_bh (conn->recv_lock);if (atomic_read (&iser_conn->ib_conn->post_send_buf_count) ==ISER_QP_MAX_REQ_DTOS ) { -iser_dbg ("%ld can't xmit task %p, suspending tx\n" ,jiffies,task); -set_bit (ISCSI_SUSPEND_BIT , &conn->suspend_tx); - rc = -EAGAIN ; +iser_dbg ("%ld can't xmit task %p\n" ,jiffies,task); +return -ENOBUFS ; } -write_unlock_bh (conn->recv_lock); -return rc; +return 0 ; }
@@ -340,7 +336,7 @@ int iser_send_command(struct iscsi_conn *conn,return -EPERM ; }if (iser_check_xmit (conn, ctask)) -return -EAGAIN ; +return -ENOBUFS ; edtl =ntohl (hdr->data_length);
@@ -426,7 +422,7 @@ int iser_send_data_out(struct iscsi_conn *conn, }if (iser_check_xmit (conn, ctask)) -return -EAGAIN ; +return -ENOBUFS ; itt =ntohl (hdr->itt); data_seg_len =ntoh24 (hdr->dlength);
@@ -498,7 +494,7 @@ int iser_send_control(struct iscsi_conn *conn, }if (iser_check_xmit (conn,mtask)) -return -EAGAIN ; +return -ENOBUFS ;/* build the tx desc regd header and add it to the tx desc dto */ mdesc->type =ISCSI_TX_CONTROL ;
@@ -605,6 +601,7 @@ void iser_snd_completion(struct iser_desc *tx_desc)struct iscsi_iser_conn *iser_conn = ib_conn->iser_conn;struct iscsi_conn *conn = iser_conn->iscsi_conn;struct iscsi_mgmt_task *mtask; +int resume_tx =0 ;iser_dbg ("Initiator, Data sent dto=0x%p\n" , dto);
@@ -613,15 +610,16 @@ void iser_snd_completion(struct iser_desc *tx_desc)if (tx_desc->type ==ISCSI_TX_DATAOUT )kmem_cache_free (ig.desc_cache, tx_desc); +if (atomic_read (&iser_conn->ib_conn->post_send_buf_count) == +ISER_QP_MAX_REQ_DTOS ) + resume_tx =1 ; +atomic_dec (&ib_conn->post_send_buf_count); -write_lock (conn->recv_lock); -if (conn->suspend_tx) { +if (resume_tx) {iser_dbg ("%ld resuming tx\n" ,jiffies); -clear_bit (ISCSI_SUSPEND_BIT , &conn->suspend_tx);scsi_queue_work (conn->session->host, &conn->xmitwork); } -write_unlock (conn->recv_lock);if (tx_desc->type ==ISCSI_TX_CONTROL ) {/* this arithmetic is legal by libiscsi dd_data allocation */