Skip to content

Commit 816e846

Browse files
Aaron Knisterjgunthorpe
authored andcommitted
IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler
Inside of start_xmit() the call to check if the connection is up and the queueing of the packets for later transmission is not atomic which leaves a window where cm_rep_handler can run, set the connection up, dequeue pending packets and leave the subsequently queued packets by start_xmit() sitting on neigh->queue until they're dropped when the connection is torn down. This only applies to connected mode. These dropped packets can really upset TCP, for example, and cause multi-minute delays in transmission for open connections. Here's the code in start_xmit where we check to see if the connection is up: if (ipoib_cm_get(neigh)) { if (ipoib_cm_up(neigh)) { ipoib_cm_send(dev, skb, ipoib_cm_get(neigh)); goto unref; } } The race occurs if cm_rep_handler execution occurs after the above connection check (specifically if it gets to the point where it acquires priv->lock to dequeue pending skb's) but before the below code snippet in start_xmit where packets are queued. if (skb_queue_len(&neigh->queue) < IPOIB_MAX_PATH_REC_QUEUE) { push_pseudo_header(skb, phdr->hwaddr); spin_lock_irqsave(&priv->lock, flags); __skb_queue_tail(&neigh->queue, skb); spin_unlock_irqrestore(&priv->lock, flags); } else { ++dev->stats.tx_dropped; dev_kfree_skb_any(skb); } The patch acquires the netif tx lock in cm_rep_handler for the section where it sets the connection up and dequeues and retransmits deferred skb's. Fixes: 839fcab ("IPoIB: Connected mode experimental support") Cc: [email protected] Signed-off-by: Aaron Knister <[email protected]> Tested-by: Ira Weiny <[email protected]> Reviewed-by: Ira Weiny <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent 308aa2b commit 816e846

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/infiniband/ulp/ipoib/ipoib_cm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,12 +1027,14 @@ static int ipoib_cm_rep_handler(struct ib_cm_id *cm_id,
10271027

10281028
skb_queue_head_init(&skqueue);
10291029

1030+
netif_tx_lock_bh(p->dev);
10301031
spin_lock_irq(&priv->lock);
10311032
set_bit(IPOIB_FLAG_OPER_UP, &p->flags);
10321033
if (p->neigh)
10331034
while ((skb = __skb_dequeue(&p->neigh->queue)))
10341035
__skb_queue_tail(&skqueue, skb);
10351036
spin_unlock_irq(&priv->lock);
1037+
netif_tx_unlock_bh(p->dev);
10361038

10371039
while ((skb = __skb_dequeue(&skqueue))) {
10381040
skb->dev = p->dev;

0 commit comments

Comments
 (0)