From owner-svn-src-stable@freebsd.org Thu Aug 27 13:38:21 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90E003B2493;
Thu, 27 Aug 2020 13:38:21 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4BckMK3HVNz4dZK;
Thu, 27 Aug 2020 13:38:21 +0000 (UTC) (envelope-from avg@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 54C7024AA9;
Thu, 27 Aug 2020 13:38:21 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07RDcLx0022100;
Thu, 27 Aug 2020 13:38:21 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07RDcL52022099;
Thu, 27 Aug 2020 13:38:21 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <202008271338.07RDcL52022099@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 27 Aug 2020 13:38:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r364865 - stable/12/sys/cam/scsi
X-SVN-Group: stable-12
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: stable/12/sys/cam/scsi
X-SVN-Commit-Revision: 364865
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2020 13:38:21 -0000
Author: avg
Date: Thu Aug 27 13:38:20 2020
New Revision: 364865
URL: https://svnweb.freebsd.org/changeset/base/364865
Log:
MFC r354621-r354623 by imp: scsi_da state machine improvements
r354621
Require and enforce that dareprobe() has to be called with the periph lock held.
r354622
Update the softc state of the da driver before releasing the CCB.
r354623
Add asserts for some state transitions
Modified:
stable/12/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/12/sys/cam/scsi/scsi_da.c Thu Aug 27 13:33:21 2020 (r364864)
+++ stable/12/sys/cam/scsi/scsi_da.c Thu Aug 27 13:38:20 2020 (r364865)
@@ -2130,8 +2130,8 @@ daasync(void *callback_arg, u_int32_t code,
"Capacity data has changed\n");
cam_periph_lock(periph);
softc->flags &= ~DA_FLAG_PROBED;
- cam_periph_unlock(periph);
dareprobe(periph);
+ cam_periph_unlock(periph);
} else if (asc == 0x28 && ascq == 0x00) {
cam_periph_lock(periph);
softc->flags &= ~DA_FLAG_PROBED;
@@ -2142,8 +2142,8 @@ daasync(void *callback_arg, u_int32_t code,
"INQUIRY data has changed\n");
cam_periph_lock(periph);
softc->flags &= ~DA_FLAG_PROBED;
- cam_periph_unlock(periph);
dareprobe(periph);
+ cam_periph_unlock(periph);
}
}
break;
@@ -4593,6 +4593,14 @@ dadone_probewp(struct cam_periph *periph, union ccb *d
cam_periph_assert(periph, MA_OWNED);
+ KASSERT(softc->state == DA_STATE_PROBE_WP,
+ ("State (%d) not PROBE_WP in dadone_probewp, periph %p ccb %p",
+ softc->state, periph, done_ccb));
+ KASSERT((csio->ccb_h.ccb_state & DA_CCB_TYPE_MASK) == DA_CCB_PROBE_WP,
+ ("CCB State (%lu) not PROBE_WP in dadone_probewp, periph %p ccb %p",
+ (unsigned long)csio->ccb_h.ccb_state & DA_CCB_TYPE_MASK, periph,
+ done_ccb));
+
if (softc->minimum_cmd_size > 6) {
mode_hdr10 = (struct scsi_mode_header_10 *)csio->data_ptr;
dev_spec = mode_hdr10->dev_spec;
@@ -4625,11 +4633,11 @@ dadone_probewp(struct cam_periph *periph, union ccb *d
}
free(csio->data_ptr, M_SCSIDA);
- xpt_release_ccb(done_ccb);
if ((softc->flags & DA_FLAG_CAN_RC16) != 0)
softc->state = DA_STATE_PROBE_RC16;
else
softc->state = DA_STATE_PROBE_RC;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -4653,6 +4661,13 @@ dadone_proberc(struct cam_periph *periph, union ccb *d
csio = &done_ccb->csio;
state = csio->ccb_h.ccb_state & DA_CCB_TYPE_MASK;
+ KASSERT(softc->state == DA_STATE_PROBE_RC || softc->state == DA_STATE_PROBE_RC16,
+ ("State (%d) not PROBE_RC* in dadone_proberc, periph %p ccb %p",
+ softc->state, periph, done_ccb));
+ KASSERT(state == DA_CCB_PROBE_RC || state == DA_CCB_PROBE_RC16,
+ ("CCB State (%lu) not PROBE_RC* in dadone_probewp, periph %p ccb %p",
+ (unsigned long)state, periph, done_ccb));
+
lbp = 0;
rdcap = NULL;
rcaplong = NULL;
@@ -4689,8 +4704,8 @@ dadone_proberc(struct cam_periph *periph, union ccb *d
*/
if (maxsector == 0xffffffff) {
free(rdcap, M_SCSIDA);
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_RC16;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -4796,8 +4811,8 @@ dadone_proberc(struct cam_periph *periph, union ccb *d
cam_periph_assert(periph, MA_OWNED);
softc->flags &= ~DA_FLAG_CAN_RC16;
free(rdcap, M_SCSIDA);
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_RC;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -4904,14 +4919,14 @@ dadone_proberc(struct cam_periph *periph, union ccb *d
dadeleteflag(softc, DA_DELETE_WS10, 1);
dadeleteflag(softc, DA_DELETE_UNMAP, 1);
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_LBP;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_BDC;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -4968,8 +4983,8 @@ dadone_probelbp(struct cam_periph *periph, union ccb *
}
free(lbp, M_SCSIDA);
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_BLK_LIMITS;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -5062,8 +5077,8 @@ dadone_probeblklimits(struct cam_periph *periph, union
}
free(block_limits, M_SCSIDA);
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_BDC;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -5163,8 +5178,8 @@ dadone_probebdc(struct cam_periph *periph, union ccb *
}
free(bdc, M_SCSIDA);
- xpt_release_ccb(done_ccb);
softc->state = DA_STATE_PROBE_ATA;
+ xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
}
@@ -5303,8 +5318,8 @@ dadone_probeata(struct cam_periph *periph, union ccb *
continue_probe = 1;
}
if (continue_probe != 0) {
- xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
+ xpt_release_ccb(done_ccb);
return;
} else
daprobedone(periph, done_ccb);
@@ -5793,8 +5808,8 @@ dadone_tur(struct cam_periph *periph, union ccb *done_
/*timeout*/0,
/*getcount_only*/0);
}
- xpt_release_ccb(done_ccb);
softc->flags &= ~DA_FLAG_TUR_PENDING;
+ xpt_release_ccb(done_ccb);
da_periph_release_locked(periph, DA_REF_TUR);
return;
}
@@ -5806,6 +5821,8 @@ dareprobe(struct cam_periph *periph)
int status;
softc = (struct da_softc *)periph->softc;
+
+ cam_periph_assert(periph, MA_OWNED);
/* Probe in progress; don't interfere. */
if (softc->state != DA_STATE_NORMAL)