post-2.6.17-rc1 fixes
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
This includes some changes that I asked you to pull last week right before you left. There are a couple of largish changes in here, but I think they are all needed:
- the IPoIB ring size tunables fix horrible performance IBM sees
- the static rate change fixes big problems on mixed rate networks
- the callback refcounting changes are fixing possible crashes on module unload
The exact changes and patch are:
Eli Cohen:
IPoIB: Wait for join to finish before freeing mcast struct
IPoIB: Close race in ipoib_flush_paths()
Jack Morgenstein:
IB: simplify static rate encoding
Michael S. Tsirkin:
IB/mad: fix oops in cancel_mads
IPoIB: Consolidate private neighbour data handling IB/mthca: Disable tuning PCI read burst size IB/sa: Don't let a module be unloaded with a callback running
Roland Dreier:
IPoIB: Always build debugging code unless CONFIG_EMBEDDED=y IB/mthca: Always build debugging code unless CONFIG_EMBEDDED=y IB/srp: Fix memory leak in options parsing
IPoIB: Use spin_lock_irq() instead of spin_lock_irqsave()
Sean Hefty:
IB/cm: Don't let a module be unloaded with a callback running
Shirley Ma:
IPoIB: Make send and receive queue sizes tunable
drivers/infiniband/core/cm.c | 31 +++- drivers/infiniband/core/mad.c | 2 drivers/infiniband/core/sa_query.c | 93 +++++++----- drivers/infiniband/core/verbs.c | 34 ++++ drivers/infiniband/hw/mthca/Kconfig | 11 + drivers/infiniband/hw/mthca/Makefile | 4 - drivers/infiniband/hw/mthca/mthca_av.c | 96 ++++++++++++ drivers/infiniband/hw/mthca/mthca_cmd.c | 4 + drivers/infiniband/hw/mthca/mthca_cmd.h | 1 drivers/infiniband/hw/mthca/mthca_dev.h | 21 ++- drivers/infiniband/hw/mthca/mthca_mad.c | 42 +++++ drivers/infiniband/hw/mthca/mthca_main.c | 27 ++++ drivers/infiniband/hw/mthca/mthca_provider.h | 3 drivers/infiniband/hw/mthca/mthca_qp.c | 46 ++++-- drivers/infiniband/ulp/ipoib/Kconfig | 3 drivers/infiniband/ulp/ipoib/ipoib.h | 7 + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 2 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 22 +-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 88 +++++++---- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 58 +++----- drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 6 - drivers/infiniband/ulp/srp/ib_srp.c | 1 include/rdma/ib_cm.h | 13 +- include/rdma/ib_sa.h | 185 ++++++++++++++++-------- include/rdma/ib_verbs.h | 28 ++++ 25 files changed, 603 insertions(+), 225 deletions(-)
drivers/infiniband/core/cm.c +23 -8
@@ -118,6 +118,7 @@ struct cm_timewait_info {struct cm_id_private {struct ib_cm_id id; +struct module *owner;struct rb_node service_node;struct rb_node sidr_id_node;
@@ -538,9 +539,9 @@ static void cm_reject_sidr_req(struct cmib_send_cm_sidr_rep (&cm_id_priv->id, ¶m); } -struct ib_cm_id *ib_create_cm_id (struct ib_device *device, -ib_cm_handler cm_handler, -void *context) +struct ib_cm_id *__ib_create_cm_id (struct ib_device *device, +ib_cm_handler cm_handler, +void *context,struct module *owner) {struct cm_id_private *cm_id_priv;int ret;
@@ -549,6 +550,7 @@ struct ib_cm_id *ib_create_cm_id(structif (!cm_id_priv)return ERR_PTR (-ENOMEM ); + cm_id_priv->owner = owner; cm_id_priv->id.state =IB_CM_IDLE ; cm_id_priv->id.device = device; cm_id_priv->id.cm_handler = cm_handler;
@@ -569,7 +571,7 @@ error:kfree (cm_id_priv);return ERR_PTR (-ENOMEM ); } -EXPORT_SYMBOL (ib_create_cm_id); +EXPORT_SYMBOL (__ib_create_cm_id);static struct cm_work *cm_dequeue_work (struct cm_id_private *cm_id_priv) {
@@ -1086,6 +1088,18 @@ static void cm_format_req_event(struct c work->cm_event.private_data = &req_msg->private_data; } +static int invoke_cm_handler (struct cm_id_private *cm_id_priv, +struct ib_cm_event *event) +{ +int ret; + +BUG_ON (!try_module_get (cm_id_priv->owner)); + ret = cm_id_priv->id.cm_handler (&cm_id_priv->id, event); +module_put (cm_id_priv->owner); + +return ret; +} +static void cm_process_work (struct cm_id_private *cm_id_priv,struct cm_work *work) {
@@ -1093,7 +1107,7 @@ static void cm_process_work(struct cm_idint ret;/* We will typically only have the current event to report. */ - ret = cm_id_priv->id.cm_handler (&cm_id_priv->id, &work->cm_event); + ret =invoke_cm_handler (cm_id_priv, &work->cm_event);cm_free_work (work);while (!ret && !atomic_add_negative (-1 , &cm_id_priv->work_count)) {
@@ -1101,8 +1115,7 @@ static void cm_process_work(struct cm_id work =cm_dequeue_work (cm_id_priv);spin_unlock_irqrestore (&cm_id_priv->lock, flags);BUG_ON (!work); - ret = cm_id_priv->id.cm_handler (&cm_id_priv->id, - &work->cm_event); + ret =invoke_cm_handler (cm_id_priv, &work->cm_event);cm_free_work (work); }cm_deref_id (cm_id_priv);
@@ -1291,6 +1304,7 @@ static int cm_req_handler(struct cm_work goto error2; } + cm_id_priv->owner = listen_cm_id_priv->owner; cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler; cm_id_priv->id.context = listen_cm_id_priv->id.context; cm_id_priv->id.service_id = req_msg->service_id;
@@ -2662,6 +2676,7 @@ static int cm_sidr_req_handler(struct cmatomic_inc (&cur_cm_id_priv->refcount);spin_unlock_irqrestore (&cm.lock, flags); + cm_id_priv->owner = cur_cm_id_priv->owner; cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler; cm_id_priv->id.context = cur_cm_id_priv->id.context; cm_id_priv->id.service_id = sidr_req_msg->service_id;
@@ -2830,7 +2845,7 @@ static void cm_process_send_error(struct cm_event.param.send_status = wc_status;/* No other events can occur on the cm_id at this point. */ - ret = cm_id_priv->id.cm_handler (&cm_id_priv->id, &cm_event); + ret =invoke_cm_handler (cm_id_priv, &cm_event);cm_free_msg (msg);if (ret)ib_destroy_cm_id (&cm_id_priv->id);
drivers/infiniband/core/mad.c +1 -1
@@ -2311,6 +2311,7 @@ static void local_completions(void *data local =list_entry (mad_agent_priv->local_list.next, struct ib_mad_local_private, completion_list); +list_del (&local->completion_list);spin_unlock_irqrestore (&mad_agent_priv->lock, flags);if (local->mad_priv) { recv_mad_agent = local->recv_mad_agent;
@@ -2362,7 +2363,6 @@ local_send_completion: &mad_send_wc);spin_lock_irqsave (&mad_agent_priv->lock, flags); -list_del (&local->completion_list);atomic_dec (&mad_agent_priv->refcount);if (!recv)kmem_cache_free (ib_mad_cache, local->mad_priv);
drivers/infiniband/core/sa_query.c +54 -39
170 lines not on this page · raw message
drivers/infiniband/core/verbs.c +34 -0
@@ -45,6 +45,40 @@#include <rdma/ib_verbs.h> #include <rdma/ib_cache.h> +int ib_rate_to_mult (enum ib_rate rate) +{ +switch (rate) { +case IB_RATE_2_5_GBPS :return 1 ; +case IB_RATE_5_GBPS :return 2 ; +case IB_RATE_10_GBPS :return 4 ; +case IB_RATE_20_GBPS :return 8 ; +case IB_RATE_30_GBPS :return 12 ; +case IB_RATE_40_GBPS :return 16 ; +case IB_RATE_60_GBPS :return 24 ; +case IB_RATE_80_GBPS :return 32 ; +case IB_RATE_120_GBPS :return 48 ; +default :return -1 ; + } +} +EXPORT_SYMBOL (ib_rate_to_mult); + +enum ib_rate mult_to_ib_rate (int mult) +{ +switch (mult) { +case 1 :return IB_RATE_2_5_GBPS ; +case 2 :return IB_RATE_5_GBPS ; +case 4 :return IB_RATE_10_GBPS ; +case 8 :return IB_RATE_20_GBPS ; +case 12 :return IB_RATE_30_GBPS ; +case 16 :return IB_RATE_40_GBPS ; +case 24 :return IB_RATE_60_GBPS ; +case 32 :return IB_RATE_80_GBPS ; +case 48 :return IB_RATE_120_GBPS ; +default :return IB_RATE_PORT_CURRENT ; + } +} +EXPORT_SYMBOL (mult_to_ib_rate); +/* Protection domains */ struct ib_pd *ib_alloc_pd (struct ib_device *device)
drivers/infiniband/hw/mthca/Kconfig +6 -5
@@ -7,10 +7,11 @@ config INFINIBAND_MTHCA ("Tavor") and the MT25208 PCI Express HCA ("Arbel"). config INFINIBAND_MTHCA_DEBUG - bool "Verbose debugging output" + bool "Verbose debugging output" if EMBEDDED depends on INFINIBAND_MTHCA - default n + default y ---help--- - This option causes the mthca driver produce a bunch of debug - messages. Select this is you are developing the driver or - trying to diagnose a problem. + This option causes debugging code to be compiled into the + mthca driver. The output can be turned on via the + debug_level module parameter (which can also be set after + the driver is loaded through sysfs).
drivers/infiniband/hw/mthca/Makefile +0 -4
@@ -1,7 +1,3 @@ -ifdef CONFIG_INFINIBAND_MTHCA_DEBUG -EXTRA_CFLAGS += -DDEBUG -endif - obj-$(CONFIG_INFINIBAND_MTHCA) += ib_mthca.o ib_mthca-y := mthca_main.o mthca_cmd.o mthca_profile.o mthca_reset.o \
drivers/infiniband/hw/mthca/mthca_av.c +95 -1
114 lines not on this page · raw message
drivers/infiniband/hw/mthca/mthca_cmd.c +4 -0
@@ -965,6 +965,7 @@ int mthca_QUERY_DEV_LIM(struct mthca_devu32 *outbox;u8 field;u16 size; +u16 stat_rate;int err;#define QUERY_DEV_LIM_OUT_SIZE 0x100
@@ -995,6 +996,7 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev#define QUERY_DEV_LIM_MTU_WIDTH_OFFSET 0x36#define QUERY_DEV_LIM_VL_PORT_OFFSET 0x37#define QUERY_DEV_LIM_MAX_GID_OFFSET 0x3b +#define QUERY_DEV_LIM_RATE_SUPPORT_OFFSET 0x3c#define QUERY_DEV_LIM_MAX_PKEY_OFFSET 0x3f#define QUERY_DEV_LIM_FLAGS_OFFSET 0x44#define QUERY_DEV_LIM_RSVD_UAR_OFFSET 0x48
@@ -1086,6 +1088,8 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev dev_lim->num_ports = field &0xf ;MTHCA_GET (field, outbox,QUERY_DEV_LIM_MAX_GID_OFFSET ); dev_lim->max_gids =1 << (field &0xf ); +MTHCA_GET (stat_rate, outbox,QUERY_DEV_LIM_RATE_SUPPORT_OFFSET ); + dev_lim->stat_rate_support = stat_rate;MTHCA_GET (field, outbox,QUERY_DEV_LIM_MAX_PKEY_OFFSET ); dev_lim->max_pkeys =1 << (field &0xf );MTHCA_GET (dev_lim->flags, outbox,QUERY_DEV_LIM_FLAGS_OFFSET );
drivers/infiniband/hw/mthca/mthca_cmd.h +1 -0
@@ -146,6 +146,7 @@ struct mthca_dev_lim {int max_vl;int num_ports;int max_gids; +u16 stat_rate_support;int max_pkeys;u32 flags;int reserved_uars;
drivers/infiniband/hw/mthca/mthca_dev.h +19 -2
@@ -172,6 +172,7 @@ struct mthca_limits {int reserved_pds;u32 page_size_cap;u32 flags; +u16 stat_rate_support;u8 port_width_cap; };
@@ -353,10 +354,24 @@ struct mthca_dev {struct ib_mad_agent *send_agent[MTHCA_MAX_PORTS ][2 ];struct ib_ah *sm_ah[MTHCA_MAX_PORTS ];spinlock_t sm_lock; +u8 rate[MTHCA_MAX_PORTS ]; }; -#define mthca_dbg(mdev, format, arg...) \ - dev_dbg(&mdev->pdev->dev, format, ## arg) +#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG +extern int mthca_debug_level; + +#define mthca_dbg(mdev, format, arg...) \ + do { \ + if (mthca_debug_level) \ + dev_printk(KERN_DEBUG, &mdev->pdev->dev, format, ## arg); \ + } while (0) + +#else /* CONFIG_INFINIBAND_MTHCA_DEBUG */ + +#define mthca_dbg(mdev, format, arg...) do { (void) mdev; } while (0) + +#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */ + #define mthca_err(mdev, format, arg...) \ dev_err(&mdev->pdev->dev, format, ## arg) #define mthca_info(mdev, format, arg...) \
@@ -542,6 +557,8 @@ int mthca_read_ah(struct mthca_dev *dev, struct ib_ud_header *header);int mthca_ah_query (struct ib_ah *ibah,struct ib_ah_attr *attr);int mthca_ah_grh_present (struct mthca_ah *ah); +u8 mthca_get_rate (struct mthca_dev *dev,int static_rate,u8 port); +enum ib_rate mthca_rate_to_ib (struct mthca_dev *dev,u8 mthca_rate,u8 port);int mthca_multicast_attach (struct ib_qp *ibqp,union ib_gid *gid,u16 lid);int mthca_multicast_detach (struct ib_qp *ibqp,union ib_gid *gid,u16 lid);
drivers/infiniband/hw/mthca/mthca_mad.c +40 -2
76 lines not on this page · raw message
drivers/infiniband/hw/mthca/mthca_main.c +27 -0
@@ -52,6 +52,14 @@ MODULE_DESCRIPTION("Mellanox InfiniBandMODULE_LICENSE ("Dual BSD/GPL" );MODULE_VERSION (DRV_VERSION ); +#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG + +int mthca_debug_level =0 ; +module_param_named (debug_level, mthca_debug_level, int,0644 ); +MODULE_PARM_DESC (debug_level,"Enable debug tracing if > 0" ); + +#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */ +#ifdef CONFIG_PCI_MSI static int msi_x =0 ;
@@ -69,6 +77,10 @@ MODULE_PARM_DESC(msi, "attempt to use MS#endif /* CONFIG_PCI_MSI */ +static int tune_pci =0 ; +module_param (tune_pci, int,0444 ); +MODULE_PARM_DESC (tune_pci,"increase PCI burst from the default set by BIOS if nonzero" ); +static const char mthca_version[]__devinitdata =DRV_NAME ": Mellanox InfiniBand HCA driver v" DRV_VERSION " (" DRV_RELDATE ")\n" ;
@@ -90,6 +102,9 @@ static int __devinit mthca_tune_pci(struint cap;u16 val; +if (!tune_pci) +return 0 ; +/* First try to max out Read Byte Count */ cap =pci_find_capability (mdev->pdev,PCI_CAP_ID_PCIX );if (cap) {
@@ -191,6 +206,18 @@ static int __devinit mthca_dev_lim(struc mdev->limits.port_width_cap = dev_lim->max_port_width; mdev->limits.page_size_cap = ~(u32) (dev_lim->min_page_sz -1 ); mdev->limits.flags = dev_lim->flags; +/* +* For old FW that doesn't return static rate support, use a +* value of 0x3 (only static rate values of 0 or 1 are handled), +* except on Sinai, where even old FW can handle static rate +* values of 2 and 3. +*/ +if (dev_lim->stat_rate_support) + mdev->limits.stat_rate_support = dev_lim->stat_rate_support; +else if (mdev->mthca_flags &MTHCA_FLAG_SINAI_OPT ) + mdev->limits.stat_rate_support =0xf ; +else + mdev->limits.stat_rate_support =0x3 ;/* IB_DEVICE_RESIZE_MAX_WR not supported by driver. May be doable since hardware supports it for SRQ.
drivers/infiniband/hw/mthca/mthca_provider.h +2 -1
@@ -257,6 +257,8 @@ struct mthca_qp {atomic_t refcount;u32 qpn;int is_direct; +u8 port;/* for SQP and memfree use only */ +u8 alt_port;/* for memfree use only */ u8 transport;u8 state;u8 atomic_rd_en;
@@ -278,7 +280,6 @@ struct mthca_qp {struct mthca_sqp {struct mthca_qp qp; -int port;int pkey_index;u32 qkey;u32 send_psn;
drivers/infiniband/hw/mthca/mthca_qp.c +33 -13
131 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/Kconfig +2 -1
@@ -10,8 +10,9 @@ config INFINIBAND_IPOIB group: <http://www.ietf.org/html.charters/ipoib-charter.html>. config INFINIBAND_IPOIB_DEBUG - bool "IP-over-InfiniBand debugging" + bool "IP-over-InfiniBand debugging" if EMBEDDED depends on INFINIBAND_IPOIB + default y ---help--- This option causes debugging code to be compiled into the IPoIB driver. The output can be turned on via the
drivers/infiniband/ulp/ipoib/ipoib.h +7 -0
@@ -65,6 +65,8 @@ enum {IPOIB_RX_RING_SIZE =128 ,IPOIB_TX_RING_SIZE =64 , +IPOIB_MAX_QUEUE_SIZE =8192 , +IPOIB_MIN_QUEUE_SIZE =2 , IPOIB_NUM_WC = 4,
@@ -230,6 +232,9 @@ static inline struct ipoib_neigh **to_ip INFINIBAND_ALEN, sizeof(void *)); } +struct ipoib_neigh *ipoib_neigh_alloc (struct neighbour *neigh); +void ipoib_neigh_free (struct ipoib_neigh *neigh); +extern struct workqueue_struct *ipoib_workqueue;/* functions */
@@ -329,6 +334,8 @@ static inline void ipoib_unregister_debu #define ipoib_warn(priv, format, arg...) \ ipoib_printk(KERN_WARNING, priv, format , ## arg) +extern int ipoib_sendq_size; +extern int ipoib_recvq_size;#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG extern int ipoib_debug_level;
drivers/infiniband/ulp/ipoib/ipoib_fs.c +1 -1
@@ -213,7 +213,7 @@ static int ipoib_path_seq_show(struct se gid_buf, path.pathrec.dlid ? "yes" : "no");if (path.pathrec.dlid) { - rate =ib_sa_rate_enum_to_int (path.pathrec.rate) *25 ; + rate =ib_rate_to_mult (path.pathrec.rate) *25 ;seq_printf (file, " DLID: 0x%04x\n"
drivers/infiniband/ulp/ipoib/ipoib_ib.c +11 -11
@@ -161,7 +161,7 @@ static int ipoib_ib_post_receives(structstruct ipoib_dev_priv *priv =netdev_priv (dev);int i; -for (i =0 ; i <IPOIB_RX_RING_SIZE ; ++i) { +for (i =0 ; i < ipoib_recvq_size; ++i) {if (ipoib_alloc_rx_skb (dev, i)) {ipoib_warn (priv,"failed to allocate receive buffer %d\n" , i);return -ENOMEM ;
@@ -187,7 +187,7 @@ static void ipoib_ib_handle_wc(struct neif (wr_id &IPOIB_OP_RECV ) { wr_id &= ~IPOIB_OP_RECV ; -if (wr_id <IPOIB_RX_RING_SIZE ) { +if (wr_id < ipoib_recvq_size) {struct sk_buff *skb = priv->rx_ring[wr_id].skb;dma_addr_t addr = priv->rx_ring[wr_id].mapping;
@@ -252,9 +252,9 @@ static void ipoib_ib_handle_wc(struct nestruct ipoib_tx_buf *tx_req;unsigned long flags; -if (wr_id >=IPOIB_TX_RING_SIZE ) { +if (wr_id >= ipoib_sendq_size) {ipoib_warn (priv,"completion event with wrid %d (> %d)\n" , - wr_id,IPOIB_TX_RING_SIZE ); + wr_id, ipoib_sendq_size);return ; }
@@ -275,7 +275,7 @@ static void ipoib_ib_handle_wc(struct nespin_lock_irqsave (&priv->tx_lock, flags); ++priv->tx_tail;if (netif_queue_stopped (dev) && - priv->tx_head - priv->tx_tail <=IPOIB_TX_RING_SIZE /2 ) + priv->tx_head - priv->tx_tail <= ipoib_sendq_size >>1 )netif_wake_queue (dev);spin_unlock_irqrestore (&priv->tx_lock, flags);
@@ -344,13 +344,13 @@ void ipoib_send(struct net_device *dev,* means we have to make sure everything is properly recorded and * our state is consistent before we call post_send(). */ - tx_req = &priv->tx_ring[priv->tx_head & (IPOIB_TX_RING_SIZE -1 )]; + tx_req = &priv->tx_ring[priv->tx_head & (ipoib_sendq_size -1 )]; tx_req->skb = skb; addr =dma_map_single (priv->ca->dma_device, skb->data, skb->len,DMA_TO_DEVICE );pci_unmap_addr_set (tx_req, mapping, addr); -if (unlikely (post_send (priv, priv->tx_head & (IPOIB_TX_RING_SIZE -1 ), +if (unlikely (post_send (priv, priv->tx_head & (ipoib_sendq_size -1 ), address->ah, qpn, addr, skb->len))) {ipoib_warn (priv,"post_send failed\n" ); ++priv->stats.tx_errors;
@@ -363,7 +363,7 @@ void ipoib_send(struct net_device *dev, address->last_send = priv->tx_head; ++priv->tx_head; -if (priv->tx_head - priv->tx_tail ==IPOIB_TX_RING_SIZE ) { +if (priv->tx_head - priv->tx_tail == ipoib_sendq_size) {ipoib_dbg (priv,"TX ring full, stopping kernel net queue\n" );netif_stop_queue (dev); }
@@ -488,7 +488,7 @@ static int recvs_pending(struct net_deviint pending =0 ;int i; -for (i =0 ; i <IPOIB_RX_RING_SIZE ; ++i) +for (i =0 ; i < ipoib_recvq_size; ++i)if (priv->rx_ring[i].skb) ++pending;
@@ -527,7 +527,7 @@ int ipoib_ib_dev_stop(struct net_device*/ while ((int ) priv->tx_tail - (int ) priv->tx_head <0 ) { tx_req = &priv->tx_ring[priv->tx_tail & - (IPOIB_TX_RING_SIZE -1 )]; + (ipoib_sendq_size -1 )]; dma_unmap_single(priv->ca->dma_device, pci_unmap_addr(tx_req, mapping), tx_req->skb->len,
@@ -536,7 +536,7 @@ int ipoib_ib_dev_stop(struct net_device ++priv->tx_tail; } -for (i =0 ; i <IPOIB_RX_RING_SIZE ; ++i) +for (i =0 ; i < ipoib_recvq_size; ++i)if (priv->rx_ring[i].skb) { dma_unmap_single(priv->ca->dma_device, pci_unmap_addr(&priv->rx_ring[i],
drivers/infiniband/ulp/ipoib/ipoib_main.c +57 -31
202 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +23 -35
107 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_verbs.c +3 -3
@@ -159,8 +159,8 @@ int ipoib_transport_dev_init(struct net_struct ipoib_dev_priv *priv =netdev_priv (dev);struct ib_qp_init_attr init_attr = { .cap = { - .max_send_wr =IPOIB_TX_RING_SIZE , - .max_recv_wr =IPOIB_RX_RING_SIZE , + .max_send_wr = ipoib_sendq_size, + .max_recv_wr = ipoib_recvq_size, .max_send_sge =1 , .max_recv_sge =1 },
@@ -175,7 +175,7 @@ int ipoib_transport_dev_init(struct net_ } priv->cq =ib_create_cq (priv->ca, ipoib_ib_completion,NULL , dev, -IPOIB_TX_RING_SIZE +IPOIB_RX_RING_SIZE +1 ); + ipoib_sendq_size + ipoib_recvq_size +1 );if (IS_ERR (priv->cq)) {printk (KERN_WARNING "%s: failed to create CQ\n" , ca->name); goto out_free_pd;
drivers/infiniband/ulp/srp/ib_srp.c +1 -0
@@ -1434,6 +1434,7 @@ static int srp_parse_options(const char p =match_strdup (args);if (strlen (p) !=32 ) { printk(KERN_WARNING PFX "bad dest GID parameter '%s'\n", p); +kfree (p); goto out; }
include/rdma/ib_cm.h +10 -3
@@ -292,6 +292,10 @@ struct ib_cm_id {u32 remote_cm_qpn;/* 1 unless redirected */ }; +struct ib_cm_id *__ib_create_cm_id (struct ib_device *device, +ib_cm_handler cm_handler, +void *context,struct module *owner); +/** * ib_create_cm_id - Allocate a communication identifier. * @device: Device associated with the cm_id. All related communication will
@@ -303,9 +307,12 @@ struct ib_cm_id {* Communication identifiers are used to track connection states, service * ID resolution requests, and listen requests. */ -struct ib_cm_id *ib_create_cm_id (struct ib_device *device, -ib_cm_handler cm_handler, -void *context); +static inline struct ib_cm_id *ib_create_cm_id (struct ib_device *device, +ib_cm_handler cm_handler, +void *context) +{ +return __ib_create_cm_id (device, cm_handler, context,THIS_MODULE ); +}/** * ib_destroy_cm_id - Destroy a connection identifier.
include/rdma/ib_sa.h +121 -64
215 lines not on this page · raw message
include/rdma/ib_verbs.h +28 -0
@@ -314,6 +314,34 @@ enum ib_ah_flags {IB_AH_GRH =1 }; +enum ib_rate { +IB_RATE_PORT_CURRENT =0 , +IB_RATE_2_5_GBPS =2 , +IB_RATE_5_GBPS =5 , +IB_RATE_10_GBPS =3 , +IB_RATE_20_GBPS =6 , +IB_RATE_30_GBPS =4 , +IB_RATE_40_GBPS =7 , +IB_RATE_60_GBPS =8 , +IB_RATE_80_GBPS =9 , +IB_RATE_120_GBPS =10 +}; + +/** +* ib_rate_to_mult - Convert the IB rate enum to a multiple of the +* base rate of 2.5 Gbit/sec. For example, IB_RATE_5_GBPS will be +* converted to 2, since 5 Gbit/sec is 2 * 2.5 Gbit/sec. +* @rate: rate to convert. +*/ +int ib_rate_to_mult(enum ib_rate rate) __attribute_const__; + +/** +* mult_to_ib_rate - Convert a multiple of 2.5 Gbit/sec to an IB rate +* enum. +* @mult: multiple to convert. +*/ +enum ib_rate mult_to_ib_rate(int mult) __attribute_const__; +struct ib_ah_attr {struct ib_global_route grh;u16 dlid;