d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing set of the current VNET when inputting IP packets in IPoIB.

Browse Source 
This fixes a kernel panic when using IPoIB with VIMAGE and infiniband.

PR:		208957
Sponsored by:	Mellanox Technologies
Tested by:	Justin Clift <justin@postgresql.org>
MFC after:	1 week
This commit is contained in:
hselasky 2016-04-22 06:33:06 +00:00
parent 61c734ce11
commit 8e21c4207a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
View File

@ -481,6 +481,8 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
int has_srq; int has_srq;
u_short proto; u_short proto;
CURVNET_SET_QUIET(dev->if_vnet);
ipoib_dbg_data(priv, "cm recv completion: id %d, status: %d\n", ipoib_dbg_data(priv, "cm recv completion: id %d, status: %d\n",
wr_id, wc->status); wr_id, wc->status);
@ -496,7 +498,7 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
} else } else
ipoib_warn(priv, "cm recv completion event with wrid %d (> %d)\n", ipoib_warn(priv, "cm recv completion event with wrid %d (> %d)\n",
wr_id, ipoib_recvq_size); wr_id, ipoib_recvq_size);
return; goto done;
} }
p = wc->qp->qp_context; p = wc->qp->qp_context;
@ -520,7 +522,7 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
queue_work(ipoib_workqueue, &priv->cm.rx_reap_task); queue_work(ipoib_workqueue, &priv->cm.rx_reap_task);
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
} }
return; goto done;
} }
} }
@ -579,6 +581,9 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
"for buf %d\n", wr_id); "for buf %d\n", wr_id);
} }
} }
done:
CURVNET_RESTORE();
return;
} }
static inline int post_send(struct ipoib_dev_priv *priv, static inline int post_send(struct ipoib_dev_priv *priv,