From owner-svn-soc-all@freebsd.org Mon Aug 1 11:24:10 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 A7D1BBA3212 for ; Mon, 1 Aug 2016 11:24:10 +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 9B5341A2F for ; Mon, 1 Aug 2016 11:24:10 +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 u71BOA3g066624 for ; Mon, 1 Aug 2016 11:24:10 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u71BOA9e066521 for svn-soc-all@FreeBSD.org; Mon, 1 Aug 2016 11:24:10 GMT (envelope-from vincenzo@FreeBSD.org) Date: Mon, 1 Aug 2016 11:24:10 GMT Message-Id: <201608011124.u71BOA9e066521@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: r307059 - soc2016/vincenzo/head/usr.sbin/bhyve 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, 01 Aug 2016 11:24:10 -0000 Author: vincenzo Date: Mon Aug 1 11:24:09 2016 New Revision: 307059 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307059 Log: pci_virtio_net: remove useless rx_in_progress flag Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c Mon Aug 1 11:23:53 2016 (r307058) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_virtio_net.c Mon Aug 1 11:24:09 2016 (r307059) @@ -147,7 +147,6 @@ struct virtio_net_config vsc_config; pthread_mutex_t rx_mtx; - int rx_in_progress; /* XXX-VM: useless. */ int rx_vhdrlen; int rx_merge; /* merged rx bufs in use */ @@ -197,17 +196,13 @@ /* * If the receive thread is active then stall until it is done. + * It is enough to lock and unlock the RX mutex. */ static void pci_vtnet_rxwait(struct pci_vtnet_softc *sc) { pthread_mutex_lock(&sc->rx_mtx); - while (sc->rx_in_progress) { - pthread_mutex_unlock(&sc->rx_mtx); - usleep(10000); - pthread_mutex_lock(&sc->rx_mtx); - } pthread_mutex_unlock(&sc->rx_mtx); } @@ -584,9 +579,7 @@ struct pci_vtnet_softc *sc = param; pthread_mutex_lock(&sc->rx_mtx); - sc->rx_in_progress = 1; sc->pci_vtnet_rx(sc); - sc->rx_in_progress = 0; pthread_mutex_unlock(&sc->rx_mtx); } @@ -901,7 +894,6 @@ sc->rx_merge = 1; sc->rx_vhdrlen = sizeof(struct virtio_net_rxhdr); - sc->rx_in_progress = 0; pthread_mutex_init(&sc->rx_mtx, NULL); /*