From owner-svn-src-all@freebsd.org  Tue Feb 28 11:56:18 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2AFECF112D;
 Tue, 28 Feb 2017 11:56:18 +0000 (UTC) (envelope-from mav@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 88EDB90B;
 Tue, 28 Feb 2017 11:56:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SBuHcb021648;
 Tue, 28 Feb 2017 11:56:17 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SBuHhi021647;
 Tue, 28 Feb 2017 11:56:17 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201702281156.v1SBuHhi021647@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 28 Feb 2017 11:56:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314387 - head/sys/cam/ctl
X-SVN-Group: head
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.23
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: Tue, 28 Feb 2017 11:56:18 -0000

Author: mav
Date: Tue Feb 28 11:56:17 2017
New Revision: 314387
URL: https://svnweb.freebsd.org/changeset/base/314387

Log:
  Make ctl_queue_sense() not sleep.
  
  It may be called in non-sleepable frontend context.
  
  MFC after:	2 weeks

Modified:
  head/sys/cam/ctl/ctl.c

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Tue Feb 28 11:42:04 2017	(r314386)
+++ head/sys/cam/ctl/ctl.c	Tue Feb 28 11:56:17 2017	(r314387)
@@ -13146,21 +13146,15 @@ ctl_queue_sense(union ctl_io *io)
 
 	initidx = ctl_get_initindex(&io->io_hdr.nexus);
 	p = initidx / CTL_MAX_INIT_PER_PORT;
-	if ((ps = lun->pending_sense[p]) == NULL) {
-		mtx_unlock(&lun->lun_lock);
-		ps = malloc(sizeof(*ps) * CTL_MAX_INIT_PER_PORT, M_CTL,
-		    M_WAITOK | M_ZERO);
-		mtx_lock(&lun->lun_lock);
-		if (lun->pending_sense[p] == NULL) {
-			lun->pending_sense[p] = ps;
-		} else {
-			free(ps, M_CTL);
-			ps = lun->pending_sense[p];
-		}
+	if (lun->pending_sense[p] == NULL) {
+		lun->pending_sense[p] = malloc(sizeof(*ps) * CTL_MAX_INIT_PER_PORT,
+		    M_CTL, M_NOWAIT | M_ZERO);
+	}
+	if ((ps = lun->pending_sense[p]) != NULL) {
+		ps += initidx % CTL_MAX_INIT_PER_PORT;
+		memset(ps, 0, sizeof(*ps));
+		memcpy(ps, &io->scsiio.sense_data, io->scsiio.sense_len);
 	}
-	ps += initidx % CTL_MAX_INIT_PER_PORT;
-	memset(ps, 0, sizeof(*ps));
-	memcpy(ps, &io->scsiio.sense_data, io->scsiio.sense_len);
 	mtx_unlock(&lun->lun_lock);
 
 bailout: