From nobody Sat Jun 27 16:07:09 2026 X-Original-To: dev-commits-src-main@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 4gncqy3mPYz6jmwH for ; Sat, 27 Jun 2026 16:07:10 +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 4gncqy1Jyzz3m9r for ; Sat, 27 Jun 2026 16:07:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782576430; 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=4Gk1A8dtnkJoyjeJVOVECJ/L9kkKF1hyQHLDZ2SgxL0=; b=Ugslyg/A+bqSFmvRiygKz/3klugjUanoQT0T1CoNE+C3hMn+CfQD9iZ/WFd2wkE9DdzZQI Xi7GjheUjMVR6P+Xp2GMc44FaXtyGH1L4Uk1F9YGHKRTCXCIJOFYLlPrZW7tCKP+STeVQZ nxoEMcxRu04rUsqihwFuO4FsfFZjVfwBS8UUzXf0XKrc4OwN7T55WV1MNrWq/dfl+dQa9b rvMFrEhCsQcmaPBlTeSkrVmkpaOIJhttJruQM2YumLx0HjKQFXGoYdj78zqFwgQQKeXJva rRP9JBbXd6xXSTzvi2HltMzOEguth1XZevXx3z5idScyCK635YpK9K9yT7wcoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782576430; a=rsa-sha256; cv=none; b=NgMwTWcTjAItRePl86O8kg2YaSVfnn8J1HU4IMoRghmhnEoS9lm+ITsgVaVNt+msd4lKSa Euf1HKyndrJFAQJE96advOeVYco4EEaN8ehLujlBVSlIALYesWOwDAjDbcGTiHo/sqKp1N utHY4C3Bv06mJeRSGyqfKeXZ/CaBMhzTI2lpnMrc7SGVCx5g8+5KGilathY3A8xyL3I6Ef MUV2yJmkUiXETPau/pKZDNQj4rT5aHGrscPMUJT1eW5i1Ktf8K0Lgz4ekXzDfK/QSbdBzp AtbO/7DggrEoP+hBtUpb/yaCZaToiLEQLU1VJFV5b2VOdMDa/5bYotGkQ9xyeQ== 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=1782576430; 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=4Gk1A8dtnkJoyjeJVOVECJ/L9kkKF1hyQHLDZ2SgxL0=; b=OBCyZQbHTZvV4CjoQPC67UEN+cs0DYy9ZtdQ5k8Ylg6b1+xZoNkTfxwfMj+ssadRwrFVu2 6z5Toerbl6qZ3Rgs2p8f0zooiJfFZ4+h+2eHWNBq9vpIdXv6Ljlvtf+r6O1V0y96XLfM5o J/Z62Mn3TjVsJ8cCGRtPTK7y73qAPxM7mfF4OdOxgj6NsC2z1TugyhG002k0XTQ+Yh3M+l 3KwxT31vE3XMC/vtivew5nEru1eR+rrL+Bg0b3rDuKYFrZiJlaFEZaRjGju3rEWeCEqOp7 bdIIxjECCslQOYpQCHodTBqWvVttLqq+zYqHDi9Xd2gtJd9ecL3lHrmeiAK/Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gncqx6Yc5zVWt for ; Sat, 27 Jun 2026 16:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 302a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 16:07:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 21e94133eb51 - main - ctld: Cleanup redundant handling of duplicate kernel ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 21e94133eb51ef4eaea5bc37891741dd52d5933b Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 16:07:09 +0000 Message-Id: <6a3ff52d.302a8.4a18a62e@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=21e94133eb51ef4eaea5bc37891741dd52d5933b commit 21e94133eb51ef4eaea5bc37891741dd52d5933b Author: John Baldwin AuthorDate: 2026-06-26 19:42:33 +0000 Commit: John Baldwin CommitDate: 2026-06-27 16:01:55 +0000 ctld: Cleanup redundant handling of duplicate kernel ports Sponsored by: Chelsio Communications --- 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"); } }