From nobody Fri Apr 24 18:38:17 2026 X-Original-To: dev-commits-src-all@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 4g2MCt3hzXz6b2Dd for ; Fri, 24 Apr 2026 18:38:18 +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 4g2MCt0qvCz47nt for ; Fri, 24 Apr 2026 18:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777055898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDi2bCZ/JmwYWyBM2ioUgTNyu/npYMp30b0q7TnoARo=; b=CaMaiIhp4JvZfiKvdnYS+vJxWQjO/KivHZZ3aH9LuT1Fq0liC78cMLud03HzBvzoBPuvqQ dZVlDyNBWC4ijerk542pNv3QM48mpGzEk5nX8yrZmde2oO5uQbtQ3LuT2NDe4Eg6Y6BmST Pt11rnw8ZBtRbud0XRERB1Cw1JW6sCz4yMwWQCyeVktidFJ5BQphSdQIGwj+xHI8vIe3l8 VBW9sckYAM+87H8raW+a2lo4+ZjFdmWB0ilMKOwwiMVsABzIg2yV66dsKJ5pHuHYEVWBrj hgMG5+2lgkEKnJtQYM57llMEmSSfZeSAvv0Ku8fYceI1gUo2KAv5KgddXn3IPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777055898; a=rsa-sha256; cv=none; b=LEFamcM3RFWFZuP2FJ90i7lwGwUdV1Jk9oOTPInmPtV2P2DnDDupWm1ZCU5a1rgJQji/xR eC7GXCBXjemg/+DMCY3IN9l3H80YhMotD6SpHzmjIgwp09P2SpoFajNANkpj27ayxL+qz6 3Tm+yIhigJ2nwIQw2euJwHVjInVHN0wJUVuw6pFG6S0vkCjh9e482xit01yZiaHZbLX3l+ YIcznIYtHpZWjzuHJgwLRkDmX2H7tch1cU2WXJExrM7uViQLIvH1xyUJniejOK+2sNLv8d MCIApN6D09N4cQYHD4Mr+bBRRqALvV4HFqSyyrkZicabfeEffqFn25HzyzRI9A== 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=1777055898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDi2bCZ/JmwYWyBM2ioUgTNyu/npYMp30b0q7TnoARo=; b=V0DkmqHo3SGkyhOqd3vohnCRREn7N6CY5SYVxs7L9hbcG/kSF3B3PeoqduIwikOeH8zM8B 0q0epR7dRUtRUrSLJZKprBoUuxcL+sMaEMV7VjuvZYB0gm+y0IpVzhcCAh4mfV3fOLLEJ/ kSZzTR3fIQo7R3fFw19gdrPtf+DON08t13BLfybRwT0mKEP3dPgrKuDyDXCjPinLImFlkt q8fv4AQMBoQ0gmpUMlgPU5nWyCBCT8q1XiW0Nj29cKgWgYN47pIr3D/+ftaKF3UA/p3L87 BD3ZHibe60F+0CMeht78aQsBHDvmTvtbIxYkt25QpHYuygiDe1demF5uHSSn2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2MCs72X2z1Drt for ; Fri, 24 Apr 2026 18:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22aad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 18:38:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Scott Long From: Warner Losh Subject: git: cb78764d47db - main - cam: kern.cam.max_high_power tuneable / sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb78764d47db973a1c9d08565143a1b1b7f17513 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 18:38:17 +0000 Message-Id: <69ebb899.22aad.5bac334@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb78764d47db973a1c9d08565143a1b1b7f17513 commit cb78764d47db973a1c9d08565143a1b1b7f17513 Author: Scott Long AuthorDate: 2026-04-24 18:31:29 +0000 Commit: Warner Losh CommitDate: 2026-04-24 18:32:46 +0000 cam: kern.cam.max_high_power tuneable / sysctl Create a tunable for the maxinum number of 'high power' commands to schedule, kern.cam.max_high_power. Default remains at 4. Differential Revision: https://reviews.freebsd.org/D56462 --- sys/cam/cam_xpt.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 605f4d8c3cf0..0ae6adb8adf3 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -86,8 +86,8 @@ SDT_PROBE_DEFINE4(cam, , xpt, async__cb, "void *", "uint32_t", _Static_assert(XPT_PRINT_LEN <= XPT_PRINT_MAXLEN, "XPT_PRINT_LEN is too large"); /* - * This is the maximum number of high powered commands (e.g. start unit) - * that can be outstanding at a particular time. + * This sets a default for the the maximum number of high powered commands + * (e.g. start unit) that can be outstanding at a particular time. */ #ifndef CAM_MAX_HIGHPOWER #define CAM_MAX_HIGHPOWER 4 @@ -168,6 +168,9 @@ SYSCTL_INT(_kern_cam, OID_AUTO, boot_delay, CTLFLAG_RDTUN, &xsoftc.boot_delay, 0, "Bus registration wait time"); SYSCTL_UINT(_kern_cam, OID_AUTO, xpt_generation, CTLFLAG_RD, &xsoftc.xpt_generation, 0, "CAM peripheral generation count"); +SYSCTL_INT(_kern_cam, OID_AUTO, max_high_power, CTLFLAG_RWTUN, + &xsoftc.num_highpower, 0, + "Max number of high power commands to be issued at once"); struct cam_doneq { struct mtx_padalign cam_doneq_mtx; @@ -892,7 +895,10 @@ xpt_init(void *dummy) TAILQ_INIT(&xsoftc.xpt_busses); TAILQ_INIT(&xsoftc.ccb_scanq); STAILQ_INIT(&xsoftc.highpowerq); - xsoftc.num_highpower = CAM_MAX_HIGHPOWER; + + /* Fall back to a default if the kenv tunable isn't set */ + if (xsoftc.num_highpower == 0) + xsoftc.num_highpower = CAM_MAX_HIGHPOWER; mtx_init(&xsoftc.xpt_highpower_lock, "XPT highpower lock", NULL, MTX_DEF); xsoftc.xpt_taskq = taskqueue_create("CAM XPT task", M_WAITOK,