From nobody Wed May 27 21:00:34 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 4gQhpq3nVRz6fgxB for ; Wed, 27 May 2026 21:00:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQhpp6k5Nz3PLt for ; Wed, 27 May 2026 21:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779915635; 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=2U0dCnjFlSaLJ63nvujJfVloP6DK3MZkgDhCIcuFetw=; b=OCVgFskHW7oj9fiCjgO7mY0TFFBlQLeubzfxF2vqcIfa7YZFTxA2hFkbD7sCWX/oEa8S7/ Lxs1ATqsZLyb0h0Zc2WGFYxGRJO5TlKn/FzLrq6hf785N5VfZSdqiphm3JWpvNCvGoqlPU y7Xdhhhprxkgc/MnIirdB7EKD6hABH78hAxD4PJ0KxNXThMytnz+ZdabcMB2nludOphZdv KUfiBM/GnblGiMLSc7hGqgrzw2koNhe+qohRIqgPs/LXJDTOkJL4f6aZb120jdrz4SJceV TuQuiHvpLuS03a4/dCXY5InYm2flot2vfekohJYTgtlwdBty1jeRi5UxkF2Kgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779915635; a=rsa-sha256; cv=none; b=wjcz35+n1K4+krQdAovj+dX9DYl2iFY/hdbRTi79nYrpRnFstUbSM+Q46AfIK9PJvBcN3C rug13b8+ygcpEMmWX9yZVFWbwq1Seh2ZGe6IJab+OBtxE36D33z+OYQVOvzXo6K94e3kQJ 1j322Li98ObF/ojL5yaoohAk7lPmSNuaXbe/+nFRs7XPvnvpWQ+cd4V2bvLKOGhizMTfTZ qLBxxM/btVuaulNFVaAD+ShrsJFpwSoV6evhiWIHOlGvRqkAMlcDRCk7WJpnCfQ4rdp78j JXCnyXiduiMorUpJc4bntl0nn9Ck12HXnZNbfu2STrHuQbwBiqaKmBGFx08uNg== 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=1779915635; 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=2U0dCnjFlSaLJ63nvujJfVloP6DK3MZkgDhCIcuFetw=; b=v3tipMmV+lh/eLb3KffHV+lwtJkzzNP4GRFxc8APJ6Y/yYJ6fmfZmW4CVeEjoCgzZzvsve aRPqMa+x4ot9BUVCtS4lU4ZdWvKmttSZFPzTBH7rfrGgeMzFJdDSXHcAQdLuMst9qRxpGV SqBqgYDEaZUaHm4aDa/4LhWfal72xleuRDRcgRYCLgxL7ema61SwbuPCmZkN1EYGMsWmvi QkgpcTLM6Pb6X95pG6ApvNF5eR7YIgGX5Z1KITgk/c87F9268xTJhBpzPr6D7zWmem6Lok /hOyH+pV7hceWBjZqwyRZOF2z/ORUnAaJi9hgWIKt1/pZzszkiS6ImPnxvF3Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQhpp6GRvz18W for ; Wed, 27 May 2026 21:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23b10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 21:00:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d1a8fa2e0f41 - main - ctld: Only check physical port linking in a single configuration context 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: d1a8fa2e0f415f941e628f959fa0e70f23058fdb Auto-Submitted: auto-generated Date: Wed, 27 May 2026 21:00:34 +0000 Message-Id: <6a175b72.23b10.16d36bc4@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d1a8fa2e0f415f941e628f959fa0e70f23058fdb commit d1a8fa2e0f415f941e628f959fa0e70f23058fdb Author: John Baldwin AuthorDate: 2026-05-27 20:57:38 +0000 Commit: John Baldwin CommitDate: 2026-05-27 20:57:38 +0000 ctld: Only check physical port linking in a single configuration context Commit 969876fcee57 moved struct pport from being per-configuration to being a "global" object shared across multiple configurations. As a result, the check for duplicate ports actually spanned across configurations, such that reloading a configuration would now think that existing physical ports were already linked. The linking field in pport added in the C++-ification (commit 6acc7afa34aa) faithfully replicated this bug (albeit simpler as I had noticed that the TAILQ links weren't used after the earlier commit). To restore the desired behavior, remove the linking field from struct pport entirely and use a local unordered_map in conf::add_pports which tracks if a given pport is claimed by more than one target. PR: 293076 Reported by: Ken J. Thomson Fixes: 969876fcee57 ("ctld: parse config file independently of getting kernel info") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57093 --- usr.sbin/ctld/ctld.cc | 12 +++++++----- usr.sbin/ctld/ctld.hh | 4 ---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 8b99bde14911..834bef4ef363 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1175,7 +1175,6 @@ conf::add_port(struct target *target, struct pport *pp) return (false); } - pp->link(); return (true); } @@ -2641,6 +2640,7 @@ conf_new_from_file(const char *path, bool ucl) bool conf::add_pports(struct kports &kports) { + std::unordered_map linked_ports; struct pport *pp; int ret, i_pp, i_vp; @@ -2654,11 +2654,13 @@ conf::add_pports(struct kports &kports) */ pp = kports.find_port(pport); if (pp != nullptr) { - if (pp->linked()) { + const auto &pair = linked_ports.try_emplace(pp, + targ); + if (!pair.second) { log_warnx("can't link port \"%s\" to " - "%s, port already linked to some " - "target", pport.c_str(), - targ->label()); + "%s, port already linked to %s", + pport.c_str(), targ->label(), + pair.first->second->label()); return (false); } diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 8d63de06dd80..3bc92449e372 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -567,13 +567,9 @@ struct pport { const char *name() const { return pp_name.c_str(); } uint32_t ctl_port() const { return pp_ctl_port; } - bool linked() const { return pp_linked; } - void link() { pp_linked = true; } - private: std::string pp_name; uint32_t pp_ctl_port; - bool pp_linked = false; }; struct kports {