Commit 8d2cae06 authored by Roland Dreier's avatar Roland Dreier
Browse files

[PATCH] IPoIB: Don't flush workqueue from within workqueue 



ipoib_mcast_restart_task() is always called from within the
single-threaded IPoIB workqueue, so flushing the workqueue from within
the function can lead to a recursion overflow.  But since we're
running in a single-threaded workqueue, we're already synchronized
against other items in the workqueue, so just get rid of the flush in
ipoib_mcast_restart_task().

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent eff4c654

drivers/infiniband/ulp/ipoib/ipoib.h

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid, 


void ipoib_mcast_restart_task(void *dev_ptr);

int ipoib_mcast_start_thread(struct net_device *dev);

int ipoib_mcast_stop_thread(struct net_device *dev);

int ipoib_mcast_stop_thread(struct net_device *dev, int flush);



void ipoib_mcast_dev_down(struct net_device *dev);

void ipoib_mcast_dev_flush(struct net_device *dev);

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ int ipoib_ib_dev_down(struct net_device *dev) 
		flush_workqueue(ipoib_workqueue);

	}



	ipoib_mcast_stop_thread(dev);

	ipoib_mcast_stop_thread(dev, 1);



	/*

	 * Flush the multicast groups first so we stop any multicast joins. The
@@ -599,7 +599,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev) 


	ipoib_dbg(priv, "cleaning up ib_dev\n");



	ipoib_mcast_stop_thread(dev);

	ipoib_mcast_stop_thread(dev, 1);



	/* Delete the broadcast address and the local address */

	ipoib_mcast_dev_down(dev);

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+4 −3
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ int ipoib_mcast_start_thread(struct net_device *dev) 
	return 0;

}



int ipoib_mcast_stop_thread(struct net_device *dev)

int ipoib_mcast_stop_thread(struct net_device *dev, int flush)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_mcast *mcast;
@@ -610,6 +610,7 @@ int ipoib_mcast_stop_thread(struct net_device *dev) 
	cancel_delayed_work(&priv->mcast_task);

	up(&mcast_mutex);



	if (flush)

		flush_workqueue(ipoib_workqueue);



	if (priv->broadcast && priv->broadcast->query) {
@@ -832,7 +833,7 @@ void ipoib_mcast_restart_task(void *dev_ptr) 


	ipoib_dbg_mcast(priv, "restarting multicast task\n");



	ipoib_mcast_stop_thread(dev);

	ipoib_mcast_stop_thread(dev, 0);



	spin_lock_irqsave(&priv->lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE