From nobody Wed May 27 21:00:35 2026 X-Original-To: dev-commits-src-main@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 4gQhpr3qfpz6fgxH for ; Wed, 27 May 2026 21:00:36 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQhpr0F5kz3P5B for ; Wed, 27 May 2026 21:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779915636; 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=0VAkwTlpw63q/Ia2whio9nFIWyRdseE3POZ3oXk3tlA=; b=sUdP1YxMTwQ3MpsPJWS5V/UXoAoIvWD1FytDmYn8y0cpWoJGXAIkiLmTiv2VzfiwL+Vvi5 Fldonpd1Lvcmgv7I2iueFQSqaw57SSB2pv7u1TzmNT/cZJQnuMyzua/X9nHnfsNerPverb oFRrm5aX+AwZvn+uCJjfFenydLYRxsQ0znfOXDm/0UblzoPcrBikl7v7Q85+N4hUheCafo Ajs7R1EoMm3UVtuySpII2buXKiB8fy3m9X11MHmJ4MvMxa4wPvNhwyGnoK2wTpt9O5c02Z uMKeNE6v6hCUSuGrRpeNON3huW0dJQyLaun06v/e9lIvoS/1hQcCu9aQ7iPpdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779915636; a=rsa-sha256; cv=none; b=nll+nHfMIEfiXf/8t+2rKsQ9b6R/nDcDNw/0Bh8FjOOGDmaHGu7yjMT3VluGlcfTgUPR5s 3p3y2sXPX19OWyl0/MYErI8lfeH2OWSQyGL50cv91/HjQd8VY5xBW9YTBckp0IKd3fCQG9 l1reN1dZqCBJ9t4oWcKIR5/zqL2tLoCIMN6VmeSmPKmeiT2dUnCrCYk0csvjNsB2EkCa8C lQL4L1BpWXQJipgshfXfI2CfH4Pze9IZ4cVm4i7Eljo/EsCT2ZF6izLxBqf6RB1bn/HaO2 JnD+0Q7d4+cf+luAC+j7YLaBVSAw/a05QQAYvjd06i4irb63AuWmomoUfBNGFw== 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=1779915636; 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=0VAkwTlpw63q/Ia2whio9nFIWyRdseE3POZ3oXk3tlA=; b=OXljOCBAvB2OpjH3Aojr7wSUIm6hqFb742kQvdmUFA72j6PQTWI9GKsw0Ct7zBpf5T8eDE tKdJQrTyt2W/2ZsOK8onymIXL3+jm7jorMfu6Pi+SpW4cYpIAyzq4tlZZbtp5Woctpht2b ngzDwia6T53jC7v1MARIPprII4RI85Sadi7mjDdkX0OuIncu3vy5pm0Vni4sRlh+PVcugR LRDwmGVjiYX1r/3PrBTv2sLJNzzATuvdrzbjeP2gKczGBGZ28xGue/OooGMYC/0S0urJzl +UdgypFW6BDJTIGSoWnW8+tB3OG+7X08/HxpC2Bwx+PdBo00rlugfFONoe438Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQhpq6csqz1c6 for ; Wed, 27 May 2026 21:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2389a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 21:00:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 887841731be6 - main - ctl: Use CAM_PRIORITY_NORMAL for queued CCBs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 887841731be60a958e471b9fd79261169b67b7ad Auto-Submitted: auto-generated Date: Wed, 27 May 2026 21:00:35 +0000 Message-Id: <6a175b73.2389a.154600ac@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=887841731be60a958e471b9fd79261169b67b7ad commit 887841731be60a958e471b9fd79261169b67b7ad Author: John Baldwin AuthorDate: 2026-05-27 20:58:05 +0000 Commit: John Baldwin CommitDate: 2026-05-27 20:58:05 +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 --- 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);