svn commit: r356633 - head/sys/ofed/drivers/infiniband/ulp/ipoib

Hans Petter Selasky hselasky at FreeBSD.org
Sat Jan 11 12:02:17 UTC 2020


Author: hselasky
Date: Sat Jan 11 12:02:16 2020
New Revision: 356633
URL: https://svnweb.freebsd.org/changeset/base/356633

Log:
  Make sure the VNET is properly set when reaping mbufs in ipoib.
  Else the following panic may happen:
  
  panic()
  icmp_error()
  ipoib_cm_mb_reap()
  linux_work_fn()
  taskqueue_run_locked()
  taskqueue_thread_loop()
  fork_exit()
  fork_trampoline()
  
  Submitted by:	Andreas Kempe <kempe at lysator.liu.se>
  MFC after:	1 week
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c

Modified: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	Sat Jan 11 11:38:02 2020	(r356632)
+++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	Sat Jan 11 12:02:16 2020	(r356633)
@@ -1268,6 +1268,8 @@ static void ipoib_cm_mb_reap(struct work_struct *work)
 
 	spin_lock_irqsave(&priv->lock, flags);
 
+	CURVNET_SET_QUIET(priv->dev->if_vnet);
+
 	for (;;) {
 		IF_DEQUEUE(&priv->cm.mb_queue, mb);
 		if (mb == NULL)
@@ -1293,6 +1295,8 @@ static void ipoib_cm_mb_reap(struct work_struct *work)
 
 		spin_lock_irqsave(&priv->lock, flags);
 	}
+
+	CURVNET_RESTORE();
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 }


More information about the svn-src-all mailing list