> -----Original Message----- > From: linux-rdma-owner@xxxxxxxxxxxxxxx [mailto:linux-rdma-owner@xxxxxxxxxxxxxxx] On > Behalf Of Doug Ledford > Sent: Wednesday, December 10, 2014 11:47 AM > To: linux-rdma@xxxxxxxxxxxxxxx; roland@xxxxxxxxxx > Cc: Doug Ledford > Subject: [PATCH 05/10] IPoIB: change init sequence ordering > > In preparation for using per device work queues, we need to move the > start of the neighbor thread task to after ipoib_ib_dev_init and move > the destruction of the neighbor task to before ipoib_ib_dev_cleanup. > Otherwise we will end up freeing our workqueue with work possibly still > on it. > > Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx> Acked-by: Alex Estrin <alex.estrin@xxxxxxxxx> > --- > drivers/infiniband/ulp/ipoib/ipoib_main.c | 24 +++++++++++++++++------- > 1 file changed, 17 insertions(+), 7 deletions(-) > > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c > b/drivers/infiniband/ulp/ipoib/ipoib_main.c > index 58b5aa3b6f2..2cf81ef5141 100644 > --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c > +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c > @@ -1262,15 +1262,13 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device > *ca, int port) > { > struct ipoib_dev_priv *priv = netdev_priv(dev); > > - if (ipoib_neigh_hash_init(priv) < 0) > - goto out; > /* Allocate RX/TX "rings" to hold queued skbs */ > priv->rx_ring = kzalloc(ipoib_recvq_size * sizeof *priv->rx_ring, > GFP_KERNEL); > if (!priv->rx_ring) { > printk(KERN_WARNING "%s: failed to allocate RX ring (%d entries)\n", > ca->name, ipoib_recvq_size); > - goto out_neigh_hash_cleanup; > + goto out; > } > > priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof *priv->tx_ring); > @@ -1285,16 +1283,24 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device > *ca, int port) > if (ipoib_ib_dev_init(dev, ca, port)) > goto out_tx_ring_cleanup; > > + /* > + * Must be after ipoib_ib_dev_init so we can allocate a per > + * device wq there and use it here > + */ > + if (ipoib_neigh_hash_init(priv) < 0) > + goto out_dev_uninit; > + > return 0; > > +out_dev_uninit: > + ipoib_ib_dev_cleanup(); > + > out_tx_ring_cleanup: > vfree(priv->tx_ring); > > out_rx_ring_cleanup: > kfree(priv->rx_ring); > > -out_neigh_hash_cleanup: > - ipoib_neigh_hash_uninit(dev); > out: > return -ENOMEM; > } > @@ -1317,6 +1323,12 @@ void ipoib_dev_cleanup(struct net_device *dev) > } > unregister_netdevice_many(&head); > > + /* > + * Must be before ipoib_ib_dev_cleanup or we delete an in use > + * work queue > + */ > + ipoib_neigh_hash_uninit(dev); > + > ipoib_ib_dev_cleanup(dev); > > kfree(priv->rx_ring); > @@ -1324,8 +1336,6 @@ void ipoib_dev_cleanup(struct net_device *dev) > > priv->rx_ring = NULL; > priv->tx_ring = NULL; > - > - ipoib_neigh_hash_uninit(dev); > } > > static const struct header_ops ipoib_header_ops = { > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
