From nobody Wed Jun 24 15:29:04 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 4glm7P4fmkz6jMmr for ; Wed, 24 Jun 2026 15:29:05 +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 4glm7P0Zf4z49wh for ; Wed, 24 Jun 2026 15:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782314945; 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=gqNMbpuTivB5Wp7+A7Ziw5ot5PwBI0YzTCv1kQA2lTs=; b=U4eMNmxv7yQ3QG9yceKvhwfYwouKm7Jk8JoGjGS3klvp1ExmbqRIoWCAtGrisbazmJ7pXM OZfh7Ke9cB8tzp4K4Uvrsv63U/WejRPCW4pdaLtDDOIkQe181vVNkX+tiP6GfF53n44yOu Px8DAcQ2KfVn9gCrH3B1rVXmWNXXPXfLiyRJ4OBCDWWsXsrXxnsMddprKSyvSRD6sd1RSq KjlqlhPzXFXVMEU/4O6BwcnsBSlLvx+XJcF+bGRFJ27DRu9t22BvhY6JY/dIDjeN1yUviH s3gC8Hey4Ssu1aSY9lSUW6D1bXfRXdB6pQp4Jk9XFFe3QWY3RJb6ZSWCOecn1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782314945; a=rsa-sha256; cv=none; b=phZ0bLX9gKKPBATzraVwaWWkaFizYxt5C7rghsT2BEgJuXiUwLPsn/PIjXFFpfJaCykNzP QFfkqsXI9uqMtpJscnxSw0k9Kz2AiqkBATd5+PhzUsJLmP8Pcok4Civ3X7ZnSjMRJsrp7E V4BhcfCBrZEzJTlaKHEQu/MK1wEiRP8AIGjlhHSfXbh/QAJPhdmFuSj53ONS4DU9TcvcEj hbPTd3A6ymqZYqGitJNA066Gh9X+MEmmHRSpq7hYtIRRJKhFaycjwVWiIawMXFdj8grqkf OV83/vGH+oBMfRerR3L/IQDldosQB+rG7DOPPyfp8qEcYou2rKPLLtExZulv7A== 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=1782314945; 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=gqNMbpuTivB5Wp7+A7Ziw5ot5PwBI0YzTCv1kQA2lTs=; b=RiwVp8XTaKpHqQR/O6meYjTRCfv03iguCKpd3ckI/sj4oaffhhl8jq7KIMtwIXh6NzYkbg KoHsdwDbVkW25GYpbxATq4FAAPBqJiDihHSkTgUGkrJkJCmzVsr4tXNl+8hGjDmpKzRdz1 N8PuPOOysWVth+1jtwJtwbSuojuX+2DEw3SS2vqLlnr80IZaZUbvXJD8IrTx5LdKkN3mFf 8XK9ABLDMJf5n9Xk6knBJXftLpOV6LKXVmBzcHOrHMtqbCSloUlFUs6Ju7VgL5bIi4C5y4 aRjEAKiSLToX8ojBTuLuf9EnyH7EbHhNcge9KdNoKSeKUllo5KPeSOK3Wko2nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glm7N5mxVz91k for ; Wed, 24 Jun 2026 15:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 206d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 15:29:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 03ac6fe4f6d2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 03ac6fe4f6d2bce06a672024152eb894a423dfcb Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 15:29:04 +0000 Message-Id: <6a3bf7c0.206d6.75d88d33@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=03ac6fe4f6d2bce06a672024152eb894a423dfcb commit 03ac6fe4f6d2bce06a672024152eb894a423dfcb Author: John Baldwin AuthorDate: 2026-06-24 15:28:51 +0000 Commit: John Baldwin CommitDate: 2026-06-24 15:28:51 +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 --- 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); } }