From owner-svn-soc-all@freebsd.org Mon Jul 18 09:08:47 2016 Return-Path: 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 CC3A0B9C779 for ; Mon, 18 Jul 2016 09:08:47 +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 A6F1D1E76 for ; Mon, 18 Jul 2016 09:08:47 +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 u6I98lOb031183 for ; Mon, 18 Jul 2016 09:08:47 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u6I98lt5030680 for svn-soc-all@FreeBSD.org; Mon, 18 Jul 2016 09:08:47 GMT (envelope-from vincenzo@FreeBSD.org) Date: Mon, 18 Jul 2016 09:08:47 GMT Message-Id: <201607180908.u6I98lt5030680@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: r306418 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2016 09:08:47 -0000 Author: vincenzo Date: Mon Jul 18 09:08:46 2016 New Revision: 306418 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=306418 Log: freebsd: ptnet_rx_eof: implement batching scheme 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 Jul 18 09:08:16 2016 (r306417) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Mon Jul 18 09:08:46 2016 (r306418) @@ -236,6 +236,7 @@ #define PTNET_BUF_RING_SIZE 4096 #define PTNET_RX_BUDGET 512 +#define PTNET_RX_BATCH 1 #define PTNET_TX_BATCH 64 #define PTNET_HDR_SIZE sizeof(struct virtio_net_hdr_mrg_rxbuf) #define PTNET_MAX_PKT_SIZE 65536 @@ -1751,8 +1752,8 @@ m_freem(mhead); if (++batch_count == PTNET_TX_BATCH) { - batch_count = 0; ptnet_ring_update(pq, kring, head, NAF_FORCE_RECLAIM); + batch_count = 0; } } @@ -1872,6 +1873,7 @@ unsigned int const lim = kring->nkr_num_slots - 1; unsigned int budget = PTNET_RX_BUDGET; unsigned int head = ring->head; + unsigned int batch_count = 0; struct ifnet *ifp = sc->ifp; PTNET_Q_LOCK(pq); @@ -2025,21 +2027,26 @@ (*ifp->if_input)(ifp, mhead); PTNET_Q_LOCK(pq); + if (++batch_count == PTNET_RX_BATCH) { + /* Some packets have been pushed to the network stack. + * We need to update the CSB to tell the host about the new + * ring->cur and ring->head (RX buffer refill). */ + ptnet_ring_update(pq, kring, head, NAF_FORCE_READ); + batch_count = 0; + } } while (--budget); escape: - if (head != ring->head) { - /* Some packets have been pushed to the network stack. - * We need to update the CSB to tell the host about the new - * ring->cur and ring->head (RX buffer refill). */ + if (batch_count) { ptnet_ring_update(pq, kring, head, NAF_FORCE_READ); - if (!budget) { - /* If we ran out of budget or the double-check found new - * slots to process, schedule the taskqueue. */ - DBG(RD(1, "out of budget: resched h %u t %u\n", - head, ring->tail)); - taskqueue_enqueue(pq->taskq, &pq->task); - } + } + + if (!budget) { + /* If we ran out of budget or the double-check found new + * slots to process, schedule the taskqueue. */ + DBG(RD(1, "out of budget: resched h %u t %u\n", + head, ring->tail)); + taskqueue_enqueue(pq->taskq, &pq->task); } PTNET_Q_UNLOCK(pq);