From owner-svn-soc-all@freebsd.org  Mon Jun 27 09:34:04 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 6135AB84F29
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 27 Jun 2016 09:34:04 +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 54D542171
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jun 2016 09:34:04 +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 u5R9Y483027354
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jun 2016 09:34:04 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5R9Y39C027352
 for svn-soc-all@FreeBSD.org; Mon, 27 Jun 2016 09:34:03 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Mon, 27 Jun 2016 09:34:03 GMT
Message-Id: <201606270934.u5R9Y39C027352@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: r305576 - 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:04 -0000

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

Log:
   freebsd: ptnet_transmit: add doublecheck with rescheduling

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:33:54 2016	(r305575)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Mon Jun 27 09:34:03 2016	(r305576)
@@ -937,8 +937,20 @@
 
 	if (head == ring->tail) {
 		/* Reactivate the interrupts so that we can be notified
-		 * when some netmap slots are made available by the host. */
+		 * when some free slots are made available by the host. */
 		ptring->guest_need_kick = 1;
+
+                /* Double check. */
+		ptnet_sync_tail(ptring, kring);
+		if (unlikely(head != ring->tail)) {
+			RD(1, "Doublecheck finds more slots");
+			/* More slots were freed before reactivating
+			 * the interrupts. */
+			ptring->guest_need_kick = 0;
+			if (!drbr_empty(ifp, pq->bufring)) {
+				taskqueue_enqueue(pq->taskq, &pq->task);
+			}
+		}
 	}
 
 	PTNET_Q_UNLOCK(pq);