IPoIB: Make sure path is fully initialized before using it
PATCH 1/5 IPoIB: Make sure path is fully initialized before using it
The SA path record query completion can initialize path->pathrec.dlid before IPoIB's callback runs and initializes path->ah, so we must test ah rather than dlid.
---
drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
47f7a0714b67b904a3a36e2f2d85904e8064219b
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -2
@@ -505,7 +505,7 @@ static void neigh_add_path(struct sk_buflist_add_tail (&neigh->list, &path->neigh_list); -if (path->pathrec.dlid) { +if (path->ah) {kref_get (&path->ah->ref); neigh->ah = path->ah;
@@ -591,7 +591,7 @@ static void unicast_arp_send(struct sk_breturn ; } -if (path->pathrec.dlid) { +if (path->ah) {ipoib_dbg (priv,"Send unicast ARP to %04x\n" ,be16_to_cpu (path->pathrec.dlid));
Signature · 1 line
1.1.3
PATCH 2/5 IB/uverbs: Flush scheduled work before unloading module
uverbs might schedule work to clean up when a file is closed. Make sure that this work runs before allowing module text to go away.
---
drivers/infiniband/core/uverbs_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
cc76e33ec98ee2acab2d10828d31588d1b10f274
drivers/infiniband/core/uverbs_main.c +1 -0
@@ -902,6 +902,7 @@ static void __exit ib_uverbs_cleanup(voiunregister_filesystem (&uverbs_event_fs);class_destroy (uverbs_class);unregister_chrdev_region (IB_UVERBS_BASE_DEV ,IB_UVERBS_MAX_DEVICES ); +flush_scheduled_work ();idr_destroy (&ib_uverbs_pd_idr);idr_destroy (&ib_uverbs_mr_idr);idr_destroy (&ib_uverbs_mw_idr);
Signature · 1 line
1.1.3
PATCH 3/5 IB/sa_query: Flush scheduled work before unloading module
sa_query schedules work on IB asynchronous events. After unregistering the async event handler, make sure that this work has completed before releasing the IB device (and possibly allowing the sa_query module text to go away).
---
drivers/infiniband/core/sa_query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
0f47ae0b3ec35dc5f4723f2e0ad0f6f3f55e9bcd
drivers/infiniband/core/sa_query.c +2 -0
@@ -956,6 +956,8 @@ static void ib_sa_remove_one(struct ib_dib_unregister_event_handler (&sa_dev->event_handler); +flush_scheduled_work (); +for (i =0 ; i <= sa_dev->end_port - sa_dev->start_port; ++i) {ib_unregister_mad_agent (sa_dev->port[i].agent);kref_put (&sa_dev->port[i].sm_ah->ref, free_sm_ah);
Signature · 1 line
1.1.3
PATCH 4/5 IPoIB: Lock accesses to multicast packet queues
Avoid corrupting mcast->pkt_queue by serializing access with priv->tx_lock. Also, update dropped packet statistics to count multicast packets removed from pkt_queue as dropped.
---
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 25 +++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-)
b36f170b617a7cd147b694dabf504e856a50ee9d
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +22 -3
@@ -97,6 +97,7 @@ static void ipoib_mcast_free(struct ipoistruct ipoib_dev_priv *priv =netdev_priv (dev);struct ipoib_neigh *neigh, *tmp;unsigned long flags; +int tx_dropped =0 ; ipoib_dbg_mcast(netdev_priv(dev), "deleting multicast group " IPOIB_GID_FMT "\n",
@@ -123,8 +124,14 @@ static void ipoib_mcast_free(struct ipoiif (mcast->ah)ipoib_put_ah (mcast->ah); -while (!skb_queue_empty (&mcast->pkt_queue)) +while (!skb_queue_empty (&mcast->pkt_queue)) { + ++tx_dropped;dev_kfree_skb_any (skb_dequeue (&mcast->pkt_queue)); + } + +spin_lock_irqsave (&priv->tx_lock, flags); + priv->stats.tx_dropped += tx_dropped; +spin_unlock_irqrestore (&priv->tx_lock, flags);kfree (mcast); }
@@ -276,8 +283,10 @@ static int ipoib_mcast_join_finish(struc }/* actually send any queued packets */ +spin_lock_irq (&priv->tx_lock);while (!skb_queue_empty (&mcast->pkt_queue)) {struct sk_buff *skb =skb_dequeue (&mcast->pkt_queue); +spin_unlock_irq (&priv->tx_lock); skb->dev = dev;
@@ -288,7 +297,9 @@ static int ipoib_mcast_join_finish(strucif (dev_queue_xmit (skb))ipoib_warn (priv,"dev_queue_xmit failed to requeue packet\n" ); +spin_lock_irq (&priv->tx_lock); } +spin_unlock_irq (&priv->tx_lock);return 0 ; }
@@ -300,6 +311,7 @@ ipoib_mcast_sendonly_join_complete(int s {struct ipoib_mcast *mcast = mcast_ptr;struct net_device *dev = mcast->dev; +struct ipoib_dev_priv *priv =netdev_priv (dev);if (!status)ipoib_mcast_join_finish (mcast, mcmember);
@@ -310,8 +322,12 @@ ipoib_mcast_sendonly_join_complete(int s IPOIB_GID_ARG(mcast->mcmember.mgid), status);/* Flush out any queued packets */ -while (!skb_queue_empty (&mcast->pkt_queue)) +spin_lock_irq (&priv->tx_lock); +while (!skb_queue_empty (&mcast->pkt_queue)) { + ++priv->stats.tx_dropped;dev_kfree_skb_any (skb_dequeue (&mcast->pkt_queue)); + } +spin_unlock_irq (&priv->tx_lock);/* Clear the busy flag so we try again */ clear_bit (IPOIB_MCAST_FLAG_BUSY , &mcast->flags);
@@ -687,6 +703,7 @@ void ipoib_mcast_send(struct net_deviceif (!mcast) {ipoib_warn (priv,"unable to allocate memory for " "multicast structure\n" ); + ++priv->stats.tx_dropped;dev_kfree_skb_any (skb); goto out; }
@@ -700,8 +717,10 @@ void ipoib_mcast_send(struct net_deviceif (!mcast->ah) {if (skb_queue_len (&mcast->pkt_queue) <IPOIB_MAX_MCAST_QUEUE )skb_queue_tail (&mcast->pkt_queue, skb); -else +else { + ++priv->stats.tx_dropped;dev_kfree_skb_any (skb); + }if (mcast->query) ipoib_dbg_mcast(priv, "no address vector, "
Signature · 1 line
1.1.3
PATCH 5/5 IB/mthca: Use correct GID in MADs sent on port 2
mthca_create_ah() includes the port number in the GID index. The reverse needs to be done in mthca_read_ah().
Noted by Hal Rosenstock.
---
drivers/infiniband/hw/mthca/mthca_av.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
f9e61929e5e1dacc2afefbde6abc3e6571ca2887
drivers/infiniband/hw/mthca/mthca_av.c +1 -1
@@ -184,7 +184,7 @@ int mthca_read_ah(struct mthca_dev *dev, ah->av->sl_tclass_flowlabel &cpu_to_be32 (0xfffff );ib_get_cached_gid (&dev->ib_dev,be32_to_cpu (ah->av->port_pd) >>24 , - ah->av->gid_index, + ah->av->gid_index % dev->limits.gid_table_len, &header->grh.source_gid);memcpy (header->grh.destination_gid.raw, ah->av->dgid,16 );
Signature · 1 line
1.1.3