Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e07832b6 authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files

IPoIB: Fix race in detaching from mcast group before attaching 



There's a race between ipoib_mcast_leave() and ipoib_mcast_join_finish()
where we can try to detach from a multicast group before we've
attached to it.  Fix this by reordering the code in ipoib_mcast_leave
to free the multicast group first, which waits for the multicast
callback thread (which calls ipoib_mcast_join_finish()) to complete
before detaching from the group.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 60a596da

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -644,6 +644,9 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast) 
	struct ipoib_dev_priv *priv = netdev_priv(dev);

	int ret = 0;



	if (test_and_clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags))

		ib_sa_free_multicast(mcast->mc);



	if (test_and_clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) {

		ipoib_dbg_mcast(priv, "leaving MGID " IPOIB_GID_FMT "\n",

				IPOIB_GID_ARG(mcast->mcmember.mgid));
@@ -655,9 +658,6 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast) 
			ipoib_warn(priv, "ipoib_mcast_detach failed (result = %d)\n", ret);

	}



	if (test_and_clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags))

		ib_sa_free_multicast(mcast->mc);



	return 0;

}