From nobody Thu Oct 08 20:43:50 2026 X-Original-To: dev-commits-src-branches@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 4j125f66wfz6wCjr for ; Thu, 08 Oct 2026 20:43:50 +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 4j125f1tSfz4bxg for ; Thu, 08 Oct 2026 20:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492230; 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=ASzQUi9DCA4Ti3sFw7Fn05kpcMAqsVEC6igl1c2oRy4=; b=Ma3b/Nw/BLe/AZluvpLtarmFPlgpbF3k06QCKAhWP9UaWWE1dyBrJjtkrjQvCs2PN7FcjV CQeWCZCFmN0TLAeBj1JiWp1RfnAcwtMs7XO9n6RtKfBalkJYTRehaTX3t3pYsI6Zvmm/Qn NPp5biDBzXWGRauGMM5P31GMB1y/hdr7YeOPEkAId1nRtS4o3uWrNHUpPawc2SSdI8EmfI MoGgkdreUsBi3I9hDxI6aCNLwH3cyn0K1WeMedAqn+H9L9QKMnPcuQtS+ovPNcF+CE5Eyy 1H1LHPx7L40AZVLFZmuWhbK0muhVdecNMKowA2vqhCZo2xi9WAsUYLhBvO+8pg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492230; b=LxjXxZ0LbcXmJ5qyYVbQuGvLzgBSfF+fOzCIJa4TIEAojHAWcD6UI/25yLyM9+zB5NSXAQ vFG6hCTAcei5ja/OykWInjWzgBHshRQ6NP3OmNvKw5/dKkW7USbSelSvUFzGNRaQ2Xw7DN aCr7jysbMRqXojRVX3r+Q8z9T6ljXq72gq71eFKxUppMYtsxFfhHkxyMmiYY7pC8fbB9m2 KL6p9I54KNH+iyAO7M03nMVwBw+/Kov1ZU0v2jCVEPSBLzRiLj0L3dyIr5EMsSRQfPGvHM kpBf1SeFNBbPrRQCntyP/gaCQtBAP0i/Zonfa7jBdASnCovBHgxqr72+XSd+lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492230; 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=ASzQUi9DCA4Ti3sFw7Fn05kpcMAqsVEC6igl1c2oRy4=; b=lgfikW6pFquagjUVFYd/P+ZROWMPIARYvG58NDK2BzxAzjn40deXONt1WGqqq1yBHYILVJ 5Y0v8nfmfr6n/g/YGN8igg9Q07DJPZdkZ2gc6K9eQLyHKHcha5pi3rEWpqPUlxCcQKdIUJ 7O9NwjGFzgVmhJOZMI5Nfk1wg8lelmIL44ioc3oy3BVdIA5MMa7NBrRPZH67LnNnXoUKus pD7df+oYFjMZQDBwUxizoYQqlILHrfsTrqF7u2nPhVstIrNYAI7DmTtA8LwU+OtZWamU1C pYVEwEM6pn6YlYMbw2x4hcEZ3uJRE5jVcp0SyvDZdBhJxB5yGDeOlfPSB4IGiA== 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 4j125f0xXBzwWP for ; Thu, 08 Oct 2026 20:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 333dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4187412f2d3e - stable/15 - ctld: Cleanup redundant handling of duplicate kernel ports List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 4187412f2d3ef2b5e014863be2896de4c89681be Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:50 +0000 Message-Id: <6ac80086.333dd.1daa10bc@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4187412f2d3ef2b5e014863be2896de4c89681be commit 4187412f2d3ef2b5e014863be2896de4c89681be Author: John Baldwin AuthorDate: 2026-06-26 19:42:33 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:31 +0000 ctld: Cleanup redundant handling of duplicate kernel ports Sponsored by: Chelsio Communications (cherry picked from commit 21e94133eb51ef4eaea5bc37891741dd52d5933b) --- usr.sbin/ctld/ctld.cc | 14 +------------- usr.sbin/ctld/ctld.hh | 1 - usr.sbin/ctld/kernel.cc | 7 +------ 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 19baa0486e44..6c027e513ee7 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1069,19 +1069,7 @@ bool kports::add_port(std::string &name, uint32_t ctl_port) { const auto &pair = pports.try_emplace(name, name, ctl_port); - if (!pair.second) { - log_warnx("duplicate kernel port \"%s\" (%u)", name.c_str(), - ctl_port); - return (false); - } - - return (true); -} - -bool -kports::has_port(std::string_view name) -{ - return (pports.count(std::string(name)) > 0); + return (pair.second); } struct pport * diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 3bc92449e372..870e1f230c8a 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -574,7 +574,6 @@ private: struct kports { bool add_port(std::string &name, uint32_t ctl_port); - bool has_port(std::string_view name); struct pport *find_port(const std::string &name); private: diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index 188d01052a1c..952159ee8e59 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -531,14 +531,9 @@ 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)) { + if (!kports.add_port(name, port.port_id)) { 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"); } }