From owner-svn-src-head@freebsd.org  Mon Oct 30 21:08:14 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 1BB14E6576E;
 Mon, 30 Oct 2017 21:08:14 +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 mx1.freebsd.org (Postfix) with ESMTPS id DCFDE71807;
 Mon, 30 Oct 2017 21:08:13 +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 v9UL8Cus071652;
 Mon, 30 Oct 2017 21:08:12 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UL8CMP071651;
 Mon, 30 Oct 2017 21:08:12 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201710302108.v9UL8CMP071651@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: Mon, 30 Oct 2017 21:08:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325166 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 325166
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2017 21:08:14 -0000

Author: shurd
Date: Mon Oct 30 21:08:12 2017
New Revision: 325166
URL: https://svnweb.freebsd.org/changeset/base/325166

Log:
  Avoid enabling MSI-X if MSI-X is disabled globally
  
  It was reported on the community call that with
  hw.pci.enable_msix=0, iflib would enable MSI-X on the device and attempt
  to use it, which caused issues. Test the sysctl explicitly and do not
  enable MSI-X if it's disabled globally.
  
  Reviewed by:	sbruno
  Approved by:	sbruno (mentor)
  Sponsored by:	Limelight Networks
  Differential Revision:	https://reviews.freebsd.org/D12805

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Mon Oct 30 20:58:57 2017	(r325165)
+++ head/sys/net/iflib.c	Mon Oct 30 21:08:12 2017	(r325166)
@@ -5260,6 +5260,19 @@ iflib_msix_init(if_ctx_t ctx)
 	
 	bar = ctx->ifc_softc_ctx.isc_msix_bar;
 	admincnt = sctx->isc_admin_intrcnt;
+	/* Override by global tuneable */
+	{
+		int i;
+		size_t len = sizeof(i);
+		err = kernel_sysctlbyname(curthread, "hw.pci.enable_msix", &i, &len, NULL, 0, NULL, 0);
+		if (err == 0) {
+			if (i == 0)
+				goto msi;
+		}
+		else {
+			device_printf(dev, "unable to read hw.pci.enable_msix.");
+		}
+	}
 	/* Override by tuneable */
 	if (scctx->isc_disable_msix)
 		goto msi;