From owner-svn-soc-all@freebsd.org  Fri Jun 17 16:23:38 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 B9C46A776C0
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri, 17 Jun 2016 16:23:38 +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 AD701257C
 for <svn-soc-all@FreeBSD.org>; Fri, 17 Jun 2016 16:23:38 +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 u5HGNcQF023894
 for <svn-soc-all@FreeBSD.org>; Fri, 17 Jun 2016 16:23:38 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5HGNcMJ023836
 for svn-soc-all@FreeBSD.org; Fri, 17 Jun 2016 16:23:38 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Fri, 17 Jun 2016 16:23:38 GMT
Message-Id: <201606171623.u5HGNcMJ023836@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: r305293 - 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: Fri, 17 Jun 2016 16:23:38 -0000

Author: vincenzo
Date: Fri Jun 17 16:23:37 2016
New Revision: 305293
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305293

Log:
   freebsd: ptnet_rx_eof: add batch limiting (budget)

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	Fri Jun 17 16:23:28 2016	(r305292)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Jun 17 16:23:37 2016	(r305293)
@@ -1153,6 +1153,7 @@
 	unsigned int const lim = kring->nkr_num_slots - 1;
 	unsigned int head = ring->head;
 	struct ifnet *ifp = sc->ifp;
+	unsigned int budget = 512;
 
 	PTNET_Q_LOCK(pq);
 
@@ -1162,7 +1163,7 @@
 
 	kring->nr_kflags &= ~NKR_PENDINTR;
 
-	while (head != ring->tail) {
+	while (head != ring->tail && budget) {
 		struct netmap_slot *slot = ring->slot + head;
 		unsigned int nmbuf_len = slot->len;
 		uint8_t *nmbuf = NMB(na, slot);
@@ -1183,11 +1184,12 @@
 		memcpy(m->m_data, nmbuf, nmbuf_len);
 		m->m_len = nmbuf_len;
 
-		head = nm_next(head, lim);
-
 		PTNET_Q_UNLOCK(pq);
 		(*ifp->if_input)(ifp, m);
 		PTNET_Q_LOCK(pq);
+
+		head = nm_next(head, lim);
+		budget--;
 	}
 
 	PTNET_Q_UNLOCK(pq);