please pull infiniband.git
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
to get a few fixes:
Dotan Barak:
IB/mthca: Fix SRQ limit event range check
Michael S. Tsirkin:
IB/uverbs: Fix unlocking in error paths IB/ipoib: Fix packet loss after hardware address update
Or Gerlitz:
IB/ipoib: Fix oops with ipoib_debug_mcast set
Ralph Campbell:
IB/ipath: Fix a data corruption
IB/ipath: Fix ib_ipath driver to work with SRP IB/ipath: ipath_skip_sge() can break if num_sge > 1
Roland Dreier:
IB/uverbs: Fix lockdep warnings
IB/mthca: Initialize max_cmds before debug code prints it
Sean Hefty:
IB/mad: Validate MADs for spec compliance
drivers/infiniband/core/mad.c | 22 +++--- drivers/infiniband/core/user_mad.c | 87 +++++++++++++++++++++--- drivers/infiniband/core/uverbs_cmd.c | 42 ++++++++---- drivers/infiniband/hw/ipath/ipath_driver.c | 76 ++++++++++----------- drivers/infiniband/hw/ipath/ipath_keys.c | 15 ++++ drivers/infiniband/hw/ipath/ipath_verbs.c | 5 - drivers/infiniband/hw/mthca/mthca_cmd.c | 5 + drivers/infiniband/hw/mthca/mthca_srq.c | 3 + drivers/infiniband/ulp/ipoib/ipoib.h | 1 drivers/infiniband/ulp/ipoib/ipoib_main.c | 23 ++++++ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 8 +- include/rdma/ib_mad.h | 7 ++ 12 files changed, 209 insertions(+), 85 deletions(-)
drivers/infiniband/core/mad.c +12 -10
@@ -167,6 +167,15 @@ static int is_vendor_method_in_use(return 0 ; } +int ib_response_mad (struct ib_mad *mad) +{ +return ((mad->mad_hdr.method &IB_MGMT_METHOD_RESP ) || + (mad->mad_hdr.method ==IB_MGMT_METHOD_TRAP_REPRESS ) || + ((mad->mad_hdr.mgmt_class ==IB_MGMT_CLASS_BM ) && + (mad->mad_hdr.attr_mod &IB_BM_ATTR_MOD_RESP ))); +} +EXPORT_SYMBOL (ib_response_mad); +/* * ib_register_mad_agent - Register to send/receive MADs */
@@ -570,13 +579,6 @@ int ib_unregister_mad_agent(struct ib_ma }EXPORT_SYMBOL (ib_unregister_mad_agent); -static inline int response_mad (struct ib_mad *mad) -{ -/* Trap represses are responses although response bit is reset */ -return ((mad->mad_hdr.method ==IB_MGMT_METHOD_TRAP_REPRESS ) || - (mad->mad_hdr.method &IB_MGMT_METHOD_RESP )); -} -static void dequeue_mad (struct ib_mad_list_head *mad_list) {struct ib_mad_queue *mad_queue;
@@ -723,7 +725,7 @@ static int handle_outgoing_dr_smp(structswitch (ret) {case IB_MAD_RESULT_SUCCESS |IB_MAD_RESULT_REPLY : -if (response_mad (&mad_priv->mad.mad) && +if (ib_response_mad (&mad_priv->mad.mad) && mad_agent_priv->agent.recv_handler) { local->mad_priv = mad_priv; local->recv_mad_agent = mad_agent_priv;
@@ -1551,7 +1553,7 @@ find_mad_agent(struct ib_mad_port_privatunsigned long flags;spin_lock_irqsave (&port_priv->reg_lock, flags); -if (response_mad (mad)) { +if (ib_response_mad (mad)) {u32 hi_tid;struct ib_mad_agent_private *entry;
@@ -1799,7 +1801,7 @@ static void ib_mad_complete_recv(struct }/* Complete corresponding request */ -if (response_mad (mad_recv_wc->recv_buf.mad)) { +if (ib_response_mad (mad_recv_wc->recv_buf.mad)) {spin_lock_irqsave (&mad_agent_priv->lock, flags); mad_send_wr =ib_find_send_mad (mad_agent_priv, mad_recv_wc);if (!mad_send_wr) {
drivers/infiniband/core/user_mad.c +76 -11
144 lines not on this page · raw message
drivers/infiniband/core/uverbs_cmd.c +29 -13
135 lines not on this page · raw message
drivers/infiniband/hw/ipath/ipath_driver.c +36 -40
100 lines not on this page · raw message
drivers/infiniband/hw/ipath/ipath_keys.c +15 -0
@@ -197,6 +197,21 @@ int ipath_rkey_ok(struct ipath_ibdev *desize_t off;int ret; +/* +* We use RKEY == zero for physical addresses +* (see ipath_get_dma_mr). +*/ +if (rkey ==0 ) { + sge->mr =NULL ; + sge->vaddr =phys_to_virt (vaddr); + sge->length = len; + sge->sge_length = len; + ss->sg_list =NULL ; + ss->num_sge =1 ; + ret =1 ; + goto bail; + } + mr = rkt->table[(rkey >> (32 - ib_ipath_lkey_table_size))];if (unlikely (mr ==NULL || mr->lkey != rkey)) { ret =0 ;
drivers/infiniband/hw/ipath/ipath_verbs.c +1 -4
@@ -191,10 +191,6 @@ void ipath_skip_sge(struct ipath_sge_sta {struct ipath_sge *sge = &ss->sge; -while (length > sge->sge_length) { - length -= sge->sge_length; - ss->sge = *ss->sg_list++; - }while (length) {u32 len = sge->length;
@@ -627,6 +623,7 @@ static int ipath_query_device(struct ib_ props->device_cap_flags =IB_DEVICE_BAD_PKEY_CNTR |IB_DEVICE_BAD_QKEY_CNTR |IB_DEVICE_SHUTDOWN_PORT |IB_DEVICE_SYS_IMAGE_GUID ; + props->page_size_cap =PAGE_SIZE ; props->vendor_id =ipath_layer_get_vendorid (dev->dd); props->vendor_part_id =ipath_layer_get_deviceid (dev->dd); props->hw_ver =ipath_layer_get_pcirev (dev->dd);
drivers/infiniband/hw/mthca/mthca_cmd.c +3 -2
@@ -778,11 +778,12 @@ #define QUERY_FW_EQ_SET_CI_BASE_OFFSET 0 ((dev->fw_ver &0xffff0000ull ) >>16 ) | ((dev->fw_ver &0x0000ffffull ) <<16 ); +MTHCA_GET (lg, outbox,QUERY_FW_MAX_CMD_OFFSET ); + dev->cmd.max_cmds =1 << lg; +mthca_dbg (dev,"FW version %012llx, max commands %d\n" , (unsigned long long ) dev->fw_ver, dev->cmd.max_cmds); -MTHCA_GET (lg, outbox,QUERY_FW_MAX_CMD_OFFSET ); - dev->cmd.max_cmds =1 << lg;MTHCA_GET (dev->catas_err.addr, outbox,QUERY_FW_ERR_START_OFFSET );MTHCA_GET (dev->catas_err.size, outbox,QUERY_FW_ERR_SIZE_OFFSET );
drivers/infiniband/hw/mthca/mthca_srq.c +2 -1
@@ -370,7 +370,8 @@ int mthca_modify_srq(struct ib_srq *ibsrreturn -EINVAL ;if (attr_mask &IB_SRQ_LIMIT ) { -if (attr->srq_limit > srq->max) +u32 max_wr =mthca_is_memfree (dev) ? srq->max -1 : srq->max; +if (attr->srq_limit > max_wr)return -EINVAL ;mutex_lock (&srq->mutex);
drivers/infiniband/ulp/ipoib/ipoib.h +1 -0
@@ -212,6 +212,7 @@ struct ipoib_path {struct ipoib_neigh {struct ipoib_ah *ah; +union ib_gid dgid;struct sk_buff_head queue;struct neighbour *neighbour;
drivers/infiniband/ulp/ipoib/ipoib_main.c +23 -0
@@ -404,6 +404,8 @@ static void path_rec_completion(int statlist_for_each_entry (neigh, &path->neigh_list, list) {kref_get (&path->ah->ref); neigh->ah = path->ah; +memcpy (&neigh->dgid.raw, &path->pathrec.dgid.raw, +sizeof (union ib_gid ));while ((skb =__skb_dequeue (&neigh->queue)))__skb_queue_tail (&skqueue, skb);
@@ -510,6 +512,8 @@ static void neigh_add_path(struct sk_bufif (path->ah) {kref_get (&path->ah->ref); neigh->ah = path->ah; +memcpy (&neigh->dgid.raw, &path->pathrec.dgid.raw, +sizeof (union ib_gid ));ipoib_send (dev, skb, path->ah,be32_to_cpup ((__be32 *) skb->dst->neighbour->ha));
@@ -633,6 +637,25 @@ static int ipoib_start_xmit(struct sk_bu neigh = *to_ipoib_neigh (skb->dst->neighbour);if (likely (neigh->ah)) { +if (unlikely (memcmp (&neigh->dgid.raw, + skb->dst->neighbour->ha +4 , +sizeof (union ib_gid )))) { +spin_lock (&priv->lock); +/* +* It's safe to call ipoib_put_ah() inside +* priv->lock here, because we know that +* path->ah will always hold one more reference, +* so ipoib_put_ah() will never do more than +* decrement the ref count. +*/ +ipoib_put_ah (neigh->ah); +list_del (&neigh->list); +ipoib_neigh_free (neigh); +spin_unlock (&priv->lock); +ipoib_path_lookup (skb, dev); + goto out; + } +ipoib_send (dev, skb, neigh->ah,be32_to_cpup ((__be32 *) skb->dst->neighbour->ha)); goto out;
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +4 -4
@@ -264,6 +264,10 @@ static int ipoib_mcast_join_finish(strucif (!ah) {ipoib_warn (priv,"ib_address_create failed\n" ); }else { +spin_lock_irq (&priv->lock); + mcast->ah = ah; +spin_unlock_irq (&priv->lock); + ipoib_dbg_mcast(priv, "MGID " IPOIB_GID_FMT " AV %p, LID 0x%04x, SL %d\n", IPOIB_GID_ARG(mcast->mcmember.mgid),
@@ -271,10 +275,6 @@ static int ipoib_mcast_join_finish(strucbe16_to_cpu (mcast->mcmember.mlid), mcast->mcmember.sl); } - -spin_lock_irq (&priv->lock); - mcast->ah = ah; -spin_unlock_irq (&priv->lock); }/* actually send any queued packets */
include/rdma/ib_mad.h +7 -0
@@ -75,6 +75,7 @@ #define IB_MGMT_METHOD_REPORT_RESP 0x86#define IB_MGMT_METHOD_TRAP_REPRESS 0x07#define IB_MGMT_METHOD_RESP 0x80 +#define IB_BM_ATTR_MOD_RESP cpu_to_be32(1)#define IB_MGMT_MAX_METHODS 128
@@ -247,6 +248,12 @@ struct ib_mad_send_buf { };/** +* ib_response_mad - Returns if the specified MAD has been generated in +* response to a sent request or trap. +*/ +int ib_response_mad (struct ib_mad *mad); + +/** * ib_get_rmpp_resptime - Returns the RMPP response time. * @rmpp_hdr: An RMPP header. */