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

Commit bd99b2e0 authored by Christoph Lameter's avatar Christoph Lameter Committed by Doug Ledford
Browse files

IB/ipoib: Expire sendonly multicast joins 



On neighbor expiration, check to see if the neighbor was actually a
sendonly multicast join, and if so, leave the multicast group as we
expire the neighbor.

Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 81fb5e26

drivers/infiniband/ulp/ipoib/ipoib.h

+2 −0
Original line number Diff line number Diff line
@@ -548,6 +548,8 @@ void ipoib_path_iter_read(struct ipoib_path_iter *iter, 


int ipoib_mcast_attach(struct net_device *dev, u16 mlid,

		       union ib_gid *mgid, int set_qkey);

int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast);

struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid);



int ipoib_init_qp(struct net_device *dev);

int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+18 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,9 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
	unsigned long dt;

	unsigned long flags;

	int i;

	LIST_HEAD(remove_list);

	struct ipoib_mcast *mcast, *tmcast;

	struct net_device *dev = priv->dev;



	if (test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))

		return;
@@ -1176,6 +1179,19 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
							  lockdep_is_held(&priv->lock))) != NULL) {

			/* was the neigh idle for two GC periods */

			if (time_after(neigh_obsolete, neigh->alive)) {

				u8 *mgid = neigh->daddr + 4;



				/* Is this multicast ? */

				if (*mgid == 0xff) {

					mcast = __ipoib_mcast_find(dev, mgid);



					if (mcast && test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {

						list_del(&mcast->list);

						rb_erase(&mcast->rb_node, &priv->multicast_tree);

						list_add_tail(&mcast->list, &remove_list);

					}

				}



				rcu_assign_pointer(*np,

						   rcu_dereference_protected(neigh->hnext,

									     lockdep_is_held(&priv->lock)));
@@ -1191,6 +1207,8 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 


out_unlock:

	spin_unlock_irqrestore(&priv->lock, flags);

	list_for_each_entry_safe(mcast, tmcast, &remove_list, list)

		ipoib_mcast_leave(dev, mcast);

}



static void ipoib_reap_neigh(struct work_struct *work)

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev, 
	return mcast;

}



static struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid)

struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct rb_node *n = priv->multicast_tree.rb_node;
@@ -675,7 +675,7 @@ int ipoib_mcast_stop_thread(struct net_device *dev) 
	return 0;

}



static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)

int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	int ret = 0;