please pull infiniband.git
Subsystems (3)
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
This is the first batch of post-2.6.19 fixes:
Arne Redlich (1):
IB/srp: Increase supported CDB size
Dotan Barak (1):
RDMA/cm: Remove setting local write as part of QP access flags
Eric Sesterhenn (1):
IB: kmemdup() cleanup
Hoang-Nam Nguyen (1):
IB/ehca: Use WQE offset instead of WQE addr for pending work reqs
Jack Morgenstein (1):
IB/mthca: Fix initial SRQ logsize for mem-free HCAs
Krishna Kumar (11):
RDMA/cma: Optimize cma_bind_loopback() to check for empty list RDMA/cma: Remove redundant check in cma_add_one RDMA/addr: Use time_after_eq() instead of time_after() in queue_req() RDMA/cma: Rewrite cma_req_handler() to encapsulate common code RDMA/iwcm: Fix memory corruption bug in cm_work_handler() RDMA/iwcm: Fix memory leak
RDMA/iwcm: Remove unnecessary initializations
RDMA/iwcm: Remove unnecessary function argument RDMA/iwcm: Fix comment for iwcm_deref_id() to match code RDMA/amso1100: Prevent deadlock in destroy QP
RDMA/addr: Fix some cancellation problems in process_req()
Michael S. Tsirkin (2):
IPoIB: Fix skb leak when freeing neighbour
IB/ucm: Fix deadlock in cleanup
Roland Dreier (5):
IB/mthca: Fix section mismatches RDMA/amso1100: Fix section mismatches IB/ipath: Fix typo in pma_counter_select subscript
IB: Convert kmem_cache_t -> struct kmem_cache RDMA/addr: list_move() cleanups
Sean Hefty (1):
IB/cm: Fix automatic path migration support
Vu Pham (1):
IB/srp: Fix memory leak on reconnect
drivers/infiniband/core/addr.c | 19 ++-- drivers/infiniband/core/cm.c | 121 ++++++++++++++++++------ drivers/infiniband/core/cma.c | 49 ++++------ drivers/infiniband/core/iwcm.c | 43 +++++---- drivers/infiniband/core/mad.c | 2 +- drivers/infiniband/core/ucm.c | 20 ++-- drivers/infiniband/hw/amso1100/c2.h | 2 +- drivers/infiniband/hw/amso1100/c2_qp.c | 36 ++++++-- drivers/infiniband/hw/amso1100/c2_rnic.c | 4 +- drivers/infiniband/hw/ehca/ehca_main.c | 4 +- drivers/infiniband/hw/ehca/ehca_qp.c | 22 ++--- drivers/infiniband/hw/ehca/ipz_pt_fn.c | 13 +++ drivers/infiniband/hw/ehca/ipz_pt_fn.h | 15 +++ drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- drivers/infiniband/hw/mthca/mthca_av.c | 3 +- drivers/infiniband/hw/mthca/mthca_cq.c | 3 +- drivers/infiniband/hw/mthca/mthca_eq.c | 21 ++-- drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- drivers/infiniband/hw/mthca/mthca_main.c | 29 +++--- drivers/infiniband/hw/mthca/mthca_mcg.c | 3 +- drivers/infiniband/hw/mthca/mthca_mr.c | 5 +- drivers/infiniband/hw/mthca/mthca_pd.c | 3 +- drivers/infiniband/hw/mthca/mthca_provider.c | 3 +- drivers/infiniband/hw/mthca/mthca_qp.c | 3 +- drivers/infiniband/hw/mthca/mthca_srq.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 19 +++- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 11 ++- include/rdma/ib_cm.h | 16 +++- include/rdma/ib_user_cm.h | 7 +- 32 files changed, 297 insertions(+), 193 deletions(-)
drivers/infiniband/core/addr.c +8 -11
@@ -139,7 +139,7 @@ static void queue_req(struct addr_req *rmutex_lock (&lock);list_for_each_entry_reverse (temp_req, &req_list, list) { -if (time_after (req->timeout, temp_req->timeout)) +if (time_after_eq (req->timeout, temp_req->timeout))break ; }
@@ -225,19 +225,17 @@ static void process_req(void *data)mutex_lock (&lock);list_for_each_entry_safe (req, temp_req, &req_list, list) { -if (req->status) { +if (req->status == -ENODATA ) { src_in = (struct sockaddr_in *) &req->src_addr; dst_in = (struct sockaddr_in *) &req->dst_addr; req->status =addr_resolve_remote (src_in, dst_in, req->addr); +if (req->status &&time_after_eq (jiffies, req->timeout)) + req->status = -ETIMEDOUT ; +else if (req->status == -ENODATA ) +continue ; } -if (req->status &&time_after (jiffies, req->timeout)) - req->status = -ETIMEDOUT ; -else if (req->status == -ENODATA ) -continue ; - -list_del (&req->list); -list_add_tail (&req->list, &done_list); +list_move_tail (&req->list, &done_list); }if (!list_empty (&req_list)) {
@@ -347,8 +345,7 @@ void rdma_addr_cancel(struct rdma_dev_adif (req->addr == addr) { req->status = -ECANCELED ; req->timeout = jiffies; -list_del (&req->list); -list_add (&req->list, &req_list); +list_move (&req->list, &req_list);set_timeout (req->timeout);break ; }
drivers/infiniband/core/cm.c +90 -31
244 lines not on this page · raw message
drivers/infiniband/core/cma.c +21 -28
90 lines not on this page · raw message
drivers/infiniband/core/iwcm.c +22 -21
142 lines not on this page · raw message
drivers/infiniband/core/mad.c +1 -1
@@ -46,7 +46,7 @@ MODULE_DESCRIPTION("kernel IB MAD API");MODULE_AUTHOR ("Hal Rosenstock" );MODULE_AUTHOR ("Sean Hefty" ); -static kmem_cache_t *ib_mad_cache; +static struct kmem_cache *ib_mad_cache;static struct list_head ib_mad_port_list;static u32 ib_mad_client_id =0 ;
drivers/infiniband/core/ucm.c +10 -10
@@ -161,12 +161,14 @@ static void ib_ucm_cleanup_events(struct struct ib_ucm_event, ctx_list);list_del (&uevent->file_list);list_del (&uevent->ctx_list); +mutex_unlock (&ctx->file->file_mutex);/* clear incoming connections. */ if (ib_ucm_new_cm_id (uevent->resp.event))ib_destroy_cm_id (uevent->cm_id);kfree (uevent); +mutex_lock (&ctx->file->file_mutex); }mutex_unlock (&ctx->file->file_mutex); }
@@ -328,20 +330,18 @@ static int ib_ucm_event_process(struct i }if (uvt->data_len) { - uvt->data =kmalloc (uvt->data_len,GFP_KERNEL ); + uvt->data =kmemdup (evt->private_data, uvt->data_len,GFP_KERNEL );if (!uvt->data) goto err1; -memcpy (uvt->data, evt->private_data, uvt->data_len); uvt->resp.present |=IB_UCM_PRES_DATA ; }if (uvt->info_len) { - uvt->info =kmalloc (uvt->info_len,GFP_KERNEL ); + uvt->info =kmemdup (info, uvt->info_len,GFP_KERNEL );if (!uvt->info) goto err2; -memcpy (uvt->info, info, uvt->info_len); uvt->resp.present |=IB_UCM_PRES_INFO ; }return 0 ;
@@ -685,11 +685,11 @@ out:return result; } -static ssize_t ib_ucm_establish (struct ib_ucm_file *file, -const char __user *inbuf, -int in_len,int out_len) +static ssize_t ib_ucm_notify (struct ib_ucm_file *file, +const char __user *inbuf, +int in_len,int out_len) { -struct ib_ucm_establish cmd; +struct ib_ucm_notify cmd;struct ib_ucm_context *ctx;int result;
@@ -700,7 +700,7 @@ static ssize_t ib_ucm_establish(struct iif (IS_ERR (ctx))return PTR_ERR (ctx); - result =ib_cm_establish (ctx->cm_id); + result =ib_cm_notify (ctx->cm_id, (enum ib_event_type ) cmd.event);ib_ucm_ctx_put (ctx);return result; }
@@ -1107,7 +1107,7 @@ static ssize_t (*ucm_cmd_table[])(struct [IB_USER_CM_CMD_DESTROY_ID] = ib_ucm_destroy_id, [IB_USER_CM_CMD_ATTR_ID] = ib_ucm_attr_id, [IB_USER_CM_CMD_LISTEN] = ib_ucm_listen, - [IB_USER_CM_CMD_ESTABLISH] = ib_ucm_establish, + [IB_USER_CM_CMD_NOTIFY] = ib_ucm_notify, [IB_USER_CM_CMD_SEND_REQ] = ib_ucm_send_req, [IB_USER_CM_CMD_SEND_REP] = ib_ucm_send_rep, [IB_USER_CM_CMD_SEND_RTU] = ib_ucm_send_rtu,
drivers/infiniband/hw/amso1100/c2.h +1 -1
@@ -302,7 +302,7 @@ struct c2_dev {unsigned long pa;/* PA device memory */ void **qptr_array; -kmem_cache_t *host_msg_cache; +struct kmem_cache *host_msg_cache;struct list_head cca_link;/* adapter list */ struct list_head eh_wakeup_list;/* event wakeup list */
drivers/infiniband/hw/amso1100/c2_qp.c +28 -8
@@ -564,6 +564,32 @@ int c2_alloc_qp(struct c2_dev *c2dev,return err; } +static inline void c2_lock_cqs (struct c2_cq *send_cq,struct c2_cq *recv_cq) +{ +if (send_cq == recv_cq) +spin_lock_irq (&send_cq->lock); +else if (send_cq > recv_cq) { +spin_lock_irq (&send_cq->lock); +spin_lock_nested (&recv_cq->lock,SINGLE_DEPTH_NESTING ); + }else { +spin_lock_irq (&recv_cq->lock); +spin_lock_nested (&send_cq->lock,SINGLE_DEPTH_NESTING ); + } +} + +static inline void c2_unlock_cqs (struct c2_cq *send_cq,struct c2_cq *recv_cq) +{ +if (send_cq == recv_cq) +spin_unlock_irq (&send_cq->lock); +else if (send_cq > recv_cq) { +spin_unlock (&recv_cq->lock); +spin_unlock_irq (&send_cq->lock); + }else { +spin_unlock (&send_cq->lock); +spin_unlock_irq (&recv_cq->lock); + } +} +void c2_free_qp (struct c2_dev *c2dev,struct c2_qp *qp) {struct c2_cq *send_cq;
@@ -576,15 +602,9 @@ void c2_free_qp(struct c2_dev *c2dev, st* Lock CQs here, so that CQ polling code can do QP lookup * without taking a lock. */ -spin_lock_irq (&send_cq->lock); -if (send_cq != recv_cq) -spin_lock (&recv_cq->lock); - +c2_lock_cqs (send_cq, recv_cq);c2_free_qpn (c2dev, qp->qpn); - -if (send_cq != recv_cq) -spin_unlock (&recv_cq->lock); -spin_unlock_irq (&send_cq->lock); +c2_unlock_cqs (send_cq, recv_cq);/* * Destory qp in the rnic...
drivers/infiniband/hw/amso1100/c2_rnic.c +2 -2
@@ -441,7 +441,7 @@ static int c2_rnic_close(struct c2_dev ** involves initalizing the various limits and resouce pools that * comprise the RNIC instance. */ -int c2_rnic_init (struct c2_dev *c2dev) +int __devinit c2_rnic_init (struct c2_dev *c2dev) {int err;u32 qsize, msgsize;
@@ -611,7 +611,7 @@ int c2_rnic_init(struct c2_dev *c2dev)/* * Called by c2_remove to cleanup the RNIC resources. */ -void c2_rnic_term (struct c2_dev *c2dev) +void __devexit c2_rnic_term(struct c2_dev *c2dev) {/* Close the open adapter instance */
drivers/infiniband/hw/ehca/ehca_main.c +2 -2
@@ -52,7 +52,7 @@ #include "hcp_if.h"MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Christoph Raisch <[email protected]>" );MODULE_DESCRIPTION ("IBM eServer HCA InfiniBand Device Driver" ); -MODULE_VERSION ("SVNEHCA_0018" ); +MODULE_VERSION ("SVNEHCA_0019" );int ehca_open_aqp1 =0 ;int ehca_debug_level =0 ;
@@ -790,7 +790,7 @@ int __init ehca_module_init(void)int ret;printk (KERN_INFO "eHCA Infiniband Device Driver " -"(Rel.: SVNEHCA_0018)\n" ); +"(Rel.: SVNEHCA_0019)\n" );idr_init (&ehca_qp_idr);idr_init (&ehca_cq_idr);spin_lock_init (&ehca_qp_idr_lock);
drivers/infiniband/hw/ehca/ehca_qp.c +9 -13
@@ -732,8 +732,7 @@ static int prepare_sqe_rts(struct ehca_qu64 h_ret;struct ipz_queue *squeue;void *bad_send_wqe_p, *bad_send_wqe_v; -void *squeue_start_p, *squeue_end_p; -void *squeue_start_v, *squeue_end_v; +u64 q_ofs;struct ehca_wqe *wqe;int qp_num = my_qp->ib_qp.qp_num;
@@ -755,26 +754,23 @@ static int prepare_sqe_rts(struct ehca_qif (ehca_debug_level)ehca_dmp (bad_send_wqe_v,32 ,"qp_num=%x bad_wqe" , qp_num); squeue = &my_qp->ipz_squeue; - squeue_start_p = (void *)virt_to_abs (ipz_qeit_calc (squeue,0L )); - squeue_end_p = squeue_start_p+squeue->queue_length; - squeue_start_v =abs_to_virt ((u64 )squeue_start_p); - squeue_end_v =abs_to_virt ((u64 )squeue_end_p); -ehca_dbg (&shca->ib_device,"qp_num=%x squeue_start_v=%p squeue_end_v=%p" , - qp_num, squeue_start_v, squeue_end_v); +if (ipz_queue_abs_to_offset (squeue, (u64 )bad_send_wqe_p, &q_ofs)) { +ehca_err (&shca->ib_device,"failed to get wqe offset qp_num=%x" +" bad_send_wqe_p=%p" , qp_num, bad_send_wqe_p); +return -EFAULT ; + }/* loop sets wqe's purge bit */ - wqe = (struct ehca_wqe *)bad_send_wqe_v; + wqe = (struct ehca_wqe *)ipz_qeit_calc (squeue, q_ofs); *bad_wqe_cnt =0 ;while (wqe->optype !=0xff && wqe->wqef !=0xff ) {if (ehca_debug_level)ehca_dmp (wqe,32 ,"qp_num=%x wqe" , qp_num); wqe->nr_of_data_seg =0 ;/* suppress data access */ wqe->wqef =WQEF_PURGE ;/* WQE to be purged */ - wqe = (struct ehca_wqe *)((u8 *)wqe+squeue->qe_size); + q_ofs =ipz_queue_advance_offset (squeue, q_ofs); + wqe = (struct ehca_wqe *)ipz_qeit_calc (squeue, q_ofs); *bad_wqe_cnt = (*bad_wqe_cnt)+1 ; -if ((void *)wqe >= squeue_end_v) { - wqe = squeue_start_v; - } }/* * bad wqe will be reprocessed and ignored when pol_cq() is called,
drivers/infiniband/hw/ehca/ipz_pt_fn.c +13 -0
@@ -70,6 +70,19 @@ void *ipz_qeit_eq_get_inc(struct ipz_quereturn ret; } +int ipz_queue_abs_to_offset (struct ipz_queue *queue,u64 addr,u64 *q_offset) +{ +int i; +for (i =0 ; i < queue->queue_length / queue->pagesize; i++) { +u64 page = (u64 )virt_to_abs (queue->queue_pages[i]); +if (addr >= page && addr < page + queue->pagesize) { + *q_offset = addr - page + i * queue->pagesize; +return 0 ; + } + } +return -EINVAL ; +} +int ipz_queue_ctor (struct ipz_queue *queue,const u32 nr_of_pages,const u32 pagesize,const u32 qe_size,const u32 nr_of_sg)
drivers/infiniband/hw/ehca/ipz_pt_fn.h +15 -0
@@ -150,6 +150,21 @@ static inline void *ipz_qeit_reset(strucreturn ipz_qeit_get (queue); } +/* +* return the q_offset corresponding to an absolute address +*/ +int ipz_queue_abs_to_offset (struct ipz_queue *queue,u64 addr,u64 *q_offset); + +/* +* return the next queue offset. don't modify the queue. +*/ +static inline u64 ipz_queue_advance_offset (struct ipz_queue *queue,u64 offset) +{ + offset += queue->qe_size; +if (offset >= queue->queue_length) offset =0 ; +return offset; +} +/* struct generic page table */ struct ipz_pt {u64 entries[EHCA_PT_ENTRIES ];
drivers/infiniband/hw/ipath/ipath_verbs.c +1 -1
@@ -1487,7 +1487,7 @@ int ipath_register_ib_device(struct ipat idev->pma_counter_select[1 ] =IB_PMA_PORT_RCV_DATA ; idev->pma_counter_select[2 ] =IB_PMA_PORT_XMIT_PKTS ; idev->pma_counter_select[3 ] =IB_PMA_PORT_RCV_PKTS ; - idev->pma_counter_select[5 ] =IB_PMA_PORT_XMIT_WAIT ; + idev->pma_counter_select[4 ] =IB_PMA_PORT_XMIT_WAIT ; idev->link_width_enabled =3 ;/* 1x or 4x */ /* Snapshot current HW counters to "clear" them. */
drivers/infiniband/hw/mthca/mthca_av.c +1 -2
@@ -33,7 +33,6 @@* $Id: mthca_av.c 1349 2004-12-16 21:09:43Z roland $ */ -#include <linux/init.h> #include <linux/string.h> #include <linux/slab.h>
@@ -323,7 +322,7 @@ int mthca_ah_query(struct ib_ah *ibah, sreturn 0 ; } -int __devinit mthca_init_av_table (struct mthca_dev *dev) +int mthca_init_av_table (struct mthca_dev *dev) {int err;
drivers/infiniband/hw/mthca/mthca_cq.c +1 -2
@@ -36,7 +36,6 @@* $Id: mthca_cq.c 1369 2004-12-20 16:17:07Z roland $ */ -#include <linux/init.h> #include <linux/hardirq.h> #include <asm/io.h>
@@ -970,7 +969,7 @@ void mthca_free_cq(struct mthca_dev *devmthca_free_mailbox (dev, mailbox); } -int __devinit mthca_init_cq_table (struct mthca_dev *dev) +int mthca_init_cq_table (struct mthca_dev *dev) {int err;
drivers/infiniband/hw/mthca/mthca_eq.c +10 -11
@@ -33,7 +33,6 @@* $Id: mthca_eq.c 1382 2004-12-24 02:21:02Z roland $ */ -#include <linux/init.h> #include <linux/errno.h> #include <linux/interrupt.h> #include <linux/pci.h>
@@ -479,10 +478,10 @@ static irqreturn_t mthca_arbel_msi_x_intreturn IRQ_HANDLED ; } -static int __devinit mthca_create_eq (struct mthca_dev *dev, -int nent, -u8 intr, -struct mthca_eq *eq) +static int mthca_create_eq (struct mthca_dev *dev, +int nent, +u8 intr, +struct mthca_eq *eq) {int npages;u64 *dma_list =NULL ;
@@ -664,9 +663,9 @@ static void mthca_free_irqs(struct mthca dev->eq_table.eq + i); } -static int __devinit mthca_map_reg (struct mthca_dev *dev, -unsigned long offset,unsigned long size, -void __iomem **map) +static int mthca_map_reg (struct mthca_dev *dev, +unsigned long offset,unsigned long size, +void __iomem **map) {unsigned long base =pci_resource_start (dev->pdev,0 );
@@ -691,7 +690,7 @@ static void mthca_unmap_reg(struct mthcaiounmap (map); } -static int __devinit mthca_map_eq_regs (struct mthca_dev *dev) +static int mthca_map_eq_regs (struct mthca_dev *dev) {if (mthca_is_memfree (dev)) {/*
@@ -781,7 +780,7 @@ static void mthca_unmap_eq_regs(struct m } } -int __devinit mthca_map_eq_icm (struct mthca_dev *dev,u64 icm_virt) +int mthca_map_eq_icm (struct mthca_dev *dev,u64 icm_virt) {int ret;u8 status;
@@ -825,7 +824,7 @@ void mthca_unmap_eq_icm(struct mthca_dev__free_page (dev->eq_table.icm_page); } -int __devinit mthca_init_eq_table (struct mthca_dev *dev) +int mthca_init_eq_table (struct mthca_dev *dev) {int err;u8 status;
drivers/infiniband/hw/mthca/mthca_mad.c +1 -1
@@ -317,7 +317,7 @@ err:return ret; } -void __devexit mthca_free_agents(struct mthca_dev *dev) +void mthca_free_agents (struct mthca_dev *dev) {struct ib_mad_agent *agent;int p, q;
drivers/infiniband/hw/mthca/mthca_main.c +14 -15
@@ -98,7 +98,7 @@ static struct mthca_profile default_prof .uarc_size = 1 << 18, /* Arbel only */ }; -static int __devinit mthca_tune_pci (struct mthca_dev *mdev) +static int mthca_tune_pci (struct mthca_dev *mdev) {int cap;u16 val;
@@ -143,7 +143,7 @@ static int __devinit mthca_tune_pci(strureturn 0 ; } -static int __devinit mthca_dev_lim (struct mthca_dev *mdev,struct mthca_dev_lim *dev_lim) +static int mthca_dev_lim (struct mthca_dev *mdev,struct mthca_dev_lim *dev_lim) {int err;u8 status;
@@ -255,7 +255,7 @@ static int __devinit mthca_dev_lim(strucreturn 0 ; } -static int __devinit mthca_init_tavor (struct mthca_dev *mdev) +static int mthca_init_tavor (struct mthca_dev *mdev) {u8 status;int err;
@@ -333,7 +333,7 @@ err_disable:return err; } -static int __devinit mthca_load_fw (struct mthca_dev *mdev) +static int mthca_load_fw (struct mthca_dev *mdev) {u8 status;int err;
@@ -379,10 +379,10 @@ err_free:return err; } -static int __devinit mthca_init_icm (struct mthca_dev *mdev, -struct mthca_dev_lim *dev_lim, -struct mthca_init_hca_param *init_hca, -u64 icm_size) +static int mthca_init_icm (struct mthca_dev *mdev, +struct mthca_dev_lim *dev_lim, +struct mthca_init_hca_param *init_hca, +u64 icm_size) {u64 aux_pages;u8 status;
@@ -575,7 +575,7 @@ static void mthca_free_icms(struct mthcamthca_free_icm (mdev, mdev->fw.arbel.aux_icm); } -static int __devinit mthca_init_arbel (struct mthca_dev *mdev) +static int mthca_init_arbel (struct mthca_dev *mdev) {struct mthca_dev_lim dev_lim;struct mthca_profile profile;
@@ -683,7 +683,7 @@ static void mthca_close_hca(struct mthcamthca_SYS_DIS (mdev, &status); } -static int __devinit mthca_init_hca (struct mthca_dev *mdev) +static int mthca_init_hca (struct mthca_dev *mdev) {u8 status;int err;
@@ -720,7 +720,7 @@ err_close:return err; } -static int __devinit mthca_setup_hca (struct mthca_dev *dev) +static int mthca_setup_hca (struct mthca_dev *dev) {int err;u8 status;
@@ -875,8 +875,7 @@ err_uar_table_free:return err; } -static int __devinit mthca_request_regions (struct pci_dev *pdev, -int ddr_hidden) +static int mthca_request_regions (struct pci_dev *pdev,int ddr_hidden) {int err;
@@ -928,7 +927,7 @@ static void mthca_release_regions(struct MTHCA_HCR_SIZE); } -static int __devinit mthca_enable_msi_x (struct mthca_dev *mdev) +static int mthca_enable_msi_x (struct mthca_dev *mdev) {struct msix_entry entries[3 ];int err;
@@ -1213,7 +1212,7 @@ int __mthca_restart_one(struct pci_dev * }static int __devinit mthca_init_one (struct pci_dev *pdev, -const struct pci_device_id *id) +const struct pci_device_id *id) {static int mthca_version_printed =0 ;int ret;
drivers/infiniband/hw/mthca/mthca_mcg.c +1 -2
@@ -32,7 +32,6 @@* $Id: mthca_mcg.c 1349 2004-12-16 21:09:43Z roland $ */ -#include <linux/init.h> #include <linux/string.h> #include <linux/slab.h>
@@ -371,7 +370,7 @@ int mthca_multicast_detach(struct ib_qpreturn err; } -int __devinit mthca_init_mcg_table (struct mthca_dev *dev) +int mthca_init_mcg_table (struct mthca_dev *dev) {int err;int table_size = dev->limits.num_mgms + dev->limits.num_amgms;
drivers/infiniband/hw/mthca/mthca_mr.c +2 -3
@@ -34,7 +34,6 @@*/ #include <linux/slab.h> -#include <linux/init.h> #include <linux/errno.h> #include "mthca_dev.h"
@@ -135,7 +134,7 @@ static void mthca_buddy_free(struct mthcspin_unlock (&buddy->lock); } -static int __devinit mthca_buddy_init (struct mthca_buddy *buddy,int max_order) +static int mthca_buddy_init (struct mthca_buddy *buddy,int max_order) {int i, s;
@@ -759,7 +758,7 @@ void mthca_arbel_fmr_unmap(struct mthca_ *(u8 *) fmr->mem.arbel.mpt =MTHCA_MPT_STATUS_SW ; } -int __devinit mthca_init_mr_table (struct mthca_dev *dev) +int mthca_init_mr_table (struct mthca_dev *dev) {unsigned long addr;int err, i;
drivers/infiniband/hw/mthca/mthca_pd.c +1 -2
@@ -34,7 +34,6 @@* $Id: mthca_pd.c 1349 2004-12-16 21:09:43Z roland $ */ -#include <linux/init.h> #include <linux/errno.h> #include "mthca_dev.h"
@@ -69,7 +68,7 @@ void mthca_pd_free(struct mthca_dev *devmthca_free (&dev->pd_table.alloc, pd->pd_num); } -int __devinit mthca_init_pd_table (struct mthca_dev *dev) +int mthca_init_pd_table (struct mthca_dev *dev) { return mthca_alloc_init(&dev->pd_table.alloc, dev->limits.num_pds,
drivers/infiniband/hw/mthca/mthca_provider.c +1 -2
@@ -1100,11 +1100,10 @@ static struct ib_fmr *mthca_alloc_fmr(ststruct mthca_fmr *fmr;int err; - fmr =kmalloc (sizeof *fmr,GFP_KERNEL ); + fmr =kmemdup (fmr_attr,sizeof *fmr,GFP_KERNEL );if (!fmr)return ERR_PTR (-ENOMEM ); -memcpy (&fmr->attr, fmr_attr,sizeof *fmr_attr); err =mthca_fmr_alloc (to_mdev (pd->device),to_mpd (pd)->pd_num,convert_access (mr_access_flags), fmr);
drivers/infiniband/hw/mthca/mthca_qp.c +1 -2
@@ -35,7 +35,6 @@* $Id: mthca_qp.c 1355 2004-12-17 15:23:43Z roland $ */ -#include <linux/init.h> #include <linux/string.h> #include <linux/slab.h>
@@ -2241,7 +2240,7 @@ void mthca_free_err_wqe(struct mthca_dev *new_wqe =0 ; } -int __devinit mthca_init_qp_table (struct mthca_dev *dev) +int mthca_init_qp_table (struct mthca_dev *dev) {int err;u8 status;
drivers/infiniband/hw/mthca/mthca_srq.c +2 -2
@@ -120,7 +120,7 @@ static void mthca_arbel_init_srq_contextmemset (context,0 ,sizeof *context); - logsize =long_log2 (srq->max) + srq->wqe_shift; + logsize =long_log2 (srq->max); context->state_logsize_srqn =cpu_to_be32 (logsize <<24 | srq->srqn); context->lkey =cpu_to_be32 (srq->mr.ibmr.lkey); context->db_index =cpu_to_be32 (srq->db_index);
@@ -715,7 +715,7 @@ int mthca_max_srq_sge(struct mthca_dev * sizeof (struct mthca_data_seg)); } -int __devinit mthca_init_srq_table (struct mthca_dev *dev) +int mthca_init_srq_table (struct mthca_dev *dev) {int err;
drivers/infiniband/ulp/ipoib/ipoib.h +1 -1
@@ -233,7 +233,7 @@ static inline struct ipoib_neigh **to_ip }struct ipoib_neigh *ipoib_neigh_alloc (struct neighbour *neigh); -void ipoib_neigh_free (struct ipoib_neigh *neigh); +void ipoib_neigh_free (struct net_device *dev,struct ipoib_neigh *neigh);extern struct workqueue_struct *ipoib_workqueue;
drivers/infiniband/ulp/ipoib/ipoib_main.c +13 -6
@@ -264,7 +264,7 @@ static void path_free(struct net_deviceif (neigh->ah)ipoib_put_ah (neigh->ah); -ipoib_neigh_free (neigh); +ipoib_neigh_free (dev, neigh); }spin_unlock_irqrestore (&priv->lock, flags);
@@ -525,10 +525,11 @@ static void neigh_add_path(struct sk_bufipoib_send (dev, skb, path->ah,IPOIB_QPN (skb->dst->neighbour->ha)); }else { neigh->ah =NULL ; -__skb_queue_tail (&neigh->queue, skb);if (!path->query &&path_rec_start (dev, path)) goto err_list; + +__skb_queue_tail (&neigh->queue, skb); }spin_unlock (&priv->lock);
@@ -538,7 +539,7 @@ err_list:list_del (&neigh->list); err_path: -ipoib_neigh_free (neigh); +ipoib_neigh_free (dev, neigh); ++priv->stats.tx_dropped;dev_kfree_skb_any (skb);
@@ -655,7 +656,7 @@ static int ipoib_start_xmit(struct sk_bu*/ ipoib_put_ah (neigh->ah);list_del (&neigh->list); -ipoib_neigh_free (neigh); +ipoib_neigh_free (dev, neigh);spin_unlock (&priv->lock);ipoib_path_lookup (skb, dev); goto out;
@@ -786,7 +787,7 @@ static void ipoib_neigh_destructor(strucif (neigh->ah) ah = neigh->ah;list_del (&neigh->list); -ipoib_neigh_free (neigh); +ipoib_neigh_free (n->dev, neigh); }spin_unlock_irqrestore (&priv->lock, flags);
@@ -809,9 +810,15 @@ struct ipoib_neigh *ipoib_neigh_alloc(streturn neigh; } -void ipoib_neigh_free (struct ipoib_neigh *neigh) +void ipoib_neigh_free (struct net_device *dev,struct ipoib_neigh *neigh) { +struct ipoib_dev_priv *priv =netdev_priv (dev); +struct sk_buff *skb; *to_ipoib_neigh (neigh->neighbour) =NULL ; +while ((skb =__skb_dequeue (&neigh->queue))) { + ++priv->stats.tx_dropped; +dev_kfree_skb_any (skb); + }kfree (neigh); }
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +1 -1
@@ -114,7 +114,7 @@ static void ipoib_mcast_free(struct ipoi*/ if (neigh->ah)ipoib_put_ah (neigh->ah); -ipoib_neigh_free (neigh); +ipoib_neigh_free (dev, neigh); }spin_unlock_irqrestore (&priv->lock, flags);
drivers/infiniband/ulp/iser/iscsi_iser.h +1 -1
@@ -283,7 +283,7 @@ struct iser_global {struct mutex connlist_mutex;struct list_head connlist;/* all iSER IB connections */ -kmem_cache_t *desc_cache; +struct kmem_cache *desc_cache; };extern struct iser_global ig;
drivers/infiniband/ulp/srp/ib_srp.c +7 -4
@@ -1176,9 +1176,11 @@ static int srp_cm_handler(struct ib_cm_ibreak ; } - target->status =srp_alloc_iu_bufs (target); -if (target->status) -break ; +if (!target->rx_ring[0 ]) { + target->status =srp_alloc_iu_bufs (target); +if (target->status) +break ; + } qp_attr =kmalloc (sizeof *qp_attr,GFP_KERNEL );if (!qp_attr) {
@@ -1716,7 +1718,8 @@ static ssize_t srp_create_target(structif (!target_host)return -ENOMEM ; - target_host->max_lun =SRP_MAX_LUN ; + target_host->max_lun =SRP_MAX_LUN ; + target_host->max_cmd_len =sizeof ((struct srp_cmd *) (void *)0L )->cdb; target =host_to_target (target_host);
include/rdma/ib_cm.h +12 -4
@@ -60,6 +60,7 @@ enum ib_cm_state { };enum ib_cm_lap_state { +IB_CM_LAP_UNINIT ,IB_CM_LAP_IDLE ,IB_CM_LAP_SENT ,IB_CM_LAP_RCVD ,
@@ -443,13 +444,20 @@ int ib_send_cm_drep(struct ib_cm_id *cm_ u8 private_data_len);/** -* ib_cm_establish - Forces a connection state to established. +* ib_cm_notify - Notifies the CM of an event reported to the consumer. * @cm_id: Connection identifier to transition to established. +* @event: Type of event. * -* This routine should be invoked by users who receive messages on a -* connected QP before an RTU has been received. +* This routine should be invoked by users to notify the CM of relevant +* communication events. Events that should be reported to the CM and +* when to report them are: +* +* IB_EVENT_COMM_EST - Used when a message is received on a connected +* QP before an RTU has been received. +* IB_EVENT_PATH_MIG - Notifies the CM that the connection has failed over +* to the alternate path. */ -int ib_cm_establish (struct ib_cm_id *cm_id); +int ib_cm_notify (struct ib_cm_id *cm_id,enum ib_event_type event);/** * ib_send_cm_rej - Sends a connection rejection message to the
include/rdma/ib_user_cm.h +4 -3
@@ -38,7 +38,7 @@ #define IB_USER_CM_H#include <rdma/ib_user_sa.h> -#define IB_USER_CM_ABI_VERSION 4 +#define IB_USER_CM_ABI_VERSION 5enum {IB_USER_CM_CMD_CREATE_ID ,
@@ -46,7 +46,7 @@ enum {IB_USER_CM_CMD_ATTR_ID ,IB_USER_CM_CMD_LISTEN , -IB_USER_CM_CMD_ESTABLISH , +IB_USER_CM_CMD_NOTIFY ,IB_USER_CM_CMD_SEND_REQ , IB_USER_CM_CMD_SEND_REP,
@@ -117,8 +117,9 @@ struct ib_ucm_listen {__u32 reserved; }; -struct ib_ucm_establish { +struct ib_ucm_notify {__u32 id; +__u32 event; };struct ib_ucm_private_data {