From owner-svn-soc-all@freebsd.org Mon Jul 18 09:08:04 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 7F762B9C740 for ; Mon, 18 Jul 2016 09:08: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 6C3641E41 for ; Mon, 18 Jul 2016 09:08: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 u6I984xq022700 for ; Mon, 18 Jul 2016 09:08:04 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u6I983sa022606 for svn-soc-all@FreeBSD.org; Mon, 18 Jul 2016 09:08:03 GMT (envelope-from vincenzo@FreeBSD.org) Date: Mon, 18 Jul 2016 09:08:03 GMT Message-Id: <201607180908.u6I983sa022606@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: r306416 - 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:04 -0000 Author: vincenzo Date: Mon Jul 18 09:08:03 2016 New Revision: 306416 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=306416 Log: freebsd: ptnet_ring_update: generalize it, so that can be used by ptnet_rx_eof 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:07:52 2016 (r306415) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Mon Jul 18 09:08:03 2016 (r306416) @@ -1565,7 +1565,7 @@ static void ptnet_ring_update(struct ptnet_queue *pq, struct netmap_kring *kring, - unsigned int head) + unsigned int head, unsigned int sync_flags) { struct netmap_ring *ring = kring->ring; struct ptnet_ring *ptring = pq->ptring; @@ -1575,14 +1575,14 @@ * and head in the CSB. */ ring->head = ring->cur = head; - /* nm_txsync_prologue */ - kring->rcur = kring->rhead = ring->head; + /* Mimic nm_txsync_prologue/nm_rxsync_prologue. */ + kring->rcur = kring->rhead = 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_RECLAIM; + ptring->sync_flags = sync_flags; bus_write_4(pq->sc->iomem, pq->kick, 0); } } @@ -1752,12 +1752,12 @@ if (++batch_count == PTNET_TX_BATCH) { batch_count = 0; - ptnet_ring_update(pq, kring, head); + ptnet_ring_update(pq, kring, head, NAF_FORCE_RECLAIM); } } if (batch_count) { - ptnet_ring_update(pq, kring, head); + ptnet_ring_update(pq, kring, head, NAF_FORCE_RECLAIM); } PTNET_Q_UNLOCK(pq);