From nobody Fri Sep 25 21:43: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 4hs42F28S8z6txnw for ; Fri, 25 Sep 2026 21:43:17 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hs42F1bmlz3RCP for ; Fri, 25 Sep 2026 21:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790372597; 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=oN0e6y74t2PlNdB7VsTmL/LBk6ebp1XQd8mB+xZwZ0Y=; b=dyARTwxiawqB9p4H9n5PWEarNs74e05FNLQSGHAOXs0ztRmgYyge/E95QCPEJvmv9fcy1D n9ji46SqCtXDn+2kHI5v0TyAWXcarltoyTac36HcgLbLLpQnxNotCpqFSEwNgeBgoACLV5 06QnHXGlxxqKYWFPab5Ytwz7hkn4QU82MgwVbFZLvkXhVq/pQLZnwRZSB4bQlSHn0iJrha /48zKyIcEKyo4HGAedOyVDcrwv/PdekA52MgK6ZOOOe93LhkGscn3qfsbqUw97ULxuHNPr sMWQ55xPTbw/B5Z/cf1DXRf3t1enjD7RFxZ7nRpx5IB9JfUmRp0cf4fKQJ9O2A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790372597; b=Ux5CKY9rvHi/O5FPvuFRekPQo9o/+imDNYfTUp/wVTgUjYvBGkC9mUxD1YqeFWXtfI/NMw q7RHuvjhdhjyIWpxawrjZNnlOM3XnZYBrlXJPY2r1czf4AqBv621roTiheG03n4XICR9je vLWQ648Sl+6lcfU414LLpWA8HL6mqByI1R1AN3plVrZ1K59SDoZGe9CtdUOb4zAmfvcRd5 XIWzXnj+EcYBYf4LKz/JPv3tcGEjR+LL0T/GsLDhTqZgmzcwMQ01DuSzixhBpAEF8yYXmV F27TlpobKWvLQzqw6p0OHCqAB+geqXi4R2GdFJAzzenClTsoqf0LLDJbU6P1HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790372597; 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=oN0e6y74t2PlNdB7VsTmL/LBk6ebp1XQd8mB+xZwZ0Y=; b=IeZZ7tRN7WenmG16i7x+jTNKbyaMDYzsleC4gsZTj4NnXc3Z1M6DZBtdnxlGrKaWcumC7a 4fis+rSOCBryFz5Ro9sjmMJWtGvjKu26fR8jdH7+oKj305zkr7HNK99vtxtDbcBDtw0q8W SRc/HQ05wgwEYswoJXg+KKs/wWT/6UmB3W0RBFCIj7i94q3cpxY2E0bpukLO/k9wgf2nmh Do3IT1QWDyjqxF4mI8egddh/vQ56821bCfEN1l7rmSaJJ0XcmsksP0lydXmvij5ZtK5HKZ zKg3/HFGu1vgzI42q39VPlJNKe5vPiJEkcRSt2VfDxOiXkPILvlk1E1xu3Kv0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hs42F0MbCzRjZ for ; Fri, 25 Sep 2026 21:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4311d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 25 Sep 2026 21:43:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 92dec9201bf9 - main - nvme: share one handler between the interrupt coalescing sysctls 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 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92dec9201bf9759fc760da49a175fc99f3277c6c Auto-Submitted: auto-generated Date: Fri, 25 Sep 2026 21:43:17 +0000 Message-Id: <6ab6eaf5.4311d.689197d9@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=92dec9201bf9759fc760da49a175fc99f3277c6c commit 92dec9201bf9759fc760da49a175fc99f3277c6c Author: Abdelkader Boudih AuthorDate: 2026-09-25 21:42:15 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-25 21:42:15 +0000 nvme: share one handler between the interrupt coalescing sysctls The int_coal_time and int_coal_threshold handlers differed only in which controller field they updated before reprogramming the feature. Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D60018 --- sys/dev/nvme/nvme_sysctl.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index d94bff15244f..6da1be02f4b2 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -93,36 +93,17 @@ nvme_sysctl_dump_debug(SYSCTL_HANDLER_ARGS) } static int -nvme_sysctl_int_coal_time(SYSCTL_HANDLER_ARGS) +nvme_sysctl_int_coal(SYSCTL_HANDLER_ARGS) { struct nvme_controller *ctrlr = arg1; - uint32_t oldval = ctrlr->int_coal_time; - int error = sysctl_handle_int(oidp, &ctrlr->int_coal_time, 0, - req); + uint32_t *valp = (uint32_t *)((char *)ctrlr + (size_t)arg2); + uint32_t oldval = *valp; + int error = sysctl_handle_int(oidp, valp, 0, req); if (error) return (error); - if (oldval != ctrlr->int_coal_time) - nvme_ctrlr_cmd_set_interrupt_coalescing(ctrlr, - ctrlr->int_coal_time, ctrlr->int_coal_threshold, NULL, - NULL); - - return (0); -} - -static int -nvme_sysctl_int_coal_threshold(SYSCTL_HANDLER_ARGS) -{ - struct nvme_controller *ctrlr = arg1; - uint32_t oldval = ctrlr->int_coal_threshold; - int error = sysctl_handle_int(oidp, &ctrlr->int_coal_threshold, 0, - req); - - if (error) - return (error); - - if (oldval != ctrlr->int_coal_threshold) + if (oldval != *valp) nvme_ctrlr_cmd_set_interrupt_coalescing(ctrlr, ctrlr->int_coal_time, ctrlr->int_coal_threshold, NULL, NULL); @@ -361,13 +342,15 @@ nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "int_coal_time", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, - ctrlr, 0, nvme_sysctl_int_coal_time, "IU", + ctrlr, offsetof(struct nvme_controller, int_coal_time), + nvme_sysctl_int_coal, "IU", "Interrupt coalescing timeout (in microseconds)"); SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "int_coal_threshold", - CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, ctrlr, 0, - nvme_sysctl_int_coal_threshold, "IU", + CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, ctrlr, + offsetof(struct nvme_controller, int_coal_threshold), + nvme_sysctl_int_coal, "IU", "Interrupt coalescing threshold"); SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO,