Skip to content

Commit

Permalink
ipoib: Need to do dst_neigh_lookup_skb() outside of priv->lock.
Browse files Browse the repository at this point in the history
Otherwise local_bh_enable() complains.

Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 6, 2012
1 parent a2de86f commit 700db99
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/infiniband/ulp/ipoib/ipoib_multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,9 +658,15 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct dst_entry *dst = skb_dst(skb);
struct ipoib_mcast *mcast;
struct neighbour *n;
unsigned long flags;

n = NULL;
if (dst)
n = dst_neigh_lookup_skb(dst, skb);

spin_lock_irqsave(&priv->lock, flags);

if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags) ||
Expand Down Expand Up @@ -715,12 +721,6 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)

out:
if (mcast && mcast->ah) {
struct dst_entry *dst = skb_dst(skb);
struct neighbour *n = NULL;

rcu_read_lock();
if (dst)
n = dst_neigh_lookup_skb(dst, skb);
if (n) {
if (!*to_ipoib_neigh(n)) {
struct ipoib_neigh *neigh;
Expand All @@ -735,13 +735,14 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
}
neigh_release(n);
}
rcu_read_unlock();
spin_unlock_irqrestore(&priv->lock, flags);
ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN);
return;
}

unlock:
if (n)
neigh_release(n);
spin_unlock_irqrestore(&priv->lock, flags);
}

Expand Down

0 comments on commit 700db99

Please sign in to comment.