From owner-svn-soc-all@freebsd.org Fri Jun 17 16:24:23 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 875A0A77757 for ; Fri, 17 Jun 2016 16:24:23 +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 6125025D9 for ; Fri, 17 Jun 2016 16:24:23 +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 u5HGONrw024823 for ; Fri, 17 Jun 2016 16:24:23 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5HGOMuX024821 for svn-soc-all@FreeBSD.org; Fri, 17 Jun 2016 16:24:22 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 17 Jun 2016 16:24:22 GMT Message-Id: <201606171624.u5HGOMuX024821@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: r305297 - 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: Fri, 17 Jun 2016 16:24:23 -0000 Author: vincenzo Date: Fri Jun 17 16:24:22 2016 New Revision: 305297 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305297 Log: freebsd: ptnet_rx_eof: update CSB with new cur/head 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:24:11 2016 (r305296) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 16:24:22 2016 (r305297) @@ -808,7 +808,7 @@ * head in the CSB. */ ptnetmap_guest_write_kring_csb(ptring, kring->rcur, kring->rhead); - /* Ask for a kick from a guest to the host if needed. */ + /* Kick the host if needed. */ if (NM_ACCESS_ONCE(ptring->host_need_kick)) { ptring->sync_flags = NAF_FORCE_RECLAIM; bus_write_4(sc->iomem, pq->kick, 0); @@ -1144,6 +1144,8 @@ ptnet_rx_eof(pq); } +#define RX_BUDGET 512 + static int ptnet_rx_eof(struct ptnet_queue *pq) { @@ -1155,7 +1157,7 @@ unsigned int const lim = kring->nkr_num_slots - 1; unsigned int head = ring->head; struct ifnet *ifp = sc->ifp; - unsigned int budget = 512; + unsigned int budget = RX_BUDGET; PTNET_Q_LOCK(pq); @@ -1198,11 +1200,32 @@ PTNET_Q_UNLOCK(pq); (*ifp->if_input)(ifp, m); PTNET_Q_LOCK(pq); + device_printf(sc->dev, "%s: if_input(%p)\n", __func__, m); next: head = nm_next(head, lim); budget--; } + if (budget != RX_BUDGET) { + /* 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). */ + ring->head = ring->cur = head; + + /* Mimic rxsync_prologue */ + kring->rcur = ring->cur; + kring->rhead = ring->head; + + ptnetmap_guest_write_kring_csb(ptring, kring->rcur, + kring->rhead); + + /* Kick the host if needed. */ + if (NM_ACCESS_ONCE(ptring->host_need_kick)) { + ptring->sync_flags = NAF_FORCE_READ; + bus_write_4(sc->iomem, pq->kick, 0); + } + } + PTNET_Q_UNLOCK(pq); return 0;