From owner-svn-soc-all@freebsd.org  Mon Jun 27 09:34:13 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F244B84F3E
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 27 Jun 2016 09:34:13 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62C84218C
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jun 2016 09:34:13 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5R9YDfU027672
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jun 2016 09:34:13 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5R9YCTn027612
 for svn-soc-all@FreeBSD.org; Mon, 27 Jun 2016 09:34:12 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Mon, 27 Jun 2016 09:34:12 GMT
Message-Id: <201606270934.u5R9YCTn027612@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 vincenzo@FreeBSD.org using -f
From: vincenzo@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r305577 - soc2016/vincenzo/head/sys/dev/netmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2016 09:34:13 -0000

Author: vincenzo
Date: Mon Jun 27 09:34:12 2016
New Revision: 305577
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305577

Log:
   freebsd: ptnet_detach: drain taskqueue before detaching the interface

Modified:
  soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jun 27 09:34:03 2016	(r305576)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jun 27 09:34:12 2016	(r305577)
@@ -417,6 +417,18 @@
 ptnet_detach(device_t dev)
 {
 	struct ptnet_softc *sc = device_get_softc(dev);
+	int i;
+
+	if (sc->queues) {
+		/* Drain taskqueues before calling if_detach. */
+		for (i = 0; i < sc->num_rings; i++) {
+			struct ptnet_queue *pq = sc->queues + i;
+
+			if (pq->taskq) {
+				taskqueue_drain(pq->taskq, &pq->task);
+			}
+		}
+	}
 
 	if (sc->ifp) {
 		ether_ifdetach(sc->ifp);
@@ -441,8 +453,6 @@
 	}
 
 	if (sc->queues) {
-		int i;
-
 		for (i = 0; i < sc->num_rings; i++) {
 			struct ptnet_queue *pq = sc->queues + i;
 
@@ -943,7 +953,7 @@
                 /* Double check. */
 		ptnet_sync_tail(ptring, kring);
 		if (unlikely(head != ring->tail)) {
-			RD(1, "Doublecheck finds more slots");
+			RD(1, "Found more slots by doublecheck");
 			/* More slots were freed before reactivating
 			 * the interrupts. */
 			ptring->guest_need_kick = 0;