From owner-svn-src-head@freebsd.org Fri Jun 8 21:49:20 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90CE4FDBA70; Fri, 8 Jun 2018 21:49:20 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3569874929; Fri, 8 Jun 2018 21:49:20 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14D8B14B8B; Fri, 8 Jun 2018 21:49:20 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w58LnJT6021083; Fri, 8 Jun 2018 21:49:19 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w58LnJmx021082; Fri, 8 Jun 2018 21:49:19 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201806082149.w58LnJmx021082@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Fri, 8 Jun 2018 21:49:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334862 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 334862 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2018 21:49:20 -0000 Author: shurd Date: Fri Jun 8 21:49:19 2018 New Revision: 334862 URL: https://svnweb.freebsd.org/changeset/base/334862 Log: Remove tx task spinning added in r333686 This caused issues with PASTE. Just remove the reschedule since the DELAY() should be enough for use cases such as pkt-gen which were failing before the change. Reported by: Michio Honda Sponsored by: Limelight Networks Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Fri Jun 8 21:47:17 2018 (r334861) +++ head/sys/net/iflib.c Fri Jun 8 21:49:19 2018 (r334862) @@ -3728,16 +3728,6 @@ _task_fn_tx(void *context) */ if (ctx->isc_txd_credits_update(ctx->ifc_softc, txq->ift_id, false)) netmap_tx_irq(ifp, txq->ift_id); - else { -#ifdef DEV_NETMAP - if (!(ctx->ifc_flags & IFC_NETMAP_TX_IRQ)) { - struct netmap_kring *kring = NA(ctx->ifc_ifp)->tx_rings[txq->ift_id]; - - if (kring->nr_hwtail != nm_prev(kring->rhead, kring->nkr_num_slots - 1)) - GROUPTASK_ENQUEUE(&txq->ift_task); - } -#endif - } IFDI_TX_QUEUE_INTR_ENABLE(ctx, txq->ift_id); return; }