From owner-svn-soc-all@freebsd.org Mon Jul 18 09:08:17 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 D5085B9C762 for ; Mon, 18 Jul 2016 09:08:17 +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 C65381E59 for ; Mon, 18 Jul 2016 09:08:17 +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 u6I98HJg024394 for ; Mon, 18 Jul 2016 09:08:17 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u6I98HS0024311 for svn-soc-all@FreeBSD.org; Mon, 18 Jul 2016 09:08:17 GMT (envelope-from vincenzo@FreeBSD.org) Date: Mon, 18 Jul 2016 09:08:17 GMT Message-Id: <201607180908.u6I98HS0024311@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: r306417 - 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:17 -0000 Author: vincenzo Date: Mon Jul 18 09:08:16 2016 New Revision: 306417 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=306417 Log: freebsd: ptnet_rx_eof: reuse ptnet_ring_update() function 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:03 2016 (r306416) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Mon Jul 18 09:08:16 2016 (r306417) @@ -2031,20 +2031,7 @@ /* 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_ring_update(pq, kring, head, NAF_FORCE_READ); if (!budget) { /* If we ran out of budget or the double-check found new