From owner-svn-soc-all@freebsd.org Mon Jun 27 09:35: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 F21C3B84FFC for ; Mon, 27 Jun 2016 09:35: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 CD6722218 for ; Mon, 27 Jun 2016 09:35: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 u5R9ZHbR029514 for ; Mon, 27 Jun 2016 09:35:17 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5R9ZHDh029512 for svn-soc-all@FreeBSD.org; Mon, 27 Jun 2016 09:35:17 GMT (envelope-from vincenzo@FreeBSD.org) Date: Mon, 27 Jun 2016 09:35:17 GMT Message-Id: <201606270935.u5R9ZHDh029512@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: r305583 - 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, 27 Jun 2016 09:35:18 -0000 Author: vincenzo Date: Mon Jun 27 09:35:16 2016 New Revision: 305583 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305583 Log: freebsd: ptnet_rx_eof: add double-check with rescheduling 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 Jun 27 09:35:06 2016 (r305582) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Mon Jun 27 09:35:16 2016 (r305583) @@ -955,7 +955,7 @@ * when some free slots are made available by the host. */ ptring->guest_need_kick = 1; - /* Double check. */ + /* Double-check. */ ptnet_sync_tail(ptring, kring); if (unlikely(head != ring->tail)) { RD(1, "Found more slots by doublecheck"); @@ -1326,7 +1326,6 @@ unsigned int budget = PTNET_RX_BUDGET; unsigned int head = ring->head; struct ifnet *ifp = sc->ifp; - unsigned int more; PTNET_Q_LOCK(pq); @@ -1377,10 +1376,6 @@ budget--; } - /* Reactivate interrupts as they were disabled by the host thread right - * before issuing the last interrupt. */ - ptring->guest_need_kick = 1; - if (budget != PTNET_RX_BUDGET) { /* Some packets have been pushed to the network stack. * We need to update the CSB to tell the host about the new @@ -1401,17 +1396,30 @@ } } - more = (head != ring->tail); + if (head == ring->tail) { + /* No more slots to process. Reactivate interrupts as they + * were disabled by the host thread right before issuing the + * last interrupt. */ + ptring->guest_need_kick = 1; - PTNET_Q_UNLOCK(pq); + /* Double-check. */ + ptnet_sync_tail(ptring, kring); + if (unlikely(head != ring->tail)) { + ptring->guest_need_kick = 0; + } + } - if (more) { + if (head != ring->tail) { + /* If we ran out of budget or the double-check found new + * slots to process, schedule the taskqueue. */ device_printf(sc->dev, "%s: resched: budget %u h %u " "t %u\n", __func__, budget, ring->head, ring->tail); taskqueue_enqueue(pq->taskq, &pq->task); } + PTNET_Q_UNLOCK(pq); + return 0; }