From nobody Tue Jun 23 16:28:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vg64v8z6hhp0 for ; Tue, 23 Jun 2026 16:28:43 +0000 (UTC) (envelope-from git@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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vg42ctz3NX8 for ; Tue, 23 Jun 2026 16:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eETjBApSUeAOxDMClGH+96tGvbBI+1nGYZUJkwU10eY=; b=ETRGWhplTP4uUV2e8QX3wIQX7yecVmScNyTvBRi8QoVBnszxpwewlTkXZ4mkWUaWO0uHir ofEfShCjKhRj5X9dyk2Jg8suo3lju9PpA8KcvWB+qsiUKa0Pj2Aw7APJ1W7le1ypawgfjv w0amiD4A0JGmUhaGEI1+M5l8OjsvGbpcr+fa6xq+zaMCD+C9IYWCm9dbyxcnIVj/AKa+c9 IMPwIY5emSJnNLCfLTlPXNxC9o/vO+0oiUeRWRvWpRS5mot93QYAE/o+6mVY7Qqt4lUpAy Y8Vc0RqpdHtVVSCDS9r+AyvUDO75c96PEWfBNa6yO46cIYPjXJovQgfX7Igbtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232123; a=rsa-sha256; cv=none; b=oNi7w5krk+L0bgqL4zEir1GYEQ/uQqbT8pGbom7tlLbsD3xg0JAMIv1QL4bmVUNr0XLOJw yLzdCJSpbLkMO3sol1PxbQJUep+JdkK7Uq8ed5D/NXPaqCz6iq4WqdV1o6qFVYGtYiL+5Z v00bgC9FhyB6OpaC3Jae91RHEWdbdfTiARZcZdl5+XHJGXhWEhAx0KXmX+Cou72LtMdgbM 87jRN4R2o42XMu7U+oj2ZqOt9XD/axdUbtRmARdPgrB+UFPm/iBIEp3Ef1GLKsXpnjysF1 yvPNqmnM4Q0WfEdvmNK/+drDcFS7nwUqhCxQOJzyjx0Ad4IKDfSSpTd/buOzOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eETjBApSUeAOxDMClGH+96tGvbBI+1nGYZUJkwU10eY=; b=XVfClPZd1Op/iNmn7mITDEL8MCfVt+JnyPaVn6Q6VdefH6aKCluRxtRvojGmHEgLNxm8Bh JY+m9oL9jeCAIibqt7LzpzVoM/hndAxbYPjBBqebY2sDSwvjx8pK7cTO++nWia7hYZ0dPy Q5B1dAM96HEnvdbvSQKKlVQPCSCGlKI5rWMfVaAA4ngK3WvPfhH2B6h8web8clpC1ZVpWW nSpcTUhVnQjxxewWyEyRhuBrflBMDUbIfGwRcrhyPsymR0KD1+2eIJsv5BWS+pWtrRygcH HrCRThxr5jiZoyJzWyBtEwXekvlH1pNOI56odjpsjydu2KfSAbJcmPaE6xfMqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vg2JNPzj5R for ; Tue, 23 Jun 2026 16:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27821 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e61edb9eff06 - stable/15 - ctl: Use CAM_PRIORITY_NORMAL for queued CCBs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e61edb9eff065c2ec0c94e03f696e90c8454faa6 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:43 +0000 Message-Id: <6a3ab43b.27821.479b17b9@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e61edb9eff065c2ec0c94e03f696e90c8454faa6 commit e61edb9eff065c2ec0c94e03f696e90c8454faa6 Author: John Baldwin AuthorDate: 2026-05-27 20:58:05 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:32 +0000 ctl: Use CAM_PRIORITY_NORMAL for queued CCBs Previously this was using CAM_PRIORITY_NONE which tripped over the assertion added in b4b166b8c46b8. PR: 293076 Reported by: Ken J. Thomson Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D56995 (cherry picked from commit 887841731be60a958e471b9fd79261169b67b7ad) --- sys/cam/ctl/scsi_ctl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index 68f1cabf6d07..6a55aba2669b 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -522,7 +522,8 @@ ctlferegister(struct cam_periph *periph, void *arg) new_ccb->ccb_h.io_ptr = new_io; LIST_INSERT_HEAD(&softc->atio_list, &new_ccb->ccb_h, periph_links.le); - xpt_setup_ccb(&new_ccb->ccb_h, periph->path, CAM_PRIORITY_NONE); + xpt_setup_ccb(&new_ccb->ccb_h, periph->path, + CAM_PRIORITY_NORMAL); new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO; new_ccb->ccb_h.cbfcnp = ctlfedone; new_ccb->ccb_h.flags |= CAM_UNLOCKED; @@ -569,7 +570,8 @@ ctlferegister(struct cam_periph *periph, void *arg) new_ccb->ccb_h.io_ptr = new_io; LIST_INSERT_HEAD(&softc->inot_list, &new_ccb->ccb_h, periph_links.le); - xpt_setup_ccb(&new_ccb->ccb_h, periph->path, CAM_PRIORITY_NONE); + xpt_setup_ccb(&new_ccb->ccb_h, periph->path, + CAM_PRIORITY_NORMAL); new_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY; new_ccb->ccb_h.cbfcnp = ctlfedone; new_ccb->ccb_h.flags |= CAM_UNLOCKED; @@ -1003,7 +1005,7 @@ ctlfe_requeue_ccb(struct cam_periph *periph, union ccb *ccb, int unlock) * target/lun. Reset the target and LUN fields back to the wildcard * values before we send them back down to the SIM. */ - xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NONE, + xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NORMAL, ccb->ccb_h.flags); xpt_action(ccb);