From nobody Sat Jun 27 16:07:08 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 4gncqx1sjDz6jmXf for ; Sat, 27 Jun 2026 16:07:09 +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 4gncqw6THhz3mSG for ; Sat, 27 Jun 2026 16:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782576428; 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=rEa54uoeVdZpt9l2YeWbKkMki+5u5EG5KFpT4kHoREU=; b=nX3PA/4/L2E9qU03y+dg0Qeh7Pq3L7BAmcV5kGRyBZIgQaWIiD149BDiheANhmsGa3Ehif IM6QKnGRGDdSkkvHzqKsyTr5GV/gX7N/xQ+kVhTxgTkI8ZBcwemxJRg3rCKsfhlPY+Kt7f brBotrNm5k+B37NhB7W4UtxuDO6kku1nDjAknJn2RZbsux5jsz7F2L11zL/E8C8Y1BnAbw vRyrBsDw4rHHe7sMUdePD0OVkLygBTywRNSNgHln+1JymAts9zKWBUmo7QAhoK1kpJqwSR p6isDp9j0kBzWR/nJ2P5Um9k9omQKX7Kurgrupdt9n+wOXX6sStbiIWUtv5NsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782576428; a=rsa-sha256; cv=none; b=X1SZZAeo5TPTOvhHZFG+KLinmVX8Ko9CxPICOn00BGQUg117w8z3ZIjE8i9QLMVxrS706M ShJZ0Jupi6q/jzCK8ez0A5wuAGEqHa8/FCPl4HFdCekKG7xvBA9gwjQX9NPJpwrrtwcgKU tqJ13oV+bfG0LZ0c6Hj/WwbNyExs7FjhgpydCV7O4JV4CePCQlRHfDzkgTzxS7Moic3dV7 8XkMDLtIDF4togMVdiOMJDOo9wcZwIaOOvtmxsLeFEoX/zRdRRttBpEQHrJ9gPNhnatkJk Tpa6UzL3ISFl1R+1wQgt/aB7sQ3A/kt0pqD75RCibNknEmjCPZo4MaZos/GqCg== 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=1782576428; 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=rEa54uoeVdZpt9l2YeWbKkMki+5u5EG5KFpT4kHoREU=; b=WYX1PcxxoSuJL7Y4JK/rhyuX9gCDL2/Zu0YBMZxcsWRMj/FQeKVh4mdpZozMk4taJhLmeU lC8V3NMhDiMhPi7GstlKLeai4a9X3l9zLCa27EUJQsOJEfvqVvWxijJ+3eg0YMGeabIR4z TEsFrM4YQ8gVXC82wGItdiiB6B2fU+WnEdSn4sDiElt1JWaqIzjTP0hvpfoEarxUAFsPoJ GyZ0KEwB/RtMT/BBLvnK3/qCoCjbiIZ7161YztNsW6c5KbVftOf6IieHZlKlSGhECmvHhb 5pSzkDeXFuT3mPKxswj+l9ayRMmBAsCUokY2GBnFMYn5RrWBPDpsgcyTRRJTiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gncqw5KlvzWf0 for ; Sat, 27 Jun 2026 16:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27764 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 16:07:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4907d1c5c7f9 - main - ctld: Normalize physical port names 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: 4907d1c5c7f97ca985611441df5871705b90030c Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 16:07:08 +0000 Message-Id: <6a3ff52c.27764.6a2746d4@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4907d1c5c7f97ca985611441df5871705b90030c commit 4907d1c5c7f97ca985611441df5871705b90030c Author: John Baldwin AuthorDate: 2026-06-25 16:21:25 +0000 Commit: John Baldwin CommitDate: 2026-06-27 16:01:55 +0000 ctld: Normalize physical port names Don't require ioctl port names to be fully expanded as this contradicts the syntax documented in the ctl.conf(5). However, don't require users to exactly guess when pp or vp can be omitted. Instead, normalize all physical port names by parsing any port name with a pp or vp value and reformatting them to a standardized format. This format is also used when generating names for kernel-enumerated ports. Reported by: Seth Hoffert Fixes: caef3c50ac06 ("ctld: Refactor ioctl port handling") Sponsored by: Chelsio Communications --- usr.sbin/ctld/ctld.cc | 61 +++++++++++++++++++++++++++++++++++++++++-------- usr.sbin/ctld/kernel.cc | 5 +--- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 834bef4ef363..19baa0486e44 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -53,6 +53,7 @@ #include #include +#include #include #include "conf.h" @@ -1378,17 +1379,55 @@ target::set_auth_type(const char *type) bool target::add_physical_port(std::string_view pport) { - /* Normalize ioctl port names. */ + /* Normalize port names. */ std::string pname; - if (pport.compare(0, strlen("ioctl/"), "ioctl/") == 0) { - int ret, pp, vp; - - pname = std::string(pport); - ret = sscanf(pname.c_str(), "ioctl/%d/%d", &pp, &vp); - if (ret == 2) { - pname = freebsd::stringf("ioctl/%d/%d", pp, vp); - pport = pname; + size_t pos = pport.find('/'); + if (pos == 0) { + log_warnx("invalid physical port \"%s\" for target " + "\"%s\"", std::string(pport).c_str(), name()); + return (false); + } + + if (pos != pport.npos) { + const char *pport_end = pport.data() + pport.size(); + int pp, vp; + + auto parse_int = [](const char *start, const char *end) -> int { + int value; + + if (start == end) + return -1; + + auto [ptr, ec] = std::from_chars(start, end, value); + if (ec != std::errc() || ptr != end) + return -1; + return value; + }; + + const char *ppstart = pport.data() + pos + 1; + size_t ppend = pport.find('/', pos + 1); + if (ppend == pport.npos) { + pp = parse_int(ppstart, pport_end); + vp = 0; + } else { + const char *vpstart = pport.data() + ppend + 1; + pp = parse_int(ppstart, pport.data() + ppend); + vp = parse_int(vpstart, pport_end); + } + + if (pp == -1 || vp == -1) { + log_warnx("invalid physical port \"%s\" for target " + "\"%s\"", std::string(pport).c_str(), name()); + return (false); + } + + pname = pport.substr(0, pos); + if (pp != 0 || vp != 0) { + pname += "/" + std::to_string(pp); + if (vp != 0) + pname += "/" + std::to_string(vp); } + pport = pname; } for (const auto &s : t_pports) { @@ -2679,7 +2718,9 @@ conf::add_pports(struct kports &kports) */ ret = sscanf(pport.c_str(), "ioctl/%d/%d", &i_pp, &i_vp); - if (ret == 2) { + if (ret > 0) { + if (ret == 1) + i_vp = 0; if (!add_port(targ, pport, i_pp, i_vp)) { log_warnx("can't create new port %s " "for %s", pport.c_str(), diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index f84440d64c23..188d01052a1c 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -559,10 +559,7 @@ conf_new_from_kernel(struct kports &kports) continue; std::string name = port.port_name; - if (port.port_frontend == "ioctl") - name += "/" + std::to_string(port.pp) + "/" + - std::to_string(port.vp); - else if (port.pp != 0 || port.vp != 0) { + if (port.pp != 0 || port.vp != 0) { name += "/" + std::to_string(port.pp); if (port.vp != 0) name += "/" + std::to_string(port.vp);