From nobody Mon Mar 10 10:13:48 2025 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 4ZBCR040Lfz5qfy4; Mon, 10 Mar 2025 10:13:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBCR01NNHz3tY4; Mon, 10 Mar 2025 10:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741601628; 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=KDpKtRL0i/TOHfp8Q3ac1L18SYzXli244kx8tRxAJeY=; b=isEDhcgXLavUuvoXAB+yDR4L/FVFk8UYC4tXOPGqU+LhKuFkCVliDr8/BP5IhnoIOg3+8O 7qjNBzswOb6JHRI4UrH9MP0WvtByaLQA7oBsFoG8xDCrsSRfP44oWUVCZvekhKSvYdDYuh EdCCqGnjX97JDBwpTRNzbs8RyFOSpeL7rD/kD+I2RrQKFoLQ8rq1OlxjNfH5E4caYcTT62 EIyMlsRNm5SEIgnntKetzA+QSEpqDa9eG6cjkTdhK3ldlPpoj3rWwHkMOYJr82NXDBOOC2 crsQr0iiG6u1CskWTNSWcnHhxL+yj3sB0QmUGjxxyWLCk7KjxgRCGpxbY/d15g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741601628; a=rsa-sha256; cv=none; b=x9zGGYhQAoozHQtJXqiRo0mCjoDr6d8hcVGT4dCgz4QYR+nPhOb9F0WFSBB2rZvZsJVQpf 6oINjFXhZBn0Mc9XInRI5b+BRMNthzZyM3/rQcPD+USkZ+b4rA8lzLwFSA98UmOVmVwEec p4GbbtRILUYFFELhGRsFEcHfmyVZhyWv+A4X2HJ02FZ5Z1OS62UQQ06vUOzYYdjxOmkJbi QicJOnixLOX8O7wETGE0EDCE1QlqzFPUFsDioZkm42bs+RrdJTviS6WK85ASXKDbWsyNhk XZ7R7USk4OuEFLah8Unp9aWuAHCzLLJ73kLzsaf51bZeKTdRCZ6X7d7jRkHM9Q== 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=1741601628; 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=KDpKtRL0i/TOHfp8Q3ac1L18SYzXli244kx8tRxAJeY=; b=EUst94SARuAjCO/BoC5l2s/TY4ew0LIGs6j4oOXUQgBUgcZoTLM/b+7qWETEE7EIjXo1+e fCh1/fItfCivBo03GU8KZXJSfBB3VlBRK7VllSAp+By2GXm9+nr6lKM1Q9ofbeG/HiOj7G DeYm3cGgTSU/OWHVvYKNWZR7mZOiqV85530RAya3Iu8LQENmG2KviBIYybzHvpLW3y1oxy iG2xviQm5ZLaCm8d8CFyQ8B/YM8U6/UK9lwItmrk9drg+Q9wsFMjxsO+TO+1Ks23F5WO2y DYevsL1oFCVP1uwp7jrF5UueEkYV7zOBcD78P5CF7o5cQ4Ir1Z6iL5UfWAFlnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBCR00yNlzbDV; Mon, 10 Mar 2025 10:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52AADmjd003784; Mon, 10 Mar 2025 10:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AADmBG003781; Mon, 10 Mar 2025 10:13:48 GMT (envelope-from git) Date: Mon, 10 Mar 2025 10:13:48 GMT Message-Id: <202503101013.52AADmBG003781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e84a17db1cc0 - stable/14 - tests/netlink: Assert the route scope of interface's addresses 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e84a17db1cc034b87df7660dadb709a019140c3c Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e84a17db1cc034b87df7660dadb709a019140c3c commit e84a17db1cc034b87df7660dadb709a019140c3c Author: Zhenlei Huang AuthorDate: 2025-03-07 04:14:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-10 10:13:10 +0000 tests/netlink: Assert the route scope of interface's addresses While here, add one additional IPv4 link-local address to test_46_nofilter to cover the IPv4 RT_SCOPE_LINK case. Reviewed by: melifaro, #network MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49226 (cherry picked from commit 5d8b48487acc8375675f2b7c4507c98ac5d0bf75) --- tests/sys/netlink/test_rtnl_ifaddr.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/sys/netlink/test_rtnl_ifaddr.py b/tests/sys/netlink/test_rtnl_ifaddr.py index 48e53502df54..768bf38153ff 100644 --- a/tests/sys/netlink/test_rtnl_ifaddr.py +++ b/tests/sys/netlink/test_rtnl_ifaddr.py @@ -33,7 +33,10 @@ class TestRtNlIfaddrList(NetlinkTestTemplate, SingleVnetTestTemplate): def setup_method(self, method): method_name = method.__name__ if "4" in method_name: - self.IPV4_PREFIXES = ["192.0.2.1/24"] + if "nofilter" in method_name: + self.IPV4_PREFIXES = ["192.0.2.1/24", "169.254.169.254/16"] + else: + self.IPV4_PREFIXES = ["192.0.2.1/24"] if "6" in method_name: self.IPV6_PREFIXES = ["2001:db8::1/64"] super().setup_method(method) @@ -49,14 +52,21 @@ class TestRtNlIfaddrList(NetlinkTestTemplate, SingleVnetTestTemplate): for rx_msg in self.read_msg_list(msg.nl_hdr.nlmsg_seq, NlRtMsgType.RTM_NEWADDR): ifname = socket.if_indextoname(rx_msg.base_hdr.ifa_index) family = rx_msg.base_hdr.ifa_family - ret.append((ifname, family, rx_msg)) + scope = rx_msg.base_hdr.ifa_scope + ret.append((ifname, family, scope)) ifname = "lo0" - assert len([r for r in ret if r[0] == ifname]) > 0 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_HOST.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_HOST.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname]) == 3 ifname = self.vnet.iface_alias_map["if1"].name - assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET]) == 1 - assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6]) == 2 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_UNIVERSE.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_UNIVERSE.value]) == 1 + assert len([r for r in ret if r[0] == ifname]) == 4 def test_46_filter_iface(self): """Tests that listing outputs both IPv4/IPv6 for the specific interface""" From nobody Mon Mar 10 10:24:29 2025 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 4ZBCgK4NFHz5qgcY; Mon, 10 Mar 2025 10:24:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBCgK2dwbz40LN; Mon, 10 Mar 2025 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741602269; 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=yPDCZ5BNWUXkFr6U+fL7cm76V66DDd5E+xQj9lMUzh4=; b=i5K2dnHiEShtZWxBoEZ5Npyg7Z9i2exXuEGhf2KRtW/TKN12T6ysvF3S5bBkgcBoPQmjnh /O1y5VHjq4AL6NAl9SOpHsjupfGAJPbxnxTKS6EdeWMhb8jL1Jngvq12YvLXQaCa08d4qW P023W6n5nhZr+sV8VM+uDckZhYzkxFtD9DiYsBYwI8h6Y4f8cgB5o12H1Ay1AGTxfOnvdA hosi8jQOas5RL3cRlrdh0gNzLx8jtTEnbgkG/TkZGAwWRd+5HouKyyuCbxfO/imCzZDnzv 9y34jV8+U1ySHchZxjD9h4IuuXIZIZp+eZ0g7EoB+Uy9Lcw4wnZsKpLbhNMwEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741602269; a=rsa-sha256; cv=none; b=ORphX5uZdUTV8VzTNMm3auB2MykQ1nR/jfm3BiMrEPNxkAQDbJrM2fa/6Sjsr59MKJQZFw mCc4vPd0LXuWXBbn+8P1MO5Iv7TugeZWEKZpqqql1Xf7OVXZUk78WbBhWoYiTusHmlmN5b RqOU5MNhoheq8oxImmTjdDNcA09Tqsqm6hw4T2evelb+WYOh0DP0qPxxc0aWxoHjaUw401 a4y1zfhMeo880Wzacm2BDLS0oA9zj1x4u9/TSC0WQgb0S0mOr4xq5Uo9NYlqzr4ERxsp+m D2AUafr59rBJt9J2oef6J9Km1UcXBNx3GYOzLIHSTcT/fDAaK51z26ci/crZ7A== 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=1741602269; 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=yPDCZ5BNWUXkFr6U+fL7cm76V66DDd5E+xQj9lMUzh4=; b=gH3HxWtGzsfK21PFjU+4yXfvZZwVoOA0V4J8zssJ2/Hf+05hcqEijtURUfd3CIDTOnFfST SdRH2tpIPd5+MJrxn0MQGxmsbW2Wt9DtbtaSaFjbR/kM5XbhMK1ItI3J2103mxr/yIcvlw RECYh2shhYj1CKHww1wR98nK71vB65ApjvYJ4R1BYOd9ApwxoyZQ22yzZXO2kNXkZpqzOr BlXCqHaEoDTqzSA6v55Vri4XHiHacdI5xj8OXr2XRYxU/qivMQmOfc2c72ZEya2MOoxK+D Jd4rnrjTK1Yf0P0WzwKOv4pmbuSMJ1X3Gm0ZFRC/70zN5nyE1m0BUrj7WSdMUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBCgK24bPzcBL; Mon, 10 Mar 2025 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52AAOTxN022969; Mon, 10 Mar 2025 10:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AAOTiW022965; Mon, 10 Mar 2025 10:24:29 GMT (envelope-from git) Date: Mon, 10 Mar 2025 10:24:29 GMT Message-Id: <202503101024.52AAOTiW022965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9f26a03fdbdc - stable/13 - tests/netlink: Assert the route scope of interface's addresses 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f26a03fdbdc94196e062aa34066143279f7ca8d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9f26a03fdbdc94196e062aa34066143279f7ca8d commit 9f26a03fdbdc94196e062aa34066143279f7ca8d Author: Zhenlei Huang AuthorDate: 2025-03-07 04:14:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-10 10:23:11 +0000 tests/netlink: Assert the route scope of interface's addresses While here, add one additional IPv4 link-local address to test_46_nofilter to cover the IPv4 RT_SCOPE_LINK case. Reviewed by: melifaro, #network MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49226 (cherry picked from commit 5d8b48487acc8375675f2b7c4507c98ac5d0bf75) (cherry picked from commit e84a17db1cc034b87df7660dadb709a019140c3c) --- tests/sys/netlink/test_rtnl_ifaddr.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/sys/netlink/test_rtnl_ifaddr.py b/tests/sys/netlink/test_rtnl_ifaddr.py index ec349fcd6fde..fd0a2a7686ee 100644 --- a/tests/sys/netlink/test_rtnl_ifaddr.py +++ b/tests/sys/netlink/test_rtnl_ifaddr.py @@ -20,7 +20,10 @@ class TestRtNlIfaddr(NetlinkTestTemplate, SingleVnetTestTemplate): def setup_method(self, method): method_name = method.__name__ if "4" in method_name: - self.IPV4_PREFIXES = ["192.0.2.1/24"] + if "nofilter" in method_name: + self.IPV4_PREFIXES = ["192.0.2.1/24", "169.254.169.254/16"] + else: + self.IPV4_PREFIXES = ["192.0.2.1/24"] if "6" in method_name: self.IPV6_PREFIXES = ["2001:db8::1/64"] super().setup_method(method) @@ -38,14 +41,21 @@ class TestRtNlIfaddr(NetlinkTestTemplate, SingleVnetTestTemplate): for rx_msg in self.read_msg_list(msg.nl_hdr.nlmsg_seq, NlRtMsgType.RTM_NEWADDR): ifname = socket.if_indextoname(rx_msg.base_hdr.ifa_index) family = rx_msg.base_hdr.ifa_family - ret.append((ifname, family, rx_msg)) + scope = rx_msg.base_hdr.ifa_scope + ret.append((ifname, family, scope)) ifname = "lo0" - assert len([r for r in ret if r[0] == ifname]) > 0 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_HOST.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_HOST.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname]) == 3 ifname = self.vnet.iface_alias_map["if1"].name - assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET]) == 1 - assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6]) == 2 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET and r[2] == RtScope.RT_SCOPE_UNIVERSE.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_LINK.value]) == 1 + assert len([r for r in ret if r[0] == ifname and r[1] == socket.AF_INET6 and r[2] == RtScope.RT_SCOPE_UNIVERSE.value]) == 1 + assert len([r for r in ret if r[0] == ifname]) == 4 def test_46_filter_iface(self): """Tests that listing outputs both IPv4/IPv6 for the specific interface""" From nobody Tue Mar 11 00:43:20 2025 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 4ZBZkK0Tq0z5qPJX; Tue, 11 Mar 2025 00:43:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBZkJ6rZdz3DsJ; Tue, 11 Mar 2025 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741653801; 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=1QAbmkRtmZk7Ca5wTP1LjVWEkvtIdYt/EXo1H18W7qU=; b=rJ+v/r2eAXeIVF8DYAWsvpO7PMjhBH6IEfJd+xWlDW5X2x1gNHnFXuqpB+op44yAQLui8Z d+mwczvNSj5MsFu4DTlBWTkcu8oGpObVhpisL0V3IPl4g4I8vCMn3WZNZWz5sXXKtfWXcz 2K4O7mMFfxk9c6htCU8FSeiRbCoNB5ubcx9T/TaTQzZGv0TysGMtpQ7j2ETeYmlqx8bBQV tzDPcPPHiFBHJjI/JW2k6CjD44JNWn6bOArbhLfiFnIOZZTl/7VXUODg2UxssabHzcKWDg VNgIzMDDJopELcavxMSzDiUd5XLUe+cqLBaOavxNAhUnGGjs+r3Ye2AO/98tNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741653801; a=rsa-sha256; cv=none; b=xy1/NnioolULq6BlvXa0D8mt5quNEWDF3aYm2qJKrUk/0Eaykgcne3XILQgpalnkkID9kx TA3FhXDq2K9qu8z1O7SU4sQ0BV2UxLbTFS9AiW7r+GYwu+SDguPW2Ur1m+ZT7tWwvMDT+z LjKZotV/wNcfs81eplL6aHj81W6JVpja7JBQn/k53Vro695W//7WB0j1AY89OxTVHWxUVS MMDzLVaBSn7PpuzNNSkQXdxqYEEifkOclscOta2bhC2kYAspLenz4dc7MLaFQB9Xm/qbLY 1mv1h0/+kPcLs6Qw7QIxS8BfRnTG83GYiJ01HP+CA4WMDTZCRYO3wa2MGuEsZA== 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=1741653801; 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=1QAbmkRtmZk7Ca5wTP1LjVWEkvtIdYt/EXo1H18W7qU=; b=urPbfOdhGe7OaFvh3x2ileU6EeCm4HmuusBPX+F9lpEh0SjARzfgwTdzFBp7eglsLA5XNj RAugjrNDQ7aZUTNyQtYpz6hEV/N2rX0VSSegphMhqoim8qks+JRKjOAWmE1V7HD5TzC6DN CwNs7VpHliKgEfCjmtX4BTSgpZ1VOYZV4U7WQbegGa7gNi+GH0CnY2VSz7WRIB6k6lYLby FradR6b2bEp4Gmzmhw/drXMlW1rMnaqMv32D2TI5QEbVU/SARXv33ImkaHXSrJlPW6iliB X9w2O/kb77uZdS9Cbjh5XJ5Lo9X7QV5CeigsHaQ88lQVTb679cvD6NZijZxSQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBZkJ6KH9z13Lj; Tue, 11 Mar 2025 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52B0hKkq031115; Tue, 11 Mar 2025 00:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52B0hKC7031111; Tue, 11 Mar 2025 00:43:20 GMT (envelope-from git) Date: Tue, 11 Mar 2025 00:43:20 GMT Message-Id: <202503110043.52B0hKC7031111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 3733546de363 - stable/14 - vmm: Emulate testb imm8,r/m8 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3733546de363eda2d7bade2c110b8ba69a8e3c3e Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=3733546de363eda2d7bade2c110b8ba69a8e3c3e commit 3733546de363eda2d7bade2c110b8ba69a8e3c3e Author: Jose Luis Duran AuthorDate: 2025-03-04 13:51:47 +0000 Commit: Jose Luis Duran CommitDate: 2025-03-11 00:41:29 +0000 vmm: Emulate testb imm8,r/m8 Add support for "testb imm8,r/m8" emulation. PR: 261940 PR: 282852 Reviewed by: markj, emaste Approved by: emaste (mentor) Obtained from: Illumos (https://www.illumos.org/issues/14483) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49208 (cherry picked from commit 49a4838a0d94e145a826abf02aa03ff444e614e3) --- sys/amd64/vmm/vmm_instruction_emul.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c index 1b042621c0eb..7626082ff88d 100644 --- a/sys/amd64/vmm/vmm_instruction_emul.c +++ b/sys/amd64/vmm/vmm_instruction_emul.c @@ -234,6 +234,12 @@ static const struct vie_op one_byte_opcodes[256] = { .op_byte = 0x8F, .op_type = VIE_OP_TYPE_POP, }, + [0xF6] = { + /* XXX Group 3 extended opcode - not just TEST */ + .op_byte = 0xF6, + .op_type = VIE_OP_TYPE_TEST, + .op_flags = VIE_OP_F_IMM8, + }, [0xF7] = { /* XXX Group 3 extended opcode - not just TEST */ .op_byte = 0xF7, @@ -1282,6 +1288,12 @@ emulate_test(struct vcpu *vcpu, uint64_t gpa, struct vie *vie, error = EINVAL; switch (vie->op.op_byte) { + case 0xF6: + /* + * F6 /0 test r/m8, imm8 + */ + size = 1; /* override for byte operation */ + /* FALLTHROUGH */ case 0xF7: /* * F7 /0 test r/m16, imm16 From nobody Tue Mar 11 00:43:40 2025 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 4ZBZkj0hNLz5qPbT; Tue, 11 Mar 2025 00:43:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBZkh6rVVz3FQp; Tue, 11 Mar 2025 00:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741653821; 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=W8t44rGwvo7LS+pvHbYdfTi7klUMfXf8hIaALZKJcdw=; b=cKBqvg/SSZfm3ULS0jvJyUumL5Ss9B4Ek0bklQQg4R6uRa6sC7/zgKwAFfyoz9hgBE58kS 9M7npOlAQVu9GYSmt5M5qApX5F9RtrQfrtwQcD7P7FeY9gWsoRlShlHna47Z6HJsx+JSQ+ XFO9PDJlxBzHGTeuooE2Fq7FpQme7xSpQb3f9qGeATWhJEMdjTX0lnKS5812Mxn3Qaslpm gkgT13OJkEggS/OrI92UUvKT2sj0FBrdm9AmMoQGFGZ96uXbOPZRXiSaz4wMTxYU4VYIlD vFIwBP5gSp7VhVSiEblKmmmDgStwhDePWQWLApJ7HxgXKx0i42NzOzi7OvpKcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741653821; a=rsa-sha256; cv=none; b=vycW28TBKXl5vhGwpny14POOpSsDWuKWe7DDiu0jDxFBxic4n9WPzIMLSWsA/Kz8++T8ML pKW9cRerU7cpVSmNubnnVBndDOJ/dUJRdy0Ubi+LaoarhKfY8WGbvXv9ekoncD4ftxpUNK Y9Ov9MZh0cI3/hmmkMWxsNJwI9w7gl52zZ6GGGljVCbLsienV1en653MetiC0yMibwUR6u NOLteG7vGRP+2ptd9/9PEfVBqo/ir3yS2vzTzYT8iVmJiptujF04t12qGh/5rg+Cxhkp8Y Hau1r10PPtxpc4wEiJgBqxocXi0wJo5wm8AjaFFAeLuYWuKdEpuW6x/MZYcdeQ== 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=1741653821; 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=W8t44rGwvo7LS+pvHbYdfTi7klUMfXf8hIaALZKJcdw=; b=ZVuoLTwT7SSizTAERTS/ffpfXhM7Ef8+P45DZmry8ZXyB5md7GzZIZl+QiKwCs8miXBhQs 257TzDWGyr2WwEqOHBfowo4HEhp8ff2mtDT88E851WJc3J0W+T+5nnz1KclqCOn8/uBuI9 PsR2XBfjDwkW9Ja3vvv8zhHOf8U+6+MPyDuZ0u0RCxSddXiQUz/nYrYwXszUU5WeWkKy/6 hu7jKcXvuba4kMREDfduHei4FFnSkSFagtKFXSzIc0Vm3J/qJIQKal+glZgJ4KzwBNqc8e FewmG78Y7blOzgiiiNx9n/DyfpvFPTNMq2f9JhshZ8Cj8CpRBlNXka5RM2cTdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBZkh6JVSz139l; Tue, 11 Mar 2025 00:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52B0heQ1031373; Tue, 11 Mar 2025 00:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52B0heh2031370; Tue, 11 Mar 2025 00:43:40 GMT (envelope-from git) Date: Tue, 11 Mar 2025 00:43:40 GMT Message-Id: <202503110043.52B0heh2031370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 20083496866c - stable/13 - vmm: Emulate testb imm8,r/m8 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20083496866c379aef98fc352a4b6fd49801894d Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=20083496866c379aef98fc352a4b6fd49801894d commit 20083496866c379aef98fc352a4b6fd49801894d Author: Jose Luis Duran AuthorDate: 2025-03-04 13:51:47 +0000 Commit: Jose Luis Duran CommitDate: 2025-03-11 00:42:30 +0000 vmm: Emulate testb imm8,r/m8 Add support for "testb imm8,r/m8" emulation. PR: 261940 PR: 282852 Reviewed by: markj, emaste Approved by: emaste (mentor) Obtained from: Illumos (https://www.illumos.org/issues/14483) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49208 (cherry picked from commit 49a4838a0d94e145a826abf02aa03ff444e614e3) --- sys/amd64/vmm/vmm_instruction_emul.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c index 10661ba40c8c..ad46163ed377 100644 --- a/sys/amd64/vmm/vmm_instruction_emul.c +++ b/sys/amd64/vmm/vmm_instruction_emul.c @@ -234,6 +234,12 @@ static const struct vie_op one_byte_opcodes[256] = { .op_byte = 0x8F, .op_type = VIE_OP_TYPE_POP, }, + [0xF6] = { + /* XXX Group 3 extended opcode - not just TEST */ + .op_byte = 0xF6, + .op_type = VIE_OP_TYPE_TEST, + .op_flags = VIE_OP_F_IMM8, + }, [0xF7] = { /* XXX Group 3 extended opcode - not just TEST */ .op_byte = 0xF7, @@ -1282,6 +1288,12 @@ emulate_test(VCPU_DECL, uint64_t gpa, struct vie *vie, error = EINVAL; switch (vie->op.op_byte) { + case 0xF6: + /* + * F6 /0 test r/m8, imm8 + */ + size = 1; /* override for byte operation */ + /* FALLTHROUGH */ case 0xF7: /* * F7 /0 test r/m16, imm16 From nobody Tue Mar 11 00:59:46 2025 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 4ZBb5H3d3Rz5qQN9; Tue, 11 Mar 2025 00:59:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBb5H2B0Wz3NN3; Tue, 11 Mar 2025 00:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741654787; 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=skpkCsw2DmfGUVhnjITk+gmqC3F20HgTEQVPvSu37Gc=; b=OkRu0NRoeff9MEbRw+OxGG8YXA5F5LQp3hoVFdioXpbPTAOT9Fq/cwUks/sGzGa7VzkTGC Wi3ppdO8061TZToU2Ot3CTiLookysrCATZzXDA0ELqX9YJsnz7sHSSjY4WmGfbsa+IQHf0 wuSUNJyKqHxjKeUOE1dqYfHWu7zuD0qaNGIGOSDzuXaHfSmIDQvJq/83tXEzjTOPh9hEPG bR1wQwipB+nUCGAqJZA7SURc9DGoWCyxzmUPGhK6lsHarFn8BI/LzLiv16DXTjzSLj6ibO tQFwWelEHuEqH25BqUdxAQATzfuuVtowKtH5okByXq8SayBxisNo5FexGxaqRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741654787; a=rsa-sha256; cv=none; b=IdYGotOgav/xoCbtgmSJiH00z2PZR8kt+Scol0Sh9Niu+zxju3wTEBRN8RNIW/X+5rEGCI sbDSDE8MElEwIuYHjYvCAeyMDMo06j/mUJIZ6e94YQDMbRefYzBsI6gJF7Bvyekjl581Ch NTVKs5dBWDxJrzNVYr95zGMKx3+RD0dK5kgkIRvFP6ZW8PbvCvDRDbWIj6Ky9T3tzvNwI2 ywwMs/z7Ihi3hf+Go7LfhQE4U4iDJjxusp9YROMFTxMpKhk28bZ9dRQaUDAqs4uHCGfR1n 9P9yuJKiA0PsM+bJURoTwYHDB/uLqle++wiTMNm95YjR88dNmJMIoiX2HvL+7w== 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=1741654787; 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=skpkCsw2DmfGUVhnjITk+gmqC3F20HgTEQVPvSu37Gc=; b=SWm/YHE85n2hsT+5XPf6pRE0gwmGfgzXWkd9T0SJT8RG0EF+Gl5qYPYEToxjD4Vy3RWEn9 F7JSTFUq10h5xkwTexZfyETVil/OZ6uUJVD3V+EYyV4NUA/3MvIH89y1gQ2DMS/2DgdZMr gqae6IA5nP4UqEEzsEmAs77EiefSMyXVYXYsyW3p+IyulY1Xz+OU/gSsXAHe2xR6HOTWde eXBzPmQZZJx97W/yyXNMM4pmue5QNKemgmfOZPYz9HmTsr1HDm6LjABDy95G62Yxr3jJ2Y ZUosKH8L+VHXEaG3vPz+pMQy93cTSYE4pNCNa9z6yI/bVc5tmQa/ZkMXCE7fBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBb5H1H31z13X5; Tue, 11 Mar 2025 00:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52B0xkS0052048; Tue, 11 Mar 2025 00:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52B0xkvj052045; Tue, 11 Mar 2025 00:59:46 GMT (envelope-from git) Date: Tue, 11 Mar 2025 00:59:46 GMT Message-Id: <202503110059.52B0xkvj052045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: dc1467c68df2 - stable/14 - amd64 csu: microoptimize startup 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dc1467c68df2e9a3bb0b212924b2131950cd1305 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dc1467c68df2e9a3bb0b212924b2131950cd1305 commit dc1467c68df2e9a3bb0b212924b2131950cd1305 Author: Konstantin Belousov AuthorDate: 2025-03-02 23:54:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-11 00:59:11 +0000 amd64 csu: microoptimize startup (cherry picked from commit cb991a228179639cc0568fdd5d4b4b07b6f47b5a) --- lib/csu/amd64/crt1_s.S | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/csu/amd64/crt1_s.S b/lib/csu/amd64/crt1_s.S index f7ea076d94f1..3ceea9289330 100644 --- a/lib/csu/amd64/crt1_s.S +++ b/lib/csu/amd64/crt1_s.S @@ -49,15 +49,12 @@ _start: #ifdef GCRT subq $16, %rsp #endif - movq %rsi, %rcx - movq %rdi, %rsi /* argv = ap */ - addq $8, %rsi /* argv += 1 */ - movq %rdi, %rdx /* env = ap */ - addq $16, %rdx /* env += 2 */ - movslq (%rdi), %rax - movl %eax, %edi /* argc = *(long *)(void *)ap */ - shlq $3, %rax - addq %rax, %rdx /* env += argc */ + movq %rsi, %rcx /* cleanup */ + movslq (%rdi), %rax /* long *ap; tmpargc = *ap */ + leaq 0x8(%rdi), %rsi /* argv = ap + 1 */ + leaq 0x10(%rdi, %rax, 8), %rdx /* env = ap + 2 + tmpargc */ + movl %eax, %edi /* argc = tmpargc */ + #ifdef PIC /* * XXX. %rip relative addressing is not intended for use in the From nobody Tue Mar 11 00:59:48 2025 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 4ZBb5J44bYz5qQ1n; Tue, 11 Mar 2025 00:59:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBb5J1wkXz3NVw; Tue, 11 Mar 2025 00:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741654788; 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=E+2ZaPr/DC16DP3p27RiZizVT6UcnDmns+axFYxrUBQ=; b=dfq3dNzvdxtAVs2iqSumrY6dfK2Sm4r1yBpL6/qhFkJ7mvIX78JSUxk5paxm81twNN5FHs Phm+Yf1a5CToFG19Dh8TfdZzb1JIYZdy+MUkL2q6NPngTJb9BsNPtwMjYqEhyiD2QJvLlB CwPQiBv4NAQtV8zspu4SawWjQMC5aJcHA6nIuzLwFjYfClcuU81RXtqZafOHFI90Gwf9l/ y0N/RmMTm34ao0RHQRhYczIT0j+LiIlRVtM2liEl/NXttAeCrTt1KjyNT18S2+UEX7qnQu dpplYRNs8ppnMOErjzxr8yJdLEbgfN6ejZ8VAkgBEs49TL1fA7wFsZ0RYpQrBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741654788; a=rsa-sha256; cv=none; b=enBwCWTASFVt1Vrf+fw+h7kiiV7Tgd4i65iRNmY1ke8Kr58Kzq6sIFayPBYxgT62oX/27n 3/iVLeJemqO7EJm9TztJstdvu2kOgYEdVOY70zYi5mR5NUmhqBdIQBkoOFqmZb4uJcz3/v 0wZcpp822hO07m3cAWrlWBKp8/EJU7wnAReZxCIyI+A3ZhrFbOqDjtpbbR/Li/lLQCmj5Y cA1/Kh2q+O+9dtwvc2DgzdU1ueuc6hmyYVtQVhKor99jhHeNdpQ0gHBpP2YHOSyXAzcGR/ Cx1Mkw55Cw8ZZ/iLpFe0VIiZrjnROPcNzCr/AYbKpUHoRGjardxfeAdMKPoJ1w== 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=1741654788; 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=E+2ZaPr/DC16DP3p27RiZizVT6UcnDmns+axFYxrUBQ=; b=O0F6+Eldenmth2DMjj9pKGEPv1HnDB8QCkouWy5knb6YucP5/Rg74SlwdbJYSUJv/ny9BC ksJ7CbikdldHJWOr64VPaSa3c5g9z1pO6YfByNhSLC5B8fATG1Bsbo6K8LdjodHSJiL7eE TvqyJHj7rIwweXSYRGGmzGA6uCmw1btUjY6iGd/vHrSUoGj+12xfiuBXdX3qrhuA9G9gKx NZq1Hshd2wv0v8PrfbRPxcpCDtFbeVOg3ryqMJjM8t8VLzVbLoK05P+zynTPd1BVFvGyO7 FhbvzxCgL+qou8DN2OCRH8oRxK9ui/js87/MW6cwgMQtI+AacBjPP/zWAQLpng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBb5J1FzJz13Br; Tue, 11 Mar 2025 00:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52B0xmRl052081; Tue, 11 Mar 2025 00:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52B0xmxO052078; Tue, 11 Mar 2025 00:59:48 GMT (envelope-from git) Date: Tue, 11 Mar 2025 00:59:48 GMT Message-Id: <202503110059.52B0xmxO052078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b328b79f6f2b - stable/14 - mlx5en: Fix domain set usage in TLS tag import functions 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 commit b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 Author: Slava Shwartsman AuthorDate: 2025-02-24 18:08:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-11 00:59:11 +0000 mlx5en: Fix domain set usage in TLS tag import functions (cherry picked from commit 85af37e15958bd050093e6368afe6afe8e7a5ced) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index af280abcdcd2..a5d485597c77 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -117,7 +117,7 @@ mlx5e_tls_tag_import(void *arg, void **store, int cnt, int domain, int flags) for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS, - mlx5_dev_domainset(arg), flags | M_ZERO); + mlx5_dev_domainset(priv->mdev), flags | M_ZERO); if (ptag == NULL) return (i); ptag->tls = &priv->tls; diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 19c6adf18809..f584e5228657 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -387,11 +387,12 @@ static int mlx5e_tls_rx_tag_import(void *arg, void **store, int cnt, int domain, int flags) { struct mlx5e_tls_rx_tag *ptag; + struct mlx5_core_dev *mdev = arg; int i; for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS_RX, - mlx5_dev_domainset(arg), flags | M_ZERO); + mlx5_dev_domainset(mdev), flags | M_ZERO); mtx_init(&ptag->mtx, "mlx5-tls-rx-tag-mtx", NULL, MTX_DEF); INIT_WORK(&ptag->work, mlx5e_tls_rx_work); store[i] = ptag; From nobody Tue Mar 11 14:39:59 2025 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 4ZBxHh50Cvz5qf45; Tue, 11 Mar 2025 14:40:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBxHh08s8z3CVn; Tue, 11 Mar 2025 14:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741704000; 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=4ILAMkAePqPQhpJkqfshqDlq3Rlx8e6XJ4g/IiCqSjU=; b=vHLcDgj1sqDCv9HMUIM/cwcXfK3debb1v6n4NAjPMw6Nau2CDLtlbFj5OtmaL4VRMsxlky 6yRNCxal758GdS6NJPtT0SYMP2MpJqAReyzPwwcj0+7uZT9XfPjgll8b1+xKyn/x5pECBO afYr89pjQvbrFupipyoVT9fJpFTBxalFPA9ZLYCmWzVMS7U+5snd+F7ghEfHtJomCWeQ/O N4kW7DN+gcrzVW0EiRUf53YkSZkFBxUNAUXi0NcRe2fd4tX3MYW3+OkjqvjyMXVox+vJfV zcOhDnC5C7GksWoj07/nHSUexmJe5T5wncw9sz9763ggiRP6qMLoUBUOrSlNWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741704000; a=rsa-sha256; cv=none; b=hJehq4vpFdrSKVKQcyzfOs7BDyCU6DWEZf56tav6P6OJDdweaZWbKXiZGUDK4sPapeQDoA U/0h7CKx5BiQC2ces6+HLEBYkKWEZDyxvdLZhDxORKs/ayIt/2mDU1dVHYS8c0+BPkbSnV 7L8IEGFYQM8cBd3BLnkDX0pn32yqDsnl6BafJaYxGlRseV6o3elEmeaVau+yYedrSumKJk eLJ7l8PJr4ik8XohaGIYgGyLCfTYIS/vlQUPGP3HsdOhWU1WoFfxfzjz4QccW8jUq+QGGg pASZJXSrhIDMWY5BKK7BRgJSl+/jPSlMMnN/Y+eYkJtnDx+hqXGli1MCaW+Wlw== 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=1741704000; 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=4ILAMkAePqPQhpJkqfshqDlq3Rlx8e6XJ4g/IiCqSjU=; b=WsXQHz5VCmVTJCPn0MfMq4zjGOyRqRtVlamL5MY1/hjK992xMndLyhl03MVzPfttk8u4e2 9mBVEzgHuoiU7sgkidWm2N8zlb35CPAjUTKoDESKV5YPFQRJGHfhRO8hgQEe3wKhRyGNnj 3SWqmlaoDiji0jC/KPP5owjqv3LQuOrAZnN3wm4wQLu8ys2qp9vmFSVFDOD+HHcm1+nNNx 6taPkpAumjieW9jFRecY9zcvBaZaa7fUy64Mho6MPX89V1ftOZRBhDwi32aWi9iOvWmgFY V2ohYWknZ6Ku9GGgRs1nwxFClF08yf2Ep7C07CqXXscNq+g0lgrx1UACJ1p+Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZBxHg6p3rzV70; Tue, 11 Mar 2025 14:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52BEdxQL086776; Tue, 11 Mar 2025 14:39:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BEdxFv086773; Tue, 11 Mar 2025 14:39:59 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:39:59 GMT Message-Id: <202503111439.52BEdxFv086773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 74776eba28d8 - stable/14 - ssh: Consolidate HAVE_LDNS / LIBWRAP in ssh.mk 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 74776eba28d86b9384faa7fce5a699a73afced99 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74776eba28d86b9384faa7fce5a699a73afced99 commit 74776eba28d86b9384faa7fce5a699a73afced99 Author: Ed Maste AuthorDate: 2022-04-12 13:18:20 +0000 Commit: Ed Maste CommitDate: 2025-03-11 14:39:36 +0000 ssh: Consolidate HAVE_LDNS / LIBWRAP in ssh.mk Commit 9d63429fa163 ("ssh: move common Makefile boilerplate to a new ssh.mk") introduced ssh.mk for common OpenSSH paths and flags, as part of enabling FIDO/U2F. Move duplicated MK_LDNS and MK_TCP_WRAPPERS handling there. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D31896 (cherry picked from commit d71e7e57fc1472e3ea6d31c44e187c2819d2c71e) --- secure/lib/libssh/Makefile | 2 +- secure/libexec/sftp-server/Makefile | 6 ------ secure/libexec/ssh-keysign/Makefile | 10 +--------- secure/libexec/ssh-pkcs11-helper/Makefile | 10 +--------- secure/libexec/sshd-session/Makefile | 6 ------ secure/ssh.mk | 8 ++++++++ secure/usr.bin/scp/Makefile | 6 ------ secure/usr.bin/sftp/Makefile | 6 ------ secure/usr.bin/ssh-add/Makefile | 6 ------ secure/usr.bin/ssh-agent/Makefile | 10 +--------- secure/usr.bin/ssh-keygen/Makefile | 8 +------- secure/usr.bin/ssh-keyscan/Makefile | 6 ------ secure/usr.bin/ssh/Makefile | 4 ---- secure/usr.sbin/sshd/Makefile | 1 - 14 files changed, 13 insertions(+), 76 deletions(-) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 0a5b25e6780d..1917e0a58e31 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -46,7 +46,7 @@ SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \ SRCS+= getrrsetbyname.c .else LDNSDIR= ${SRCTOP}/contrib/ldns -CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} +CFLAGS+= -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c LIBADD+= ldns .endif diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 852055bfe625..4aac86ac01bf 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -8,12 +8,6 @@ MAN= sftp-server.8 LIBADD= ssh -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - .include .PATH: ${SSHDIR} diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index e5aa05f40f1d..129b34199fad 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -7,15 +7,7 @@ SRCS= ssh-keysign.c readconf.c uidswap.c MAN= ssh-keysign.8 BINMODE=4555 -LIBADD= ssh - -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - -LIBADD+= crypto +LIBADD= crypto ssh .include diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index 2e04a0ed1fc2..506697531965 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -6,15 +6,7 @@ PROG= ssh-pkcs11-helper SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c MAN= ssh-pkcs11-helper.8 -LIBADD= ssh - -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - -LIBADD+= crypto +LIBADD= crypto ssh .include diff --git a/secure/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile index bce96112f65a..81e481559189 100644 --- a/secure/libexec/sshd-session/Makefile +++ b/secure/libexec/sshd-session/Makefile @@ -26,12 +26,6 @@ MAN= # pam should always happen before ssh here for static linking LIBADD= pam ssh util -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1 LIBADD+= bsm diff --git a/secure/ssh.mk b/secure/ssh.mk index bd88e43aa0a3..8411fb11fb16 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -12,6 +12,14 @@ CFLAGS+= -include krb5_config.h CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\" +.if ${MK_LDNS} != "no" +CFLAGS+= -DHAVE_LDNS=1 +.endif + +.if ${MK_TCP_WRAPPERS} != "no" +CFLAGS+= -DLIBWRAP=1 +.endif + .if ${MK_USB} != "no" # Built-in security key support CFLAGS+= -include sk_config.h diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index bb2623062333..a8d5eac77397 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -8,12 +8,6 @@ PACKAGE= ssh LIBADD= ssh -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - .include .PATH: ${SSHDIR} diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 72229d100c45..2f51bf524c6b 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -9,12 +9,6 @@ PACKAGE= ssh LIBADD= ssh edit -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - .include .PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 43ee63c567e7..ddde52130027 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -8,12 +8,6 @@ PACKAGE= ssh LIBADD= ssh -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - .include .PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 83813452e69a..a96af6255b7e 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -6,20 +6,12 @@ PROG= ssh-agent SRCS= ssh-agent.c ssh-pkcs11-client.c PACKAGE= ssh -LIBADD= ssh - -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif +LIBADD= crypto ssh .if defined(LOCALBASE) CFLAGS+= -DDEFAULT_PKCS11_WHITELIST='"/usr/lib*/*,${LOCALBASE}/lib*/*"' .endif -LIBADD+= crypto - .include .PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 6595ad3db132..e15b7aafbb45 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -7,13 +7,7 @@ PROG= ssh-keygen SRCS= ssh-keygen.c sshsig.c ssh-sk-client.c PACKAGE= ssh -LIBADD= ssh - -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -.endif - -LIBADD+= crypto +LIBADD= crypto ssh .include diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index b71c07a91b90..72057781a286 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -8,12 +8,6 @@ PACKAGE= ssh LIBADD= ssh -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -#DPADD+= ${LIBLDNS} -#LDADD+= -lldns -.endif - .include .PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index e16433ec5d1d..ad4b692c961c 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -18,10 +18,6 @@ SRCS+= gss-genr.c LIBADD= ssh -.if ${MK_LDNS} != "no" -CFLAGS+= -DHAVE_LDNS=1 -.endif - .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" LIBADD+= gssapi .endif diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 5d6dca203a0b..f0a6105e83b6 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -22,7 +22,6 @@ LIBADD+= gssapi_krb5 gssapi krb5 .endif .if ${MK_TCP_WRAPPERS} != "no" -CFLAGS+= -DLIBWRAP=1 LIBADD+= wrap .endif From nobody Tue Mar 11 15:43:00 2025 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 4ZByhN5LFRz5qk04; Tue, 11 Mar 2025 15:43:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZByhN50Wvz3bZp; Tue, 11 Mar 2025 15:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741707780; 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=sXj8+5c07tQC5eqKMYQqukNH6CUKWeHBSN7XjhWcOMA=; b=EboygQCRZ/kynwATjazuqONeBsYMqVqtgDB8PtMB4dbGM3SFLjXZH3Ileg/adMMwShRzRG yXcEjwxTvSlTdnEVppe7O068LpXi7VtrZvtdQVgIremxIHwfwsSlNs4ENq8I6gRXnjRi+T b/w3rVdJOUi/Q2DNhDm8VfhtB3kI44SKlLhFRhZf4svApLDoBRMiA+83gLZqtwjeNQ3q3l YvouaQ3vVO6E7PIiZO9RgpbyOr8Ga0GS/p3qA84Srn+0PRHb51GLWuKuuXCZ7LyD7VBOkv DEho0dypzf7kkQrg7GgCUHlo5BGRmy/od/ExOIGHUOeYj+KUhRGC8yzkUGn7pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741707780; a=rsa-sha256; cv=none; b=vDpaZim8HyiIQ1AH/tALRZeGxk8EMxC2NU98ffZfgXyiWrFVxq6WhgEVMjl6/iRUdr5fIg Hn4Q7c0XS4PwH9apPRFi3+QQJugMgwckdUkOTPaYe7rnzBasbeLonZKcDI3oMGNu9mKnI1 t7RG2CmRc32+2/Tf822OHltVlO0Bn0/exMtYW0pCoXg5yXksN/tGDJk6tnQoxFUVgHGivI W52CCxa5SkaYgKmaBolAQagHQHbojjSYY6rW3ABLQcJZvuBYRtmv5pjfbMAN70TVyZ6bc7 bQLndwEODqSBSG1f//Nrnxhq5e/7MkS/WTgnglnqkT3u7lEljw74f1JsA7sXSA== 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=1741707780; 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=sXj8+5c07tQC5eqKMYQqukNH6CUKWeHBSN7XjhWcOMA=; b=AtswKBBsM1xV95WG3qr+2fvlYD920cZH4nVTprbQgPQN9tLsTR3vHQsxP4vxQxPlFR8TIE Xhq8l/+y2H5ck92I3Mf8mKnlNywV7Iig3uVkyvyWPWPUyd6oLIEi6PZt8aEVyyKLRoppMx I4rmaNRtXwwTnYxg4mHdwtQbflpI0nsJlEhK/KjUQ4Me1ChI3BSy3fKtX5K7ToDhlYo+Dc Il41tRYyCsjDpGpIU/lu4oEqYpBsJTwDSIGoIKmNDlsNEZqOtDNd/JTVYmW+PGW9JVJTeX f90iZ6HKvUtkcElyIcl9qP1XIXuGnfv2O9stHiUkpPZGFIQTKb6NAZFRk+FpGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZByhN4JLTzY4r; Tue, 11 Mar 2025 15:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52BFh02Z016666; Tue, 11 Mar 2025 15:43:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BFh0Kd016663; Tue, 11 Mar 2025 15:43:00 GMT (envelope-from git) Date: Tue, 11 Mar 2025 15:43:00 GMT Message-Id: <202503111543.52BFh0Kd016663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 642fc04eda48 - stable/14 - usb: Kill left-over cdefs.h includes 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 642fc04eda48d6b8b0091d968cb5fbca0cb577ba Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=642fc04eda48d6b8b0091d968cb5fbca0cb577ba commit 642fc04eda48d6b8b0091d968cb5fbca0cb577ba Author: Warner Losh AuthorDate: 2025-03-04 21:42:28 +0000 Commit: Warner Losh CommitDate: 2025-03-11 15:41:19 +0000 usb: Kill left-over cdefs.h includes These includes were for __FBSD_RCSID() macro. They weren't formatted like the rest of the tree so weren't trimmed automatically when that script was run. Trim them now. MFC After: 1 week Sponsored by: Netflix (cherry picked from commit ca48e43ba9ee73a07cdbad8365117793b01273bb) --- sys/dev/usb/controller/dwc3.c | 1 - sys/dev/usb/controller/dwc_otg_acpi.c | 1 - sys/dev/usb/controller/ehci_fsl.c | 1 - sys/dev/usb/controller/ehci_imx.c | 1 - sys/dev/usb/controller/ehci_msm.c | 1 - sys/dev/usb/controller/ehci_mv.c | 1 - sys/dev/usb/controller/ehci_pci.c | 1 - sys/dev/usb/controller/generic_ehci.c | 1 - sys/dev/usb/controller/generic_ehci_acpi.c | 1 - sys/dev/usb/controller/generic_ehci_fdt.c | 1 - sys/dev/usb/controller/generic_xhci.c | 1 - sys/dev/usb/controller/generic_xhci_acpi.c | 1 - sys/dev/usb/controller/generic_xhci_fdt.c | 1 - sys/dev/usb/controller/ohci_pci.c | 1 - sys/dev/usb/controller/uhci_pci.c | 1 - sys/dev/usb/controller/xhci_pci.c | 1 - sys/dev/usb/controller/xlnx_dwc3.c | 2 -- sys/dev/usb/input/atp.c | 1 - sys/dev/usb/input/uhid.c | 1 - sys/dev/usb/input/ukbd.c | 1 - sys/dev/usb/input/ums.c | 1 - sys/dev/usb/input/usbhid.c | 1 - sys/dev/usb/input/wmt.c | 1 - sys/dev/usb/input/wsp.c | 1 - sys/dev/usb/misc/udbp.c | 1 - sys/dev/usb/misc/ugold.c | 1 - sys/dev/usb/misc/uled.c | 1 - sys/dev/usb/net/if_aue.c | 1 - sys/dev/usb/net/if_axe.c | 1 - sys/dev/usb/net/if_axge.c | 1 - sys/dev/usb/net/if_cdce.c | 1 - sys/dev/usb/net/if_cdceem.c | 1 - sys/dev/usb/net/if_cue.c | 1 - sys/dev/usb/net/if_ipheth.c | 1 - sys/dev/usb/net/if_kue.c | 1 - sys/dev/usb/net/if_mos.c | 1 - sys/dev/usb/net/if_muge.c | 1 - sys/dev/usb/net/if_rue.c | 1 - sys/dev/usb/net/if_smsc.c | 1 - sys/dev/usb/net/if_udav.c | 1 - sys/dev/usb/net/if_urndis.c | 1 - sys/dev/usb/net/ruephy.c | 1 - sys/dev/usb/serial/ubsa.c | 1 - sys/dev/usb/serial/ubser.c | 1 - sys/dev/usb/serial/uchcom.c | 1 - sys/dev/usb/serial/ucycom.c | 1 - sys/dev/usb/serial/ufoma.c | 1 - sys/dev/usb/serial/uftdi.c | 1 - sys/dev/usb/serial/uipaq.c | 1 - sys/dev/usb/serial/ulpt.c | 1 - sys/dev/usb/serial/umcs.c | 1 - sys/dev/usb/serial/umct.c | 1 - sys/dev/usb/serial/umodem.c | 1 - sys/dev/usb/serial/uplcom.c | 1 - sys/dev/usb/serial/usb_serial.c | 1 - sys/dev/usb/serial/uslcom.c | 1 - sys/dev/usb/serial/uvscom.c | 1 - sys/dev/usb/storage/umass.c | 1 - sys/dev/usb/storage/urio.c | 1 - sys/dev/usb/template/usb_template_multi.c | 1 - sys/dev/usb/template/usb_template_serialnet.c | 1 - sys/dev/usb/wlan/if_rsu.c | 1 - sys/dev/usb/wlan/if_rum.c | 1 - sys/dev/usb/wlan/if_run.c | 1 - sys/dev/usb/wlan/if_uath.c | 1 - sys/dev/usb/wlan/if_ural.c | 1 - sys/dev/usb/wlan/if_urtw.c | 1 - sys/dev/usb/wlan/if_zyd.c | 1 - 68 files changed, 69 deletions(-) diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c index bf3001c0389e..35e58f632a94 100644 --- a/sys/dev/usb/controller/dwc3.c +++ b/sys/dev/usb/controller/dwc3.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_platform.h" #include "opt_acpi.h" diff --git a/sys/dev/usb/controller/dwc_otg_acpi.c b/sys/dev/usb/controller/dwc_otg_acpi.c index 9b982dfd6e41..a6d9057128dd 100644 --- a/sys/dev/usb/controller/dwc_otg_acpi.c +++ b/sys/dev/usb/controller/dwc_otg_acpi.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include "opt_acpi.h" #include diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c index 668a5b44e4c3..c29cc9c1fd35 100644 --- a/sys/dev/usb/controller/ehci_fsl.c +++ b/sys/dev/usb/controller/ehci_fsl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c index 1fa2d1dab737..afa9b27a351b 100644 --- a/sys/dev/usb/controller/ehci_imx.c +++ b/sys/dev/usb/controller/ehci_imx.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include /* * EHCI driver for Freescale i.MX SoCs which incorporate the USBOH3 controller. */ diff --git a/sys/dev/usb/controller/ehci_msm.c b/sys/dev/usb/controller/ehci_msm.c index 37e330fd6ea7..8ab9c265e91e 100644 --- a/sys/dev/usb/controller/ehci_msm.c +++ b/sys/dev/usb/controller/ehci_msm.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index b5096e5f2fb6..2f751e05d789 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -35,7 +35,6 @@ * FDT attachment driver for the USB Enhanced Host Controller. */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 916e11fe16fa..cb2cbd6cb0cb 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. * diff --git a/sys/dev/usb/controller/generic_ehci.c b/sys/dev/usb/controller/generic_ehci.c index 471ce72776d4..fc0795079301 100644 --- a/sys/dev/usb/controller/generic_ehci.c +++ b/sys/dev/usb/controller/generic_ehci.c @@ -32,7 +32,6 @@ * Generic EHCI driver based on the Allwinner A10 EHCI driver */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/generic_ehci_acpi.c b/sys/dev/usb/controller/generic_ehci_acpi.c index f565590fa09a..d947215ad355 100644 --- a/sys/dev/usb/controller/generic_ehci_acpi.c +++ b/sys/dev/usb/controller/generic_ehci_acpi.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c index 4dc3758b59f3..b2f046228765 100644 --- a/sys/dev/usb/controller/generic_ehci_fdt.c +++ b/sys/dev/usb/controller/generic_ehci_fdt.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/generic_xhci.c b/sys/dev/usb/controller/generic_xhci.c index e89d1bc84497..a7be3adf23a1 100644 --- a/sys/dev/usb/controller/generic_xhci.c +++ b/sys/dev/usb/controller/generic_xhci.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c b/sys/dev/usb/controller/generic_xhci_acpi.c index 2cb5977e0cf1..e24fe1b1bcc3 100644 --- a/sys/dev/usb/controller/generic_xhci_acpi.c +++ b/sys/dev/usb/controller/generic_xhci_acpi.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include "opt_acpi.h" #include diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c index a5c3f190783f..ddbd0dd5336e 100644 --- a/sys/dev/usb/controller/generic_xhci_fdt.c +++ b/sys/dev/usb/controller/generic_xhci_fdt.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bus.h" #include diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index 12bf55785215..737d615232ff 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * USB Open Host Controller driver. * diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index a851af86d9ef..c55dd4cc19c3 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* Universal Host Controller Interface * * UHCI spec: http://www.intel.com/ diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 3afb9fa8c6ef..fdd44d04c5d0 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c index 0a53fb855034..3c00e9d027dd 100644 --- a/sys/dev/usb/controller/xlnx_dwc3.c +++ b/sys/dev/usb/controller/xlnx_dwc3.c @@ -29,8 +29,6 @@ * Xilinx DWC3 glue */ -#include - #include #include #include diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c index fa78f7d7221b..41ab37c6f1cc 100644 --- a/sys/dev/usb/input/atp.c +++ b/sys/dev/usb/input/atp.c @@ -58,7 +58,6 @@ * giving me an opportunity to do this work. */ -#include #include #include #include diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 098ec4364df7..a31081663f0c 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -4,7 +4,6 @@ * $NetBSD: uhid.c,v 1.54 2002/09/23 05:51:21 simonb Exp $ */ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index 9ff093628312..57e9beac34b6 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -1,4 +1,3 @@ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c index 067feed13e92..523ec4d05db9 100644 --- a/sys/dev/usb/input/ums.c +++ b/sys/dev/usb/input/ums.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c index 0832d657e521..a4f613ef203c 100644 --- a/sys/dev/usb/input/usbhid.c +++ b/sys/dev/usb/input/usbhid.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * HID spec: https://www.usb.org/sites/default/files/documents/hid1_11.pdf */ diff --git a/sys/dev/usb/input/wmt.c b/sys/dev/usb/input/wmt.c index 23692e77a0fa..03e4da35a9fe 100644 --- a/sys/dev/usb/input/wmt.c +++ b/sys/dev/usb/input/wmt.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * MS Windows 7/8/10 compatible USB HID Multi-touch Device driver. * https://msdn.microsoft.com/en-us/library/windows/hardware/jj151569(v=vs.85).aspx diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index f1931c9e03c0..018640d70ddc 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_evdev.h" #include diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c index 68caf368b683..2990ede9f491 100644 --- a/sys/dev/usb/misc/udbp.c +++ b/sys/dev/usb/misc/udbp.c @@ -30,7 +30,6 @@ * */ -#include /* Driver for arbitrary double bulk pipe devices. * The driver assumes that there will be the same driver on the other side. * diff --git a/sys/dev/usb/misc/ugold.c b/sys/dev/usb/misc/ugold.c index d322348ee333..1b5f54bc679b 100644 --- a/sys/dev/usb/misc/ugold.c +++ b/sys/dev/usb/misc/ugold.c @@ -19,7 +19,6 @@ /* Driver for Microdia's HID based TEMPer Temperature sensor */ -#include #include #include #include diff --git a/sys/dev/usb/misc/uled.c b/sys/dev/usb/misc/uled.c index 6fc325522f20..7608524cddee 100644 --- a/sys/dev/usb/misc/uled.c +++ b/sys/dev/usb/misc/uled.c @@ -25,7 +25,6 @@ * */ -#include #include #include #include diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c index 3bd6dd50f7b7..84268c60a780 100644 --- a/sys/dev/usb/net/if_aue.c +++ b/sys/dev/usb/net/if_aue.c @@ -35,7 +35,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. * Datasheet is available from http://www.admtek.com.tw. diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c index ed40a1e415c3..117a3daa170f 100644 --- a/sys/dev/usb/net/if_axe.c +++ b/sys/dev/usb/net/if_axe.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. * Used in the LinkSys USB200M and various other adapters. diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c index cae1d61feb34..cb8f0fafff45 100644 --- a/sys/dev/usb/net/if_axge.c +++ b/sys/dev/usb/net/if_axge.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include /* * ASIX Electronics AX88178A/AX88179/AX88179A USB 2.0/3.0 gigabit ethernet * driver. diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index cbb6ae76ef0c..25697c8ec4c9 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -47,7 +47,6 @@ * http://www.usb.org/developers/devclass_docs/NCM10.zip */ -#include #include #include #include diff --git a/sys/dev/usb/net/if_cdceem.c b/sys/dev/usb/net/if_cdceem.c index 07ce7328a3ca..b4978e5ea394 100644 --- a/sys/dev/usb/net/if_cdceem.c +++ b/sys/dev/usb/net/if_cdceem.c @@ -37,7 +37,6 @@ * https://usb.org/sites/default/files/CDC_EEM10.pdf */ -#include #include #include #include diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c index e7b6d6cbbca4..a65bafee066f 100644 --- a/sys/dev/usb/net/if_cue.c +++ b/sys/dev/usb/net/if_cue.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate * adapters and others. diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c index dfb9463cf024..f70113c53eb4 100644 --- a/sys/dev/usb/net/if_ipheth.c +++ b/sys/dev/usb/net/if_ipheth.c @@ -31,7 +31,6 @@ * the Apple iPhone Ethernet driver. */ -#include #include #include #include diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c index 9398b7ac98ee..55c531e278fb 100644 --- a/sys/dev/usb/net/if_kue.c +++ b/sys/dev/usb/net/if_kue.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. * diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c index b0ad55e726b5..442bfb27d83f 100644 --- a/sys/dev/usb/net/if_mos.c +++ b/sys/dev/usb/net/if_mos.c @@ -80,7 +80,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller * The datasheet is available at the following URL: diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c index dd4a89aa8b05..a39343b2e3c9 100644 --- a/sys/dev/usb/net/if_muge.c +++ b/sys/dev/usb/net/if_muge.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include /* * USB-To-Ethernet adapter driver for Microchip's LAN78XX and related families. * diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c index 1c11e70e63a6..d1b46887cd20 100644 --- a/sys/dev/usb/net/if_rue.c +++ b/sys/dev/usb/net/if_rue.c @@ -58,7 +58,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * RealTek RTL8150 USB to fast ethernet controller driver. * Datasheet is available from diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 58809de4ad3a..0ebbf8482446 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Microchip LAN9xxx devices (https://www.microchip.com/en-us/product/lan9500a) * diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c index 6517a4a0e7b7..1554f0a4cd57 100644 --- a/sys/dev/usb/net/if_udav.c +++ b/sys/dev/usb/net/if_udav.c @@ -44,7 +44,6 @@ * External PHYs */ -#include #include #include #include diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c index 0a7cb3fed953..4b0582442e30 100644 --- a/sys/dev/usb/net/if_urndis.c +++ b/sys/dev/usb/net/if_urndis.c @@ -20,7 +20,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c index 05ed5cc6586a..2b5358ab8d0c 100644 --- a/sys/dev/usb/net/ruephy.c +++ b/sys/dev/usb/net/ruephy.c @@ -27,7 +27,6 @@ * */ -#include /* * driver for RealTek RTL8150 internal PHY */ diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c index 5ff207a17c62..38782d5aef11 100644 --- a/sys/dev/usb/serial/ubsa.c +++ b/sys/dev/usb/serial/ubsa.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c index 91fefceb8240..978639a809be 100644 --- a/sys/dev/usb/serial/ubser.c +++ b/sys/dev/usb/serial/ubser.c @@ -64,7 +64,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * BWCT serial adapter driver */ diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index a61b5a92364c..a886b25c89d7 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -57,7 +57,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Driver for WinChipHead CH341/340, the worst USB-serial chip in the * world. diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c index 664cb7f05263..5ab1810a0d11 100644 --- a/sys/dev/usb/serial/ucycom.c +++ b/sys/dev/usb/serial/ucycom.c @@ -1,4 +1,3 @@ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c index 66002f57e3b9..3fc6a7a609ba 100644 --- a/sys/dev/usb/serial/ufoma.c +++ b/sys/dev/usb/serial/ufoma.c @@ -1,6 +1,5 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ -#include #define UFOMA_HANDSFREE /*- * SPDX-License-Identifier: BSD-2-Clause diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c index 3b0400d9b353..b06dc38432be 100644 --- a/sys/dev/usb/serial/uftdi.c +++ b/sys/dev/usb/serial/uftdi.c @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * NOTE: all function names beginning like "uftdi_cfg_" can only * be called from within the config thread function ! diff --git a/sys/dev/usb/serial/uipaq.c b/sys/dev/usb/serial/uipaq.c index 2b282009a8bb..f24f1e215767 100644 --- a/sys/dev/usb/serial/uipaq.c +++ b/sys/dev/usb/serial/uipaq.c @@ -43,7 +43,6 @@ * Contact isis@cs.umd.edu if you have any questions/comments about this driver */ -#include #include #include #include diff --git a/sys/dev/usb/serial/ulpt.c b/sys/dev/usb/serial/ulpt.c index b1e4232ff2a3..ec25ad737596 100644 --- a/sys/dev/usb/serial/ulpt.c +++ b/sys/dev/usb/serial/ulpt.c @@ -1,4 +1,3 @@ -#include /* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */ /*- diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c index 18135e3bf67d..8b9b7807ac61 100644 --- a/sys/dev/usb/serial/umcs.c +++ b/sys/dev/usb/serial/umcs.c @@ -39,7 +39,6 @@ * quad-port mos7840. * */ -#include #include #include #include diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c index 4329cf293098..bf6c672907e0 100644 --- a/sys/dev/usb/serial/umct.c +++ b/sys/dev/usb/serial/umct.c @@ -1,4 +1,3 @@ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index 08d3be554915..59aa5b21e85f 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -1,6 +1,5 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index 88278ef5790e..1fd73f1f7665 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -1,6 +1,5 @@ /* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index dfae051ecfd6..e62bfdb8ff1d 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/uslcom.c b/sys/dev/usb/serial/uslcom.c index 1c27788f77ce..26b937d0b200 100644 --- a/sys/dev/usb/serial/uslcom.c +++ b/sys/dev/usb/serial/uslcom.c @@ -1,6 +1,5 @@ /* $OpenBSD: uslcom.c,v 1.17 2007/11/24 10:52:12 jsg Exp $ */ -#include /* * Copyright (c) 2006 Jonathan Gray * diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c index ee34f0ad3f3d..b9add5c1b37b 100644 --- a/sys/dev/usb/serial/uvscom.c +++ b/sys/dev/usb/serial/uvscom.c @@ -1,6 +1,5 @@ /* $NetBSD: usb/uvscom.c,v 1.1 2002/03/19 15:08:42 augustss Exp $ */ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index e0daada72bdb..c886531ccbc8 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -1,4 +1,3 @@ -#include /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/storage/urio.c b/sys/dev/usb/storage/urio.c index e733ae4dfcba..c13aab44e435 100644 --- a/sys/dev/usb/storage/urio.c +++ b/sys/dev/usb/storage/urio.c @@ -30,7 +30,6 @@ * its contributors. */ -#include /* * 2000/3/24 added NetBSD/OpenBSD support (from Alex Nemirovsky) * 2000/3/07 use two bulk-pipe handles for read and write (Dirk) diff --git a/sys/dev/usb/template/usb_template_multi.c b/sys/dev/usb/template/usb_template_multi.c index 2533459be799..be36e5ea70df 100644 --- a/sys/dev/usb/template/usb_template_multi.c +++ b/sys/dev/usb/template/usb_template_multi.c @@ -37,7 +37,6 @@ * USB template for CDC ACM (serial), CDC ECM (network), and CDC MSC (storage). */ -#include #ifdef USB_GLOBAL_INCLUDE_FILE #include USB_GLOBAL_INCLUDE_FILE #else diff --git a/sys/dev/usb/template/usb_template_serialnet.c b/sys/dev/usb/template/usb_template_serialnet.c index adcc561ccd21..6ee43f7f1f28 100644 --- a/sys/dev/usb/template/usb_template_serialnet.c +++ b/sys/dev/usb/template/usb_template_serialnet.c @@ -37,7 +37,6 @@ * This file contains the USB template for USB Networking and Serial */ -#include #ifdef USB_GLOBAL_INCLUDE_FILE #include USB_GLOBAL_INCLUDE_FILE #else diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index e000d1fb5992..311cf22b585d 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -15,7 +15,6 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include /* * Driver for Realtek RTL8188SU/RTL8191SU/RTL8192SU. * diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index 2720f2ffedcb..21646372d3db 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -18,7 +18,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include /*- * Ralink Technology RT2501USB/RT2601USB chipset driver * http://www.ralinktech.com.tw/ diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index e2ea78f78b13..78c4f73154c3 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -17,7 +17,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include /*- * Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver. * http://www.ralinktech.com/ diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 26a1b2c74baf..f0514419c06e 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -50,7 +50,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include /*- * Driver for Atheros AR5523 USB parts. * diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index 1acae6d84b53..39b711605db1 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -19,7 +19,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include /*- * Ralink Technology RT2500USB chipset driver * http://www.ralinktech.com/ diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index d08a3237e9b2..0d30515719f8 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -14,7 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include "opt_wlan.h" #include diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index a4dc6b972c96..2d75b5a5542c 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -18,7 +18,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include /* * ZyDAS ZD1211/ZD1211B USB WLAN driver. */ From nobody Tue Mar 11 17:59:24 2025 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 4ZC1jm6qhXz5qsND; Tue, 11 Mar 2025 17:59:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZC1jm61Lhz3vhs; Tue, 11 Mar 2025 17:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741715964; 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=KptxMCpFMjlV51hINk9VMY5+E0MVom7Z3cNtIwWk3ls=; b=DEWzrb/+MYDkayGQxexfXPkmiNToilwFcREhAXyKYXAp/W4NyaOpI8qx6PhyAhtGKo7jlj /2NaS+7Nd35ra5bWjgrMgpt21eD3wnL5JrXte03S3up9lilBm90YNh1XrlxjMbXoV6bLDs 5anLQ7P4dJUqYScAHPMDTKl0Vww3va1ZncjOTacREDbIPZHZ0WHyvivJG99slFnEb0LwZ2 cXvg/N0SNqka+6JZejBjvVpo/LWkxVElCA3o4nzx55IJ5iANpPJMRQ7nz/1JciTVAQfB1y ODXUOlpFSwPoaP+gIg2uKriadT3Lh+/hmcZg5w6DbXj99isNYEZKtOMiNBInWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741715964; a=rsa-sha256; cv=none; b=ee3m0a3g+XEfMxVSc5NlsIzGLjya3dlT4BBWegDUKQiOByVfVJhkzsRkHJCjURRfI98Jkq 15e3Z494eOt8TKOU3M3anhM8R0bEmF+tw1wdsbx2OEveQtU8wWQiiGRbtl5KTbnNEKGVph 5Tkt+fzeImXjWBQMyoVeXh+jLP8JLcklk8Da1EN5rUuKFNBAj6xiAn2E8VaHDkEcAKBgZ5 CGO2+oGz4Pu3ck+v3zmpyEKv6POu3sx4eNkxzG6RUfN2vjPOskcOMu80EAXZ1ray2CeIJI cqYl7n23sn8wJsq3WLaT5s1ohBIQpj0Q26Pu6kN3Ria+aOTrCKpabGr5MvdUcw== 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=1741715964; 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=KptxMCpFMjlV51hINk9VMY5+E0MVom7Z3cNtIwWk3ls=; b=wVK9zMLU/5dTrsd3I4wh/BquSR3n8Z2fMgDD8xDuQM23wqHWimK4bgl//O0YHvRqzhxAxB Tg0kLLwUSHuqSWUIRtiEovK+XaXUuSfGxGAvb6wU4fbTTUQP5rhEPv6UQYoD37YY2ZgGZs Gvpdh9YVzm/pM/JZvZKs9nX+P9AOU+wJbQB0JCwW7H0BuwVmicKvFhDmWsF2RsGeuBDGPK xBh/maRrSe7QceYu5nPlneCjhAVF0w4hxpqYMPoX6EJfKCUCIw+OT0cP6Z0rslVsCOAQCl sBCtjBLg5AeBDCXyivkR7TkUoPgbu5Tjhj1nJRIOpQMsRkXFrzD2avxpJhVlAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZC1jm52Nbzchl; Tue, 11 Mar 2025 17:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52BHxOOV061217; Tue, 11 Mar 2025 17:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BHxOwf061214; Tue, 11 Mar 2025 17:59:24 GMT (envelope-from git) Date: Tue, 11 Mar 2025 17:59:24 GMT Message-Id: <202503111759.52BHxOwf061214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 94f414086075 - stable/14 - Revert "ntpd: Use the ntpd -u option in preference to the rc su plumbing" 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 94f41408607515afc2857a283a499d979240c71d Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=94f41408607515afc2857a283a499d979240c71d commit 94f41408607515afc2857a283a499d979240c71d Author: Cy Schubert AuthorDate: 2025-03-11 17:51:11 +0000 Commit: Cy Schubert CommitDate: 2025-03-11 17:59:10 +0000 Revert "ntpd: Use the ntpd -u option in preference to the rc su plumbing" Using the ntpd -u option to set the credentials ntpd is to run under while still using rc(8) to invoke causes some FreeBSD installs to fail to load mac_ntp. The fact that that can_run_nonroot() does not indicate why failures occur leaves people on the mailing lists guessing as to why there are failures. Let's revert back to using the rc(8) provided su. The ntpd rc script will be rewritten when the ntpd chroot will be implemented. Reported on: freebsd-stable@ This reverts commit 521f66715afb312b356afafc68cbc044a436a753. (cherry picked from commit 5ca7754519e8c618968d8acbf54d653b6e968829) --- libexec/rc/rc.d/ntpd | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libexec/rc/rc.d/ntpd b/libexec/rc/rc.d/ntpd index 36df4ae08c96..76d83149ae1a 100755 --- a/libexec/rc/rc.d/ntpd +++ b/libexec/rc/rc.d/ntpd @@ -98,6 +98,7 @@ ntpd_precmd() # by the admin, we don't add the option. If the file exists in the old # default location we use that, else we use the new default location. if can_run_nonroot; then + _user="ntpd" driftopt="-f ${_ntp_default_driftfile}" elif grep -q "^[ \t]*driftfile" "${ntpd_config}" || [ -n "${rc_flags}" ] && @@ -111,13 +112,7 @@ ntpd_precmd() fi # Set command_args based on the various config vars. - command_args="-p ${pidfile} -c ${ntpd_config} ${driftopt} -u ${ntpd_user:=ntpd:ntpd}" - - # Unset ntpd_user because rc.subr uses $${name}_user to determine - # whether to invoke su(1) to setuid() to $ntpd_user for us. We want - # ntpd to do the setuid() itself through the -u argument, above. - unset ntpd_user - + command_args="-p ${pidfile} -c ${ntpd_config} ${driftopt}" if checkyesno ntpd_sync_on_start; then command_args="${command_args} -g" fi From nobody Tue Mar 11 17:59:43 2025 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 4ZC1k75g53z5qsQ0; Tue, 11 Mar 2025 17:59:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZC1k752Jmz3vxv; Tue, 11 Mar 2025 17:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741715983; 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=5903Z+jRL5xIiV6oIcYmoGN/QytfTCF7vraha8B++Ls=; b=P9hxJj33QKcTAF7zJN6/Aq+UXgpRZ6G/sKF7OmyTO1hVP84wNk1yM6OwNpyEBb+eZ413Y5 wjDknAQ4v45+ScayDCiaxX4UHek6/JHamwP5VmJobpFVgWVuHCwEx/fTzO0Ems8lZ7TyQr plmEjtBB4lPjFd+oWHhnrShGuCV0JJ6tjaaxUaIXnJovr6XPsUgaERUvrMs+UckpiFhPdj Y/EqyDjqmVDhqWSiuFxaNDat0ix87dR5pxEUR+S9hivwva2aD7g9YsNFg821TZCCZS0pcn cAunwZqK/QgD1xsTAbpqbBDZRqyv2Vr85XKRc1HAKGYaCR9kSuf2WcWdWaWtSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741715983; a=rsa-sha256; cv=none; b=QIs7G5QgaNESeKOm7N+acJrBdSPW54oq7UQZG8/sm/bOd5dvTqLSgxcyd3mCoKF/IW/WEL j1J1XLZoWDPbDbViv4sl2zJ3eg6HcUh44bLW4CC+9zRQsCHnwvDwaPTu+DMBHXl13uoIP4 gZXFgZu1e6kh1NSp/JNeCun3LOVUnjd3YUxnjvtZTV9rVdsZHqmOeSsusG0SWVCcned0zh Vypvk/nLuReQJ38XCFzaQwYMWLGuTxQP2USGsRGTtWY0AShRF/ahOh/BH4afRHN0BoKAmC ySHdZpxyAWoS8bLKx6mhYvdvXq8Wr8+r2HdfUKZdb4GAhwBvQzFM4g71VSU32g== 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=1741715983; 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=5903Z+jRL5xIiV6oIcYmoGN/QytfTCF7vraha8B++Ls=; b=m6MiTZ6yMprCrixqKsqHZb1TSnyt6zadipHMWxjNzCYRJkJX1g0KKGVYi4pcMP4rvclEvN I2jlWJPhNWDj7xnuTz23jaHSJScYISbSnOaRCcRpE8KYqCNqXOh2ZsSjY7NyJ2tr0Sx45y HX8Z4Z/wbHJwaa/pyGOIfiAEdgquWEzsCdiMUkHD36LcFIvwTJRf8Rxma4RoFX8exYbuxc IEyh6SqK3qNGlInPfKeadvKvvX34VCXLa1dknwFy3gmJfDVEQHpJA7Gcbvbpdt1sah5mi+ EMLERMKjtMvShbOse5cOm+J1ntK5i2CADCUBv3nBiOkTzFU6gzcQ+T6DH9Ax6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZC1k74B8wzchm; Tue, 11 Mar 2025 17:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52BHxhOD061431; Tue, 11 Mar 2025 17:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BHxh52061428; Tue, 11 Mar 2025 17:59:43 GMT (envelope-from git) Date: Tue, 11 Mar 2025 17:59:43 GMT Message-Id: <202503111759.52BHxh52061428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 067cf605f884 - stable/13 - Revert "ntpd: Use the ntpd -u option in preference to the rc su plumbing" 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 067cf605f884d888fd269ca269d9dda3b66a8787 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=067cf605f884d888fd269ca269d9dda3b66a8787 commit 067cf605f884d888fd269ca269d9dda3b66a8787 Author: Cy Schubert AuthorDate: 2025-03-11 17:51:11 +0000 Commit: Cy Schubert CommitDate: 2025-03-11 17:59:36 +0000 Revert "ntpd: Use the ntpd -u option in preference to the rc su plumbing" Using the ntpd -u option to set the credentials ntpd is to run under while still using rc(8) to invoke causes some FreeBSD installs to fail to load mac_ntp. The fact that that can_run_nonroot() does not indicate why failures occur leaves people on the mailing lists guessing as to why there are failures. Let's revert back to using the rc(8) provided su. The ntpd rc script will be rewritten when the ntpd chroot will be implemented. Reported on: freebsd-stable@ This reverts commit 521f66715afb312b356afafc68cbc044a436a753. (cherry picked from commit 5ca7754519e8c618968d8acbf54d653b6e968829) --- libexec/rc/rc.d/ntpd | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libexec/rc/rc.d/ntpd b/libexec/rc/rc.d/ntpd index 36df4ae08c96..76d83149ae1a 100755 --- a/libexec/rc/rc.d/ntpd +++ b/libexec/rc/rc.d/ntpd @@ -98,6 +98,7 @@ ntpd_precmd() # by the admin, we don't add the option. If the file exists in the old # default location we use that, else we use the new default location. if can_run_nonroot; then + _user="ntpd" driftopt="-f ${_ntp_default_driftfile}" elif grep -q "^[ \t]*driftfile" "${ntpd_config}" || [ -n "${rc_flags}" ] && @@ -111,13 +112,7 @@ ntpd_precmd() fi # Set command_args based on the various config vars. - command_args="-p ${pidfile} -c ${ntpd_config} ${driftopt} -u ${ntpd_user:=ntpd:ntpd}" - - # Unset ntpd_user because rc.subr uses $${name}_user to determine - # whether to invoke su(1) to setuid() to $ntpd_user for us. We want - # ntpd to do the setuid() itself through the -u argument, above. - unset ntpd_user - + command_args="-p ${pidfile} -c ${ntpd_config} ${driftopt}" if checkyesno ntpd_sync_on_start; then command_args="${command_args} -g" fi From nobody Wed Mar 12 00:25:23 2025 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 4ZCBH83L5xz5rGN5; Wed, 12 Mar 2025 00:25:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCBH80t3Vz3Zkp; Wed, 12 Mar 2025 00:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741739124; 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=KygFKI7GHZBa+KXfJScE1Wrzq1YeUgPH1E+z+WbH5Og=; b=olhpvwuSk5phzBOCP9SZrWfy+a80GZ+AkhN2PtiPZtfO3zit3zmE2iwd0lVQ96R0xECBDD XAU/skRUqkSnWhp2vDUPHfa0PYVCmqpmPlUeuX3tD4KVRqsONL67+srTPvJ7MFBCBnZlmE bxxCiXwHKZ7VsQP8qw+cp1itMHmYl2HiILyqZH3dR0wLfiAiX0dqc4fFhbTMw+sskApvSI 9/PyfGxmxDxS0b6FxX6pC4mIJuGEsfLZiVDm2Az56/2UB1a0QJKzfKk5cnUOniS+DZ6RaG XWJ3H6THZ53uWZNcbwo/ASiDuhGD/bW3DnoAwV6DWGJOK3gqsoRQ+20JCHRUfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741739124; a=rsa-sha256; cv=none; b=VPh0J7o+0e14gdlrB25qQiLBcb/3nj1EXxnHjlSae0mce6BQKuM4E5ax/bCsx7eSqXBWBW jKklOvjAtlaiWsQJerDNKswDpKZVVDiuzoxOaykth7QZiR8f/5ZGt7PFjWLfjjTq/xkOb4 m384Y8BWf1yHET9GXsyZaXianZ7w+6JryVqpsEV3oB48Qd5Zj6qJLh3JC3W+KwA8k7B9As BRy935d5TUsGsSleZCSRpbuDcln0joebik/2LZUQQcvejPhUp0SnTn90GOk645S8in7b2m 1IxTqY4NOq+S9kzlDfsE23tUdkctD1Ew5bZJLw0dJAJlBDxZkr9GuH0tQoNgSg== 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=1741739124; 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=KygFKI7GHZBa+KXfJScE1Wrzq1YeUgPH1E+z+WbH5Og=; b=KV+sniVGGFAU/uqSaVP26Fp6KePxZOBowB3kNAWqKRjKSmQ4Z14EZE8dz82A8Z/Q54xX6/ cQtAXEQ57dKWHFruzEKqC6UFOtaj+xFPBJ6pRbnwXHGpF0vt2kBm8j76PZxWuKpD20HrB7 92fHW5YueX7PJnmaTDsC+9CFbyILK7F9ZwAQc9hifu75qg6JOtneJOcvM0AYkDI1/PCQMq EZnx0g/42X0vJi8BFsqjUHGKkHNoQEYuu/xJFjjhRNbwHWrgC/uej87SwRiqAzMRMhZJVz T1gQpCIh446khf5zfyS9sbwOhYgMAjjsMzdIiHBn6Gw8Ex/5THjfJ5Ghgt+2QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZCBH802DmzpZ0; Wed, 12 Mar 2025 00:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C0PNNU089845; Wed, 12 Mar 2025 00:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C0PNWX089842; Wed, 12 Mar 2025 00:25:23 GMT (envelope-from git) Date: Wed, 12 Mar 2025 00:25:23 GMT Message-Id: <202503120025.52C0PNWX089842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f9857ea43a38 - stable/14 - bhyve: fix CPUID L3 Cache Size reporting for AMD/SVM 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9857ea43a38b74e34ce7f6576ad4e6415413454 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f9857ea43a38b74e34ce7f6576ad4e6415413454 commit f9857ea43a38b74e34ce7f6576ad4e6415413454 Author: Konstantin Belousov AuthorDate: 2024-12-17 21:09:33 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-12 00:25:02 +0000 bhyve: fix CPUID L3 Cache Size reporting for AMD/SVM PR: 279901 (cherry picked from commit 0698ce429f78f548f7eb3e54476fb312109ddd8b) --- sys/amd64/vmm/x86.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index 7d11346ac842..744e2bfd57db 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -152,8 +152,6 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, * pkg_id_shift and other OSes may rely on it. */ width = MIN(0xF, log2(threads * cores)); - if (width < 0x4) - width = 0; logical_cpus = MIN(0xFF, threads * cores - 1); regs[2] = (width << AMDID_COREID_SIZE_SHIFT) | logical_cpus; } @@ -258,7 +256,7 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, func = 3; /* unified cache */ break; default: - logical_cpus = 0; + logical_cpus = sockets * threads * cores; level = 0; func = 0; break; @@ -268,7 +266,14 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, regs[0] = (logical_cpus << 14) | (1 << 8) | (level << 5) | func; regs[1] = (func > 0) ? (CACHE_LINE_SIZE - 1) : 0; + + /* + * ecx: Number of cache ways for non-fully + * associative cache, minus 1. Reported value + * of zero means there is one way. + */ regs[2] = 0; + regs[3] = 0; break; From nobody Wed Mar 12 03:45:19 2025 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 4ZCGjq3mjHz5qFdn; Wed, 12 Mar 2025 03:45:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCGjq2lJxz4198; Wed, 12 Mar 2025 03:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741751119; 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=aCb2T3bCgb+nfByMbraDPS9gH6ezOJSN4ZAPuSQ5h3g=; b=kLek8uLaxg5HVJY3Th0R6e9liGxCnc1Y7myhj72ZSjCBygDlKp1aqX3ycp3EuKcOul/v7z z+RaIsINRKKD4X7/U5GKOyMz11AB67ncUpH207KwBUocPqJS/CT3BmkSmZF2Fzeg2MnM2I tqYc1TlYbELnHCrJ+cvVysX6wUjiwaNrN8IJOcrbUVxlJZ2/B6qP5QOKWx6K6Kix52XChP 89sva7f9LStKWQg4SSrgzSHByy93stfVwtzhco560AqwiRKhtOafOY2YRhuXHKd6H02HxK YcPBqdGO4DMLY7nWsJVO9p9tMS0bLMnRhQ0ntJp0iHi1Eg+WZG5om2cyfjiXzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741751119; a=rsa-sha256; cv=none; b=wpnyzy30hdcIamsKEichjaKkL/W3RgZrFEiU8JZ5Lq8b2qvmcMkkcI0e5+E4W1xzoSrB7M Qqu8/ZoMfbX7WQT5jZpMB8kwycX9UnrmUVxbIqmyTqGc3syys93eDoi4e+5J2lnY3ja8A6 Od9l6DMDFj+bTrx/R8wBawjOVpFVnyWNN9H28iGVoxAu8ybHpRJb2bvO5HnQZz8AZpDvgp eagNsZoxxTmcGoJohc14CxirUzTj5jk6DmD6151v0csOn+/PyPNGRqWO/2mWh3B76o8x4j G095dnHTNgdX7Zx7Ku+wnb7P0w3dU99wDaSz/NpQQgVaqCtaXRx/qE1CaK1MXw== 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=1741751119; 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=aCb2T3bCgb+nfByMbraDPS9gH6ezOJSN4ZAPuSQ5h3g=; b=OpxvU3cu/b3n5ajVpknj5/73N5zQFgxCyUUNOuesWLnHjL8CuTa+mv5yvYkjxVNQKi23Li 1VKNyBLISasYEuUjUjr/yZm8Ui7rHz+Q09w+RDpulXetdk6BbH1yz5cZBME8de+fuTBhvN 94Ho2p4yd6RJJV2gobSMXZEWgSI08K92GCBgrXQtJNdTRUn/K5v3D2cY9dTlt4YJ9k2xZ0 3vcztRgZidq0E4AVKx6bziM/42h6sgF5GUMrfR6ZikSKhIeU4jJ+ObtMeZLd7EG8fRK4bO 85X0WFtN0hZE5ocCUq1mFKzaPFMgrBNeaiP59VSlGL5h85/oWmepOJdkUa8jPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZCGjq2HXjzw48; Wed, 12 Mar 2025 03:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C3jJws063934; Wed, 12 Mar 2025 03:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C3jJfJ063931; Wed, 12 Mar 2025 03:45:19 GMT (envelope-from git) Date: Wed, 12 Mar 2025 03:45:19 GMT Message-Id: <202503120345.52C3jJfJ063931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 568a1a1d15e0 - stable/14 - wg.4: Document kernel config option 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 568a1a1d15e0a8451cf914c84eda81259bef3e06 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=568a1a1d15e0a8451cf914c84eda81259bef3e06 commit 568a1a1d15e0a8451cf914c84eda81259bef3e06 Author: Lexi Winter AuthorDate: 2025-02-12 12:18:15 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-12 03:44:24 +0000 wg.4: Document kernel config option wg(4) can be compiled into the kernel (device wg), but the wg.4 manpage does not document this. Adjust it to mention this like other drivers do. MFC after: 3 days Reviewed by: carlavilla, kevans, ziaee Approved by: carlavilla (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1597 (cherry picked from commit 780a4667bbde0daa90db900bb0f93f6337d6208b) --- share/man/man4/wg.4 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/share/man/man4/wg.4 b/share/man/man4/wg.4 index 05d6961a9610..482200f3bd51 100644 --- a/share/man/man4/wg.4 +++ b/share/man/man4/wg.4 @@ -23,14 +23,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 12, 2023 +.Dd February 12, 2025 .Dt WG 4 .Os .Sh NAME .Nm wg .Nd "WireGuard protocol driver" .Sh SYNOPSIS -To load the driver as a module at boot time, place the following line in +To compile this driver into the kernel, +place the following lines in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "device wg" +.Ed +.Pp +Alternatively, to load the driver as a module at boot time, +place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_wg_load="YES" From nobody Wed Mar 12 04:15:50 2025 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 4ZCHP335kTz5qHbW; Wed, 12 Mar 2025 04:15:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCHP30b0dz46mL; Wed, 12 Mar 2025 04:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741752951; 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=hoLTurOjlPIx/ir3sWq9WZX1PUwWv1OoZaFXEJbi2qk=; b=ugBXG4+aSJ0/kvgKul7/06vfdfiiivbd4YeiFAyafojzn6n9A4hF8Vj4g37qcZTH9VVZnX HK2pzslQdbjoC9Poc3gAk+slZHyZFv6UR9LACJzjFBW0iAFvgj13mBUzsw3QcfHcwBCa0P oyjgW48OW2BWebhQfp0DTMFNYO6G7+8gL5Io2gLwrfBF6MyOIzA3DQfyRA+bQT57N6ncM7 tc/5VVw7Gz4fwzffr8PqFnYXFw10n8Xj3oYnYY34foDm55X4NBn5Tg9jZXWN4VEXxShrjh eeWRjAC3rrwTUV9htl3Vw2T0Ah66BTQGEJ13NCbL+x3/XPcBMi8htyRNtoFqPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741752951; a=rsa-sha256; cv=none; b=C+E2eA5hY3nU80Nuzv0jcFzicytzNz3wDT9MRlCXe1gCLkv5aRYJJAjpWLaF6KH0oI0O91 VSZYynM0dwkKToZlY6csyUrX3CUcwLXm3yTSUbH5lwMXeDHMudeosEXD5rC4eawkUfG0+m lGoAFJL8/K+nyyqiZV9vH8AHkTpqQU7YSqVOD5KXK51TYD/M3tgyPWZnj/sX3cR4egLI6B FTjdm48HrEXl1kBPHDQH07BOQ4g9vGnTbPhEPZYaY/Q8w5f3t6gd+NPw2YtIs3m514SkCe 3XoWcskY0pZ8Cb7+w4L1l4eqodYW51DtvLJIxjAt8EWpi5QxMTJfhG7y2CPFXQ== 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=1741752951; 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=hoLTurOjlPIx/ir3sWq9WZX1PUwWv1OoZaFXEJbi2qk=; b=Rrk8L8zWYArUPFXvDKEEwHCmOfXJMcaIoy6gNQs+QXLGM2+t7PIxVbaO4EXEk1uc1aYEw0 km6ySSCH0vhr6B8GWXMkltWAmh79fj5ao6mUIzlbARUXJofJC/x6aRGrT5rPPLXOA0QxXR UTowncfENs/Uq6+pMYHrQc/RN73Otk5+Zg82fN4PMQlrzKNxPgpjs4bzei/oeBXGxXnXWu nGGIM8GQUpeOt2ympTysMmySj15hBhvSAccWwLqXI4u+U5TH9VeS6iocliW+WedAKjLk33 cEcqYj/T17usv2VfmMrtyB63ISMJ3RCKM7z/ixJe7zeZIQPE7viFPIsjF+bhuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZCHP271QNzwp4; Wed, 12 Mar 2025 04:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C4FoUG020760; Wed, 12 Mar 2025 04:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C4FoBH020757; Wed, 12 Mar 2025 04:15:50 GMT (envelope-from git) Date: Wed, 12 Mar 2025 04:15:50 GMT Message-Id: <202503120415.52C4FoBH020757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 454938d04bca - stable/14 - loader.conf: Document boot_verbose 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 454938d04bca53c1afa8315225db674b28b7d99e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=454938d04bca53c1afa8315225db674b28b7d99e commit 454938d04bca53c1afa8315225db674b28b7d99e Author: Warner Losh AuthorDate: 2025-02-09 18:23:35 +0000 Commit: Warner Losh CommitDate: 2025-03-12 04:14:42 +0000 loader.conf: Document boot_verbose And for the moment, point people to loader.efi(8) for all boot_* variables. Sponsored by: Netflix MFC After: 1 week (cherry picked from commit 36f1db7a37aed8e831ec385a542ef3377890bfce) --- stand/defaults/loader.conf.5 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index e38ad865c288..d5c5305fac5f 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd February 2, 2024 +.Dd February 9, 2025 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -116,6 +116,13 @@ option in this manner, .Va beastie_disable must be set to .Dq Li YES . +.It Ar boot_* +See list in +.Xr loader.efi 8 +since those flags apply to all boot loaders. +.It Ar boot_verbose +Set to "yes" to get the same effect as boot -v or booting verbose from the +loader menu. .It Ar exec Immediately executes a .Xr loader 8 From nobody Wed Mar 12 08:39:11 2025 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 4ZCPDv5bfDz5qc31; Wed, 12 Mar 2025 08:39:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCPDv4vcmz3wdm; Wed, 12 Mar 2025 08:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741768751; 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=yEmTfuP90IC3g3vdmJciiSvwcVdA+uR1wHHKD8yWPEI=; b=j909hJJpsRP8k3Tzh4Xxm5qPuWtO3775MMI3BWUGiaeM09y+PScF4EZQlRyzGM7+kp3/wn E7bjB7D+DtXCxcW1FJcjoGNZqKW5NPK0Nfs+PD196z3Gw4DgDV1bBbsDRR6bzrvy+j/icV a3wM6JOfPESELmPtiC/DCvA80bu08o8eB5O+B2nW3u1PKB2CHMpM2k03rvnZw1NaziHMUA 7I3pmyrxrUvoq79NewFHs5KS2mNVJftILQGPqj/FTekpNdWszVqlTxInKsJYlx4ShX8XN6 IhXiTnKJyB+ZS6F4mDYw4KhhHgWD52iJP61ji2nmnj62p4iLoslj/XNGqicdIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741768751; a=rsa-sha256; cv=none; b=lTSsmQbFyzgyHmIjLgqMneFZ+KxD8MiAoA9bm2QX0Icwplv4Qd8OtsCCjxdSVdC1Remutm NFVBFBtgBs6raOzhwgyYLuYhZrXiHjhWnK0SJcB7NSZ+Ys5jPww9BnhN7seAkc6M3TqWdg LcXZrqbCi6lcpvbe6iutRo6HBwi5X4MkbBN97REtOrql91RroXg/SRN86ysINQPwpW3JA4 bKOglC1uYPeN9etQfKckRpnDGCvrx/+6rxJBTGGbdlTPNSTp4yi1rA5i9BJyof/zKiZ052 52oxf0xccUdOGR69bEHkoo0iMfVC+OH4AClXK3+eHayRnGow6vb6Oxo2D5nlMA== 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=1741768751; 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=yEmTfuP90IC3g3vdmJciiSvwcVdA+uR1wHHKD8yWPEI=; b=LpXFMphCDfsZqn9j2rDpin/gbdTTDv8B86E3FbOHPJbJJVBNkI0b9Pdv08V+qHba8kwTUP vsS2pBSdfEc0omjhV89niQo70KrtrBkdwY2M1Nc23otCfKEzyoxXT/ObCYsCzja6QQT4BW HRwT2IFoCjMCPRkqcEUWVQ7NneYVyTe5kew3JtUNelJBOed+xEL7eOXM7m32lPtLxC3WXR EuP9MtMh/t69Kolgl61miJtjBC7pjiaqOB/nD6/pejuWgg9408b0FnJUCJA1fDGB7WX0yw eUHEvZkGkLMcz3wh0rdatrUVYxJgz1prtfDjXHNfHJMJXbhyuEoik4EljRPAPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZCPDv4TjJz14P4; Wed, 12 Mar 2025 08:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C8dBkG006931; Wed, 12 Mar 2025 08:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C8dBLH006928; Wed, 12 Mar 2025 08:39:11 GMT (envelope-from git) Date: Wed, 12 Mar 2025 08:39:11 GMT Message-Id: <202503120839.52C8dBLH006928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: ec0c098369c8 - stable/14 - Hyper-V: hn: rewrite hn rsc swtich to avoid sysctl hang 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec0c098369c8fb1acbe0b0566769dd8b98d75753 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=ec0c098369c8fb1acbe0b0566769dd8b98d75753 commit ec0c098369c8fb1acbe0b0566769dd8b98d75753 Author: Wei Hu AuthorDate: 2025-02-04 13:39:14 +0000 Commit: Wei Hu CommitDate: 2025-03-12 08:18:01 +0000 Hyper-V: hn: rewrite hn rsc swtich to avoid sysctl hang Changing the rsc_switch flag using sysctl to turn rsc on or off could hang. The orignal code sends request to host to get the mtu setting. Sometimes the host fails to reply, causing the thread to sleep forever waiting for the host response. Use existing cached mtu from hn device instead to avoid calling host. Reported by: whu Tested by: whu MFC after: 1 week (cherry picked from commit da1deb784d9ad3a4015a3f91fa1a5ce394fd3fdb) --- sys/dev/hyperv/netvsc/if_hn.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 9f51f5b32199..db5ebdfd65bc 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -2355,7 +2355,7 @@ hn_attach(device_t dev) } SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rsc_switch", - CTLTYPE_UINT | CTLFLAG_RW, sc, 0, hn_rsc_sysctl, "A", + CTLTYPE_UINT | CTLFLAG_RW, sc, 0, hn_rsc_sysctl, "I", "switch to rsc"); /* @@ -4523,24 +4523,22 @@ static int hn_rsc_sysctl(SYSCTL_HANDLER_ARGS) { struct hn_softc *sc = arg1; - uint32_t mtu; + int rsc_ctrl, mtu; int error; - HN_LOCK(sc); - error = hn_rndis_get_mtu(sc, &mtu); - if (error) { - if_printf(sc->hn_ifp, "failed to get mtu\n"); - goto back; - } - error = SYSCTL_OUT(req, &(sc->hn_rsc_ctrl), sizeof(sc->hn_rsc_ctrl)); + + rsc_ctrl = sc->hn_rsc_ctrl; + error = sysctl_handle_int(oidp, &rsc_ctrl, 0, req); if (error || req->newptr == NULL) - goto back; + return (error); + + if (sc->hn_rsc_ctrl != rsc_ctrl) { + HN_LOCK(sc); + sc->hn_rsc_ctrl = rsc_ctrl; + mtu = if_getmtu(sc->hn_ifp); + error = hn_rndis_reconf_offload(sc, mtu); + HN_UNLOCK(sc); + } - error = SYSCTL_IN(req, &(sc->hn_rsc_ctrl), sizeof(sc->hn_rsc_ctrl)); - if (error) - goto back; - error = hn_rndis_reconf_offload(sc, mtu); -back: - HN_UNLOCK(sc); return (error); } #ifndef RSS From nobody Wed Mar 12 09:08:34 2025 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 4ZCPtp55zgz5qdl9; Wed, 12 Mar 2025 09:08:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCPtp2p4Yz44Ns; Wed, 12 Mar 2025 09:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741770514; 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=QUzCpqnExHTGiH7+mav584fc72/GiP6UvWRLyR9bmZI=; b=F7L+w31Ul64wIvXGC7vso2XxkQyZrUyHIJn/oXK4SoeoT/uKLCjkFPKayVd4bCg/+cv6RS kENpjwKpdSC15MaPUIoY6XWFzf+p4k0WO5ue/Q1gOyE4oEY9Vm0cKNZHhmyPd1eRg1JezF cpJsAYpsx8FyZAK+UOMoiONx2eo2bZAGju5GrSWXE9ZqZ3JjU8J5OeQzSKpn2Xo05/ge0K KEcg65cR2P4CYSURhMVMknqKgrM0Aw5hlbfuJAuA/VOzI+UaaiyPXLcxip4b9acza5bzvP w7VP7qGy3AbsLsX2pIWRP1UUwYoyP+rzKHXykWSj103aiTJz4gdh4vvl1HDuww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741770514; a=rsa-sha256; cv=none; b=jgILRfsDPZMDVKNZRysIdbt4p6kBJcL/Jm3lkvGhbO5rWgOYDw5Xi7Kkr8R6OBCIp7gHSA 9HQdIOwLgRU4dQbLhl3/tKhGHlebQsqgLM8NHXts+XJ7m5FC7F53UMoFf7NlZM7py6Mmcs yzU/u8Y57w0qGuJkJZ+YIpaWnNd90sKJJcAf+dsX4RAIaETmGmKgFkoQKH88RPVaimm0oK z1VeOaLJOeCpairw4hO6udiwYX1RdWxDwX2Cf3x9/pUlAE2API3fuY/6rU5vFPrsXAgurh raB2KXyZzU+u036ixK6cWilAtF+mXT4U95xtkqtVoGAluXBeab3rwJr5x5+TIg== 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=1741770514; 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=QUzCpqnExHTGiH7+mav584fc72/GiP6UvWRLyR9bmZI=; b=ku3FG/m6HpnxYpEQq56B03hhC9IkNQjtv3PeY07K8DK/m3YP0JMm8ZlXZOKahJQ1CbLDNc ooPSusUSZCkDv9X//eFaU43CSb1LMp9N1dTmSYnZvJzrUCoj/J2nBWTMe9UVadymHsf243 zwV3wXJV5AVbvTaW46q0a1zVEHssT3n/Wl/bKws8hZvPZCg2YWHkKNx9D3I9lLB7REvTQN xRlOix2AlEX7yhtvbhVrbQJh5jn4F83k7G3nlkzNI4dET5Ha/cpLfEaVyf502T0SB9nnrz /TK0NnJrnNKD3/7HTeyu/2D+OH1V8IwxVYhxgcwvd9Y60nTDD9A+pLYrV8GcIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZCPtp2Khcz157q; Wed, 12 Mar 2025 09:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C98YZ7064058; Wed, 12 Mar 2025 09:08:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C98Ygx064055; Wed, 12 Mar 2025 09:08:34 GMT (envelope-from git) Date: Wed, 12 Mar 2025 09:08:34 GMT Message-Id: <202503120908.52C98Ygx064055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: dae67894b405 - stable/14 - mana: Increase default tx and rx ring size to 1024 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dae67894b405dadc6b569607b2c68bcb7a3637e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=dae67894b405dadc6b569607b2c68bcb7a3637e5 commit dae67894b405dadc6b569607b2c68bcb7a3637e5 Author: Wei Hu AuthorDate: 2025-02-24 13:56:06 +0000 Commit: Wei Hu CommitDate: 2025-03-12 08:40:56 +0000 mana: Increase default tx and rx ring size to 1024 Tcp perfomance tests show high number of retries under heave tx traffic. The numbers of queue stops and wakeups also increase. Further analysis suggests the FreeBSD network stack tends to send TSO packets with multiple sg entries, typically ranging from 10 to 16. On mana, every two sgs takes one unit of tx ring. Therefore, adding up one unit for the head, it takes 6 to 9 units of tx ring to send a typical TSO packet. Current default tx ring size is 256, which can get filled up quickly under heavy load. When tx ring is full, the send queue is stopped waiting for the ring space to be freed. This could cause the network stack to drop packets, and lead to tcp retransmissions. Increase the default tx and rx ring size to 1024 units. Also introduce two tuneables allowing users to request tx and rx ring size in loader.conf: hw.mana.rx_req_size hw.mana.tx_req_size When mana is loading, the driver checks these two values and round them up to power of 2. If these two are not set or the request values are out of the allowable range, it sets the default ring size instead. Also change the tx and rx single loop completion budget to 8. Tested by: whu MFC after: 2 weeks Sponsored by: Microsoft (cherry picked from commit a18e99945414fb1f9d455b780c6fcf2d09cc68d8) --- sys/dev/mana/mana.h | 23 +++++++++-- sys/dev/mana/mana_en.c | 96 +++++++++++++++++++++++++++++++++++++++------- sys/dev/mana/mana_sysctl.c | 16 ++++++++ 3 files changed, 119 insertions(+), 16 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index 906b28eb56b6..a805aa047b9d 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -106,9 +106,23 @@ enum TRI_STATE { #define DEFAULT_FRAME_SIZE (ADAPTER_MTU_SIZE + 14) #define MAX_FRAME_SIZE 4096 -#define RX_BUFFERS_PER_QUEUE 512 - -#define MAX_SEND_BUFFERS_PER_QUEUE 256 +/* Unit number of RX buffers. Must be power of two + * Higher number could fail at allocation. + */ +#define MAX_RX_BUFFERS_PER_QUEUE 8192 +#define DEF_RX_BUFFERS_PER_QUEUE 1024 +#define MIN_RX_BUFFERS_PER_QUEUE 128 + +/* Unit number of TX buffers. Must be power of two + * Higher number could fail at allocation. + * The max value is derived as the maximum + * allocatable pages supported on host per guest + * through testing. TX buffer size beyond this + * value is rejected by the hardware. + */ +#define MAX_SEND_BUFFERS_PER_QUEUE 16384 +#define DEF_SEND_BUFFERS_PER_QUEUE 1024 +#define MIN_SEND_BUFFERS_PER_QUEUE 128 #define EQ_SIZE (8 * PAGE_SIZE) #define LOG2_EQ_THROTTLE 3 @@ -507,6 +521,9 @@ struct mana_port_context { unsigned int max_queues; unsigned int num_queues; + unsigned int tx_queue_size; + unsigned int rx_queue_size; + mana_handle_t port_handle; int vport_use_count; diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 90730bcd70fa..4734b34a9f3b 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -67,6 +67,9 @@ static int mana_up(struct mana_port_context *apc); static int mana_down(struct mana_port_context *apc); +extern unsigned int mana_tx_req_size; +extern unsigned int mana_rx_req_size; + static void mana_rss_key_fill(void *k, size_t size) { @@ -492,6 +495,7 @@ mana_xmit(struct mana_txq *txq) if_t ndev = txq->ndev; struct mbuf *mbuf; struct mana_port_context *apc = if_getsoftc(ndev); + unsigned int tx_queue_size = apc->tx_queue_size; struct mana_port_stats *port_stats = &apc->port_stats; struct gdma_dev *gd = apc->ac->gdma_dev; uint64_t packets, bytes; @@ -635,7 +639,7 @@ mana_xmit(struct mana_txq *txq) } next_to_use = - (next_to_use + 1) % MAX_SEND_BUFFERS_PER_QUEUE; + (next_to_use + 1) % tx_queue_size; (void)atomic_inc_return(&txq->pending_sends); @@ -1423,6 +1427,7 @@ mana_poll_tx_cq(struct mana_cq *cq) unsigned int wqe_unit_cnt = 0; struct mana_txq *txq = cq->txq; struct mana_port_context *apc; + unsigned int tx_queue_size; uint16_t next_to_complete; if_t ndev; int comp_read; @@ -1436,6 +1441,7 @@ mana_poll_tx_cq(struct mana_cq *cq) ndev = txq->ndev; apc = if_getsoftc(ndev); + tx_queue_size = apc->tx_queue_size; comp_read = mana_gd_poll_cq(cq->gdma_cq, completions, CQE_POLLING_BUFFER); @@ -1521,7 +1527,7 @@ mana_poll_tx_cq(struct mana_cq *cq) mb(); next_to_complete = - (next_to_complete + 1) % MAX_SEND_BUFFERS_PER_QUEUE; + (next_to_complete + 1) % tx_queue_size; pkt_transmitted++; } @@ -1867,9 +1873,9 @@ mana_cq_handler(void *context, struct gdma_queue *gdma_queue) mana_gd_ring_cq(gdma_queue, arm_bit); } -#define MANA_POLL_BUDGET 8 -#define MANA_RX_BUDGET 256 -#define MANA_TX_BUDGET MAX_SEND_BUFFERS_PER_QUEUE +#define MANA_POLL_BUDGET 256 +#define MANA_RX_BUDGET 8 +#define MANA_TX_BUDGET 8 static void mana_poll(void *arg, int pending) @@ -1976,7 +1982,7 @@ mana_deinit_txq(struct mana_port_context *apc, struct mana_txq *txq) if (txq->tx_buf_info) { /* Free all mbufs which are still in-flight */ - for (i = 0; i < MAX_SEND_BUFFERS_PER_QUEUE; i++) { + for (i = 0; i < apc->tx_queue_size; i++) { txbuf_info = &txq->tx_buf_info[i]; if (txbuf_info->mbuf) { mana_tx_unmap_mbuf(apc, txbuf_info); @@ -2034,15 +2040,19 @@ mana_create_txq(struct mana_port_context *apc, if_t net) M_DEVBUF, M_WAITOK | M_ZERO); /* The minimum size of the WQE is 32 bytes, hence - * MAX_SEND_BUFFERS_PER_QUEUE represents the maximum number of WQEs + * apc->tx_queue_size represents the maximum number of WQEs * the SQ can store. This value is then used to size other queues * to prevent overflow. + * Also note that the txq_size is always going to be page aligned, + * as min val of apc->tx_queue_size is 128 and that would make + * txq_size 128 * 32 = 4096 and the other higher values of + * apc->tx_queue_size are always power of two. */ - txq_size = MAX_SEND_BUFFERS_PER_QUEUE * 32; + txq_size = apc->tx_queue_size * 32; KASSERT(IS_ALIGNED(txq_size, PAGE_SIZE), ("txq size not page aligned")); - cq_size = MAX_SEND_BUFFERS_PER_QUEUE * COMP_ENTRY_SIZE; + cq_size = apc->tx_queue_size * COMP_ENTRY_SIZE; cq_size = ALIGN(cq_size, PAGE_SIZE); gc = gd->gdma_context; @@ -2125,7 +2135,7 @@ mana_create_txq(struct mana_port_context *apc, if_t net) gc->cq_table[cq->gdma_id] = cq->gdma_cq; /* Initialize tx specific data */ - txq->tx_buf_info = malloc(MAX_SEND_BUFFERS_PER_QUEUE * + txq->tx_buf_info = malloc(apc->tx_queue_size * sizeof(struct mana_send_buf_info), M_DEVBUF, M_WAITOK | M_ZERO); @@ -2133,7 +2143,7 @@ mana_create_txq(struct mana_port_context *apc, if_t net) "mana:tx(%d)", i); mtx_init(&txq->txq_mtx, txq->txq_mtx_name, NULL, MTX_DEF); - txq->txq_br = buf_ring_alloc(4 * MAX_SEND_BUFFERS_PER_QUEUE, + txq->txq_br = buf_ring_alloc(4 * apc->tx_queue_size, M_DEVBUF, M_WAITOK, &txq->txq_mtx); /* Allocate taskqueue for deferred send */ @@ -2323,10 +2333,10 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, gc = gd->gdma_context; rxq = malloc(sizeof(*rxq) + - RX_BUFFERS_PER_QUEUE * sizeof(struct mana_recv_buf_oob), + apc->rx_queue_size * sizeof(struct mana_recv_buf_oob), M_DEVBUF, M_WAITOK | M_ZERO); rxq->ndev = ndev; - rxq->num_rx_buf = RX_BUFFERS_PER_QUEUE; + rxq->num_rx_buf = apc->rx_queue_size; rxq->rxq_idx = rxq_idx; /* * Minimum size is MCLBYTES(2048) bytes for a mbuf cluster. @@ -2763,6 +2773,62 @@ mana_detach(if_t ndev) return err; } +static unsigned int +mana_get_tx_queue_size(int port_idx, unsigned int request_size) +{ + unsigned int new_size; + + if (request_size == 0) + /* Uninitialized */ + new_size = DEF_SEND_BUFFERS_PER_QUEUE; + else + new_size = roundup_pow_of_two(request_size); + + if (new_size < MIN_SEND_BUFFERS_PER_QUEUE || + new_size > MAX_SEND_BUFFERS_PER_QUEUE) { + mana_info(NULL, "mana port %d: requested tx buffer " + "size %u out of allowable range (%u - %u), " + "setting to default\n", + port_idx, request_size, + MIN_SEND_BUFFERS_PER_QUEUE, + MAX_SEND_BUFFERS_PER_QUEUE); + new_size = DEF_SEND_BUFFERS_PER_QUEUE; + } + mana_info(NULL, "mana port %d: tx buffer size %u " + "(%u requested)\n", + port_idx, new_size, request_size); + + return (new_size); +} + +static unsigned int +mana_get_rx_queue_size(int port_idx, unsigned int request_size) +{ + unsigned int new_size; + + if (request_size == 0) + /* Uninitialized */ + new_size = DEF_RX_BUFFERS_PER_QUEUE; + else + new_size = roundup_pow_of_two(request_size); + + if (new_size < MIN_RX_BUFFERS_PER_QUEUE || + new_size > MAX_RX_BUFFERS_PER_QUEUE) { + mana_info(NULL, "mana port %d: requested rx buffer " + "size %u out of allowable range (%u - %u), " + "setting to default\n", + port_idx, request_size, + MIN_RX_BUFFERS_PER_QUEUE, + MAX_RX_BUFFERS_PER_QUEUE); + new_size = DEF_RX_BUFFERS_PER_QUEUE; + } + mana_info(NULL, "mana port %d: rx buffer size %u " + "(%u requested)\n", + port_idx, new_size, request_size); + + return (new_size); +} + static int mana_probe_port(struct mana_context *ac, int port_idx, if_t *ndev_storage) @@ -2782,6 +2848,10 @@ mana_probe_port(struct mana_context *ac, int port_idx, apc->max_queues = gc->max_num_queues; apc->num_queues = min_t(unsigned int, gc->max_num_queues, MANA_MAX_NUM_QUEUES); + apc->tx_queue_size = mana_get_tx_queue_size(port_idx, + mana_tx_req_size); + apc->rx_queue_size = mana_get_rx_queue_size(port_idx, + mana_rx_req_size); apc->port_handle = INVALID_MANA_HANDLE; apc->port_idx = port_idx; apc->frame_size = DEFAULT_FRAME_SIZE; diff --git a/sys/dev/mana/mana_sysctl.c b/sys/dev/mana/mana_sysctl.c index 844a05040595..acb3628f09bc 100644 --- a/sys/dev/mana/mana_sysctl.c +++ b/sys/dev/mana/mana_sysctl.c @@ -34,9 +34,17 @@ static int mana_sysctl_cleanup_thread_cpu(SYSCTL_HANDLER_ARGS); int mana_log_level = MANA_ALERT | MANA_WARNING | MANA_INFO; +unsigned int mana_tx_req_size; +unsigned int mana_rx_req_size; + SYSCTL_NODE(_hw, OID_AUTO, mana, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "MANA driver parameters"); +SYSCTL_UINT(_hw_mana, OID_AUTO, tx_req_size, CTLFLAG_RWTUN, + &mana_tx_req_size, 0, "requested number of unit of tx queue"); +SYSCTL_UINT(_hw_mana, OID_AUTO, rx_req_size, CTLFLAG_RWTUN, + &mana_rx_req_size, 0, "requested number of unit of rx queue"); + /* * Logging level for changing verbosity of the output */ @@ -166,6 +174,14 @@ mana_sysctl_add_port(struct mana_port_context *apc) "enable_altq", CTLFLAG_RW, &apc->enable_tx_altq, 0, "Choose alternative txq under heavy load"); + SYSCTL_ADD_UINT(ctx, apc->port_list, OID_AUTO, + "tx_queue_size", CTLFLAG_RD, &apc->tx_queue_size, 0, + "number of unit of tx queue"); + + SYSCTL_ADD_UINT(ctx, apc->port_list, OID_AUTO, + "rx_queue_size", CTLFLAG_RD, &apc->rx_queue_size, 0, + "number of unit of rx queue"); + SYSCTL_ADD_PROC(ctx, apc->port_list, OID_AUTO, "bind_cleanup_thread_cpu", CTLTYPE_U8 | CTLFLAG_RW | CTLFLAG_MPSAFE, From nobody Wed Mar 12 09:19:08 2025 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 4ZCQ710ryNz5qfTK; Wed, 12 Mar 2025 09:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCQ705rpVz47Jv; Wed, 12 Mar 2025 09:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741771148; 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=dM3sP9EVD/yvPhiTddTfriqolA8USnf0H/kXzxghUAw=; b=Wb9JQwNL2bN3Vfoo2zOmJ9I+laUHuQtYJZjtJmnAX1Cvqd3Q1pFXdQyyNZuaHQKU6C1uD8 ptg/aGqsLzgqsunoWTqqqvdP9Wcne33d2LbYEiE+dGfMOO4v0WG975IFYuor1nujY6kvj5 mUSvYvt/vrr0jwoKXssxa6RSqBv+c/sNmvVM7Tk7Lc8R4UIQ3Um4uniT2LS16PRvoYi7oS OtVYYD7N5WhTH0ROAsyeVIKl/KD5uUD7fpuCyegvT6z/0XPM35+cKKg3P+D80uz89dAlPz Ua2A1u6OKYnWuTjglmdeGQumWUWYBXlVs7+T2hSXAkGSCfQvXQPObkDnbbTuJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741771148; a=rsa-sha256; cv=none; b=CsSmpM6Ua1CeSQp0RNUW4IoUjmQmBeiyMrjzC4bK5dnklotU8i1Wf5y4UsYKK+p4243QLR aedFMTChn+AENhe87ZAaHb24l9ByF6OQx5iyj7h/a7rkxOndT94ubCXViCW18Y604+moCQ +XpveJfOVyXzOkmZJdlsDm23zYJSLpI/1GzVuWO0psPzX/QMG/F1mW9iAFRXGEjDlhTxnq /EL8rKB4X2IeFCqo6/Bh+tFEUCwUIpKxQ5DcfQEPwihfUbr6P545ihHD1crDBwolObcenn 2yjkjbRhBlsicK1hdGqBRS1FaWRatwYnb+KfX9yS+qOIvVZ0QLD5VZVPgi+tGw== 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=1741771148; 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=dM3sP9EVD/yvPhiTddTfriqolA8USnf0H/kXzxghUAw=; b=CrbZgcIj73yit2Ub1ld1s2c2rT1SSOkd8Knfc4fauJxru+Of40+MUkH+rJGV4V6cSo+ibO V5s30qQEt0WcrsFX0O0HUULqIL8dAwvsb4bzX5PKjbEMdByEtXgMYSqgH54HJmrUk0TDuQ ULrdq9LFflm4bgWJZpRSaebPD1wwjSH2V4vKBstVVD2LajhEJ2gNYj0X72Ly67/RkMp4ly T8KMWT51APZJM7N3e102LxgxskDrzvtO3qEZhh4N1vUaRk/FF3AvULfQGsZKLjLJOIyfmh ba5obo/zgljAHY7hmN9ntloZbQoCmqEavh+NuTUbf6jASVRHzZTbOGRFO23iYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZCQ705Grrz15RH; Wed, 12 Mar 2025 09:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C9J8Vv082688; Wed, 12 Mar 2025 09:19:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C9J8V3082685; Wed, 12 Mar 2025 09:19:08 GMT (envelope-from git) Date: Wed, 12 Mar 2025 09:19:08 GMT Message-Id: <202503120919.52C9J8V3082685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 5c97b7c296ac - stable/14 - mana: refill the rx mbuf in batch 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c97b7c296ac46d88bd4b9076c920c0b2e3d6dc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=5c97b7c296ac46d88bd4b9076c920c0b2e3d6dc2 commit 5c97b7c296ac46d88bd4b9076c920c0b2e3d6dc2 Author: Wei Hu AuthorDate: 2025-02-27 08:02:46 +0000 Commit: Wei Hu CommitDate: 2025-03-12 09:09:32 +0000 mana: refill the rx mbuf in batch Set the default refill threshod to be one quarter of the rx queue length. User can change this value with hw.mana.rx_refill_thresh in loader.conf. It improves the rx completion handling by saving 10% to 15% of overall time with this change. Tested by: whu MFC after: 2 weeks Sponsored by: Microsoft (cherry picked from commit 9b8701b81f14f0fa0787425eb9761b765d5faab0) --- sys/dev/mana/mana.h | 10 ++++ sys/dev/mana/mana_en.c | 127 ++++++++++++++++++++++++++++++++++----------- sys/dev/mana/mana_sysctl.c | 7 +++ 3 files changed, 114 insertions(+), 30 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index a805aa047b9d..a037eb3f05c7 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -149,6 +149,7 @@ struct mana_stats { counter_u64_t collapse_err; /* tx */ counter_u64_t dma_mapping_err; /* rx, tx */ counter_u64_t mbuf_alloc_fail; /* rx */ + counter_u64_t partial_refill; /* rx */ counter_u64_t alt_chg; /* tx */ counter_u64_t alt_reset; /* tx */ counter_u64_t cqe_err; /* tx */ @@ -441,6 +442,8 @@ struct mana_rxq { uint32_t num_rx_buf; uint32_t buf_index; + uint32_t next_to_refill; + uint32_t refill_thresh; uint64_t lro_tried; uint64_t lro_failed; @@ -711,6 +714,13 @@ struct mana_cfg_rx_steer_resp { #define MANA_SHORT_VPORT_OFFSET_MAX ((1U << 8) - 1) +#define MANA_IDX_NEXT(idx, size) (((idx) + 1) & ((size) - 1)) +#define MANA_GET_SPACE(start_idx, end_idx, size) \ + (((end_idx) >= (start_idx)) ? \ + ((end_idx) - (start_idx)) : ((size) - (start_idx) + (end_idx))) + +#define MANA_RX_REFILL_THRESH 256 + struct mana_tx_package { struct gdma_wqe_request wqe_req; struct gdma_sge sgl_array[MAX_MBUF_FRAGS]; diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 4734b34a9f3b..1df5419e6c64 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -69,6 +69,7 @@ static int mana_down(struct mana_port_context *apc); extern unsigned int mana_tx_req_size; extern unsigned int mana_rx_req_size; +extern unsigned int mana_rx_refill_threshold; static void mana_rss_key_fill(void *k, size_t size) @@ -638,8 +639,7 @@ mana_xmit(struct mana_txq *txq) continue; } - next_to_use = - (next_to_use + 1) % tx_queue_size; + next_to_use = MANA_IDX_NEXT(next_to_use, tx_queue_size); (void)atomic_inc_return(&txq->pending_sends); @@ -1527,7 +1527,7 @@ mana_poll_tx_cq(struct mana_cq *cq) mb(); next_to_complete = - (next_to_complete + 1) % tx_queue_size; + MANA_IDX_NEXT(next_to_complete, tx_queue_size); pkt_transmitted++; } @@ -1592,18 +1592,11 @@ mana_poll_tx_cq(struct mana_cq *cq) } static void -mana_post_pkt_rxq(struct mana_rxq *rxq) +mana_post_pkt_rxq(struct mana_rxq *rxq, + struct mana_recv_buf_oob *recv_buf_oob) { - struct mana_recv_buf_oob *recv_buf_oob; - uint32_t curr_index; int err; - curr_index = rxq->buf_index++; - if (rxq->buf_index == rxq->num_rx_buf) - rxq->buf_index = 0; - - recv_buf_oob = &rxq->rx_oobs[curr_index]; - err = mana_gd_post_work_request(rxq->gdma_rq, &recv_buf_oob->wqe_req, &recv_buf_oob->wqe_inf); if (err) { @@ -1722,6 +1715,68 @@ mana_rx_mbuf(struct mbuf *mbuf, struct mana_rxcomp_oob *cqe, counter_exit(); } +static int +mana_refill_rx_mbufs(struct mana_port_context *apc, + struct mana_rxq *rxq, uint32_t num) +{ + struct mana_recv_buf_oob *rxbuf_oob; + uint32_t next_to_refill; + uint32_t i; + int err; + + next_to_refill = rxq->next_to_refill; + + for (i = 0; i < num; i++) { + if (next_to_refill == rxq->buf_index) { + mana_warn(NULL, "refilling index reached current, " + "aborted! rxq %u, oob idx %u\n", + rxq->rxq_idx, next_to_refill); + break; + } + + rxbuf_oob = &rxq->rx_oobs[next_to_refill]; + + if (likely(rxbuf_oob->mbuf == NULL)) { + err = mana_load_rx_mbuf(apc, rxq, rxbuf_oob, true); + } else { + mana_warn(NULL, "mbuf not null when refilling, " + "rxq %u, oob idx %u, reusing\n", + rxq->rxq_idx, next_to_refill); + err = mana_load_rx_mbuf(apc, rxq, rxbuf_oob, false); + } + + if (unlikely(err != 0)) { + mana_dbg(NULL, + "failed to load rx mbuf, err = %d, rxq = %u\n", + err, rxq->rxq_idx); + counter_u64_add(rxq->stats.mbuf_alloc_fail, 1); + break; + } + + mana_post_pkt_rxq(rxq, rxbuf_oob); + + next_to_refill = MANA_IDX_NEXT(next_to_refill, + rxq->num_rx_buf); + } + + if (likely(i != 0)) { + struct gdma_context *gc = + rxq->gdma_rq->gdma_dev->gdma_context; + + mana_gd_wq_ring_doorbell(gc, rxq->gdma_rq); + } + + if (unlikely(i < num)) { + counter_u64_add(rxq->stats.partial_refill, 1); + mana_dbg(NULL, + "refilled rxq %u with only %u mbufs (%u requested)\n", + rxq->rxq_idx, i, num); + } + + rxq->next_to_refill = next_to_refill; + return (i); +} + static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, struct gdma_comp *cqe) @@ -1731,8 +1786,8 @@ mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, if_t ndev = rxq->ndev; struct mana_port_context *apc; struct mbuf *old_mbuf; + uint32_t refill_required; uint32_t curr, pktlen; - int err; switch (oob->cqe_hdr.cqe_type) { case CQE_RX_OKAY: @@ -1785,29 +1840,24 @@ mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, /* Unload DMA map for the old mbuf */ mana_unload_rx_mbuf(apc, rxq, rxbuf_oob, false); - - /* Load a new mbuf to replace the old one */ - err = mana_load_rx_mbuf(apc, rxq, rxbuf_oob, true); - if (err) { - mana_dbg(NULL, - "failed to load rx mbuf, err = %d, packet dropped.\n", - err); - counter_u64_add(rxq->stats.mbuf_alloc_fail, 1); - /* - * Failed to load new mbuf, rxbuf_oob->mbuf is still - * pointing to the old one. Drop the packet. - */ - old_mbuf = NULL; - /* Reload the existing mbuf */ - mana_load_rx_mbuf(apc, rxq, rxbuf_oob, false); - } + /* Clear the mbuf pointer to avoid reuse */ + rxbuf_oob->mbuf = NULL; mana_rx_mbuf(old_mbuf, oob, rxq); drop: mana_move_wq_tail(rxq->gdma_rq, rxbuf_oob->wqe_inf.wqe_size_in_bu); - mana_post_pkt_rxq(rxq); + rxq->buf_index = MANA_IDX_NEXT(rxq->buf_index, rxq->num_rx_buf); + + /* Check if refill is needed */ + refill_required = MANA_GET_SPACE(rxq->next_to_refill, + rxq->buf_index, rxq->num_rx_buf); + + if (refill_required >= rxq->refill_thresh) { + /* Refill empty rx_oobs with new mbufs */ + mana_refill_rx_mbufs(apc, rxq, refill_required); + } } static void @@ -2349,6 +2399,23 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, mana_dbg(NULL, "Setting rxq %d datasize %d\n", rxq_idx, rxq->datasize); + /* + * Two steps to set the mbuf refill_thresh. + * 1) If mana_rx_refill_threshold is set, honor it. + * Set to default value otherwise. + * 2) Select the smaller of 1) above and 1/4 of the + * rx buffer size. + */ + if (mana_rx_refill_threshold != 0) + rxq->refill_thresh = mana_rx_refill_threshold; + else + rxq->refill_thresh = MANA_RX_REFILL_THRESH; + rxq->refill_thresh = min_t(uint32_t, + rxq->num_rx_buf / 4, rxq->refill_thresh); + + mana_dbg(NULL, "Setting rxq %d refill thresh %u\n", + rxq_idx, rxq->refill_thresh); + rxq->rxobj = INVALID_MANA_HANDLE; err = mana_alloc_rx_wqe(apc, rxq, &rq_size, &cq_size); diff --git a/sys/dev/mana/mana_sysctl.c b/sys/dev/mana/mana_sysctl.c index acb3628f09bc..c2916f9004cd 100644 --- a/sys/dev/mana/mana_sysctl.c +++ b/sys/dev/mana/mana_sysctl.c @@ -36,6 +36,7 @@ int mana_log_level = MANA_ALERT | MANA_WARNING | MANA_INFO; unsigned int mana_tx_req_size; unsigned int mana_rx_req_size; +unsigned int mana_rx_refill_threshold; SYSCTL_NODE(_hw, OID_AUTO, mana, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "MANA driver parameters"); @@ -44,6 +45,9 @@ SYSCTL_UINT(_hw_mana, OID_AUTO, tx_req_size, CTLFLAG_RWTUN, &mana_tx_req_size, 0, "requested number of unit of tx queue"); SYSCTL_UINT(_hw_mana, OID_AUTO, rx_req_size, CTLFLAG_RWTUN, &mana_rx_req_size, 0, "requested number of unit of rx queue"); +SYSCTL_UINT(_hw_mana, OID_AUTO, rx_refill_thresh, CTLFLAG_RWTUN, + &mana_rx_refill_threshold, 0, + "number of rx slots before starting the refill"); /* * Logging level for changing verbosity of the output @@ -329,6 +333,9 @@ mana_sysctl_add_queues(struct mana_port_context *apc) SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, "mbuf_alloc_fail", CTLFLAG_RD, &rx_stats->mbuf_alloc_fail, "Failed mbuf allocs"); + SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, + "partial_refill", CTLFLAG_RD, + &rx_stats->partial_refill, "Partially refilled mbuf"); SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO, "dma_mapping_err", CTLFLAG_RD, &rx_stats->dma_mapping_err, "DMA mapping errors"); From nobody Thu Mar 13 10:14:23 2025 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 4ZD3JH5f53z5qQy2; Thu, 13 Mar 2025 10:14:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JH54Y1z3lZR; Thu, 13 Mar 2025 10:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860863; 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=rdctVdhajAYaqd0BDS4B+Iv3E5xv8VVob4twMVUx8oA=; b=AzJLL58agIB0y4wGpUbSBOa7gve2awUW+ofBzgjLSyez3QOxiVsmPsUMx+uQr5JHmw8pCy K4rU9D+9p6KtuTXrrqTMjfq/BdBgRHHz/zfUZG9GbIu4xDeAs4cv4sSnp/0j3sKduBQpHq IWeZfpr6nOLlh9NJthzNFSbkqVagOSp6LwWbztnW1CBfB+WOp4pCTb2mtmFvzNyMANqunc xxz8m0uwIOg82oYgTNnQk/uEVPTkqYcnq7o26oCxH3hBUWEzYMls7jOZkZnACkkoo6qPia 3JcqARWnBDndaBBgIEYrzPGI3rqcGTJd0BZmk2Z5TIf5TrpFt66FtHzeTrwnBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860863; a=rsa-sha256; cv=none; b=UwsK0pStl40U6iFixIvU2xnX6lA8YiUGbamCHEDGWfOOw6Togtw3J7I4fNpGsi3F193NYg l0rkoLz1QanY/gDIDTiYLk1yVgGVenA23Yzz9K8onJ5NOt7HpZrQyfF6JQBoAzQxh2qin5 EkOnOyJHnTUucv1PcRpyuLf/V81JwRY7+af3v1lT7GOjcrdCA0oSPAD/YLvZRqBX31hk3z XOvgLtHVF/7GB7P7r2BGe9zOyfOGKGwqAqgUVAzkj8QDLBN10ttEkc4J8TwmgEihquxwQl gLkbGJYmVxAv0Ed26vAN5Of5qK4Yt1mFCeVRHN1nCUdxWgoG3MYvYxz/mblJAw== 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=1741860863; 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=rdctVdhajAYaqd0BDS4B+Iv3E5xv8VVob4twMVUx8oA=; b=YvtbTUJ1odBKsaeZ9GBuJGvyboEoWoglhCv8dWxwYEjIQbuXhr16DmruNL4wjDKen6TI/I HpEmMzom69C1JXAWquLZGd5dPVKqwz97f4veSqYwTp/QB92HBAlBA90PwdEhb0mgoZLkGx lVFm+WzZfEXfKJZ1JG1DH655/bcKIjqPhOpcCPEEjp1PmDqFr/3RywkV2rIlJy8qZWUtZb 5RjHflORqfrTZzzypdned1TYYOdOwByRwMwSeMeIWq7klrS/tkZrSOFRRYMaRwDxIxWwxg HzLczo95Pdr4ePtuokvFQfPjlqCMKND77slU9lssPzfpGQ8uxFqI+2LkzVR3bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JH4QVtzt0Z; Thu, 13 Mar 2025 10:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAENP3091767; Thu, 13 Mar 2025 10:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAENV2091764; Thu, 13 Mar 2025 10:14:23 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:23 GMT Message-Id: <202503131014.52DAENV2091764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: af1bd15d3be3 - stable/14 - udp: Do not recursively enter net epoch 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af1bd15d3be3f1f348e0a0237a4edad636c4fc1b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=af1bd15d3be3f1f348e0a0237a4edad636c4fc1b commit af1bd15d3be3f1f348e0a0237a4edad636c4fc1b Author: Zhenlei Huang AuthorDate: 2025-03-05 04:57:30 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +0000 udp: Do not recursively enter net epoch The only caller udp_send() has already entered net epoch before invoking udp_v4mapped_pktinfo(). No functional change intended. This partially reverts commit d74b7baeb0d4 (ifnet_byindex() actually requires network epoch). Reviewed by: ae, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49227 (cherry picked from commit 2472f4dbe93049d70afe0897f66f9651b67672e9) --- sys/netinet/udp_usrreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0ea065f15ce4..178b5b431cf3 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1016,6 +1016,8 @@ udp_v4mapped_pktinfo(struct cmsghdr *cm, struct sockaddr_in * src, struct in6_pktinfo *pktinfo; struct in_addr ia; + NET_EPOCH_ASSERT(); + if ((flags & PRUS_IPV6) == 0) return (0); @@ -1037,11 +1039,7 @@ udp_v4mapped_pktinfo(struct cmsghdr *cm, struct sockaddr_in * src, /* Validate the interface index if specified. */ if (pktinfo->ipi6_ifindex) { - struct epoch_tracker et; - - NET_EPOCH_ENTER(et); ifp = ifnet_byindex(pktinfo->ipi6_ifindex); - NET_EPOCH_EXIT(et); /* XXXGL: unsafe ifp */ if (ifp == NULL) return (ENXIO); } else From nobody Thu Mar 13 10:14:24 2025 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 4ZD3JJ6PKsz5qQy3; Thu, 13 Mar 2025 10:14:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JJ5fxMz3lgC; Thu, 13 Mar 2025 10:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860864; 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=FiwMqQATEhbyky4cUkj3/WRmXDCqp2K97I0loX4aVZM=; b=BoT9widufGK8tJM6OgjX6beK5l7EGyWmlUOSZC7uTtWa9QOdK6WuLS+JVDl9yjFf3MiHwk +wrcYili9KpO3Vks8fiyOLdmrAOKpWT4IFaP7rg2bh0DLFlmzz4i9xgnF5VbIl6v43OLlg aLPpxNoQDd9wEmZ+a+ovY7/Cmfy4FCu5QNI6ylsG950tw7fKe6qfZO5HZppTHCpSc9xbiO 5y1SjfNLGvrMYR5XEA3+4rXSLBkrtpGi+hCOIVT6V6D4E7niIjZo6UXoSMEl+eWd2EDzHW P2ZQJ1XAleQvSUTbBXKbWfXaqXQ4V7dvBUMgGZwnRjfl5qbqcPm8u547EDfksg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860864; a=rsa-sha256; cv=none; b=ccb/AJpUKCENHfWJRXLrE//UvjW5vye4QBsB52nYQn+iEsWuq6TDeAakyg9ZXlwTIE8HuW j2xTf3q96tB8rLgiUgzFbTRnMGUXsOkdD6LzvopveAHF9KUVcbqCen6JJnE04e+buKPJLc D4luaWLXdynr0L3XCf3HABaBmQZoSNO3rUYi+VblS0N4zeDGwwZWkeBsxnxdU6vpAmgyrW 2nkH+ACVlaW4jVuh7I2WRGKthuPwt3blj058VMWyeW2ggptCSawPsR6qBFSrrh8x4F4qNj gvlaNCO4CGjzQ2T5n239nZfrNqz2WsXnRbKZFWP7REt5fMHMJiC4HjZ3DrWHrw== 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=1741860864; 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=FiwMqQATEhbyky4cUkj3/WRmXDCqp2K97I0loX4aVZM=; b=pMWRJdJeFZgNSPciRKv6eEcaPPYY2CtVcnb9lLw8Hj1DUnvVWYykx9P0tu+RTVm+hrQtMd Cm4jqC4cBSnto4eCY4wZMtsJEN/V779RCwWu976UjRHkR3Y++IYIwlI6aW+ynIkcSWfDD9 jtu4H0rBpOrLikjMum93TgDQ7m/LG1Vb5blAsqye0tmI/iccK4zV+k90M3aMiH/1VSDDL7 vO8UAOWse3mtebPnro1zkH91Z+5xu+VhIsr2PXYqvlNCcdiB05aNerlVk2o5uKRGo/nZM6 DqPT3h5WbyDy3wU+kGI7Cltf6dMgVQhc0ZZaRNRGIXUhXX1dujjALhcDQsJQTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JJ5GCNztrJ; Thu, 13 Mar 2025 10:14:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAEOhf091807; Thu, 13 Mar 2025 10:14:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEO8G091805; Thu, 13 Mar 2025 10:14:24 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:24 GMT Message-Id: <202503131014.52DAEO8G091805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e72e35500eb2 - stable/14 - bpf: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e72e35500eb20c2e93b13cd96f24844cb8190a9e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e72e35500eb20c2e93b13cd96f24844cb8190a9e commit e72e35500eb20c2e93b13cd96f24844cb8190a9e Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +0000 bpf: Use static initializers MFC after: 1 week (cherry picked from commit c7f8ffc70afa00ae863fe9f122c5a7eb7b56f4f5) --- sys/net/bpf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index e8c9aa7ce4f3..de56f3db782f 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -184,7 +184,7 @@ struct bpf_dltlist32 { * frames, ethernet frames, etc). */ CK_LIST_HEAD(bpf_iflist, bpf_if); -static struct bpf_iflist bpf_iflist; +static struct bpf_iflist bpf_iflist = CK_LIST_HEAD_INITIALIZER(); static struct sx bpf_sx; /* bpf global lock */ static int bpf_bpfd_cnt; @@ -3008,8 +3008,6 @@ bpf_drvinit(void *unused) struct cdev *dev; sx_init(&bpf_sx, "bpf global lock"); - CK_LIST_INIT(&bpf_iflist); - dev = make_dev(&bpf_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "bpf"); /* For compatibility */ make_dev_alias(dev, "bpf0"); From nobody Thu Mar 13 10:14:25 2025 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 4ZD3JL0y0Jz5qQsN; Thu, 13 Mar 2025 10:14:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JK6kflz3lj6; Thu, 13 Mar 2025 10:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860866; 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=TtgObdfgb+CgDr3j9PtdFV8S+QVaBWe++5Sf8GiFkmQ=; b=MmAG67k47a1dXtc++5hfbRXUGPv0ANx+Xwecwo5OhQhba9DY/yzoyhA/CZtT8iQT1z8d+L SpMASGPluHG5XSlBxsSyAYTIOimR7MFOFWtmZ/pwNebonOeJJGUjn0S8XKHFRatu9hZHek ej7SaXG75Mvk0oF6D7mtSMN4WZPTbHSEhoXKrVmSIvKr6KogpLLIeaMsfkbvDxLAcw3w9E No1HTjdoLNriTgMuKGT9Spx35yH37OfDLWjnjzWElp4Qix3z1WRbbEofmIlxCZdapzdFCP dV2Vfj4h1SccKEm5k7wsb4iOc8DTtPjX69+YzCRNP7wCP7KS4nQzXmdKLdv+eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860866; a=rsa-sha256; cv=none; b=pl0zVal+Di2tcYy7en/yxg6vSbIGLpFSvZJTc/c79wkJR/hWjTDLewWqG4nmycOvLsUX4v R/6uLah4YPmjSeucjnMpSUpX3jbB6vCWw3U6rCrp7ThhyUtwNnYzmrT0oW6QuWX4mSOZPV bvJjb4XJMpZer/C4y4HEZsAkyGQxAtETEz491F8mutL2VtAmAv51QQWQNeh5GXItpmj3lS hr2adXbfpCBa+bYCUeQEJnf2mJdtb3FNs+fVy9UtnYTbrMrsYblHYGBgB8S9GzxOIORsb1 Dos019u4gKENYImJUrzNt44gl4qTWVdkU5jDjcPkdDz33y6rHpWHFSxddRSjCw== 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=1741860866; 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=TtgObdfgb+CgDr3j9PtdFV8S+QVaBWe++5Sf8GiFkmQ=; b=Cnbcc7J1jvkR+0XIsieOjaNT/apFDVAz6LAQRh6tlDtDEKUuQFhc/tNukAvgkhMFbHfFPR 2syhD49c6CM9Ph7fNBpkuDrwZmbij16M4Qg6/iWNU4OL/ZDprL+P/3IAiexIGrqkly3+gu MLte1S5aw9MqunhacH+eITy1ZGZX6cul5ekeE7Bhn6hbFgZjgtSoQeFdZoTHABsmdHLhMt okyypX/HZWbsDDBlLSxdq08cqODa8n1YZvfuP+XeFo4hwZEVnSbSFeQqYJrRhJTq8TVJbs YPBZYsovM4RQkKXh7LEJIX2tl+YG3XgOADAwuGRMlKRqp8uY6qQXpaLTe8RX8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JK5prHztWK; Thu, 13 Mar 2025 10:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAEPcw091840; Thu, 13 Mar 2025 10:14:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEPdL091837; Thu, 13 Mar 2025 10:14:25 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:25 GMT Message-Id: <202503131014.52DAEPdL091837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: dbb5216e03cd - stable/14 - carp: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbb5216e03cdcd2f7bab0dee5f559b2c2bbee98d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=dbb5216e03cdcd2f7bab0dee5f559b2c2bbee98d commit dbb5216e03cdcd2f7bab0dee5f559b2c2bbee98d Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +0000 carp: Use static initializers MFC after: 1 week (cherry picked from commit b7d5bda6f109e09d8999283a9b4e4a9668df9de9) --- sys/netinet/ip_carp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 3223a76c7860..97815ea089b5 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -346,7 +346,7 @@ static void carp_ifa_delroute(struct ifaddr *); static void carp_send_ad_all(void *, int); static void carp_demote_adj(int, char *); -static LIST_HEAD(, carp_softc) carp_list; +static LIST_HEAD(, carp_softc) carp_list = LIST_HEAD_INITIALIZER(carp_list); static struct mtx carp_mtx; static struct sx carp_sx; static struct task carp_sendall_task = @@ -2525,7 +2525,6 @@ carp_mod_load(void) mtx_init(&carp_mtx, "carp_mtx", NULL, MTX_DEF); sx_init(&carp_sx, "carp_sx"); - LIST_INIT(&carp_list); carp_get_vhid_p = carp_get_vhid; carp_forus_p = carp_forus; carp_output_p = carp_output; From nobody Thu Mar 13 10:14:26 2025 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 4ZD3JM3ZKlz5qQhv; Thu, 13 Mar 2025 10:14:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JM04X3z3lZk; Thu, 13 Mar 2025 10:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860867; 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=cmczbRgRK2mmTRpkpol+6psxHOK8ofeBIqWr4ynW0pk=; b=RjQ2/jHke6A9mu5a6NhPOy9XS/9CtuCoi3gPAvrjUNxsdW9QNh9e0kFZD0nWghhrcVnTeG UlT0NQPqhK8mJi2a80IsQS4Htp092iEv7E04C3rtDVMGFS8EANX5Hmtbgna4Dmhh6bpcUw 2gJgHKm1nInvKOHqZCVkfIBmmtywWP6La0Q7OlFx9nigefuWMZm4oeGwKgm7hPFWOboe36 utwjc2CdhuTXHei2cSJi29Ix7tJMPHcpbBr/qVSxcT5uc0TTwXR1Gvo60RS+sxw6NKJzDQ hhjD2CClIlhimREEv/E7Zb2EMKwAyQpZy0CvQNconuLv9L4/pMO4ceuUC1Lc9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860867; a=rsa-sha256; cv=none; b=b11E1XjB0leeibJYnqi0TSM4zlv2A2CHU9tO76qATF9e5XAnJbqVzQ5wDGnWttmdjYSl4w 75lBskB1toggZba43+d+qekJSL65TWOtc4JAn/dFaEo8HN8SZz2eYb3MoiFZAR87nKlS0L FjDyERGMIa+1roFf52hqfDBUghZ3vafhrq+Ub9hmWLQ0pEXU2ukpAwnOkVCczp2EpdeHUN e2/+tmn5E27Bn4MFq4v9gcggEj/KiPHJZ6h9+G690EcmFX/FYkBJ5oTgoP9RSlMPqyBlQK POTbwGAz/lC7i5iRIa7AW4AQk/o8E8I55rvDgCc0K+VSHfTJW1nLhiP/QOumjA== 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=1741860867; 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=cmczbRgRK2mmTRpkpol+6psxHOK8ofeBIqWr4ynW0pk=; b=Vhq3WFsNrFlC9EtcwX92OC3M0VQqa4hd+q9+AGqC33M01wohLxJoC3r6cjInuBc2HkROSj mzWue8cl9W5mcczf4D7OquhQK5KmQSsnarXj7y8f8/3uC+O4wPl15zMGhGVrfQ9jhEoO8C h4NpW8B6f3zXHBkCLlZ362xEcpISAHL/ERw9Mtmk1nQ6F4Fk9eCO1ct+vCiIUOqBmONWGt Ik1dPsfljEfeBnn38PH/g980MGYM6dcq+4bouCJ5G2QPmejL4cG+QLfRgjIzIThWGq0l/N 5cgHtwP2YsVlIM57OBuqSVArfhJ8wNpuoLGiEnY9BUNVHCioWR4hG/qcB+cgKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JL6lsyztSg; Thu, 13 Mar 2025 10:14:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAEQbp091875; Thu, 13 Mar 2025 10:14:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEQBd091872; Thu, 13 Mar 2025 10:14:26 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:26 GMT Message-Id: <202503131014.52DAEQBd091872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 7fa12e220c7a - stable/14 - bridgestp: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fa12e220c7a4a6ef40d796d3486c5a73c771e92 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7fa12e220c7a4a6ef40d796d3486c5a73c771e92 commit 7fa12e220c7a4a6ef40d796d3486c5a73c771e92 Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +0000 bridgestp: Use static initializers MFC after: 1 week (cherry picked from commit fd0020f81a60f7c4a1401de56761cbfb2d745ca7) --- sys/net/bridgestp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index fac558b93297..ac444703c609 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -87,7 +87,7 @@ const uint8_t bstp_etheraddr[] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; -LIST_HEAD(, bstp_state) bstp_list; +LIST_HEAD(, bstp_state) bstp_list = LIST_HEAD_INITIALIZER(bstp_list); static struct mtx bstp_list_mtx; static void bstp_transmit(struct bstp_state *, struct bstp_port *); @@ -2138,7 +2138,6 @@ bstp_modevent(module_t mod, int type, void *data) switch (type) { case MOD_LOAD: mtx_init(&bstp_list_mtx, "bridgestp list", NULL, MTX_DEF); - LIST_INIT(&bstp_list); break; case MOD_UNLOAD: mtx_destroy(&bstp_list_mtx); From nobody Thu Mar 13 10:14:27 2025 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 4ZD3JN3Pq9z5qQj0; Thu, 13 Mar 2025 10:14:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JN1285z3lb1; Thu, 13 Mar 2025 10:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860868; 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=Ae6XOj3i1hJZk1CmoQt6gKIEgPSEwOMY9VSOnwKRD1Y=; b=xhVhOoBrNGOY6PXxFMGMXBHMCzochLWV5+12A7W1+VopjTNTLolSovCFKWlMXv4hCFBIRG PktWac0YK48YsL1Bmva69vMVnLn/NkBAWuE+1+SF8Sg2ehz/1E6kd1PX4AxITprrTW8ony XMzqNAI/LWmws/1vbeBW++08NXVDlI4BKnVk28c6Gu//oLaBv5P9j2yIg/Fu49ykV/XNhu y4kZLCaMpnDI8yg8dScPOfhxRENFCtIzkRCh6PnQ24ZXSULSrEAijtQwc3k2qKp8w3XP31 elgbZ2dnkqfWPQ8Wq39iI3Vmk02ZV6RS2f+rYPYyeeZG2KK6XlBNxFv40jZU4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860868; a=rsa-sha256; cv=none; b=qRnNPbHunjHtau7A0NXoQcRhEQEE7/oEzlPt1IKcBevWFu6GBj5f6cRHIdKKj6GiSxPiSo es28zcpaVuj5Mi7nfuG9EMy8UluSp/8M31ZY6Pioq7YbZIyzxgB9R+lykVMZlU1kjsWspe v3IXN8pC0Vi8Vd/LyzujWiNNZ7jPDCz3BfMnnKACKvjWYwe30yND1yXM/Ag2IVPzp9dvzU AMTutqr+8t6VugjvquYcfaE1II5ck47SHOud6dg+9g0cQKsm07yuNsjiErjOOKujxAsCi/ hRgXH5zV9iwPpK3AJhuDVC3JI0+H4SK3gNfcqNyyICcVkeKKdXZ+234zde9GWA== 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=1741860868; 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=Ae6XOj3i1hJZk1CmoQt6gKIEgPSEwOMY9VSOnwKRD1Y=; b=JQNb/cD5n3j7Hr33Ag/MIm4K5XVTRkkfgApOkX/z7HuyxnIqjSuoNcX77FqS+EIERIi/gR p5bwjOjOK4nlDaIRN2dt7pLgTH0aFoU4LczVREJME5j+xjQpjgQi+2A9aR8BoGRhD+FH7M oFB0mriWqs/T4W/j4ILipcSq4NLlwXdF9cBLivoEY/mTzXhQGqvEdqrUhXvW3IyEF0dLzs MkcY8Ni3yxDrPUbqj4Ainsy8h3HM04DciL/p0ILuy/3IeyDGzhqUzh64cz/k9lKxS/0Gpn a/w92fc3na9kvt5KfJWvQ8SFLNVgFPzST5EgU5gWqxS9J/4hJGPeybHDaqIoEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JN0cmWztx3; Thu, 13 Mar 2025 10:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAERxo091908; Thu, 13 Mar 2025 10:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEROi091905; Thu, 13 Mar 2025 10:14:27 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:27 GMT Message-Id: <202503131014.52DAEROi091905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0e03922b4501 - stable/14 - if_bridge: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e03922b450186cd2b462587a9011b26c4362b03 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0e03922b450186cd2b462587a9011b26c4362b03 commit 0e03922b450186cd2b462587a9011b26c4362b03 Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +0000 if_bridge: Use static initializers MFC after: 1 week (cherry picked from commit 59dbc829cf077ae0b07577f374ffc536d5acbc6a) --- sys/net/if_bridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 299b6d80dcde..5cb4a033e325 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -602,7 +602,8 @@ static const struct bridge_control bridge_control_table[] = { }; static const int bridge_control_table_size = nitems(bridge_control_table); -VNET_DEFINE_STATIC(LIST_HEAD(, bridge_softc), bridge_list); +VNET_DEFINE_STATIC(LIST_HEAD(, bridge_softc), bridge_list) = + LIST_HEAD_INITIALIZER(); #define V_bridge_list VNET(bridge_list) #define BRIDGE_LIST_LOCK_INIT(x) sx_init(&V_bridge_list_sx, \ "if_bridge list") @@ -623,7 +624,6 @@ vnet_bridge_init(const void *unused __unused) sizeof(struct bridge_rtnode), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); BRIDGE_LIST_LOCK_INIT(); - LIST_INIT(&V_bridge_list); struct if_clone_addreq req = { .create_f = bridge_clone_create, From nobody Thu Mar 13 10:14:30 2025 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 4ZD3JQ6MLcz5qR3s; Thu, 13 Mar 2025 10:14:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JQ2swsz3ldV; Thu, 13 Mar 2025 10:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860870; 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=B2ygoEoXpBZxyDoHQIvOo2MxqchZ2o05uMsH1M0HK7o=; b=kFbRFL0EYKDqbT74n74dtzfge6O40uXIyPElQFg/RroeLuC5+gbgMhINcL4aYLljikdjXN POa/yuc7fvv6yUCG1Grp/5USPTKVSpoP9zAKxRtAAhW3Op+3aBmHE8yPaR/nmRks/YvGdI +uK198Hdq9oAF+lHpI6nhPQYZBNlH4PetK3pZEUS0N6+H9GnSg+F1J/4fvC9I3Z93aoBm5 og5C3QZu7HQIRPJH54yQVpZ5rTEmZgf4yuTu3qh6HcPuX6ZlMlDDumzcQGtFbpqFh9VRj5 Top+HERAdQGbplyMc7opTH4TLpqtHiUJzzmsMYWUI6vSNOwX/DwDd8/Rr/6a4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860870; a=rsa-sha256; cv=none; b=ME8u825CyjffYw+Td6E+CRzYRjV0f2KUSyfHB2FFYzPkTtcXaK+7l377tiYHcKwZTrp0Fg rd36saB3DXvuJ6NPHIkewDQPagJYMESczWA3FLcLA1YTp7fNrs+8QWrCtBHEFyUbt8WQtd gMKpZQNABaCyOBst2gS7vsBasLYYjGnVoDX56mS3EbvHR7jBRGNcOmJznmW6w4EAmvdhJU ZOKFQ1mjvM/GoQ+xyyr7zp7l+S+NFSZjYTszVeRKI7ZAJ6zUTEyC2cTVsS0rGMXCKFdWqa s3hhiN/1njQsfLhH9GmEfn65tBnB/yu6sWHdqHuzNFLM4Pyfv1fDucRYKbuG/g== 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=1741860870; 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=B2ygoEoXpBZxyDoHQIvOo2MxqchZ2o05uMsH1M0HK7o=; b=T7cSumRT5vgOH3Uc14Xh+j87n9gdhL+cJcZel2oYmbnSekSj6JeUfqZRqxkPAW/b7T9IhD qM8xMmaohoH5yg8UCHWmMh8o8gui7Rhz5pCYQ7YnAEIk5G8YqKLuDtSh/aG8PW73byWeG4 roXh6jvdpZA6KgsgAhwsxjNInUWqCUBhbjyYQrX/pKD8flo+PkdAelrg0JSwmfTH4AmuiK MjJCe76fOU9PUnELXwzGVx8lhvpRUmy8ByZMUyrs1oWneuxw6JLKraQUse+O6TQbMWfyNL Ovb3b7L6EOD8SRcanT9quR5O9vdrGpdKiNH1zdNniaX5KrIoCV1zHsvmzgeCJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JQ2R21ztWL; Thu, 13 Mar 2025 10:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAEUHM091980; Thu, 13 Mar 2025 10:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEUc1091977; Thu, 13 Mar 2025 10:14:30 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:30 GMT Message-Id: <202503131014.52DAEUc1091977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e461ba1fa34a - stable/14 - lagg: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e461ba1fa34a7c9ce5aba8ce30400002ce62e8bb Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e461ba1fa34a7c9ce5aba8ce30400002ce62e8bb commit e461ba1fa34a7c9ce5aba8ce30400002ce62e8bb Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:51 +0000 lagg: Use static initializers MFC after: 1 week (cherry picked from commit 36ebdd0155d07fc53375fb212d9ca80158dde350) --- sys/net/if_lagg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index baf2643ff871..f226ce11ca37 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -101,7 +101,8 @@ struct lagg_snd_tag { struct m_snd_tag *tag; }; -VNET_DEFINE_STATIC(SLIST_HEAD(__trhead, lagg_softc), lagg_list); /* list of laggs */ +VNET_DEFINE_STATIC(SLIST_HEAD(__trhead, lagg_softc), lagg_list) = + SLIST_HEAD_INITIALIZER(); /* list of laggs */ #define V_lagg_list VNET(lagg_list) VNET_DEFINE_STATIC(struct mtx, lagg_list_mtx); #define V_lagg_list_mtx VNET(lagg_list_mtx) @@ -297,7 +298,6 @@ vnet_lagg_init(const void *unused __unused) { LAGG_LIST_LOCK_INIT(); - SLIST_INIT(&V_lagg_list); struct if_clone_addreq req = { .create_f = lagg_clone_create, .destroy_f = lagg_clone_destroy, From nobody Thu Mar 13 10:14:29 2025 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 4ZD3JQ04Dtz5qQsQ; Thu, 13 Mar 2025 10:14:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JP2PjCz3ljm; Thu, 13 Mar 2025 10:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860869; 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=XWCHRJ1JliREv3kBYdsB6MeCs2G/ON0JyM3mxo9nt34=; b=KL9pC2JzQtrpBJbz0Usuvga+4mE2iEvTgJoLt5/TKjLswDXu4Qxy1PXB31vPcnUWsqLGJ1 xhXH16NXaZTOyVA2RpFUhrkKiYM8AbNVCvMgluc/HPwHFS2VM+T3Tgh7ypqeUm3FpKwVNs i+rQFJEyIuVTj0s0Tv0MSBptF9g4JP/4akhWXj+SVaC5mennNEpe6yKpBDsy/Id7ZGWO5C Xb4O5ty7zTbQs/W8wa4Ar5JhToOpSTnmHYeSqn5sfqBGU5+y5RKkkbvIVu/PBuXoB7JeOx ksYzdsmVvYf7zEUrbXSweSdEoi8tM0ruqtYvIsPnh3MVlx3oMkqx1MdpQTmbFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860869; a=rsa-sha256; cv=none; b=RJkLQkXDev69RPONYZzv1hseY59hn0kByO9+1AddlW/1U0+eCDjK7ThTZJUx6y+aCtA7aX TdWIZLxiZvJygTxdjNS8JnX8gj47Q50/AavdCMl+lWT6FmG41rXFl3pfh4HTSa6lk+2MO+ DOEcvyQjqNSG6jNXGok46qCqrL3y2zcgyRFJCIhJvcEueDoFH4K5i8s1vQ/kEfBhMnpvw4 UvyXe33N2PcNnfl89e7+fLlVLRHtkj0S0Kuxub3Qpyf7S9LoVlo2QlusQvRETbZ3IsqBVV 2OtnhFvhIBggsxbNicIBm2ViCYxylDpUoIoNpWGk/J+labwg7vzITckLozH9ag== 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=1741860869; 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=XWCHRJ1JliREv3kBYdsB6MeCs2G/ON0JyM3mxo9nt34=; b=Q59axMhcSxPs8sPyeR6C+tR3jSZgeIolyQUYLV1kYuJMQaOma1hn01E/mpDyEvHSNbBNep /hXmQKsrAJIdg0/m3b8SxWZQaRe87gQdHA6sFRbkS/2MazK5+LAdjRe8nnevEW16ShZwpH EUU53cmRYqbkbaLPnvA7Qk4KGZsh5tVjtNjGBG2pfkztHV39Ow0M5el8ENxlXmuiYMn0xc 8yX7IHK+96HMnhQ+YFEfqLVEit+pZk5F2yV5VXEpXIx5DAF9iOQU83TfBVfWcTjFLwvWNK zq1WC2m0jf+lzTsbkftYBeXajTPU13BjSFHM7KJif4dfmwQr1O2zcWUU3dPfpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JP1d1Cztx4; Thu, 13 Mar 2025 10:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAETZf091941; Thu, 13 Mar 2025 10:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAETCC091938; Thu, 13 Mar 2025 10:14:29 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:29 GMT Message-Id: <202503131014.52DAETCC091938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2ed4c9d94dc6 - stable/14 - if_clone: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ed4c9d94dc64a453908984942b9dadbbaa5536e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2ed4c9d94dc64a453908984942b9dadbbaa5536e commit 2ed4c9d94dc64a453908984942b9dadbbaa5536e Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:44 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +0000 if_clone: Use static initializers While here, remove vnet_if_clone_init() which is therefore an empty function. MFC after: 1 week (cherry picked from commit 1ba655149ed0447f93e997a60330d9b962d061f2) --- sys/net/if.c | 1 - sys/net/if_clone.c | 9 +-------- sys/net/if_clone.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 4bc626b2de75..cf8df9a05d86 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -435,7 +435,6 @@ vnet_if_init(const void *unused __unused) CK_STAILQ_INIT(&V_ifnet); CK_STAILQ_INIT(&V_ifg_head); - vnet_if_clone_init(); } VNET_SYSINIT(vnet_if_init, SI_SUB_INIT_IF, SI_ORDER_SECOND, vnet_if_init, NULL); diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 50ebed285d28..9f0dc7cd9649 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -130,7 +130,7 @@ static int ifc_advanced_create_wrapper(struct if_clone *ifc, char *name, size_t static struct mtx if_cloners_mtx; MTX_SYSINIT(if_cloners_lock, &if_cloners_mtx, "if_cloners lock", MTX_DEF); VNET_DEFINE_STATIC(int, if_cloners_count); -VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners); +VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners) = LIST_HEAD_INITIALIZER(); #define V_if_cloners_count VNET(if_cloners_count) #define V_if_cloners VNET(if_cloners) @@ -185,13 +185,6 @@ VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners); static MALLOC_DEFINE(M_CLONE, "clone", "interface cloning framework"); -void -vnet_if_clone_init(void) -{ - - LIST_INIT(&V_if_cloners); -} - /* * Lookup and create a clone network interface. */ diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h index 86aa52c0ed25..8206af53a07b 100644 --- a/sys/net/if_clone.h +++ b/sys/net/if_clone.h @@ -150,7 +150,6 @@ typedef void (*if_clone_event_handler_t)(void *, struct if_clone *); EVENTHANDLER_DECLARE(if_clone_event, if_clone_event_handler_t); /* The below interfaces used only by net/if.c. */ -void vnet_if_clone_init(void); int if_clone_create(char *, size_t, caddr_t); int if_clone_destroy(const char *); int if_clone_list(struct if_clonereq *); From nobody Thu Mar 13 10:14:31 2025 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 4ZD3JR71fSz5qQsR; Thu, 13 Mar 2025 10:14:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JR4LFWz3m1Z; Thu, 13 Mar 2025 10:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860871; 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=WDBAEeVgzjzHZShojuN9b90VcaghhGZBMfCVVaI9JHk=; b=vjtFwKuTh2q5fLe8ck6pY13Lm0saEHoTF7qFU329/lLzuLc9nxFMIZt0kw0kC8q2Cs57g8 BxPKkCkWUQUxP6tupg7qVU6FWIwWV1F9xYMSVHXWq6agMq8aZow3hACbFFXS9TOrG/HQlw XJiQobnRHJB1z9CKqqTaSA5hT/42CZ9/CPdb9QWrjxO+h4IAh5SKbIts/9dRngFZWenVoP +L2c3oG0DWlb193gqnRLAyHeofCOmNCfA0HzIYeDjuizD0EkXklUkxfMIU9RBGtHFU8NbM qxutsAkGiR7rM+IPg9mL5dHh/ZOMD9oyx3ZtPjpTCEQKZJcDlFLtt69k4XgoCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860871; a=rsa-sha256; cv=none; b=q0hyvxDetX1xV/9OxDNsPCpYJpmS+dLEEJ7gtW9C0zP4VpqTpS3MV3w1vMrtTXRguqO3LM lxwUO/DzRFHPbTK3/gftn5lUZqVuTS1gcDeBUtGXccgQ3sfhLVP6bvN+wOwrvfQ96QZQW3 W3qz7StNViFCQg2Q2SUQHDk9zbK42qJZik+7qrFRoDqH45Dz5EiYxkRSS1lFdLIWD7vfge GFIgnVrF6LJ9kYuiaqFDYYuqPPZGLGKzt7Ka+mIxGuUxEnzwaMgbqRKModD1IRykNGENJS B3OGUth9dCKFf7YMczT+Ml+s7zGhlzbeno8tLXG+Ti8UKnD3dZBVmSUPC7yl4w== 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=1741860871; 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=WDBAEeVgzjzHZShojuN9b90VcaghhGZBMfCVVaI9JHk=; b=wTw/y1QoSc1IWiiO5GDAdLAj5WZ3aNEozF74vW2wwKXIv+ardsN2UdvbR/tSWFReNNiwrh /gdH82tuIKWUp/Wcl85qfOjo9UHqMgFyEkqWdtQGPzEp2KyRJxeifIglANTLxddyZavMHX +6WBYmNx6lfqvKz7BtEyNsPnTZPXf/X0hQp4Mg0/8v+/mLEQYmzdtx/MPD7ijzx/PO3tGl 8gE4bIln4CC4co8vp6xcY6tTRfRTDwAf/noC3RGhhInpsQ63TtEUGzQd0kxd1j3lOLkiDY PwIUByEGm+U5xaYx27t6u+aGektqUshJ/CHGBt/yLQkei5jrSBKCQwRpBCHKqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JR3GmDztQR; Thu, 13 Mar 2025 10:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAEVVb092013; Thu, 13 Mar 2025 10:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEVjl092010; Thu, 13 Mar 2025 10:14:31 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:31 GMT Message-Id: <202503131014.52DAEVjl092010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 140c473fb905 - stable/14 - tcp_ratelimit: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 140c473fb9050c2befae2f021d00b2713a12c60f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=140c473fb9050c2befae2f021d00b2713a12c60f commit 140c473fb9050c2befae2f021d00b2713a12c60f Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:45 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:51 +0000 tcp_ratelimit: Use static initializers MFC after: 1 week (cherry picked from commit 09de37310313d87942fc5349914be46b9cb8c808) --- sys/netinet/tcp_ratelimit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_ratelimit.c b/sys/netinet/tcp_ratelimit.c index 1834c702c493..521ebad4e5dd 100644 --- a/sys/netinet/tcp_ratelimit.c +++ b/sys/netinet/tcp_ratelimit.c @@ -246,10 +246,10 @@ const uint64_t desired_rates[] = { #define RS_ONE_GIGABIT_PERSEC 1000000000 #define RS_TEN_GIGABIT_PERSEC 10000000000 -static struct head_tcp_rate_set int_rs; +static struct head_tcp_rate_set int_rs = CK_LIST_HEAD_INITIALIZER(); static struct mtx rs_mtx; -uint32_t rs_number_alive; -uint32_t rs_number_dead; +uint32_t rs_number_alive = 0; +uint32_t rs_number_dead = 0; static uint32_t rs_floor_mss = 0; static uint32_t wait_time_floor = 8000; /* 8 ms */ static uint32_t rs_hw_floor_mss = 16; @@ -1772,9 +1772,6 @@ static eventhandler_tag rl_shutdown_start; static void tcp_rs_init(void *st __unused) { - CK_LIST_INIT(&int_rs); - rs_number_alive = 0; - rs_number_dead = 0; mtx_init(&rs_mtx, "tcp_rs_mtx", "rsmtx", MTX_DEF); rl_ifnet_departs = EVENTHANDLER_REGISTER(ifnet_departure_event, tcp_rl_ifnet_departure, From nobody Thu Mar 13 10:14:32 2025 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 4ZD3JT1zqdz5qQqY; Thu, 13 Mar 2025 10:14:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JS4tHWz3lkN; Thu, 13 Mar 2025 10:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860872; 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=6PdoaYfMXAGSLztqTLEdraI8pmhM9EBkqC/jlM/z1j0=; b=yXOe9ngkSqVEMnVSK7sa7CIvkZVd3zlJw4ttBbDANVUbX15rkqzlZRKm0DScZ5iUogQ//G va+IEMWfx1uqGomPnGd/KRJrpXkB8BGdRmrxbsKKzmltZxG/bciFkH8Ity+RN0lohhaV4T CPtxxfqJRj+C3Q/iesO6QhA9Xcbo/Rf6njW5JiExF8gKK++ek9nN5EZwKivNF7+pd5nEMJ PoSzaMGA6djqH8XXKLyK5KPMnN78p5DaC4hF79S/ES4ZgC3PTtwi/QJojj3I2b7rLpaCCK ijwx1D/mb8f++hIC4j6E5Jre8u3URuXGaYvXB7YKGGASkRsD33ZHOorcRooeRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860872; a=rsa-sha256; cv=none; b=MmNUKQW97NUgw2ysWkyb5FCcj0Q616wqb/sydeMfNcTlpru3/qU+Z6sj9GGERqT+XMMXZY EUv8PBwyYoXT6RYoEGi3YaneWqbZhdgVd6MStUUqozk2W9ZarmmKw5CBeXSuCNzRSADI/1 g+aEDADmvZtt+t/rJjjBM30l5m5cMVXmG5pkciIUBngH3JUYxX2Wq0EH+1DeZyuC/+KGn5 HvJvQluasIlJglBjJ47Hu9uON8oXckcMPxN8ATUsytONwlyBsK059Uxl1E/YbHckDFL0Tw ElXvmGHYUeqgKJYbGuy6FNazNUDskHo4hERBeAYa7coZT26+YVZTsHR8E07ozw== 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=1741860872; 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=6PdoaYfMXAGSLztqTLEdraI8pmhM9EBkqC/jlM/z1j0=; b=ysnWeqgIif0tgrSl2bNcJ2eBQYstEuhvQW52mixwOrZaXsBPjBTuaam3++uvsIq4EFeGLp tyF0EAxUI6+YYq3NDADSkAfzpGJJ+vI8IAI0GNqOjKh7JSAK1nfNWBdf7ekOdeAS6aPD7x vDrw6rVnU8iaoP3wsJXoSmYZFZ00yY7EWnbmXOVMI+mf8ckQ0i0Sv8+57yIoIa/KAoiOiR JH2iZZyhm6pTV0tx4QhQxAuW51M8vPkUF8ddtbaGWgCp0SDrkGKfV2/Hxn9+sysiltwagI fp8HdUlS4OiFJzI2VPYFBapwxw9ad9yXMQUxrvqX7nrHFcrj0Lun4cb02pIDKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3JS4M0QztWM; Thu, 13 Mar 2025 10:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAEWJF092047; Thu, 13 Mar 2025 10:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEWER092044; Thu, 13 Mar 2025 10:14:32 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:32 GMT Message-Id: <202503131014.52DAEWER092044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b755058a24c3 - stable/14 - vnet: Use static initializers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b755058a24c3ebda4c26ec21575d7757f4a7f65b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b755058a24c3ebda4c26ec21575d7757f4a7f65b commit b755058a24c3ebda4c26ec21575d7757f4a7f65b Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:45 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:51 +0000 vnet: Use static initializers MFC after: 1 week (cherry picked from commit 23f453ae34c29b99f892da18db44ce4292ccb7c3) --- sys/net/vnet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 688a8eb24591..13eb85266ff6 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -101,7 +101,7 @@ struct sx vnet_sxlock; sx_xunlock(&vnet_sxlock); \ } while (0) -struct vnet_list_head vnet_head; +struct vnet_list_head vnet_head = LIST_HEAD_INITIALIZER(vnet_head); struct vnet *vnet0; /* @@ -313,7 +313,6 @@ vnet_init_prelink(void *arg __unused) rw_init(&vnet_rwlock, "vnet_rwlock"); sx_init(&vnet_sxlock, "vnet_sxlock"); sx_init(&vnet_sysinit_sxlock, "vnet_sysinit_sxlock"); - LIST_INIT(&vnet_head); } SYSINIT(vnet_init_prelink, SI_SUB_VNET_PRELINK, SI_ORDER_FIRST, vnet_init_prelink, NULL); From nobody Thu Mar 13 10:17:59 2025 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 4ZD3NV0267z5qR7v; Thu, 13 Mar 2025 10:18:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3NT3dDfz3p8W; Thu, 13 Mar 2025 10:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741861081; 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=YcDMi8q9UT0+qOgORRgacDoCsOvJnYlcMgARQA+zlXY=; b=qq83Dygf7mHC13y7RThpDVwoErrzGgDm4u6ghnNNKRXQ4ZQHUCrkjDIyS8P3W8Cz27q3aJ CQc5euDfZod8rXkLURU2yj3g9O1F3SOEVgaaKFZdRWB1H4tcSCskKz061pcd+A6IVDlhOw O+0dtIMTXvXl4kr8ar60EjDUOrstlSK22DzRjTNaf7HtoiSJ1sw437wZpxz8v42m1edVbq JOtqQFmGulQJq4CCM+SjpNm9Cqu6j7m+RvoDv9bA5rm2WVNoibFfwLOF478dJTRa/JjV/O w9ko0qrYXKWabePlqWGYj4hHlc7P1y2A8FXQKpOTR6eKEj7JTP8pjffObWJoBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741861081; a=rsa-sha256; cv=none; b=L+qOyha3M3WGopYbAEQptZxBGr1ah5F8iXOrUSQmIq7UxYDVwXufD0aMVN9pEfrPZj5xr0 6CCf7kj2sVQUrWZy6aFH+LnUNEMMIxi9Rw2dlAtajejC3Z/rTHc9rL16kU2IOdYP8zE/MD +PzlmVjuFp29ZnneYpEqA7bf5R2RqFQURbRWbZo7D+jeWuqLXmKHSIwcakRxGOZb3kTwUp nDMJIuL6noGIr4LRXKM77PTc7/2alytTsJ8QVRUJoZy5Bs3Fe2WJnCyM3d7VuRRD/KHIGs yx632HHLHiFMqB8n8LF2WCWuEQt+db4h7ypkeLPeBRxg00aoAwrXObcYof48SA== 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=1741861081; 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=YcDMi8q9UT0+qOgORRgacDoCsOvJnYlcMgARQA+zlXY=; b=EIaJPFWMoKAdPOF4RiepAtWA8NcYwjLOnSKCEBw6VptriKJEyApYi07cJgQ7ueXvYDw4ZZ cDHw3YB/yZAItULBeY1eLIEi0InHIKAOSMLCD6DIdRWvYMHHea+34Y/wyoUyxqec5dzY0p FCngZ49MruarQigVv07P1rKA23peKtMHfOwgq4cL/SDsSqKokA/hut9a6mQyJsQca1mHIi x5sdK3xdZHoyUic12T4zLd5xTaCUJMQkUq/8s8pwnyTt7SFvSivk2JdAGkknQoOg8zHPcL WE4pVPWtg9E+dEPiBtWm1qAvxPdHtYjZ+7LED3SfAWvRBDe6e5vagMy0cPK0Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3NS5DnSzt2j; Thu, 13 Mar 2025 10:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAHxx0093267; Thu, 13 Mar 2025 10:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAHxpK093264; Thu, 13 Mar 2025 10:17:59 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:17:59 GMT Message-Id: <202503131017.52DAHxpK093264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 83c23b6c6630 - stable/14 - ipfw: fix dump_soptcodes() handler 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83c23b6c66303157f1bc9f06438b61d70088d849 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=83c23b6c66303157f1bc9f06438b61d70088d849 commit 83c23b6c66303157f1bc9f06438b61d70088d849 Author: Andrey V. Elsukov AuthorDate: 2025-03-05 09:29:22 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-13 10:17:37 +0000 ipfw: fix dump_soptcodes() handler Use correct indent number to dump registered socket options. It is not currently in use but can be used for debugging. PR: 283970 (cherry picked from commit b405250c77e6841a8159a4081d4e0f61e49dfbf8) --- sys/netpfil/ipfw/ip_fw_sockopt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c index 2d9a1c6d62fd..0502653c8c1b 100644 --- a/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -3134,7 +3134,7 @@ dump_soptcodes(struct ip_fw_chain *chain, ip_fw3_opheader *op3, } olh->size = size; - for (n = 1; n <= count; n++) { + for (n = 0; n < count; n++) { i = (ipfw_sopt_info *)ipfw_get_sopt_space(sd, sizeof(*i)); KASSERT(i != NULL, ("previously checked buffer is not enough")); sh = &ctl3_handlers[n]; From nobody Thu Mar 13 10:19:06 2025 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 4ZD3Pl04Bwz5qR8R; Thu, 13 Mar 2025 10:19:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3Pk6TJMz3pRm; Thu, 13 Mar 2025 10:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741861146; 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=F341AG7Z++akA47z7kTcz4m5WAQQ1IeZnbKScSrNAyU=; b=qzVygSypsreFTR5B1MXLbSi781k35rrLPxP0sGxJRa6ORWg9v/dSZ+PdFFujt06YYriFKk JO8blsr7vQBNl2n7O9gtv45XJzw31Ahs9vcKR0ujbxrTujQiLyizn10pMOtV3R9qJRo2Jv 88Ot6ka+oHJ/XRI0k6sfUBd/OEqpf+06JrSLq7TZLN1BybjHF5eTyRjK99miudv0zWKbm5 zBVvv4L47l/fBJM3xrKXvacLMT37jvEamf3wx1xV2xSLO0c79nZ67uE8qIyB3afqvURNCg h+4H9PrgLT2mUlwoV5nbBJSI10LDDLDH+PKiPH2jy4rhslNPaEPwH3lLYsNclg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741861146; a=rsa-sha256; cv=none; b=ATvwXlv6ytfR7CPr0iP1ihkBphBUkZ5BVscIXnGTz+J0G1IKfVH/YvXl97V2SCWvuwQDzM vvoGubil4coCMisy+0jD87pY3DF9NttR3a5d7i4JWCHP0CznD4AFos3PXGYfZFwpw3SE1X DJwp644V4MRoTyecqdj9pB5wigbQZvB1ALj3LmDweeel05nvScdAoSP7Z6Z/qUy9TZhyyy hmFRWnOOni8KQAp8yMalOEkIpNSh9N+FbEGBfrtb939WidZ3Rbb4sb6CMzE+BzovavZYlt DgJO2x599HHzpZ4LoJfGydzTW76rYx4nt3gNg7NHQPqOB87Hcz7JPc3ritZXHQ== 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=1741861146; 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=F341AG7Z++akA47z7kTcz4m5WAQQ1IeZnbKScSrNAyU=; b=SIg6lSTPYLS3NWZumgBkdxI2SgZp5jslwdU8+acOX0pZl271rZcDDw/DZL7At98yh4ZBUJ URtdCJgqfJfLZwBiI0p9djk0gQ0cf0ZflCW33TPGi+8l8TGWHIRUbx5bYHkrUoZpa8Q4aN fHRw1aNXmECCdA3gXtuJhCgnqbzn9BAQCeIuEOj+AC5WHbtCP7DOg0eG2QNhXtJudo5jR+ cVId17uMoEUBoF2fQslBWesMyDoMY78MVUPzxZDM4D0FCEuiB5c97pUzi5+ycCtk77T5/j 9OaV0H97q2/iqUjriXMqA27WN4QQdMcwrBctXx0WSNp2NH+IRV/GTQcsXAuKBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3Pk60yfztQV; Thu, 13 Mar 2025 10:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAJ6HQ093737; Thu, 13 Mar 2025 10:19:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAJ6rb093734; Thu, 13 Mar 2025 10:19:06 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:19:06 GMT Message-Id: <202503131019.52DAJ6rb093734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: f1929835f76d - stable/13 - ipfw: fix dump_soptcodes() handler 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f1929835f76d587804c417f19188f41b77e8e7c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=f1929835f76d587804c417f19188f41b77e8e7c6 commit f1929835f76d587804c417f19188f41b77e8e7c6 Author: Andrey V. Elsukov AuthorDate: 2025-03-05 09:29:22 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-13 10:18:44 +0000 ipfw: fix dump_soptcodes() handler Use correct indent number to dump registered socket options. It is not currently in use but can be used for debugging. PR: 283970 (cherry picked from commit b405250c77e6841a8159a4081d4e0f61e49dfbf8) --- sys/netpfil/ipfw/ip_fw_sockopt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c index 92fcf729a3ae..975a5aabfa25 100644 --- a/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -3122,7 +3122,7 @@ dump_soptcodes(struct ip_fw_chain *chain, ip_fw3_opheader *op3, } olh->size = size; - for (n = 1; n <= count; n++) { + for (n = 0; n < count; n++) { i = (ipfw_sopt_info *)ipfw_get_sopt_space(sd, sizeof(*i)); KASSERT(i != NULL, ("previously checked buffer is not enough")); sh = &ctl3_handlers[n]; From nobody Thu Mar 13 10:22:52 2025 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 4ZD3V44l8fz5qRNv; Thu, 13 Mar 2025 10:22:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3V43nBqz3qHl; Thu, 13 Mar 2025 10:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741861372; 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=n4h68tlN/fPsGuxATYa43UBejjKcXKYwpoSarEalsB4=; b=lbGr9rm3YEhRm1iSe7NZYcJ5h3G/XDwBCLjuZeySmae4CmEbP+cxIS9Fy2Xj4YSmf8rPaQ 7attaYHZ5JsJ8pZOWtI5gcS2bSvjUmFI5nagRfoZS/6ZiBKHjrIRMR6erRB3twae3CfzKx L95ratYjqyVP9ZLkpFwxt+6tmL5BAU/sGfo4oi2NVsEmWCtNSdMrykSrumDD+D564P0eOn YOkpHmnSp685iuNAhSyU6XCcMt5u7ITtvxvtuCB4RsuZpJoioUkvOFeetx8Rwd/JWjDq6W alvOM5ogsXDBh/UfOfhHucICllBBCkdqMk5qro191qge25O1ll+BaEN+iSWCaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741861372; a=rsa-sha256; cv=none; b=LB0X8YoMB6TQk+VVj/019/OycNX/+4+mjElkcNbrNQMI72wsE91tWYOy3f/sXWXTQ9Z0pU KXBolpmouFZ90KftIbBLY05A2Lqaz09WtDcEanf9F0zc26Rk9ZiCU+FSS8nF0+UWUI2LfO MJiX19WBGoKQWdRZJtyjzFE0mmFuM0Eky31Hfz55ca17Q31zd9F2ncsIZOidUbZCNEd3Te KYJimNJh5RpVAXtD0qAuhdkBnDEnriSUxDO1CBNrSSxhAs+eCSDMXL70Wk5V2zC0/bfa0C 1OEbV5+OdivmPdjUMr1ajD6HJp+jNHmBzipFiLiJmlXrqc4ZKL9leqMAvBqUBQ== 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=1741861372; 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=n4h68tlN/fPsGuxATYa43UBejjKcXKYwpoSarEalsB4=; b=ozUNJ/ytLJe5zzb0V0cIXbyiJF3OKe8Y5iMylHD2KNzzVuhz7y1WBk+4nyzimAEFFYmzpy eKzr3gHhV7f1vk2OxyRofQihLjUXkrDZC+RkurvoBVQefDMmde743alDbAOGt3HJs2mB2U 8W83MlNn9xKHhSCLDwS5IIwf3bouDjl3kbpxUmm0EDlNPpAST22ARDF3cD3GsxmhNP2pHE 23SIGQink1c/B5OUcVj6lshnCb4rWnE/KAKDEYiTskGYenhhxUKoTjM6sSNPjf+Z1p7/b7 Sv1HDm2y/bU9MFtPFP5Mg28HqZ+NsQFmzOfxgcFQRc34up1i7Cxt/r+GIP2dRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3V42Rqnztxw; Thu, 13 Mar 2025 10:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DAMqfH010407; Thu, 13 Mar 2025 10:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAMqn5010404; Thu, 13 Mar 2025 10:22:52 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:22:52 GMT Message-Id: <202503131022.52DAMqn5010404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 72e2ebf64212 - stable/14 - pfkey2: use correct value for a key length 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 72e2ebf642125efb74479fd038f45f49a3e846e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=72e2ebf642125efb74479fd038f45f49a3e846e4 commit 72e2ebf642125efb74479fd038f45f49a3e846e4 Author: Andrey V. Elsukov AuthorDate: 2025-03-06 12:18:59 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-13 10:21:30 +0000 pfkey2: use correct value for a key length The length of key data is specified via sadb_key_bits field. Use specified size for buffer allocation and key copying. Also add a check that the value of sadb_key_bits is not zero, as explicitly required in RFC 2367. PR: 241010 Submitted by: jean-francois.hren at stormshield eu (cherry picked from commit 04207850a9b988d3c04e904cb5783f33da7fe184) --- sys/netipsec/key.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 5458d189c7bf..b550182b581b 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -674,7 +674,7 @@ static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_t); static struct mbuf *key_setsadbxsareplay(u_int32_t); static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t, u_int32_t, u_int32_t); -static struct seckey *key_dup_keymsg(const struct sadb_key *, size_t, +static struct seckey *key_dup_keymsg(const struct sadb_key *, struct malloc_type *); static struct seclifetime *key_dup_lifemsg(const struct sadb_lifetime *src, struct malloc_type *); @@ -3437,6 +3437,9 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) if (len == PFKEY_ALIGN8(sizeof(struct sadb_key)) && sav->alg_auth != SADB_X_AALG_NULL) error = EINVAL; + if (key0->sadb_key_bits == 0 || (sizeof(struct sadb_key) + + (key0->sadb_key_bits >> 3)) > len) + error = EINVAL; break; case SADB_X_SATYPE_IPCOMP: default: @@ -3449,7 +3452,7 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) goto fail; } - sav->key_auth = key_dup_keymsg(key0, len, M_IPSEC_MISC); + sav->key_auth = key_dup_keymsg(key0, M_IPSEC_MISC); if (sav->key_auth == NULL ) { ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__)); @@ -3475,7 +3478,12 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) error = EINVAL; break; } - sav->key_enc = key_dup_keymsg(key0, len, M_IPSEC_MISC); + if (key0->sadb_key_bits == 0 || (sizeof(struct sadb_key) + + (key0->sadb_key_bits >> 3)) > len) { + error = EINVAL; + break; + } + sav->key_enc = key_dup_keymsg(key0, M_IPSEC_MISC); if (sav->key_enc == NULL) { ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__)); @@ -4097,13 +4105,14 @@ key_setsadbxpolicy(u_int16_t type, u_int8_t dir, u_int32_t id, u_int32_t priorit * OUT: NULL no more memory */ struct seckey * -key_dup_keymsg(const struct sadb_key *src, size_t len, - struct malloc_type *type) +key_dup_keymsg(const struct sadb_key *src, struct malloc_type *type) { struct seckey *dst; + size_t len; dst = malloc(sizeof(*dst), type, M_NOWAIT); if (dst != NULL) { + len = src->sadb_key_bits >> 3; dst->bits = src->sadb_key_bits; dst->key_data = malloc(len, type, M_NOWAIT); if (dst->key_data != NULL) { From nobody Thu Mar 13 10:23:48 2025 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 4ZD3W83b8mz5qRlT; Thu, 13 Mar 2025 10:23:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3W824Wxz3qwM; Thu, 13 Mar 2025 10:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741861428; 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=Xqj7hVQMgnGxLtfoBnUOiyjUBTEFa+qSpe0SLI8VFuU=; b=UhPBg+UHwj8HvzwYMT7q5h/plLKXlQ/gI7sXXt98yej9qv3cAjCbpgn2zWQ9JRXsi21TA/ cbgeObe2EHAQ1UVnW0N3VuQbvZDhHzKiiOyZDCZBgBbqGnIGn5y1lJ1MebjuO42S/2CJBr Y8MEPZ6gEsmHTkb4cqnpj/D4ytKMAJU1SjFVX9Ts8ifhVYGL1V+R+1VPd+Dx0Iy/ll1F9v 46aP0J3Bw7q74ustQzSSOaMrNDrMV//g0e6ZDFnYjafXXXgPUF24l8+q6/lKO5FxiKzFHp CpgwCtcRwx2RInxkKmp5GDv5ZKNI/XTc5N9DmLhJY/c2YZ+6uoeoZveh2bWcyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741861428; a=rsa-sha256; cv=none; b=cYkh3bESWyVVfNOYzm7K2n9WIjk+gx3G1D7GkQByOlMrFKmvXNkcI+/NdmYO7b0CX4Xy2s 4Ede/zGgWjb1tQV2VTyPC6FBIjtdT30qIeCaURmCJt5AffPJ+GmNZM+gtI286pPjugVkaM hviey/rteW7337CR0di2M9D7GLBKipbN+LVCsvaTnHRQLN6O5nNfHDgvMyiLPg5jNZbCta fpJU8OGa8Upc04PM/PKCaHPqk79N5aDg9Ny0nFHAHfqmXjbNIECP1+0FOUm8+04AYfY6W5 XnpAuNoJRIDBKvlq45/Ek19R7EPbe4gUk98gf661MpZBZI1gTUofteld7pGk3g== 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=1741861428; 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=Xqj7hVQMgnGxLtfoBnUOiyjUBTEFa+qSpe0SLI8VFuU=; b=stBRtWtqUv4gACClOLZ5jOHKqC/vJhzDYZbXr7FJWg8SN3kstJCX/kRS+IpvYDN65MqU2h Mz6tl2oOVbFfUapeHV5DH38EiWDhNKXVL+tXEhAi3D/plDWOF/tDC6BQfgY7j+lIsIVUpm EBD758Gd0/7bD626zoKpTckXjtvyDhLKxFgOdee6g2F+VFxXF/yNsDG3B7NCMM0m/hP7gw LAdlJT09f3Qix9iQF8TyVXDdn9tSJN1hKkxHbQb3dXRopKF1182Rcb5v1KDr8lzIRap94a qfv9pcel5Cbtcw5uVzPkq1XhEI+3LYr9T1Nd8uIsRlYpy7Hwk/Inmmb80oPU+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZD3W81KVkzvDW; Thu, 13 Mar 2025 10:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DANmH3010802; Thu, 13 Mar 2025 10:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DANm80010799; Thu, 13 Mar 2025 10:23:48 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:23:48 GMT Message-Id: <202503131023.52DANm80010799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 1219a3f40db3 - stable/13 - pfkey2: use correct value for a key length 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1219a3f40db386aaa10edfea27d9cc73fdea3935 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=1219a3f40db386aaa10edfea27d9cc73fdea3935 commit 1219a3f40db386aaa10edfea27d9cc73fdea3935 Author: Andrey V. Elsukov AuthorDate: 2025-03-06 12:18:59 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-13 10:23:29 +0000 pfkey2: use correct value for a key length The length of key data is specified via sadb_key_bits field. Use specified size for buffer allocation and key copying. Also add a check that the value of sadb_key_bits is not zero, as explicitly required in RFC 2367. PR: 241010 Submitted by: jean-francois.hren at stormshield eu (cherry picked from commit 04207850a9b988d3c04e904cb5783f33da7fe184) --- sys/netipsec/key.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 0dced6867f16..f21797009a60 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -668,7 +668,7 @@ static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_t); static struct mbuf *key_setsadbxsareplay(u_int32_t); static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t, u_int32_t, u_int32_t); -static struct seckey *key_dup_keymsg(const struct sadb_key *, size_t, +static struct seckey *key_dup_keymsg(const struct sadb_key *, struct malloc_type *); static struct seclifetime *key_dup_lifemsg(const struct sadb_lifetime *src, struct malloc_type *); @@ -3395,6 +3395,9 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) if (len == PFKEY_ALIGN8(sizeof(struct sadb_key)) && sav->alg_auth != SADB_X_AALG_NULL) error = EINVAL; + if (key0->sadb_key_bits == 0 || (sizeof(struct sadb_key) + + (key0->sadb_key_bits >> 3)) > len) + error = EINVAL; break; case SADB_X_SATYPE_IPCOMP: default: @@ -3407,7 +3410,7 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) goto fail; } - sav->key_auth = key_dup_keymsg(key0, len, M_IPSEC_MISC); + sav->key_auth = key_dup_keymsg(key0, M_IPSEC_MISC); if (sav->key_auth == NULL ) { ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__)); @@ -3433,7 +3436,12 @@ key_setsaval(struct secasvar *sav, const struct sadb_msghdr *mhp) error = EINVAL; break; } - sav->key_enc = key_dup_keymsg(key0, len, M_IPSEC_MISC); + if (key0->sadb_key_bits == 0 || (sizeof(struct sadb_key) + + (key0->sadb_key_bits >> 3)) > len) { + error = EINVAL; + break; + } + sav->key_enc = key_dup_keymsg(key0, M_IPSEC_MISC); if (sav->key_enc == NULL) { ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__)); @@ -4055,13 +4063,14 @@ key_setsadbxpolicy(u_int16_t type, u_int8_t dir, u_int32_t id, u_int32_t priorit * OUT: NULL no more memory */ struct seckey * -key_dup_keymsg(const struct sadb_key *src, size_t len, - struct malloc_type *type) +key_dup_keymsg(const struct sadb_key *src, struct malloc_type *type) { struct seckey *dst; + size_t len; dst = malloc(sizeof(*dst), type, M_NOWAIT); if (dst != NULL) { + len = src->sadb_key_bits >> 3; dst->bits = src->sadb_key_bits; dst->key_data = malloc(len, type, M_NOWAIT); if (dst->key_data != NULL) { From nobody Thu Mar 13 18:10:07 2025 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 4ZDFsD0F0Lz5r1hh; Thu, 13 Mar 2025 18:10:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDFsC5fyfz3pV5; Thu, 13 Mar 2025 18:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741889407; 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=nBNgdk/qPmi3CPzOsPDbwZXatcH6a9oO2js/DdNll7w=; b=MHhTljHOM6kSOvWqyV/T8k8hpmSesB6SJAMHl/er/E+XRgDdwxxkbEX6jQQPuuOHIXhRS2 wiIr5kpGuuShj4Q+DRt6MrcC1ijjs9uSD+eDw2GGH4JPdVgbQq67jKWZAndC8YQT8RP/zJ mgBl8IBrXHO/Obfa+i+X1XD8vd6GntmGW4JK6XMPyWzI5de8IXs8fwYqFIpEBKn/ogZfsD qPkTa4mqEqN7an3GU+M683B5Kzy/PBlFue3CB1TlRe3ffifGaV0ebGZN9ytnXxf9hmqCM8 guU/srJL4Y1XeZFqqvS8+wMhySIx77dKXeHVY9tQpXZz8UNI5XI3TxhnvzVX+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741889407; a=rsa-sha256; cv=none; b=PEM3DIQ0WieppOiJ5G3N4f+azXklOWgpTY1SEAO8uzNwaXXwCLEcWXyxcniR17Fy/ffgds otrP83G4XqTq4gEB57NFyZRSefH+AHz5OnkRP+DmNZcBXyblWQhwqBbOjY9D3Z0MHLI3ay oDDKOPC4z8mrRdt9dgfcmN3pQYF9aBEGODMFn97WOGpfZzfFcvAvvjrnZhjZ7xPR42Wrkg KemzDn9xcbz8itwbN/1S2NeklEoMSJCiRDYbo71EsRYEc1nBMmLqoTkmtmyZ38+zAXQUO7 uhNOvzfhh+hotpPmc+3OB3PDf8JQCL38b3qYpUhjG1Vcx609j5fSNDai8mG//g== 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=1741889407; 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=nBNgdk/qPmi3CPzOsPDbwZXatcH6a9oO2js/DdNll7w=; b=xKQHi9WNuApFOJqORvH9cP1Uq80DPkOK8EbDXy8jhTTuyWZVwSxS7qRWPto1QxeXoyXfTp +S7Xp3u05tSpD4ams5n9I+SG+3glDTZMk3j7gGezUogNZRKvVo84MjlvkDHwnQOGCwnTqV S0m7xQhrXHUyI1gKTxrn5/6XTTKIPgh1u6O4B7ve/XhdloVFg9f5Vz4IO57bJzzNKSE76W 1r+IaY4Qbf44RF9xvN7C+QU4lGOgwYS0+5YlMDWZSLqRtW93/78xOyGy0UlH/Nqh/LkUh3 7bYlxpvdlhDoiomq41MYjz8y1qF3xlACU9ltwqi/oyG4jSePyR8+e2/IMzVnmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDFsC56tvz180X; Thu, 13 Mar 2025 18:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DIA7ZT080945; Thu, 13 Mar 2025 18:10:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DIA7U6080940; Thu, 13 Mar 2025 18:10:07 GMT (envelope-from git) Date: Thu, 13 Mar 2025 18:10:07 GMT Message-Id: <202503131810.52DIA7U6080940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9ca20e5ec9e2 - stable/14 - Makefile.inc1: Conditionalize some package related variables 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ca20e5ec9e2a4779ede9ba8f00e00ef1db92681 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9ca20e5ec9e2a4779ede9ba8f00e00ef1db92681 commit 9ca20e5ec9e2a4779ede9ba8f00e00ef1db92681 Author: John Baldwin AuthorDate: 2025-03-10 17:30:26 +0000 Commit: Ed Maste CommitDate: 2025-03-13 18:09:09 +0000 Makefile.inc1: Conditionalize some package related variables In particular, don't invoke git to compute SOURCE_DATE_EPOCH for unrelated targets like check-old or delete-old. If the git invocation fails (e.g. when using a git worktree mounted over NFS) it can generate a lot of irrelevant warning spam. Reviewed by: emaste Fixes: 8a3537aaf7c1 ("Makefile.inc1: Make package timestamps reproducible by default") Differential Revision: https://reviews.freebsd.org/D49278 (cherry picked from commit db6f2bb93a9706963f66d270edb5ee62c37a9296) --- Makefile.inc1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index e43b2ff2e527..34b2cd658172 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -572,6 +572,7 @@ PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif .endif # !defined(PKG_VERSION) +.if make(*package*) .if !defined(PKG_TIMESTAMP) .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) SOURCE_DATE_EPOCH!= ${GIT_CMD} -C ${SRCDIR} show -s --format=%ct HEAD @@ -589,6 +590,7 @@ PKG_WWW?= https://www.FreeBSD.org .export PKG_NAME_PREFIX .export PKG_MAINTAINER .export PKG_WWW +.endif .if !defined(_MKSHOWCONFIG) _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \ From nobody Thu Mar 13 18:31:02 2025 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 4ZDGKL5hnYz5r2r8; Thu, 13 Mar 2025 18:31:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDGKL4pCHz3rm7; Thu, 13 Mar 2025 18:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741890662; 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=sbObRR6d2XOd9ljkFKNQsS8FMEyOdiekYjMgy+Xnn3g=; b=AJuDoONpBJMr2vB9iz7FEC1LJM2GlKhbnHubDN68K/TEdmOtStL48IWbs7xWFU9PpxSMiY qGBeKdBN5KI9zYZIcz+lHTrloa+83HHrogm0kc5h8XPhEc1OXnytcV1Ig763OB7IY5ezHL A3YkvxD6dskCoeKlC2+yfCGb/KcZJYl1qHEfj/rRK+QizCNthAh2x4hyHdm0iWsf0Mw0EO s4VCuOewgfJOmU7SDwU6gutYywJrJJw8UBFPFbmMDsxRNcrqHkwlcx11fG4ZZklbLBOnGg wZFjVk8HlBHryx8hfvA3S98ZbBbWgW0OI1R4MuP+HQngDXi8COUA53X1qQri+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741890662; a=rsa-sha256; cv=none; b=AaOb96cLpHoa9md9MOuNovORGftlkYKiRW7CiwpjSZuNC6yc0HpH8fxOcbLyPkVQ9tyjkR Xv291+G2PM0gD9bj3BPkCQc30cHW8LZlVhgduBytIpIfzCk1ATZaTioNP6V1FjW1lIDjj1 qjq4+ZhslaxDAtX2aktMZ9yRAI+DjURMCk4eXHLaRBIdw4/IlLYV7b9GauwXMybMQJH20y Kr0K6LJS0Lm2CVPowWK11U61QkQQ3NsoPh7X+P6pdbSM4rKOU38Ahsvd6AWtecFaZDTMKm NSAEszlMpTavVus5cJu9FozNljKNcOnJPCA7zvv0Uf0AgZmoyePCTr8CBPQ4zQ== 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=1741890662; 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=sbObRR6d2XOd9ljkFKNQsS8FMEyOdiekYjMgy+Xnn3g=; b=Gd4aCv32MeO4bi80NiV2JheNvoSXrroRyO88ZjBtuvFimfRvcI7+gfbp+KRy+78Q6O2GLk hchqTL0SifZwNPYCAO68t+20W5/zTJuIa+0cuAQV4Nw9W57dlDwm7lYa3jEGgsPTFTI3fR 1iHjBEj9ch1vme6FkLONCe1CVKTGPAKK55Yb3b+VCfndQGMVlfRbfq7ZXPyvgeYDHs8d+6 BYT7pSxeCM0I6DU8S8OBW4iID8fnIR6ECGtRh3gyvFImZbRWPsk+OAc6vkbEiRfl/n2zFq GLFCeE97fTJQ+Q/QKmhKI5YX3PQ11xy+pJWMLjE5/90XIRRx+gSecuWs7tiaJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDGKL48P9z18Fx; Thu, 13 Mar 2025 18:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DIV2ws025069; Thu, 13 Mar 2025 18:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DIV24o025066; Thu, 13 Mar 2025 18:31:02 GMT (envelope-from git) Date: Thu, 13 Mar 2025 18:31:02 GMT Message-Id: <202503131831.52DIV24o025066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 537e512cc13b - stable/14 - arch.7: Update version reference to 13.0 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 537e512cc13b94fc59ff99c0881296862cede024 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=537e512cc13b94fc59ff99c0881296862cede024 commit 537e512cc13b94fc59ff99c0881296862cede024 Author: Ed Maste AuthorDate: 2023-09-26 13:32:43 +0000 Commit: Ed Maste CommitDate: 2025-03-13 18:30:54 +0000 arch.7: Update version reference to 13.0 This document is intended to be a reference for supported FreeBSD versions, so update text to refer to 13.0 and later. Sponsored by: The FreeBSD Foundation (cherry picked from commit 46b91601bb165f20a40529775fffb4d05fe73d15) --- share/man/man7/arch.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 24979eb6b186..f87eacfff54f 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 2, 2023 +.Dd February 4, 2025 .Dt ARCH 7 .Os .Sh NAME @@ -42,7 +42,7 @@ documentation. .Pp If not explicitly mentioned, sizes are in bytes. The architecture details in this document apply to -.Fx 12.0 +.Fx 13.0 and later, unless otherwise noted. .Pp .Fx From nobody Fri Mar 14 01:57:13 2025 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 4ZDSD95xn5z5qJMG; Fri, 14 Mar 2025 01:57:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDSD92Jltz3nP1; Fri, 14 Mar 2025 01:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741917433; 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=JX79eJ1iM1TnS+2Eugxhn7RjdgJoPQwh53stIeDuI98=; b=ZtywXhmkSuxSPJ32rCXdTqvrtLb0JR/P835/4K4usFdLE5lHFKOqSkLvtbumi96YGG4HXF gLzf2oxUSrmKsgOtjNYqmMWlrUsOiQ1B1fQ64y8+68oLCOuBY9IEPPn9t27yYCJXwEjgtI Alv0YWhfQZPa7iiVnLBbpub6ircYYPRDgGJvAcylpm3A70eHSEb/G2Gy77rP2UL5jMmkeB QWCYGpAxoYX2MPsVEq7h+cWd4FMNHjHQJrFUcn2tLpm4KfxoYqdoaSk7uTvXRjF+kE8LIR +minm6Oqtf+N36Qg2J0w3N4QT2gI5Phl+otNnNZn3PLiYZeUeGyic8mmlww5mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741917433; a=rsa-sha256; cv=none; b=eQZQ1VgtI5ERHF5fOHU6jP0kKrLvf0gQ+MRGEOIcQtkjQLxaLD2nzLeELPxKbOk0LQUy0g g1iM1XL9IP1Ll3KKFbaeO3Ku/AOdhtSnGBKuA1QbhWbj3IojJfZ48ypLPqNya89NpiB+uq sAN4vPVVydP8nWkgJhmsiQSwe8Tic3m870xXQ102ApmvHMgYgokPQT2xpRmmzsoxnxyomk BI8fzuT7gBnyem8TtKL6gJ8VezWbhR9Fru7knI8RSImlAl/STg60MOlYlIb9AhQgLsi2Qi zWXwq2xNgBI7enPHVR+SP5NRf/ZnGPCGC7sKfLCLJCGoEMXupCqBJg73stq7RA== 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=1741917433; 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=JX79eJ1iM1TnS+2Eugxhn7RjdgJoPQwh53stIeDuI98=; b=aJYhOiKxU8g1ZIPyXkE599Xfl0Cup5f4Z8aNnt8wpuVotdOtE1ZUzF2+cssRc6OGBWIHfY vzwhFJ1MuKyr3ucXLVjAnCGvKpeaSDt6oKpZ1qUyrRyT5LEsn+q1mVMVJR6p0DH1jZt6P+ +yjBSWQXXc0oZgY2PnrtZTECJ2241zPsWmv4XAPZ4uin3kIVonMCM+KuQWG7BdZBj/VPGh 10EbPPR+713WyqLkO3iFz0CF72rk58WSayxSyxnceqUglTgcUCoa8zwVXuhVwqrD2FdDNn +6FLrXkyb2eDxrV3Ogfp6Ma5DFsrR9jCZmnlCTOh0ZJkBRIzq9rIzix1Csm4RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDSD91Gm8z7tx; Fri, 14 Mar 2025 01:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52E1vDrI055651; Fri, 14 Mar 2025 01:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52E1vDlb055648; Fri, 14 Mar 2025 01:57:13 GMT (envelope-from git) Date: Fri, 14 Mar 2025 01:57:13 GMT Message-Id: <202503140157.52E1vDlb055648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Konovalov Subject: git: 6207ca7b76b0 - stable/14 - truncate.1: improve the example section 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6207ca7b76b0410ed95d82d6d85ee60fe3138998 Auto-Submitted: auto-generated The branch stable/14 has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=6207ca7b76b0410ed95d82d6d85ee60fe3138998 commit 6207ca7b76b0410ed95d82d6d85ee60fe3138998 Author: Maxim Konovalov AuthorDate: 2025-03-07 01:45:21 +0000 Commit: Maxim Konovalov CommitDate: 2025-03-14 01:55:55 +0000 truncate.1: improve the example section Notably: * spell "Megabytes" as "megabytes" consistently; * remove a stray asterisk from the /boot/kernel/kernel listing * avoid using a shell prompt in the examples consistently * fixes the size parameter * add an example how to increase the file size PR: 273997 MFC after: 1 week (cherry picked from commit 5460bdda9d4cb3ce1d7431824b6f53c545888b53) --- usr.bin/truncate/truncate.1 | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1 index 649749ddf255..f6b8b0cc37c9 100644 --- a/usr.bin/truncate/truncate.1 +++ b/usr.bin/truncate/truncate.1 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2021 +.Dd March 6, 2025 .Dt TRUNCATE 1 .Os .Sh NAME @@ -188,14 +188,14 @@ and continue processing the remaining arguments. .Sh EXAMPLES Adjust the size of the file .Pa test_file -to 10 Megabytes but do not create it if it does not exist: +to 10 megabytes but do not create it if it does not exist: .Bd -literal -offset indent -truncate -c -s +10M test_file +truncate -c -s 10M test_file .Ed .Pp Same as above but create the file if it does not exist: .Bd -literal -offset indent -truncate -s +10M test_file +truncate -s 10M test_file ls -l test_file -rw-r--r-- 1 root wheel 10485760 Jul 22 18:48 test_file .Ed @@ -208,18 +208,28 @@ with the same size: .Bd -literal -offset indent truncate -r /boot/kernel/kernel test_file test_file2 ls -l /boot/kernel/kernel test_file* --r-xr-xr-x 1 root wheel 31352552 May 15 14:18 /boot/kernel/kernel* +-r-xr-xr-x 1 root wheel 31352552 May 15 14:18 /boot/kernel/kernel -rw-r--r-- 1 root wheel 31352552 Jul 22 19:15 test_file -rw-r--r-- 1 root wheel 31352552 Jul 22 19:15 test_file2 .Ed .Pp -Downsize +Increase the size of the file .Pa test_file -in 5 Megabytes: +by 5 megabytes but do not create it if it does not exist: .Bd -literal -offset indent -# truncate -s -5M test_file +truncate -s +5M test_file ls -l test_file* --rw-r--r-- 1 root wheel 26109672 Jul 22 19:17 test_file +-rw-r--r-- 1 root wheel 36595432 Sep 20 19:17 test_file +-rw-r--r-- 1 root wheel 31352552 Sep 20 19:15 test_file2 +.Ed +.Pp +Reduce the size of the file +.Pa test_file +by 5 megabytes: +.Bd -literal -offset indent +truncate -s -5M test_file +ls -l test_file* +-rw-r--r-- 1 root wheel 31352552 Jul 22 19:19 test_file -rw-r--r-- 1 root wheel 31352552 Jul 22 19:15 test_file2 .Ed .Sh SEE ALSO From nobody Fri Mar 14 17:52:27 2025 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 4ZDsQM2WrSz5qWlL; Fri, 14 Mar 2025 17:52:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDsQM1TTyz3DY0; Fri, 14 Mar 2025 17:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741974747; 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=VVRLDyKPj22VsM5nw6u1Qwcvexiy2vSVtIGmo6NKMXY=; b=T0qYcgwrpE+cjwb7Nc973O9tAhHygbMCSbIz1Hw2O834idBxRmyAoore3nP72IeovSBgkY bu6VMprbv33B8KC2wQgFb0J4xD9o5VNphzVzZ1Jt82pXLRMN5gbuSDhgDLQuOrasnatmTw ni1ytqZhSGP3XCgegzis5H4TfGlJGWtZeBwO0VyeJhTWNM3tDLbm/SSkcEr54sqqKz/Jn5 1c41wS/xIRjtZYhFiecncl7s8zivNzilIKeGBQhR8FhIjjXyvXnJn/SU0OZk0POkua9cbX Hctg6IsGYc7u6HK0zdiVZJkYL5idHL+P2tjoIj2UjgxMTJFJD9zSuMg949ZpbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741974747; a=rsa-sha256; cv=none; b=oLPNrWhh+1TrN9HOpY+6spvu1Y92WOBVDMAqxT1rmgq3pzeQe5SdmnYSUTOc76iZuvWdoq lSmUs5s4TvSMbUy5JtZYk5jJ5MUgeyLBPlosyxkPXDA3mk6BlSit1V6+0nvesJXM94K8Ri j3Nt3INJqh78Q0qpetBdH0BtG0DY51ZjrhQG72P6SU9kapliWlVz9k11IFOio82M6Iw2iX l0VpmW36TDh/3JA91w5+Ty7Lh+SUg3IaziLMWco7G6GF6DD2GhIMMOAvNb85XOl6J4K/EV JNXfqKev/jknFjGHkb4FtYTioa2YWKh1wGFtIsKIYGrfG4mUNUckTA8WSrJJIg== 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=1741974747; 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=VVRLDyKPj22VsM5nw6u1Qwcvexiy2vSVtIGmo6NKMXY=; b=KDyc0KftI0cGQSGBphWzlBZfvhZ2KzqIfnI1Yb1+WpJ6/Gqrnv0BaRxzm6g9DYDailNMnq dlmafD5HeFTdGp7HTt1DdYzSYxnWP05Kl5NEzv8j2nRwlP71k7NseANV3mHhfGrEZKpWs3 u36vr61V+BNj7QffixhjO1gD5ez5rdwUfy+MTtv4wpRUYZrP8R3aVeZ1yFv1BY9NAzsWo2 cVPN4Eb2dpFTt6B7Q2yct8vMfea5z8ozyQpKlZNdkvwHK7pPOkzpv/jQjE0f+//G7j04gX 2k0yAJJiRnY/Hb4e5Y902pe5NrcW3p/Mmt0SFtB3Po5xNjWgRzJZ7Zal29Smjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDsQM11ngzvNb; Fri, 14 Mar 2025 17:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52EHqRmb061607; Fri, 14 Mar 2025 17:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EHqRma061604; Fri, 14 Mar 2025 17:52:27 GMT (envelope-from git) Date: Fri, 14 Mar 2025 17:52:27 GMT Message-Id: <202503141752.52EHqRma061604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b9296d4d85bb - stable/14 - g_dev_orphan(): Return early if the device is already gone 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b9296d4d85bbc4f84c21615e760c5e12d1c81406 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9296d4d85bbc4f84c21615e760c5e12d1c81406 commit b9296d4d85bbc4f84c21615e760c5e12d1c81406 Author: Fabian Keil AuthorDate: 2025-03-13 23:13:46 +0000 Commit: Warner Losh CommitDate: 2025-03-14 17:51:03 +0000 g_dev_orphan(): Return early if the device is already gone The following panic was the result of running "cdcontrol eject" after using the physical ejection key on the device before the tray was actually ejected. So we have hardware racing software. The device was loaded with a DVD. Resulted in a NULL pointer dereference g_dev_orphan() at g_dev_orphan+0x2e/frame 0xfffffe01eba0a9f0 g_resize_provider_event() at g_resize_provider_event+0x71/frame 0xfffffe01eba0aa20 g_run_events() at g_run_events+0x20e/frame 0xfffffe01eba0aa70 fork_exit() at fork_exit+0x85/frame 0xfffffe01eba0aab0 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe01eba0aab0 Avoid this possibility and return early of dev is NULL already. PR: 215856 Reviewed by: imp (I've triggered this once or twice over the years too) Sponsored by: Netflix (cherry picked from commit f7856fe81df2df3c4355e674d34a4c15a095a33c) --- sys/geom/geom_dev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 0b5cfdf77149..8d71cb584f80 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -854,6 +854,9 @@ g_dev_orphan(struct g_consumer *cp) dev = sc->sc_dev; g_trace(G_T_TOPOLOGY, "g_dev_orphan(%p(%s))", cp, cp->geom->name); + if (dev == NULL) + return; + /* Reset any dump-area set on this device */ if (dev->si_flags & SI_DUMPDEV) { struct diocskerneldump_arg kda; From nobody Fri Mar 14 17:52:28 2025 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 4ZDsQN4hWKz5qWfC; Fri, 14 Mar 2025 17:52:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDsQN2PSPz3Ddv; Fri, 14 Mar 2025 17:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741974748; 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=V/QAYpramKntNP4sGzBFGlSRsGUglIYdyyx/NmS18qk=; b=WdRbxmXY6BjvKz6qKQEPwrBuAluXqbNtxGxgem7BZ5uPeWPWPALpjadMGPg+czu0M03z44 ew4n93L0+Rfyv6cpgbYXy5EcC8QXcc6DETQapVtjpGEyGFkTDUD3GduJClu4oKNYSMtllS h7X0vqZXgTHOMR7BeEVI0o2vPFgvJj/LR8wFndspdgiykKphDK0yCu9+cUjY0BKelGIuUD oaYmZAfZjA0whepqFQ+w1ncCa49ifrv2qmDvsjVaxoroc7u9VELCNim/3gvPISNEeqh2Y4 +IiDKVkKBUZH9AYWoDDN2/c4t9aiKAOGeqPVCK5o4jPDBuxXCcCvuHfCM2lOjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741974748; a=rsa-sha256; cv=none; b=iyyZ0KNCtELs+YbZ4ET5UYm/D7iNOHqrmjbiJtQw1dtL21EoC5gjs2Vuw+PWrJkdyHd0ZU Wxf+hNkS0l8Hkn5+20cje2SeBqRKk21k5sxfUUgBtoLMuyWEyQmrFB8pcOhWU57hOK284j v577cjiFCCD2FjZvS4bYXvaGtRZ+6vSP5Macqmgsl5SF8+mGzwB6wOaAqnfaOtNQyVSwSq LVfjZEGhQ7/MjeR01Vo9D2RDknVRMykyvTTlogTOfltzMPosjJBTQNWRubecYB9SGpP1VA 7G2DfigHSOIoRecMMB8ahS0bPAVJM0wUasGbcDvzixSTVuMaI2Sd/GB/iF5aHQ== 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=1741974748; 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=V/QAYpramKntNP4sGzBFGlSRsGUglIYdyyx/NmS18qk=; b=PAzVyz1SRDILqE6eDCT0euckII6yfWWipFtKCOnr/CgL+UvvDbi2CDIYKfuVzgHaStzDIH dMAfWS7rd+tnw+3OBgEAbKGmxb7cEnzd57K0zOKCTWOk+JN67YdrKR8vBT41Yyk4CU/cLV otSpa1SIionO1vdnsA/LDu4FLtLPqHrUB7lfYDIRintr7r7w168cClx/du/eWoocOLd+4Q nIsoDnqnplv7FvK6EDbO9v/JrTXG3DZ52QOOFrwtNy/HT9mU70/UYiE87Za/WeyCRDurRe k/iyEfjOr7iZfTgkpcgm1oI9gJs+Xbq5+gV5cLPUxq6K9KTckYft3yY4k4ddAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDsQN1yrGzvcl; Fri, 14 Mar 2025 17:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52EHqSX4061643; Fri, 14 Mar 2025 17:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EHqSG0061640; Fri, 14 Mar 2025 17:52:28 GMT (envelope-from git) Date: Fri, 14 Mar 2025 17:52:28 GMT Message-Id: <202503141752.52EHqSG0061640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 813072296261 - stable/14 - posix: POSIX-1.2008 moved SA_* from XSI to base standard 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8130722962610736ea41911a5e24a17bf1bc444e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8130722962610736ea41911a5e24a17bf1bc444e commit 8130722962610736ea41911a5e24a17bf1bc444e Author: Warner Losh AuthorDate: 2024-05-10 15:18:43 +0000 Commit: Warner Losh CommitDate: 2025-03-14 17:51:03 +0000 posix: POSIX-1.2008 moved SA_* from XSI to base standard Starting with POSIX-1.2008, "The SA_RESETHAND, SA_RESTART, SA_SIGINFO, SA_NOCLDWAIT, and SA_NODEFER constants are moved from the XSI option to the Base." Make them so visible. PR: 275328 Sponsored by: Netflix (cherry picked from commit 06af7bd12a4a654f5c5e8da41cf329eee3aa61f6) --- sys/sys/signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 6a519db54893..2aad8ef3a479 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -373,7 +373,7 @@ struct sigaction { #define SA_NOCLDSTOP 0x0008 /* do not generate SIGCHLD on child stop */ #endif /* __POSIX_VISIBLE || __XSI_VISIBLE */ -#if __XSI_VISIBLE +#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809 #define SA_ONSTACK 0x0001 /* take signal on signal stack */ #define SA_RESTART 0x0002 /* restart system call on signal return */ #define SA_RESETHAND 0x0004 /* reset to SIG_DFL when taking signal */ From nobody Fri Mar 14 17:52:46 2025 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 4ZDsQk4Rktz5qWj6; Fri, 14 Mar 2025 17:52:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDsQk2s0fz3Dv6; Fri, 14 Mar 2025 17:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741974766; 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=ft9KDjWrZQlEqKnL83kPpqLFcEiY4tfHlW08jm8U4Ic=; b=tzDve/LIBb1c5+vq7R7oPSUDk6jvvjLsr6k4zl1UddtGATKbIXibz1O8h296hAiGsKeEWL 3d6CBcN4dHWnz7zKdkijVVQgwSHE5p5gtVLzdsn7dVF3O/Dc0PbLVA/KQm9tjFysYH65vS TKGJ06do1gVQ8GnbLWxR3t31jqHRuT7ZJ7sD7oa0oTXIKUDVJ9KecxDJLYKdCOr1u3jJ6U iDLA8Cz+qxUlo/qPgNa4JnRQAguE3RtiprkTdVX/uhChHh1Gh9IZ/1Bucy89nu9lNG59Kh dV6yoFGoDfa3bvXLN/QKdAlAfnY9HTtbIQ8lf1bIlxEPU8nj8wZvLtW9DVZJdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741974766; a=rsa-sha256; cv=none; b=hG53wYYJoRk1vEJyFbwKMbm1n1chVCHL5XURnlZHdqGewC5G2Fq8H0fGMIMxkfh+dEt9Y8 vpNssR1vFjct11Q7zlcbBL7etkXzXs37RbMZdYSAxJaNk+QXsX9cGRW7ywDsbZr9uN6QuH VAi1jAptBgQH6rc6F/3iu0M0+UtUaYklq7AfsVTkCQRxOJV881xZ1gCA3IHWCOiT/JQXs/ pEW06c6An0KSvEFWpxOWCp7RW9wXdq15cKjzRwVGQ4rWNrJhm4kTQPOEsfGkd+lJ2AgmXR CeK3vrRPKa7+M9YfJfqFUAw1H2GyfNDOD5I26QbAHPNB11fWu8l21HM3Kws3fg== 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=1741974766; 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=ft9KDjWrZQlEqKnL83kPpqLFcEiY4tfHlW08jm8U4Ic=; b=SAZ22GfS4MwGjZ2HT63pohVh+lTTsHfws3pdNu/bC/QVTqNmo7Xt9PD4w5sPR7XpSV/21h OYUPDsg1go9LNjaomxsMN6W2jtzKx2UzlDgPW5h2TTXlm4S6I2NCzHlttgVNzMe9bPr7nV 9IGj5+QiFydhcUt8yZsXaDcvkoO+kZ/T5zQaeHozKwJvaYRUOUkhqN8Zt/y/GlRTh6G3Bl 7nO7aDMa5osPntL78ZZdE9rGXSWvAijd88dCfvouXd7B3NUV/0ipDehxFNYzedsRJ48ndJ 7LU0VHCqrmggaadTY8b26nwKrbUZf5UUxSKErzgkN7PhhHVZoIV1QVZ3uSuevw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDsQk2M1JzvNl; Fri, 14 Mar 2025 17:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52EHqkAP061883; Fri, 14 Mar 2025 17:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EHqkaC061880; Fri, 14 Mar 2025 17:52:46 GMT (envelope-from git) Date: Fri, 14 Mar 2025 17:52:46 GMT Message-Id: <202503141752.52EHqkaC061880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a4a271424f5e - stable/13 - posix: POSIX-1.2008 moved SA_* from XSI to base standard 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4a271424f5e8c4c90090d13a52034308fed60b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a4a271424f5e8c4c90090d13a52034308fed60b5 commit a4a271424f5e8c4c90090d13a52034308fed60b5 Author: Warner Losh AuthorDate: 2024-05-10 15:18:43 +0000 Commit: Warner Losh CommitDate: 2025-03-14 17:51:46 +0000 posix: POSIX-1.2008 moved SA_* from XSI to base standard Starting with POSIX-1.2008, "The SA_RESETHAND, SA_RESTART, SA_SIGINFO, SA_NOCLDWAIT, and SA_NODEFER constants are moved from the XSI option to the Base." Make them so visible. PR: 275328 Sponsored by: Netflix (cherry picked from commit 06af7bd12a4a654f5c5e8da41cf329eee3aa61f6) --- sys/sys/signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/signal.h b/sys/sys/signal.h index fe195d24fc5b..0a8b950a6953 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -386,7 +386,7 @@ struct sigaction { #define SA_NOCLDSTOP 0x0008 /* do not generate SIGCHLD on child stop */ #endif /* __POSIX_VISIBLE || __XSI_VISIBLE */ -#if __XSI_VISIBLE +#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809 #define SA_ONSTACK 0x0001 /* take signal on signal stack */ #define SA_RESTART 0x0002 /* restart system call on signal return */ #define SA_RESETHAND 0x0004 /* reset to SIG_DFL when taking signal */ From nobody Fri Mar 14 18:16:45 2025 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 4ZDsyP4pTJz5qYMY; Fri, 14 Mar 2025 18:16:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDsyP48Dtz3RqZ; Fri, 14 Mar 2025 18:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741976205; 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=Uw25QkmgAb5IVzzI70vHrI2eLsr860Bfnb4MXgCmOcw=; b=xgtDjsEzx2EvuqR4Bzf0YvO93Jmvsk2APvS8ZHwJJHpEGCcMDgHaUUgmkHyTPSrqOVk7nA AKX88zZcTY0HqXvpqAdT/h8ncPykhvJZKhfwx8CyixwipIDdS64QJfleRvPTpM3tmn0FbD z1OBcDlx0dm1TM10qQLkimjvJ52nluOZ8/PXEGjJFeLFyDb2i1yoY4ZMoPhx8uGkkDvOX0 9dUFcs4HDKMFylc0f0UTBh/r9LQdOQnzHDWjmyppFUPkEb6j40A4zV8ISLR517MTlWyeCC kLE8hVdw31IM3Y0tv5lM1uBf6x41ozaeZUyAl3FyyGdLf4w1joYREhnlHhnlkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741976205; a=rsa-sha256; cv=none; b=KMYlE7i5w3DHCYg3M6AyN4jqSSZs0OG7RNtz8WzSvnGgYkVpej6rTICg/wTXe6sFD8ciud ztMHGCmHmH/214HdLwGVvzg9D848l/SfW7TQKJ/vzEGh/k/0N1oIGqiYToN5ZMX6eUXbud hn9uOVyMwe0hLUcWbCPkx0abPyMNF5NltoGqf02uVIMIiztFpBWyGWxMEkcAxCLhmUOreS kD+l5vQKvR+0ONesCUcH03l2M5/TGzKnAP+XW5PI3Cy/9CgI+YtIbvXnZihJQQe+e1JjR9 u2dG+7enYuqisqEjH22DjzLgGgJZBmp7Z6SbxJZ5lBC/1YH6Xu6KIkqhvEo0iw== 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=1741976205; 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=Uw25QkmgAb5IVzzI70vHrI2eLsr860Bfnb4MXgCmOcw=; b=qD5A2sX50sqxz7r5+/1NG+uMRCsh2i+y+Q5gAF5GCpUHgrxkttBXXYZiCorgJzMW4qRSOu cXE0Z5ITT3pvHLmbWwdDN2aaYO4TFO6fDseGjaqK8sE3ovms3N+hNt1iwvxaYz6YcriOqi W3HYFs6zgNZnxueGhFc0x3UysB4WJSkHKRibWhQAA2Zr9eEkogOxFpIYA0InkIWl43PVSd QIc+6bNhEuKh6j4Jcuq60olEVKbV0Sw+ugwRrnP4Mn+O288ZRVxkJK8Z6XYW6LzLnF6btb dis8ODtEOwMX+8jRAWOnDHihXAhErKQuXYsHVW9odfgM/UcDGWWNdjknodAFgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDsyP3fXkzvl8; Fri, 14 Mar 2025 18:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52EIGjDR001253; Fri, 14 Mar 2025 18:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EIGjVj001250; Fri, 14 Mar 2025 18:16:45 GMT (envelope-from git) Date: Fri, 14 Mar 2025 18:16:45 GMT Message-Id: <202503141816.52EIGjVj001250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 81eb546b4e14 - stable/14 - keymaps: Add Canadian Mulitlingual Standard 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81eb546b4e146f2080096128858505773593ef82 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=81eb546b4e146f2080096128858505773593ef82 commit 81eb546b4e146f2080096128858505773593ef82 Author: Adam Scott AuthorDate: 2025-01-31 18:53:21 +0000 Commit: Ed Maste CommitDate: 2025-03-14 18:16:31 +0000 keymaps: Add Canadian Mulitlingual Standard Pull Request: https://github.com/freebsd/freebsd-src/pull/1586 (cherry picked from commit 602be8e1a8711dd9c264e75078a35533f07526eb) --- share/vt/keymaps/INDEX.keymaps | 3 + share/vt/keymaps/Makefile | 1 + share/vt/keymaps/ca-multi.kbd | 142 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+) diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps index 1bc18e3da04d..278f9ec9f373 100644 --- a/share/vt/keymaps/INDEX.keymaps +++ b/share/vt/keymaps/INDEX.keymaps @@ -208,6 +208,9 @@ ca-fr.kbd:fr:Français Canadien (avec accents) ca-fr.kbd:es:Francocanadiense (con acentos) ca-fr.kbd:uk:Французько-канадська (accent keys) +ca-multi.kbd:en:Canadian Mulitlingual Standard +ca-multi.kbd:fr:Canadien multilingue standard + de.kbd:en:German de.kbd:da:Tysk de.kbd:de:Deutsch diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index bcfd6abaa4e1..8cedb1822efb 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -12,6 +12,7 @@ FILES= INDEX.keymaps \ by.kbd \ ca.kbd \ ca-fr.kbd \ + ca-multi.kbd \ centraleuropean.kbd \ centraleuropean.qwerty.kbd \ ch-fr.acc.kbd \ diff --git a/share/vt/keymaps/ca-multi.kbd b/share/vt/keymaps/ca-multi.kbd new file mode 100644 index 000000000000..2f195c0026b4 --- /dev/null +++ b/share/vt/keymaps/ca-multi.kbd @@ -0,0 +1,142 @@ +# Canadian Multilingual Standard keyboard +# by Adam Scott (info@adamscott.studio) +# +# January 31, 2025 +# +# Based on French Canadian keyboard +# by Alexandre Normand (outcast@globetretrotter.net) +# with the help of Demis (demis@club-internet.fr) +# +# July 4, 1999 + +# alt +# scan cntrl alt alt cntrl lock +# code base shift cntrl shift alt shift cntrl shift state + 000 nop nop nop nop nop nop nop nop O + 001 esc esc esc esc esc esc debug esc O + 002 '1' '!' nop nop 0x00A1 0x2248 nop nop O # 0x00A1: '¡', 0x2248: '≈' + 003 '2' '@' nop nop '@' 0x0131 nop nop O # 0x0131: 'ı' + 004 '3' '#' nop nop 0x00A3 0x02C6 nop nop O # 0x00A3: '£', 0x02C6: 'ˆ' + 005 '4' '$' nop nop 0x20AC 0x02DC nop nop O # 0x20AC: '€', 0x02DC: '˜' + 006 '5' '%' nop nop 0x221E 0xF8FF nop nop O # 0x221E: '∞', 0xF8FF: '' + 007 '6' '?' nop nop 0x0020 0x2020 nop nop O # 0x0020: ' ', 0x2020: '†' + 008 '7' '&' nop nop '{' 0x2021 nop nop O # 0x2021: '‡' + 009 '8' '*' nop nop '}' 0x2022 nop nop O # 0x2022: '•' + 010 '9' '(' nop nop '[' 0x00B1 nop nop O # 0x00B1: '±' + 011 '0' ')' nop nop ']' 0x2014 nop nop O # 0x2014: '—' + 012 '-' '_' nop nop '|' 0x00BF nop nop O # 0x00BF: '¿' + 013 '=' '+' nop nop 0x00AC 0x2013 nop nop O # 0x00AC: '¬', 0x2013: '–' + 014 bs bs del del bs bs del del O + 015 ht btab nop nop ht btab nop nop O + 016 'q' 'Q' dc1 0x03A9 0x0153 0x0152 nop nop C # 0x03A9: 'Ω', 0x0153: 'œ', 0x0152: 'Œ' + 017 'w' 'W' etb etb 0x2211 0x2030 nop nop C # 0x2211: '∑', 0x2030: '‰' + 018 'e' 'E' enq enq 0x2202 0x00AF 0x0153 nop C # 0x2202: '∂', 0x00AF: '¯', 0x0153: 'œ' + 019 'r' 'R' dc2 0x00AE 0x00B6 0x00AE 0x00B6 dc2 C # 0x00AE: '®', 0x00B6: '¶' + 020 't' 'T' dc4 dc4 0x2122 0x02D8 dc4 dc4 C # 0x2122: '™', 0x02D8: '˘' + 021 'y' 'Y' em 0x00A5 0x00A5 0x02DD em em C # 0x00A5: '¥', 0x02DD: '˝' + 022 'u' 'U' nak nak 0x0020 0x02DB 0x0020 nak C # 0x0020: ' ', 0x02DB: '˛' + 023 'i' 'I' ht 0x0131 0x03C0 0x220F ht ht C # 0x0131: 'ı', 0x03C0: 'π', 0x220F: '∏' + 024 'o' 'O' si 0x00D8 0x00F8 0x00D8 0x00F8 si C # 0x00D8: 'Ø', 0x00F8: 'ø' + 025 'p' 'P' dle dle 0x201C 0x201D dle dle C # 0x201C: '“', 0x201D: '”' + 026 dcir dcir esc 0x02DA dgra 0x201E esc esc O # 0x02DA: '˚', 0x201E: '„' + 027 0x00E7 0x00C7 gs gs '~' dtil 0x02DC gs O # 0x00E7: 'ç', 0x00C7: 'Ç', 0x02DC: '˜' + 028 cr cr nl nl cr cr nl nl O + 029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O + 030 'a' 'A' soh soh 0x00E6 0x00C6 0x00E6 soh C # 0x00E6: 'æ', 0x00C6: 'Æ' + 031 's' 'S' dc3 0x00A7 0x00DF 0x00A7 0x00DF dc3 C # 0x00A7: '§', 0x00DF: 'ß' + 032 'd' 'D' eot eot 0x00AA eot eot eot C # 0x00AA: 'ª' + 033 'f' 'F' ack ack 0x0192 0xFB02 ack ack C # 0x0192: 'ƒ', 0xFB02: 'fl' + 034 'g' 'G' bel bel 0xFB02 0xFB01 bel bel C # 0xFB02: '©', 0xFB01: 'fi' + 035 'h' 'H' bs bs 0x02D9 0x00B7 bs bs C # 0x02D9: '˙', 0x00B7: '·' + 036 'j' 'J' nl nl 0x2206 0x201A nl nl C # 0x2206: '∆', 0x201A: '‚' + 037 'k' 'K' vt vt 0x02DA 0x2044 vt vt C # 0x02DA: '˚', 0x2044: '⁄' + 038 'l' 'L' ff ff 0x00A0 0x2026 ff ff C # 0x00A0: ' ', 0x2026: '…' + 039 ';' ':' nop nop 0x00B0 dacu 0x00B4 ':' O # 0x00B0: '°', 0x00B4: '´' + 040 0x00E8 0x00C8 dcir nop '\' 0x2019 nop dcir O # 0x00E8: 'è', 0x00C8: 'È', 0x2019: '’' + 041 '/' '\' '0' '-' '|' ' ' nop '0' O + 042 lshift lshift lshift lshift lshift lshift lshift lshift O + 043 0x00E0 0x00C0 nop nop 0x0060 dgra nop nop O # 0x00E0: 'à', 0x00C0: 'À', 0x0060: '`' + 044 'z' 'Z' sub sub 0x00AB 0x2039 sub sub C # 0x00AB: '«', 0x2039: '‹' + 045 'x' 'X' can can 0x00BB 0x203A can can C # 0x00BB: '»', 0x203A: '›' + 046 'c' 'C' etx 0x00A9 0x00A2 0x2020 etx etx C # 0x00A9: '©', 0x00A2: '¢', 0x2020: '†' + 047 'v' 'V' syn syn 0x221A 0x25CA 0x201C syn C # 0x221A: '√', 0x25CA: '◊', 0x201C: '“' + 048 'b' 'B' stx stx 0x222B 0x2264 stx stx C # 0x222B: '∫', 0x2264: '≤' + 049 'n' 'N' so so 0x00A0 0x2265 so so C # 0x00A0: ' ', 0x2265: '≥' + 050 'm' 'M' cr 0x00BA 0x00B5 0x00BA 0x00B5 cr C # 0x00BA: 'º', 0x00B5: 'µ' + 051 ',' ''' nop nop '<' 'x' 0x2014 ',' O # 0x2014: '—' + 052 '.' '"' nop 0x00F7 '>' 0x00F7 0x00B7 '.' O # 0x00F7: '÷', 0x00B7: '·' + 053 0x00E9 0x00C9 nop nop '/' 0x2260 nop 0x00E9 C # 0x00E9: 'é', 0x00C9: 'É', 0x2260: '≠' + 054 rshift rshift rshift rshift rshift rshift rshift rshift O + 055 '*' '*' '*' '*' '*' '*' '*' '*' O + 056 lalt lalt lalt lalt lalt lalt lalt lalt O + 057 ' ' ' ' nul ' ' 0x00A0 0x00A0 susp nop O # 0x00A0: ' ' + 058 clock clock clock clock clock clock clock clock O + 059 fkey01 fkey13 fkey25 fkey37 scr01 scr11 scr01 scr11 O + 060 fkey02 fkey14 fkey26 fkey38 scr02 scr12 scr02 scr12 O + 061 fkey03 fkey15 fkey27 fkey39 scr03 scr13 scr03 scr13 O + 062 fkey04 fkey16 fkey28 fkey40 scr04 scr14 scr04 scr14 O + 063 fkey05 fkey17 fkey29 fkey41 scr05 scr15 scr05 scr15 O + 064 fkey06 fkey18 fkey30 fkey42 scr06 scr16 scr06 scr16 O + 065 fkey07 fkey19 fkey31 fkey43 scr07 scr07 scr07 scr07 O + 066 fkey08 fkey20 fkey32 fkey44 scr08 scr08 scr08 scr08 O + 067 fkey09 fkey21 fkey33 fkey45 scr09 scr09 scr09 scr09 O + 068 fkey10 fkey22 fkey34 fkey46 scr10 scr10 scr10 scr10 O + 069 nlock nlock nlock nlock nlock nlock nlock nlock O + 070 slock slock slock slock slock slock slock slock O + 071 fkey49 '7' '7' '7' '7' '7' '7' '7' N + 072 fkey50 '8' '8' '8' '8' '8' '8' '8' N + 073 fkey51 '9' '9' '9' '9' '9' '9' '9' N + 074 fkey52 '-' '-' '-' '-' '-' '-' '-' N + 075 fkey53 '4' '4' '4' '4' '4' '4' '4' N + 076 fkey54 '5' '5' '5' '5' '5' '5' '5' N + 077 fkey55 '6' '6' '6' '6' '6' '6' '6' N + 078 fkey56 '+' '+' '+' '+' '+' '+' '+' N + 079 fkey57 '1' '1' '1' '1' '1' '1' '1' N + 080 fkey58 '2' '2' '2' '2' '2' '2' '2' N + 081 fkey59 '3' '3' '3' '3' '3' '3' '3' N + 082 fkey60 '0' '0' '0' '0' '0' '0' '0' N + 083 del '.' '.' '.' '.' '.' boot boot N + 084 nop nop nop nop nop nop nop nop O + 085 nop nop nop nop nop nop nop nop O + 086 0x00F9 0x00D9 duml nop '\' 0x03A9 nop duml O # 0x00F9: 'ù', 0x00D9: 'Ù', 0x03A9: 'Ω' + 087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O + 088 fkey12 fkey24 fkey36 fkey48 scr12 scr12 scr12 scr12 O + 089 cr cr nl nl cr cr nl nl O + 090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O + 091 '/' '/' '/' '/' '/' '/' '/' '/' O + 092 nscr pscr debug debug nop nop nop nop O + 093 ralt ralt ralt ralt ralt ralt ralt ralt O + 094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O + 095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O + 096 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 O + 097 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 O + 098 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 O + 099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O + 100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O + 101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O + 102 fkey60 paste fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O + 103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O + 104 slock saver slock saver susp nop susp nop O + 105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O + 106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O + 107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O + 108 nop nop nop nop nop nop nop nop O + + dgra '`' ( 'a' 0xe0 ) ( 'A' 0xc0 ) ( 'e' 0xe8 ) ( 'E' 0xc8 ) + ( 'i' 0xec ) ( 'I' 0xcc ) ( 'o' 0xf2 ) ( 'O' 0xd2 ) + ( 'u' 0xf9 ) ( 'U' 0xd9 ) + + dacu 0xb4 ( 'a' 0xe1 ) ( 'A' 0xc1 ) ( 'e' 0xe9 ) ( 'E' 0xc9 ) + ( 'i' 0xed ) ( 'I' 0xcd ) ( 'o' 0xf3 ) ( 'O' 0xd3 ) + ( 'u' 0xfa ) ( 'U' 0xda ) ( 'y' 0xfd ) ( 'Y' 0xdd ) + + dcir '^' ( 'a' 0xe2 ) ( 'A' 0xc2 ) ( 'e' 0xea ) ( 'E' 0xca ) + ( 'i' 0xee ) ( 'I' 0xce ) ( 'o' 0xf4 ) ( 'O' 0xd4 ) + ( 'u' 0xfb ) ( 'U' 0xdb ) + + dtil '~' ( 'a' 0xe3 ) ( 'A' 0xc3 ) ( 'n' 0xf1 ) ( 'N' 0xd1 ) + ( 'o' 0xf5 ) ( 'O' 0xd5 ) + + duml 0xa8 ( 'a' 0xe4 ) ( 'A' 0xc4 ) ( 'e' 0xeb ) ( 'E' 0xcb ) + ( 'i' 0xef ) ( 'I' 0xcf ) ( 'o' 0xf6 ) ( 'O' 0xd6 ) + ( 'u' 0xfc ) ( 'U' 0xdc ) ( 'y' 0xff ) From nobody Sat Mar 15 02:52:08 2025 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 4ZF5P56S1bz5rBk9; Sat, 15 Mar 2025 02:52: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZF5P46sXKz3xNv; Sat, 15 Mar 2025 02:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742007129; 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=GdgJMWLCCFhX0gHog0a0igDmvxy5MBfp5mBhVm9SEMY=; b=jZE2mg/VBTV5V1WVj7Ompg0+hWwdsNqKSpV9tIO+TBIakLDZnUU9fvdN/LWi49jwseZKvD gkesWDx8DgiFa+6BlTsiMPiSMLoZuzyCWqtT9XeAwsTVyWtrh7ya57hDQH1XNamRxTHLkc C8MK/YowOBKjePbtxwON/Z5YjMwCGmAWvnn1BVqikcbccanF54vIaUuLEjbcIHhbFcu2Xt rcB1/el0J1t58hh+KfYQ1Tu26jjHGjKepfhUrxXoXTLc1r9swTuC9SYob7PHlssdKn2gtJ 1GQ8PJDdLwFcouRNSBlosO4jG6b0o3iMTNvOdimogUFo1xUikFNSogjemBKXAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742007129; a=rsa-sha256; cv=none; b=tVc5qctETNqdSEF6HC1cv1ZRP/9MDDI522ndx80nTpb54daj/ttf5QmxX/EJI6rjvNQlA4 hMaBbqHxPeaMzqE/9dDfZLVokcZHPFP/QGkLpx5w6h+FZb6pfujV4gD1FMTzmodyBmh3KL ItraSTDgkuK6VjASWD5yewmeYA/qRv4oyRjEjdfq58+YKHqKoHx9q+dkDbWAQh2dHL3gYM BRpOgjavTKNid1S1sXZTp9ut2YHp1suBi8fxghAkWDx7Ls+yN87izX5P4ZsOdaijzUdMPP 49rscUWReBbs/YNSzzoptKBMnl/HgQ6BKMi3o3Lt7La64A/04SmB+rjTceNRlQ== 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=1742007129; 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=GdgJMWLCCFhX0gHog0a0igDmvxy5MBfp5mBhVm9SEMY=; b=qj0/ciyPq7dQ4MZLeMj+U1e7v1pWfiW3ENgEEVLUPnCJ0vP2RAV73R/QuiUDuHs11UyL7I CrZN7kvgInC8H3LMfXMqHpNIZY3KjsFyldHc9+XJHDMkqoHxg8vwxVeVDw/X6dUscANanM hntwyJgPXwrkxwfnByOjNreZl5RT6mHXKOtP39X8WJH1U6Dm0TxRXhhD5h8iliq9tHvrtB u1VHQ1vFkPmcgrAO8TcXteqUHsNRKrM0JCk4LvIe912z6C3D8+HeafKCE/LLgKEegD35jQ ojtELsMCGo8RNTGmH677O/huiiQGv9Kv8B0ISSBzSQridVkHHoe1CQ9NfXd8Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZF5P46MQ3z1B2h; Sat, 15 Mar 2025 02:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52F2q8ha070890; Sat, 15 Mar 2025 02:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52F2q8fH070887; Sat, 15 Mar 2025 02:52:08 GMT (envelope-from git) Date: Sat, 15 Mar 2025 02:52:08 GMT Message-Id: <202503150252.52F2q8fH070887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7215aed7974c - stable/14 - kern: wg: remove overly-restrictive address family check 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7215aed7974cc4b7d3197ca5e5fcf545d3a28c0f Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7215aed7974cc4b7d3197ca5e5fcf545d3a28c0f commit 7215aed7974cc4b7d3197ca5e5fcf545d3a28c0f Author: Kyle Evans AuthorDate: 2025-03-04 19:57:34 +0000 Commit: Kyle Evans CommitDate: 2025-03-15 02:52:02 +0000 kern: wg: remove overly-restrictive address family check IPv4 packets can be routed via an IPv6 nexthop, so the handling of the parsed address family is more strict than it needs to be. If we have a valid header that matches a known peer, then we have no reason to decline the packet. Convert it to an assertion that it matches the destination as viewed by the stack below it, instead. `dst` may be the gateway instead of the destination in the case of a nexthop, so the `af` assignment must be switched to use the destination in all cases. Add a test case that approximates a setup like in the PR and demonstrates the issue. PR: 284857 Reviewed by: markj (earlier version), zlei (cherry picked from commit 2bef0d54f74dad6962ef7d1dfa407e95cb4fb4ad) --- sys/dev/wg/if_wg.c | 8 ++--- tests/sys/net/if_wg.sh | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index b0ad94e284f1..ed23baf33a17 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2333,7 +2333,7 @@ wg_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) memcpy(&af, dst->sa_data, sizeof(af)); else - af = dst->sa_family; + af = RO_GET_FAMILY(ro, dst); if (af == AF_UNSPEC) { xmit_err(ifp, m, NULL, af); return (EAFNOSUPPORT); @@ -2358,10 +2358,8 @@ wg_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro xmit_err(ifp, m, NULL, AF_UNSPEC); return (ret); } - if (parsed_af != af) { - xmit_err(ifp, m, NULL, AF_UNSPEC); - return (EAFNOSUPPORT); - } + + MPASS(parsed_af == af); mtu = (ro != NULL && ro->ro_mtu > 0) ? ro->ro_mtu : if_getmtu(ifp); return (wg_xmit(ifp, m, parsed_af, mtu)); } diff --git a/tests/sys/net/if_wg.sh b/tests/sys/net/if_wg.sh index b43b40f25018..e5df6afface1 100644 --- a/tests/sys/net/if_wg.sh +++ b/tests/sys/net/if_wg.sh @@ -92,6 +92,84 @@ wg_basic_cleanup() vnet_cleanup } +atf_test_case "wg_basic_crossaf" "cleanup" +wg_basic_crossaf_head() +{ + atf_set descr 'Create a wg(4) tunnel and pass IPv4 traffic over an IPv6 nexthop' + atf_set require.user root +} + +wg_basic_crossaf_body() +{ + local epair pri1 pri2 pub1 pub2 wg1 wg2 + local endpoint1 endpoint2 tunnel1 tunnel2 + local testnet testlocal testremote + + kldload -n if_wg || atf_skip "This test requires if_wg and could not load it" + + pri1=$(wg genkey) + pri2=$(wg genkey) + + endpoint1=192.168.2.1 + endpoint2=192.168.2.2 + tunnel1=2001:db8:1::1 + tunnel2=2001:db8:1::2 + + testnet=192.168.3.0/24 + testlocal=192.168.3.1 + testremote=192.168.3.2 + + epair=$(vnet_mkepair) + + vnet_init + + vnet_mkjail wgtest1 ${epair}a + vnet_mkjail wgtest2 ${epair}b + + jexec wgtest1 ifconfig ${epair}a ${endpoint1}/24 up + jexec wgtest2 ifconfig ${epair}b ${endpoint2}/24 up + + wg1=$(jexec wgtest1 ifconfig wg create) + echo "$pri1" | jexec wgtest1 wg set $wg1 listen-port 12345 \ + private-key /dev/stdin + pub1=$(jexec wgtest1 wg show $wg1 public-key) + wg2=$(jexec wgtest2 ifconfig wg create) + echo "$pri2" | jexec wgtest2 wg set $wg2 listen-port 12345 \ + private-key /dev/stdin + pub2=$(jexec wgtest2 wg show $wg2 public-key) + + atf_check -s exit:0 -o ignore \ + jexec wgtest1 wg set $wg1 peer "$pub2" \ + endpoint ${endpoint2}:12345 allowed-ips ${tunnel2}/128,${testnet} + atf_check -s exit:0 \ + jexec wgtest1 ifconfig $wg1 inet6 ${tunnel1}/64 up + + atf_check -s exit:0 -o ignore \ + jexec wgtest2 wg set $wg2 peer "$pub1" \ + endpoint ${endpoint1}:12345 allowed-ips ${tunnel1}/128,${testnet} + atf_check -s exit:0 \ + jexec wgtest2 ifconfig $wg2 inet6 ${tunnel2}/64 up + + atf_check -s exit:0 jexec wgtest1 ifconfig $wg1 inet ${testlocal}/32 + atf_check -s exit:0 jexec wgtest2 ifconfig $wg2 inet ${testremote}/32 + + # Generous timeout since the handshake takes some time. + atf_check -s exit:0 -o ignore jexec wgtest1 ping -c 1 -t 5 "$tunnel2" + + # Setup our IPv6 endpoint and routing + atf_check -s exit:0 -o ignore \ + jexec wgtest1 route add -inet ${testnet} -inet6 "$tunnel2" + atf_check -s exit:0 -o ignore \ + jexec wgtest2 route add -inet ${testnet} -inet6 "$tunnel1" + # Now ping an address on the other side + atf_check -s exit:0 -o ignore jexec wgtest1 ping -c 1 -t 3 ${testremote} +} + +wg_basic_crossaf_cleanup() +{ + vnet_cleanup +} + atf_test_case "wg_basic_netmap" "cleanup" wg_basic_netmap_head() { @@ -349,6 +427,7 @@ wg_vnet_parent_routing_cleanup() atf_init_test_cases() { atf_add_test_case "wg_basic" + atf_add_test_case "wg_basic_crossaf" atf_add_test_case "wg_basic_netmap" atf_add_test_case "wg_key_peerdev_shared" atf_add_test_case "wg_key_peerdev_makeshared" From nobody Sat Mar 15 07:05:34 2025 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 4ZFC1V60FKz5qGsF; Sat, 15 Mar 2025 07:05:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFC1V4yp8z45kd; Sat, 15 Mar 2025 07:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742022334; 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=dd+J+gl1HBCxsD1pmh483pcAyybS5ypiKhkfARpiiw8=; b=QxYm6Nror62PRFutUp58r+EC+HyPsHxF0kOEPOcVoPkkXt5Pdx5GNLCz7Yi8IEEnPlajrm k3ChXK7z4fkzinOkyt7idskaqOf7oP5LZVPQb6V7FylmicPb8dl9d68I20Xyl9QldDk6zY Qp5mMwDKD8m49zzaqYxIEGDNDm30z9h5AvHyUjc1hI/tSETiBrrJD6JkjKqY700FQiFdFG jCkzbiqUmocCbYwrIWSk/Bma/oEFnYsqSsA4gi085bCxWX3xfu9Xtwl7qL7OoiBjRnDkwM TxlqXtghUIW6b+1n88DhwuLIClvmI9iJnw93AZhnVGaGbrtSB2IYa/IIoQalDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742022334; a=rsa-sha256; cv=none; b=rREPp35rONbqIYIdyZAo3FoH6MaGPv+5+Lu6Ywix1os1MOXs30XmVtGU3Y2ZZbCo8AWAQS png5eBvjdb6c5bENDxNkF2HI1evVnQm04y03myamLkiOIPIi7xgNi6evmzElhwVplUU2Ro pr1O3XULBbCh0BXlO+5leOeJCLVel6cJZ1IvwywEZ+Dns56E/8cX1NZW9Xj3mWp5wmiWPb WU5SfyVpozYsAP9irLq1VozHuWGP6zPiUxA8eeuLc/IcD82pKE5JBwqpkC/YWoHZ896oFA lkZvY0UlLMaqBjHn7VqrRp+ZY/+0j/GcmupirME2WPelL6gKXnD427/hOVn5Fw== 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=1742022334; 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=dd+J+gl1HBCxsD1pmh483pcAyybS5ypiKhkfARpiiw8=; b=ejre1/8U9P8txRj9/5/MqeqKz/k4YOcjl269MSfp83usxPDZXpBdHOomP9IdhRDDvv6Zbc tP4htGAStmPYkHqTXN+E1omGkIEk+NBFzweq4AMw8YFXkMuFS0FaB6JMVXvBxmIP8e2vg9 58I/VK5LuuM1KrZLDofalrc+dXESa7L5c8Z+D3QdoomhJ2WX3NXcT34UWyvzEbNDPZNZNb yzLNrRedMQUQ6uVi1hoCTiHYAH2u19hW+HguSK7uk5In9a7TU/CxfQsnCC2rYX017kjs4D GyP21DdWs9w+KstsxRnjnCJszAjqmlp/xyQ1QDO2ZJN9Q1XeV6DeauNtRdDmMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZFC1V4ZSyz1JcS; Sat, 15 Mar 2025 07:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52F75YWL041262; Sat, 15 Mar 2025 07:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52F75YSG041259; Sat, 15 Mar 2025 07:05:34 GMT (envelope-from git) Date: Sat, 15 Mar 2025 07:05:34 GMT Message-Id: <202503150705.52F75YSG041259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: fa301530e0ca - stable/14 - arm64: bus: Add 36-bit address mask for use in bus space allocations 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa301530e0ca3a762c5dbf0bb8f3411ea5ba0e13 Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=fa301530e0ca3a762c5dbf0bb8f3411ea5ba0e13 commit fa301530e0ca3a762c5dbf0bb8f3411ea5ba0e13 Author: Ka Ho Ng AuthorDate: 2025-02-06 21:26:03 +0000 Commit: Ka Ho Ng CommitDate: 2025-03-15 07:05:23 +0000 arm64: bus: Add 36-bit address mask for use in bus space allocations Obtained from: Juniper Networks, Inc. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44764 (cherry picked from commit 5484c3d6eb31a78f07ed5e66862a1e7d3b5225b6) --- sys/arm64/include/bus.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/include/bus.h b/sys/arm64/include/bus.h index 196916de92e7..2e2ef2f6d008 100644 --- a/sys/arm64/include/bus.h +++ b/sys/arm64/include/bus.h @@ -76,6 +76,7 @@ #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFFUL #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFFUL +#define BUS_SPACE_MAXADDR_36BIT 0xFFFFFFFFFUL #define BUS_SPACE_MAXADDR_40BIT 0xFFFFFFFFFFUL #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFFUL #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFFUL From nobody Sat Mar 15 13:51:46 2025 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 4ZFN2B3027z5qqM1; Sat, 15 Mar 2025 13:51:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFN2B1CQZz3tc2; Sat, 15 Mar 2025 13:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742046706; 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=5Lf7Mp1qYzCeBG3MlMX+2koJhbP3QqOvVLTFvLkgECM=; b=GR0hPNaDtGBW4LdEpV0FhgfAT2IEabgOjtoYWw4nTvYsULbpLVaplsOCAT5lB0HtVezm45 q81ppx4H//+1paflNgFcEcWN8otM33K1zBkMStmOiEGMVgiLjJz7MDCsXJtO09xL6AS4lp B5Ft4xgrmIRKpqxUo4ELMZsEittGI5KQSE+/FNgH94F5dYYtgft9JjNrLK5r1VhZy0uCvz Yu+r/YUzGJoNnlsW1kJSd3lyMHxs2AUtWdpIc8zrSbmdqrt/dagl2ymk0jRqe+3o4g0X/B 9aocvbOzz1kMtq239dgf7tISFLAe4QNu4eTBJmuPCkb/ZAYh0c1o4qQusEj0bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742046706; a=rsa-sha256; cv=none; b=Wvygl00CBOylnozQIKAAlCxMUf73N1lb8183xPBhiLTadgLkF9YHa0htj1TE0dvC63uR9R ZsnbC7DEaiqCItdvsZ/RrOL+UPejJpMyN3RiqQ7pLVlZNLkEz7tCJZYx6u33sgn5UHEXjS O2Z3R9vnaqqKdppemU6a77Ne41HYXoyIVpJB3cRyo9hUYYeXfaW7BS6sHSjOLBMCkovLGq nF+FFQ/QR3zwljEDCzvDDqS1WvuKJ/v8kAYQrOCaYmi1WeG//1eSGbCKgTy1ujl4tJjVZO s2mo4nyYN/QhDJu6qklHX0YYR2s8JuXlja9iw3dJkQ0wrBxu3MMcdM7Ehs4ATQ== 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=1742046706; 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=5Lf7Mp1qYzCeBG3MlMX+2koJhbP3QqOvVLTFvLkgECM=; b=pZOAuOL3oSpfc7WPkyZhDesF9l5wHFrQZT+CsUlYGiQOl+NdauWjF1bk9gsu6Y/wA3VTBF LCCMtwsMKDVeU+NNP2xQw/0db4zt19gI5uah3ho2NL6GOYiA1RZp6I8C4wEALon0ODZCMJ tV5NR67lJvlHEnxN1aDt9lGH9bwRN5bmZavEIXDodKCkHDClGROzcliZZtrVnJi1rubnIg cTXn3+USI24hwIvunEa99GVpdrIbtGGFyXuHWXxA0xyNpZk/lhv7f5suhQApyUpnghqPRf abGRHYtWb7jUxsHl6jJr20iWDt05eYO0X9X53ZL5DSlk3iP8WGoM1aXVP+jxRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZFN2B0cBwz2wc; Sat, 15 Mar 2025 13:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52FDpk5h002097; Sat, 15 Mar 2025 13:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52FDpkuG002094; Sat, 15 Mar 2025 13:51:46 GMT (envelope-from git) Date: Sat, 15 Mar 2025 13:51:46 GMT Message-Id: <202503151351.52FDpkuG002094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 4fd560bc94f0 - stable/14 - caroot: Ignore soft distrust of server CA certificates after 398 days 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4fd560bc94f0f6f070aeab9183c680a796450f22 Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd560bc94f0f6f070aeab9183c680a796450f22 commit 4fd560bc94f0f6f070aeab9183c680a796450f22 Author: Michael Osipov AuthorDate: 2025-02-20 09:48:48 +0000 Commit: Michael Osipov CommitDate: 2025-03-15 13:51:24 +0000 caroot: Ignore soft distrust of server CA certificates after 398 days Mozilla introduced the field CKA_NSS_SERVER_DISTRUST_AFTER which indicates that a CA certificate will be distrusted in the future before its NotAfter time. This means that the CA stops issuing new certificates, but previous ones are still valid, but at most for 398 days after the distrust date. See also: * https://bugzilla.mozilla.org/show_bug.cgi?id=1465613 * https://github.com/Lukasa/mkcert/issues/19 * https://gitlab.alpinelinux.org/alpine/ca-certificates/-/merge_requests/16 * https://github.com/curl/curl/commit/448df98d9280b3290ecf63e5fc9452d487f41a7c Tested by: michaelo Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49075 (cherry picked from commit 457c03b397c80d44da92684d417a58b3ca1fed02) --- secure/caroot/MAca-bundle.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl index 4feced90d782..58cfe1cbf6fa 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/MAca-bundle.pl @@ -37,6 +37,8 @@ use strict; use Carp; use MIME::Base64; use Getopt::Long; +use Time::Local qw( timegm_posix ); +use POSIX qw( strftime ); my $generated = '@' . 'generated'; my $inputfh = *STDIN; @@ -101,13 +103,6 @@ EOH } } -# returns a string like YYMMDDhhmmssZ of current time in GMT zone -sub timenow() -{ - my ($sec,$min,$hour,$mday,$mon,$year,undef,undef,undef) = gmtime(time); - return sprintf "%02d%02d%02d%02d%02d%02dZ", $year-100, $mon+1, $mday, $hour, $min, $sec; -} - sub printcert($$$) { my ($fh, $label, $certdata) = @_; @@ -162,10 +157,15 @@ sub grabcert($) if (/^CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL/) { my $distrust_after = graboct($ifh); - my $time_now = timenow(); - if ($time_now >= $distrust_after) { $distrust = 1; } + my ($year, $mon, $mday, $hour, $min, $sec) = unpack "A2A2A2A2A2A2", $distrust_after; + $distrust_after = timegm_posix( $sec, $min, $hour, $mday, $mon - 1, $year + 100); + my $time_now = time; + # When a CA is distrusted before its NotAfter date, issued certificates + # are valid for a maximum of 398 days after that date. + if ($time_now >= $distrust_after + 398 * 24 * 60 * 60) { $distrust = 1; } if ($debug) { - printf STDERR "line $.: $cka_label ser #%d: distrust after %s, now: %s -> distrust $distrust\n", $serial, $distrust_after, timenow(); + printf STDERR "line $.: $cka_label ser #%d: distrust 398 days after %s, now: %s -> distrust $distrust\n", $serial, + strftime("%FT%TZ", gmtime($distrust_after)), strftime("%FT%TZ", gmtime($time_now)); } if ($distrust) { return undef; From nobody Sat Mar 15 13:56:27 2025 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 4ZFN7b50MNz5qqN8; Sat, 15 Mar 2025 13:56:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFN7b2Ss2z3vZS; Sat, 15 Mar 2025 13:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742046987; 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=JEMkUyC15SjMVnsaIH4Lwux/DQ0YV0+20da4nCiVXrA=; b=AHrQoLG5N4mptPx3fvdCkUnNltggdi7oAf6NnRxtshzOwd0thuqvV/aCbCuyuoUdilyAgt 37NISEmbJWFTabSm2Cgl5BurdQTUudTmBr3M0v63Ily+yFvCEtnn6JnoDmXbeyKyFWqTLx T/RmvbybzugpNcUe59HmpUREzcjdFDlqlrO3UgE/IEnJIfMlzCOpb9WVVDAVPqg4++hZJj MArZMIOWTkjC+R5MeztVES2tyxOxbeDDeUVCs3kn51houZOvgS+BLmEgcBwJVgAG22Dd4C cg+oiiUYBVIywUBtCHWWzz0BvqFBH9LhCgRYwy0qwY4sl5gyKo/Ery8PGBkdpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742046987; a=rsa-sha256; cv=none; b=vU8Op3qx7JCdLWqODfH3FVZQ4Th3TW8jRzSTAZUKPd/ADAyaGVq6lUV9ZvVz6E/1ZqQa30 yPyOTrNa7Ac+nZye7o5UnEEfCrFfxaAsx2AeMcB91byzgAf+stDQWkyJGb7zaIzgPp6jrn uqzlzBNTBNy/LzDbPMiACxU9Jly/ZYW+1qBO8gudi4UF1F4jOPD6eek009FkoTwlVwiW5b psT+06D0vDXh5ac2Q8gxvG6DEjhGEPPpJya9b7cjilDTerd+38eI1TF5xxOTW8UEBXDVz+ /ddCYH/xlTj6Rm0emfhHsdlnpdHLLxzdCIHALj2cS/uOyL7eIwXRxi30gqsGWg== 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=1742046987; 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=JEMkUyC15SjMVnsaIH4Lwux/DQ0YV0+20da4nCiVXrA=; b=RfF4xvyTIrdLS+pbmiiFWPJXqvgmzQuv+3ij7B+ntTItMt0sjtmMkzlpUwdV5GVxsI/C+a ggjm/D6qsp77kiKUIu5IkKFMcHL6tVbND4uMdsxFDcyEVPuo0vEw/hY1XKznlA7km3+oj6 Kf0fkjXEAyHNTAgi5mTqqT2ODIio0yVLdWgzJKWrhfmJ8OTL0+DAuQ3AV2xOeQiJmLQjgz wMtzKmFmKe0mE1D42aJkMKDjowQF9lfE95mxJW92ByYbRlaLv2pQBIniQUMsOFvQA0onKS p8NxoPnASsqdidcHYxUJU6yg+4+5vr9s2fLtAw/qciqxu0vUI3fLe6x0zvFY0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZFN7b244Dz2tW; Sat, 15 Mar 2025 13:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52FDuRVD007386; Sat, 15 Mar 2025 13:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52FDuRpm007383; Sat, 15 Mar 2025 13:56:27 GMT (envelope-from git) Date: Sat, 15 Mar 2025 13:56:27 GMT Message-Id: <202503151356.52FDuRpm007383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: d3e5558d3168 - stable/13 - caroot: Ignore soft distrust of server CA certificates after 398 days 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3e5558d31688688684533e3fc575bc65d5e4b84 Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=d3e5558d31688688684533e3fc575bc65d5e4b84 commit d3e5558d31688688684533e3fc575bc65d5e4b84 Author: Michael Osipov AuthorDate: 2025-02-20 09:48:48 +0000 Commit: Michael Osipov CommitDate: 2025-03-15 13:56:16 +0000 caroot: Ignore soft distrust of server CA certificates after 398 days Mozilla introduced the field CKA_NSS_SERVER_DISTRUST_AFTER which indicates that a CA certificate will be distrusted in the future before its NotAfter time. This means that the CA stops issuing new certificates, but previous ones are still valid, but at most for 398 days after the distrust date. See also: * https://bugzilla.mozilla.org/show_bug.cgi?id=1465613 * https://github.com/Lukasa/mkcert/issues/19 * https://gitlab.alpinelinux.org/alpine/ca-certificates/-/merge_requests/16 * https://github.com/curl/curl/commit/448df98d9280b3290ecf63e5fc9452d487f41a7c Tested by: michaelo Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49075 (cherry picked from commit 457c03b397c80d44da92684d417a58b3ca1fed02) --- secure/caroot/MAca-bundle.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl index 4feced90d782..58cfe1cbf6fa 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/MAca-bundle.pl @@ -37,6 +37,8 @@ use strict; use Carp; use MIME::Base64; use Getopt::Long; +use Time::Local qw( timegm_posix ); +use POSIX qw( strftime ); my $generated = '@' . 'generated'; my $inputfh = *STDIN; @@ -101,13 +103,6 @@ EOH } } -# returns a string like YYMMDDhhmmssZ of current time in GMT zone -sub timenow() -{ - my ($sec,$min,$hour,$mday,$mon,$year,undef,undef,undef) = gmtime(time); - return sprintf "%02d%02d%02d%02d%02d%02dZ", $year-100, $mon+1, $mday, $hour, $min, $sec; -} - sub printcert($$$) { my ($fh, $label, $certdata) = @_; @@ -162,10 +157,15 @@ sub grabcert($) if (/^CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL/) { my $distrust_after = graboct($ifh); - my $time_now = timenow(); - if ($time_now >= $distrust_after) { $distrust = 1; } + my ($year, $mon, $mday, $hour, $min, $sec) = unpack "A2A2A2A2A2A2", $distrust_after; + $distrust_after = timegm_posix( $sec, $min, $hour, $mday, $mon - 1, $year + 100); + my $time_now = time; + # When a CA is distrusted before its NotAfter date, issued certificates + # are valid for a maximum of 398 days after that date. + if ($time_now >= $distrust_after + 398 * 24 * 60 * 60) { $distrust = 1; } if ($debug) { - printf STDERR "line $.: $cka_label ser #%d: distrust after %s, now: %s -> distrust $distrust\n", $serial, $distrust_after, timenow(); + printf STDERR "line $.: $cka_label ser #%d: distrust 398 days after %s, now: %s -> distrust $distrust\n", $serial, + strftime("%FT%TZ", gmtime($distrust_after)), strftime("%FT%TZ", gmtime($time_now)); } if ($distrust) { return undef; From nobody Sat Mar 15 14:00:31 2025 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 4ZFNDH73ydz5qqjY; Sat, 15 Mar 2025 14:00:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFNDH4y3Mz3wSm; Sat, 15 Mar 2025 14:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742047231; 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=xmiwmkQVXIa0DbpeMNge32alwkjjlx9qG+tmHE4nI6U=; b=Sg0u+h7pskeTiy4Eys2080vLjZ+9pKUPGHKa6NKaqYuGj23d5dZ2FBs2v9E7DbeyUN3RM6 79SanGAC8rFkfQBqp2VNYe5OnlIeTh8cp7pqflLMctSHmYDEggCKbTT2PDFPWYeKE5qSP0 cpgKTTr3GQEoBjNagY8ibn8xo8gtKe1H5AmciVkLUctxw0G4uipBJY/AKlImpquLYHif7d SswviDhXRnVGdeQLueVWwoSMwLGD4WpGESXjw0jA2HAhg2Kmg2M5YIMLmBIgl5obZIGlAi hYrqVIX0JaKOHFJpR1L94DoX8didQLETS8XD7ZOyGFT42q3XpUkmI2c5LXyT4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742047231; a=rsa-sha256; cv=none; b=lxT36rnDEVqUS2KIvXEZ83nGGABoRZ6eZPBwKziNfEYHlhn7zUvexXeVnoLdCBa8d+fD33 owEQYpVD1jYrdHaCbe+ssS58lVIUvFW23P3Nz0YDn6fr7zYqVeUuSiw7sncrrBhQ3Nrjwd WKdkVx9aIdT8i2LApcIpokLGYyFaR7axWHPZU1UnM1bheZ3+aeKxEM33D7sYMrowVBE/XW oEIhsLpLjDKJCtFDvJiKvdcMRn2GCwoRhTUlIIDgXmmdA8C3beabnJg6uuDmZtg3vOiIB5 ENdPyacIP5nNIyl/3UBs5vFyBVBp4c6NPYc9rcak/jSLEw7jG1Lxc7/2Sb7Gmg== 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=1742047231; 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=xmiwmkQVXIa0DbpeMNge32alwkjjlx9qG+tmHE4nI6U=; b=rdrI8DMpjWfvgF9ZbUGRgKXVmTX9HEp/gP6NkARlihBtaP2P2wze/3/wP2Ztm4ZYKEzYqY JTK+cQ/e/Y7CrVkrtnYgKHDLqoTxTOYAv5llTM3eh1gjDWi82Zg2t4DVoyAefRAAtJGnup psYBiB3+tMijx1TLAr1gu2149YHiKup5wUtZDUalHCyDnIZcg/zaT5KK0VZiqzyQlI021J Gkz+dkMPeS/CDJujUuKfK0ym3v5azi8PC2DwxYX8gf6b5E+8RWZZmSh1IWtqMEkM+QTMG8 YT9gKa8ImqeIgeO9msmnvbrPw1QBsguofEwOHKlYl5x5A0oJsM2GScsL/vcNiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZFNDH4YrMz2LN; Sat, 15 Mar 2025 14:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52FE0VSR018357; Sat, 15 Mar 2025 14:00:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52FE0VWM018354; Sat, 15 Mar 2025 14:00:31 GMT (envelope-from git) Date: Sat, 15 Mar 2025 14:00:31 GMT Message-Id: <202503151400.52FE0VWM018354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 1245f6e34884 - stable/14 - sh(1): Replace recommendation of use of -e with a note 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1245f6e34884699b6bb2a2e9f414d58ac8585034 Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=1245f6e34884699b6bb2a2e9f414d58ac8585034 commit 1245f6e34884699b6bb2a2e9f414d58ac8585034 Author: Michael Osipov AuthorDate: 2024-05-03 07:57:06 +0000 Commit: Michael Osipov CommitDate: 2025-03-15 14:00:17 +0000 sh(1): Replace recommendation of use of -e with a note This partially reverts b14cfdf665bb8b7b2898a4ee5b073ab87f8ea3d0 and has been discussed in D42719. Reviewed by: jrm (mentor), otis (mentor), mandree, ziaee (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45073 (cherry picked from commit 7bd8da72c5814b486ae7f492286fe3ac0a5bf03d) --- bin/sh/sh.1 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index a780d730642c..c11920e2f2a7 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -33,7 +33,7 @@ .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd January 10, 2025 +.Dd March 8, 2025 .Dt SH 1 .Os .Sh NAME @@ -240,11 +240,9 @@ If a shell function is executed and its exit status is explicitly tested, all commands of the function are considered to be tested as well. .Pp -It is recommended to check for failures explicitly -instead of relying on -.Fl e -because it tends to behave in unexpected ways, -particularly in larger scripts. +Note that many commands return non-zero values to convey information other +than errors, which can cause unexpected program termination with +.Fl e . .It Fl f Li noglob Disable pathname expansion. .It Fl h Li trackall From nobody Sat Mar 15 14:01:55 2025 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 4ZFNFw3QTFz5qr7Z; Sat, 15 Mar 2025 14:01:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFNFv5Ts7z3wn4; Sat, 15 Mar 2025 14:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742047315; 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=+XZpQg8F7WHM4F0OYz6Z54CXfwRNknGnI5AFzs8uUw8=; b=jzJBT0IOhPr35OmjGAjF9Nb8WXlyTx/P1hYYsThC0BJmp0RwwbYErOxSXTC14q/kEhq0xz FDuqzbpi1bgQgjZf2aYp7k+zoQJfduGOrJ/bSEfOtL95TMf7lmMl6MaeFgHxsHF5GSfmjZ TM6qUEpyc1w4QZnSD8N0djozStLbUqSeb8WG/mRTKvEYhmVAZzYd2TnXdS5JKe5eeiy8pp 8kZGqvxhOlxyagZ/4FHeBbb2n/OE93ml2eJJDBBOnm9OFvjhD0qKzOcfTiYAMwC+gJm10z 7HOzvjupi3iYq1JAWl7TEhfI5rybAtRu+hYJ4Ynjs1m1M6SxNN/4GenG2KUMZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742047315; a=rsa-sha256; cv=none; b=Cs21qi0T/+L0bO6vz9MGt1bOZXJcDVAlqRUhOKfL97ok2xO7GTcT9XPO27gd70WgemUXYx 3W2uKCAHAqD/O2UzO4s/JHTJDY/Z0/0/hxgaALEA74wqmo8feWKp4F/Z+GRQYeIxpb+Ewa V09mgZuTO7M2D1M2heXKPVMCEiv/lLBP4DjGAyDywRKiTbjZjyW0ceSWJLI6ZjyPkr6fH5 NsfJ6joeEZ03oMZR9Cb7T1s7it4e21rwg+kYMW6alcBNb2I70F1EyUg6/kLEJvbej3hkG2 VQgQK7WOxdZGoug9Hc3Ufb+67uqBFhGKSUZQlmFrAVgyJEC/QQOUlykOzKQlgw== 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=1742047315; 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=+XZpQg8F7WHM4F0OYz6Z54CXfwRNknGnI5AFzs8uUw8=; b=ByIZwdFi8WrHQtE3WefzUTk/sxGO2rJ4k+GnYyITUdGRuAg9wkslWh+ja1KWDuk1KNe6Hw ZXO/c/rhjA66pFQh1x5Bk/xgizfU1UyHkmTrMg4rG57wUViGG9sIXzDBIYQDMt1sgUZKTs C3t1Zo03SB4rqAAJhHR6DAbt/PuswLbQCGHFbpG2fc/PIeiIHedM5qHDI3Ppg795uhBmlu DQKS0rbVG/EjTvwz/w2jKXNaar9n4qcltGnCyZmWkrFHDWQeyFdCm9CVhwCHLBo14bnZhk 36rcjdDuFxfSghZAe7KfLCppUTLsgVZFDy0nC28rdUmLW93bbz7XK7q4+gwLlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZFNFv5475z2gc; Sat, 15 Mar 2025 14:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52FE1tME021769; Sat, 15 Mar 2025 14:01:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52FE1tAI021766; Sat, 15 Mar 2025 14:01:55 GMT (envelope-from git) Date: Sat, 15 Mar 2025 14:01:55 GMT Message-Id: <202503151401.52FE1tAI021766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 61df1b78f906 - stable/13 - sh(1): Replace recommendation of use of -e with a note 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 61df1b78f90681c015fade9b81b40ae1f379e1df Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=61df1b78f90681c015fade9b81b40ae1f379e1df commit 61df1b78f90681c015fade9b81b40ae1f379e1df Author: Michael Osipov AuthorDate: 2024-05-03 07:57:06 +0000 Commit: Michael Osipov CommitDate: 2025-03-15 14:01:42 +0000 sh(1): Replace recommendation of use of -e with a note This partially reverts b14cfdf665bb8b7b2898a4ee5b073ab87f8ea3d0 and has been discussed in D42719. Reviewed by: jrm (mentor), otis (mentor), mandree, ziaee (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45073 (cherry picked from commit 7bd8da72c5814b486ae7f492286fe3ac0a5bf03d) --- bin/sh/sh.1 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 93504c00aab7..4cdc5b8d6239 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -33,7 +33,7 @@ .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd November 20, 2024 +.Dd March 8, 2025 .Dt SH 1 .Os .Sh NAME @@ -240,11 +240,9 @@ If a shell function is executed and its exit status is explicitly tested, all commands of the function are considered to be tested as well. .Pp -It is recommended to check for failures explicitly -instead of relying on -.Fl e -because it tends to behave in unexpected ways, -particularly in larger scripts. +Note that many commands return non-zero values to convey information other +than errors, which can cause unexpected program termination with +.Fl e . .It Fl f Li noglob Disable pathname expansion. .It Fl h Li trackall From nobody Sun Mar 16 10:56:32 2025 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 4ZFw5X50Fmz5qHgf; Sun, 16 Mar 2025 10:56:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZFw5X46DXz3L5B; Sun, 16 Mar 2025 10:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742122592; 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=Tt49/NhH9RgIV1Ixo4j44kamxcecIGbq0FkK3LS9+jY=; b=YyjKx5sK4+QMA8BwNwFZFk4urPh9UxVl/petzrTVAPfOrFuKuhhgihvJa3YTMwNfDEOOjL MUQLqI9ui0i2XjXXEKhgZOQ0I1Y+7lCHipAUwszpA946gjpU6gZ7YqqW+oxJpf6bh2/D3L dMNPV8pbsJcoq40J6rMHg1o7SMNkVdlYWL8JLE1VWbB4PE0T0AgP2xqqVM4530lcsSx3br 0UoPL6aVWh6F33qPG+SMpq3ZcwdQ6Kr56m4PBsV3C4LRWUO9j0rdSzRBhK0rvBz+kvK5RI 8dTEY4n6MTddv2d0iCBAnt2/UUhkiaXBfSDzUwNDeD2/XRkL2JW1d33oHURVew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742122592; a=rsa-sha256; cv=none; b=AIMyBFecjH+VeoLJO6VEfg3lI9FW4GyoP2Hkn1dYd4LqaNJQucQG9mbbIbUdufas23Q3fu qEJRDrIuqKH/ma/wbJnYmo815CC5B0lZBN09PkK04lhbeNi6wf93qAZ8CCGzL2+39QxJfw F7zwTqPICuFrhv1tRDtem95nSLpOtivEgkr+u0qwiK55XlkF13qqOk1Yezp5t76pQF/47z gc2r4KFkO5Bz5reTsqDUHwJfOYDtVwiSmh89lvlU/bg1t1YqUvieV2g0VhTijOSrJqlRdK GwDDN8j6rBGMYSOfz2YLvCF1Rxsdjcab7o/il2kkaKtj1nGeukdfKsHFWeJA9A== 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=1742122592; 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=Tt49/NhH9RgIV1Ixo4j44kamxcecIGbq0FkK3LS9+jY=; b=l0aV4L6w2yWVmIe3kRUTTTphbXxwpBSjGy/vUjBanyzYl7Ik1aSryzv1Q7S2Anlw/mZXv8 QHGGXtVFWlnHDRsMour+airUlgkGTLxnWDzW9i2ApSkpgl/V2Jn0AnaQjVC9clhBVKhING DSRt+fpcgdy2WTX3AFgJDFpoAtH40bZBRLkpTMazeOmXd4FrG7+vXl3VG2/PcPyvwJNaHR fZkg3ba11jQVdkFAG/QJ07GPKL2OGbRy5PS9wQTlZnj+nXzKGtk+mlGzkn8tXGQo1yrlTd SPntdCPeNrMayoTsfvAAt9xWmGS/+rXk6O6NUBgGHLyrPuYAl/u/oaNZ1hTKkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZFw5X3h3pzxsv; Sun, 16 Mar 2025 10:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52GAuWCA064079; Sun, 16 Mar 2025 10:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52GAuW3d064076; Sun, 16 Mar 2025 10:56:32 GMT (envelope-from git) Date: Sun, 16 Mar 2025 10:56:32 GMT Message-Id: <202503161056.52GAuW3d064076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Igor Ostapenko Subject: git: 40a8746a775c - stable/14 - kyua: Pass unprivileged user config prop to ATF using all known names 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 40a8746a775cecbfb0b89536a977dff2391380e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=40a8746a775cecbfb0b89536a977dff2391380e7 commit 40a8746a775cecbfb0b89536a977dff2391380e7 Author: Igor Ostapenko AuthorDate: 2025-02-23 10:41:58 +0000 Commit: Igor Ostapenko CommitDate: 2025-03-16 10:46:22 +0000 kyua: Pass unprivileged user config prop to ATF using all known names Kyua and ATF speak different naming styles. In this case, the unprivileged user property can be named with underscore on the Kyua side, and with a hyphen on the ATF side. Sometimes it is not obvious which style should be used in which situation. For instance, a test case may require this configuration property being set using require.config. Also, a test case may want to read the property using something like atf_tc_get_config_var(). Which names should be used in these cases? From the perspective of the original code, it is expected to be this: require.config unprivileged-user atf_tc_get_config_var(tc, "unprivileged-user") But, as long as Kyua is the main interface, its users expect to work with kyua.conf(5), which says that it must be named as unprivileged_user (with underscore). As a result, test authors tend to do this instead: require.config unprivileged_user atf_tc_get_config_var(tc, "unprivileged_user") Kyua already has hacks to understand both unprivileged_user and unprivileged-user coming from require.config. And this patch covers the missing second part -- make Kyua pass both names back to ATF as two identical configuration properties named different ways. Reviewed by: ngie, asomers MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49039 (cherry picked from commit 51a8eb6410461c94c8e0f2b59e3417cfb5d7da75) --- contrib/kyua/engine/scheduler.cpp | 3 ++ contrib/kyua/engine/scheduler_test.cpp | 1 + contrib/kyua/integration/cmd_test_test.sh | 43 +++++++++++++++++++++++++++++ contrib/kyua/integration/helpers/config.cpp | 10 +++++-- 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/contrib/kyua/engine/scheduler.cpp b/contrib/kyua/engine/scheduler.cpp index e75091a40e38..d4507a247323 100644 --- a/contrib/kyua/engine/scheduler.cpp +++ b/contrib/kyua/engine/scheduler.cpp @@ -1632,7 +1632,10 @@ scheduler::generate_config(const config::tree& user_config, if (user_config.is_set("unprivileged_user")) { const passwd::user& user = user_config.lookup< engine::user_node >("unprivileged_user"); + // The property is duplicated using both ATF and Kyua naming styles + // for better UX. props["unprivileged-user"] = user.name; + props["unprivileged_user"] = user.name; } return props; diff --git a/contrib/kyua/engine/scheduler_test.cpp b/contrib/kyua/engine/scheduler_test.cpp index e144761d8f01..d91c448f2e5e 100644 --- a/contrib/kyua/engine/scheduler_test.cpp +++ b/contrib/kyua/engine/scheduler_test.cpp @@ -1192,6 +1192,7 @@ ATF_TEST_CASE_BODY(generate_config__some_matches) config::properties_map exp_props; exp_props["unprivileged-user"] = "nobody"; + exp_props["unprivileged_user"] = "nobody"; exp_props["var1"] = "value 1"; ATF_REQUIRE_EQ(exp_props, diff --git a/contrib/kyua/integration/cmd_test_test.sh b/contrib/kyua/integration/cmd_test_test.sh index f0862cf29582..4c2fe863a4f5 100755 --- a/contrib/kyua/integration/cmd_test_test.sh +++ b/contrib/kyua/integration/cmd_test_test.sh @@ -596,6 +596,48 @@ EOF } +utils_test_case config_unprivileged_user +config_unprivileged_user_body() { + cat >"my-config" <Kyuafile < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: afec5d1968e4 - stable/14 - ObsoleteFiles: Remove if_rtwn.4 removal 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: afec5d1968e49f12ea368970a889062a8610c7ed Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=afec5d1968e49f12ea368970a889062a8610c7ed commit afec5d1968e49f12ea368970a889062a8610c7ed Author: Alexander Ziaee AuthorDate: 2025-03-12 03:37:40 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-16 20:07:46 +0000 ObsoleteFiles: Remove if_rtwn.4 removal if_rtwn.4 was previously removed, but actually it is correct because the interfaces is called rtwn. Fixes: 4262dbc579823 MFC after: 3 days Reported by: bz Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D49323 (cherry picked from commit 732c16884215c0117d5ee3df79ca79c21ad07e19) --- ObsoleteFiles.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 244089fd2d4f..f3fec428ff4a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -12120,8 +12120,6 @@ OLD_FILES+=usr/bin/llvm-pdbdump OLD_FILES+=usr/share/man/man2/pdwait4.2.gz # 20170610: chown-f_test replaced by chown_test OLD_FILES+=usr/tests/usr.sbin/chown/chown-f_test -# 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko) -OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz # 20170531: removal of groff OLD_FILES+=usr/bin/addftinfo OLD_FILES+=usr/bin/afmtodit