From owner-svn-src-head@freebsd.org  Wed Feb 24 00:01:11 2016
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 6986BAB2A73;
 Wed, 24 Feb 2016 00:01:11 +0000 (UTC)
 (envelope-from jimharris@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 38C9D13E1;
 Wed, 24 Feb 2016 00:01:11 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1O01Aq3084519;
 Wed, 24 Feb 2016 00:01:10 GMT (envelope-from jimharris@FreeBSD.org)
Received: (from jimharris@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1O01AKT084518;
 Wed, 24 Feb 2016 00:01:10 GMT (envelope-from jimharris@FreeBSD.org)
Message-Id: <201602240001.u1O01AKT084518@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jimharris set sender to
 jimharris@FreeBSD.org using -f
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 24 Feb 2016 00:01:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295944 - head/sys/dev/nvme
X-SVN-Group: head
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.20
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: Wed, 24 Feb 2016 00:01:11 -0000

Author: jimharris
Date: Wed Feb 24 00:01:10 2016
New Revision: 295944
URL: https://svnweb.freebsd.org/changeset/base/295944

Log:
  nvme: fix intx handler to not dereference ioq during initialization
  
  This was a regression from r293328, which deferred allocation
  of the controller's ioq array until after interrupts are enabled
  during boot.
  
  PR:		207432
  Reported and tested by: Andy Carrel <wac@google.com>
  MFC after:	3 days
  Sponsored by:	Intel

Modified:
  head/sys/dev/nvme/nvme_ctrlr.c

Modified: head/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- head/sys/dev/nvme/nvme_ctrlr.c	Tue Feb 23 23:59:08 2016	(r295943)
+++ head/sys/dev/nvme/nvme_ctrlr.c	Wed Feb 24 00:01:10 2016	(r295944)
@@ -810,7 +810,7 @@ nvme_ctrlr_intx_handler(void *arg)
 
 	nvme_qpair_process_completions(&ctrlr->adminq);
 
-	if (ctrlr->ioq[0].cpl)
+	if (ctrlr->ioq && ctrlr->ioq[0].cpl)
 		nvme_qpair_process_completions(&ctrlr->ioq[0]);
 
 	nvme_mmio_write_4(ctrlr, intmc, 1);