From owner-svn-src-all@freebsd.org  Thu Apr 12 19:06:16 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 E8F9BF87C6B;
 Thu, 12 Apr 2018 19:06:15 +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 8C01076557;
 Thu, 12 Apr 2018 19:06:15 +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 86DCA75DD;
 Thu, 12 Apr 2018 19:06:15 +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 w3CJ6Fb8092139;
 Thu, 12 Apr 2018 19:06:15 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3CJ6FZo092138;
 Thu, 12 Apr 2018 19:06:15 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201804121906.w3CJ6FZo092138@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
 shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Thu, 12 Apr 2018 19:06:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r332447 - stable/11/sys/dev/ixgbe
X-SVN-Group: stable-11
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: stable/11/sys/dev/ixgbe
X-SVN-Commit-Revision: 332447
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2018 19:06:16 -0000

Author: shurd
Date: Thu Apr 12 19:06:15 2018
New Revision: 332447
URL: https://svnweb.freebsd.org/changeset/base/332447

Log:
  Work around netmap issue with ixgbe
  
  After multiple start/stop of netmap, ixgbe will get into a bad state
  requiring a reboot to recover.  Adding a delay before stopping the interface
  appears to work around the issue.
  
  The -CURRENT driver has diverged too far from -STABLE for an MFC.
  
  PR:		221317
  Submitted by:	Sylvain Galliano <sg@efficientip.com>
  Reported by:	Cassiano Peixoto <peixoto.cassiano@gmail.com>
  Sponsored by:	Limelight Networks

Modified:
  stable/11/sys/dev/ixgbe/if_ix.c

Modified: stable/11/sys/dev/ixgbe/if_ix.c
==============================================================================
--- stable/11/sys/dev/ixgbe/if_ix.c	Thu Apr 12 19:00:22 2018	(r332446)
+++ stable/11/sys/dev/ixgbe/if_ix.c	Thu Apr 12 19:06:15 2018	(r332447)
@@ -3567,6 +3567,8 @@ ixgbe_stop(void *arg)
 
 	mtx_assert(&adapter->core_mtx, MA_OWNED);
 
+	msec_delay(1000);
+
 	INIT_DEBUGOUT("ixgbe_stop: begin\n");
 	ixgbe_disable_intr(adapter);
 	callout_stop(&adapter->timer);