From nobody Thu Oct 08 20:43:47 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 4j125c3J0rz6wCmm for ; Thu, 08 Oct 2026 20:43:48 +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 4j125c0MJrz4bgl for ; Thu, 08 Oct 2026 20:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492228; 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=GgqUPV+j9vLyRuQ8QVBzO/eNG2mcIb3T7Uy48rBF/ko=; b=HzyiCBpuV3xc2fa1OLRTJfN8dI439vMVUHptn3vA+7HTlq5VDgWnYfi9jL+Le1Pn7jGTfa OVbgxjPINSVpRd7pmjrHNxaCREBgO4JC3nnWSyGLqHFGmSQcbyBnIbJuEMZMBNwTru7tUZ cVQsopZ9BlPX7ocHNNRoZZ4QK2F+y/xxCczJchkjxT/Gaxs/+IfwmAimVWr3E6Evu+3E1O UveylDG0kPtnTdL50WzqKzy9gBq+mJtswRv0uMRJmRpKN6rIbyCSdwQzqPSEiN51WUal1j sY660U0NxYgUi1U9o+YIv0/WuMxFSHeXbiFjE0Shuip2sQGmwn6MWjGD7lTEXA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492228; b=LoeFpdqGi9FmM1weS76ZTHz6A6X2v6QBTkvC8x40I6+ahMHYcY96OlSg80fSCtYu6K2mVS Y0W2aq919G/1xfSpOQkCD/zmVOMl0R0WStvwQtyHRLWDn8xzoliqNwuwbu13glJd0EWjw7 UEoObyABNc1Ta2L2GB7yr6lMOf0D67rHMbPkm75a5Pz0KrLjoB0zeP05Rpr5BBYWlPTxKB WNZa3gVBtQ6vWGwVvbxJVgUDcb87skWrLJPoDv1Mo6WZiH+IjLBMkrJui1JcJ1ppLzz07z B25qeyIW/+l7Z1dCP1OKl8hRnpYw1NbI/os6Sxcr+ABf/sBeoXCF+GZk857uzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492228; 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=GgqUPV+j9vLyRuQ8QVBzO/eNG2mcIb3T7Uy48rBF/ko=; b=PCuKARAi0m6Zft2vz6VlyS4h5OjxdHawL4LjADzgWXcZOGkqz1yHcHSleeXU/O4eMU1OVE U6l4vpp59FfWDxGwaiu6ijuKh7Ni6+DOTXzpWwO6x5ei/f69fBDOSnyEkZG3dIuFiQSbPt jOQAIjiC6MogYGj8tmgVzX7q5gVTzvEUE7Bh6q0oPlmRuNR76k9S8mkrHqXjeIsNd4DklW 3MkYuq9QI60BodThNPz8aX69G1kSC3wP0rKv9nB7JFCKE27CPDSGPejefQ0rjWfuIasPuG zQkFOVfQ286fM++ZxSt9qjLf0Ve5OEzKEk/HLEfQzlSjVYdd0Dk5DRbtfFx70Q== 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 4j125b6FSXzwZ2 for ; Thu, 08 Oct 2026 20:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 320ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4f20c129d951 - stable/15 - ctld: Simplify handling of non-iSCSI and non-NVMe kernel ports 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f20c129d951e16828bc15f825dc9d59fcca2a39 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:47 +0000 Message-Id: <6ac80083.320ee.3198d643@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4f20c129d951e16828bc15f825dc9d59fcca2a39 commit 4f20c129d951e16828bc15f825dc9d59fcca2a39 Author: John Baldwin AuthorDate: 2026-06-24 15:28:51 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:31 +0000 ctld: Simplify handling of non-iSCSI and non-NVMe kernel ports Just add these directly to the kports object rather than treating them as iSCSI ports. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57283 (cherry picked from commit 03ac6fe4f6d2bce06a672024152eb894a423dfcb) --- usr.sbin/ctld/kernel.cc | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index ef7ef87af090..f84440d64c23 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -441,19 +441,13 @@ retry_port: return (true); } -void -add_iscsi_port(struct kports &kports, struct conf *conf, - const struct cctl_port &port, std::string &name) +static void +add_iscsi_port(struct conf *conf, const struct cctl_port &port, + std::string &name) { if (port.cfiscsi_target.empty()) { log_debugx("CTL iSCSI port %u \"%s\" is not managed by ctld; " "ignoring", port.port_id, name.c_str()); - if (!kports.has_port(name)) { - if (!kports.add_port(name, port.port_id)) { - log_warnx("kports::add_port failed"); - return; - } - } return; } if (port.cfiscsi_state != 1) { @@ -493,7 +487,7 @@ add_iscsi_port(struct kports &kports, struct conf *conf, } } -void +static void add_nvmf_port(struct conf *conf, const struct cctl_port &port, std::string &name) { @@ -532,6 +526,22 @@ add_nvmf_port(struct conf *conf, const struct cctl_port &port, } } +static void +add_kernel_port(struct kports &kports, const struct cctl_port &port, + std::string &name) +{ + log_debugx("CTL kernel port %u \"%s\"", port.port_id, name.c_str()); + if (kports.has_port(name)) { + log_warnx("Ignoring duplicate kernel port \"%s\"", + name.c_str()); + return; + } + + if (!kports.add_port(name, port.port_id)) { + log_warnx("kports::add_port failed"); + } +} + conf_up conf_new_from_kernel(struct kports &kports) { @@ -559,12 +569,11 @@ conf_new_from_kernel(struct kports &kports) } if (port.port_frontend == "iscsi") { - add_iscsi_port(kports, conf.get(), port, name); + add_iscsi_port(conf.get(), port, name); } else if (port.port_frontend == "nvmf") { add_nvmf_port(conf.get(), port, name); } else { - /* XXX: Treat all unknown ports as iSCSI? */ - add_iscsi_port(kports, conf.get(), port, name); + add_kernel_port(kports, port, name); } }