From nobody Mon Feb 3 12:25:35 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 4Ymm1C6bFfz5n7Qx; Mon, 03 Feb 2025 12:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm1C5zk9z41df; Mon, 03 Feb 2025 12:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585535; 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=kHPmDs7/lQ9uSER1LHdWpgK0tVENlk40Jq9i4WOqli0=; b=OM/CKIuhRUbhC6e2BQJnYE8DKov4IfFZXFZktoPxRZ4xZr/enYzcEl/tqWAjs/x8WLFZKi RhinpqEhFha/fw1ceMrHZDDgP5gBX0OqcZ/HSBGD1E3KlyQzQuZbJHZzENt2Y3PDGRMojL u0qyyXnd3H/jAR0OU911usN6ecmwjPyWBicvZKc57RWOtDKNoI7RAMyrulavODK22kMH3g 5wkirm4euPxDf5NacKBHmTEXcsvUCji6j6Ht1Cmr25Qw9V4f7AQ2rgCfwytdk8mbpU/8g4 Ows1l7AzRcGkwPSayk9uV2bPJJZde7vbSmRWhDJKRAYq/YWOaejJBjZpHwIp8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585535; 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=kHPmDs7/lQ9uSER1LHdWpgK0tVENlk40Jq9i4WOqli0=; b=NGoTpAy7P6jy0FXBBWptqdGIa/4wecEVoroIqYnjqQIUDqifKn5uGTXrv3bdHmvcaTYCOA ajXzJRwOTIlCb51X1tGthlGZv6GSJen79CFi8mPWObqwj2V8LrKbg0o2FodIYRNfOInfIY ylLU3glZkTcomZWyCq6y8m6Lr2MEjMVwqhD4vfJgKkWWcbmpbd3Yyw8+jJoQHrLavGyJJ9 Qj80OSXMQD5pB1HiptScWoY/9/fA2m/yAeRgB0CckokhTu6ICU3bAtq6HpGMMt6uINRubT ZwOcdsHmlyXQRxC44ovo2any1NRyLDlfTHSkTQ+K9RWOuvPuCINR95quw1yKag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585535; a=rsa-sha256; cv=none; b=CJ7Jyq5MpcBjeq4nZZ96MCWEhuUoI+Ft6oMth9K1DVSc8n3IWvx+EZUEexi4EB8JJuxqOr wR2GEcfDeOf1NRHSxq8CVcFreat5nfsNg/OM3UtjinvycFBujrPNV2191Gik3rT23oEP3w A/SRk4M95YMqrj64HD06euE95L34LyP7UMzj0RJ8YpYtT8EJYVVNECFTXepHAE7sodPANa AkOL9Vaxp7iZ0QHC6dJrOTTof1uJOj5hgqCzy7zDU9w3LaY+gfP/9Z77zCYBACgqEM8l1q 8tfECkkjT7WhrfeXXrLd2JOqYYWWEns1nG8VZPg5vYGgi5SazvoRu+mmOsC1yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm1C5BrHzcl0; Mon, 03 Feb 2025 12:25:35 +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 513CPZkL099521; Mon, 3 Feb 2025 12:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CPZep099518; Mon, 3 Feb 2025 12:25:35 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:25:35 GMT Message-Id: <202502031225.513CPZep099518@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: db9074ea54c0 - stable/14 - ip6addrctl(8): Use static initializer 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: db9074ea54c095d22eb0dec681eae163079dd41f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=db9074ea54c095d22eb0dec681eae163079dd41f commit db9074ea54c095d22eb0dec681eae163079dd41f Author: Zhenlei Huang AuthorDate: 2025-01-25 10:31:55 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:23:44 +0000 ip6addrctl(8): Use static initializer MFC after: 1 week (cherry picked from commit 7bb9ba61d35703c8a819c3745b8a2b1feb56923d) --- usr.sbin/ip6addrctl/ip6addrctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index 13413fefa8ce..146b2f1ad3e0 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -58,7 +58,7 @@ struct policyqueue { struct in6_addrpolicy pc_policy; }; TAILQ_HEAD(policyhead, policyqueue); -static struct policyhead policyhead; +static struct policyhead policyhead = TAILQ_HEAD_INITIALIZER(policyhead); static void usage(void) __dead2; static void get_policy(void); @@ -75,8 +75,6 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - TAILQ_INIT(&policyhead); - if (argc == 1 || strcasecmp(argv[1], "show") == 0) { get_policy(); dump_policy(); From nobody Mon Feb 3 12:25:36 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 4Ymm1F3Hz0z5n7FB; Mon, 03 Feb 2025 12:25:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm1D6j8Mz41S6; Mon, 03 Feb 2025 12:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585536; 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=YKwg8r7EazMwQBg81/o5YX/NbnqqSJoKOWlYsTcAnds=; b=p7r2A0G1cVCH7w7QX1nZFhObj2zxSMW7P5XqGAvM0W1XP1z1Zi9t+6evHRs0PVY5ypeXN3 bdNP6lY5HPPtkYU0SBA6mUuqOOC5e9gimmUeLOgUQv9lCswzidb39k8W6AJ8rFl89Ztovq UHapEEEMuWEfOEC6enzTFUzLJX33swxmh/FIDGUlrhmqPGJPPRhnYxvnvBvbD+EMjEbAXs kQjfmGjwI5FwoijIpqgKkF90Q2aqZmR+xuxMFpC+n72CczSg5A3DbHbNPTt7w0AX4RnkMZ 85uodQNHvZ9ps+iv6575bWEKUmqA8uQCVDZ7YYCafOD4uT8hjxh7ImohKzNUQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585536; 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=YKwg8r7EazMwQBg81/o5YX/NbnqqSJoKOWlYsTcAnds=; b=Frv78fh7I71nZAgmLLIEfsf7b/dA4UA+26fr684HLw2zytfNXvkgw66SEhQqJXTe82/Zyj vjWLUs5EW/cFKsFipcfjCYYqY2VnG8DeFOKzFKNf9a7wCZezBPEjoxbsnV+jLr4i0/5leT QbqE00fWKOvaSLRgGJvdjDMCQJmT28UmlNEiFajqGTJEEKF0Ig/OLCYU4uJQg8MWWDj0Qx 8FD47gZO75sNCtcg2Ufw1ohsQZSCXEzo6M1PtTfQ+YtmwsT8WKkl3m1JXYiMK/t462YgFa 38m7z23wSPmLfNyY5hmxkzHVRhxFAytI7Sb8y4kYM2TzwNT4fe6CVsIy7FF9dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585536; a=rsa-sha256; cv=none; b=Z0Cq729lZATFR2l7N4hFwgkx604VkOzDVtaWrkPlFEPVnx2AyH41PQtjFjn00b7nwLMmDQ t5tz4k27AxjGm5IB+mqQR04ru+I9RgQ1/ywlPeTTu5T0WabZ1EonzMugOcLvPu2uT9+qPM AYrfZfuQrTYw9nAAfkfcwBXuWJAnEL7luZ5QsV5Lxedv6lP2Xh8H2tIcVG5sn4cmM/4v1h qe0SpNJDeio8oONNzGAzKI27bF11a78nK7LdiLtgeKrZQcbtNALsQplmj6a1bauopzbaXB unbgm6bcuFj5FhMl3Wr9AJNwyhaiPcmj3Lc7Tlf2uWsmyM1AlDxWdEkBC/d6wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm1D5YNhzc1D; Mon, 03 Feb 2025 12:25:36 +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 513CPa9j099559; Mon, 3 Feb 2025 12:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CPatE099556; Mon, 3 Feb 2025 12:25:36 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:25:36 GMT Message-Id: <202502031225.513CPatE099556@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: e2b6e11583eb - stable/14 - if_vxlan(4): 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: e2b6e11583eb13ee09a7cb0babc2a1d8f3bd952a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e2b6e11583eb13ee09a7cb0babc2a1d8f3bd952a commit e2b6e11583eb13ee09a7cb0babc2a1d8f3bd952a Author: Zhenlei Huang AuthorDate: 2025-01-24 09:37:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:23:59 +0000 if_vxlan(4): Use static initializers MFC after: 1 week (cherry picked from commit 5e0dbbc238e2e935c68e293314a90f2ce6e6ef16) --- sys/net/if_vxlan.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 0bbb3e0bcf9c..204fdc351df1 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -420,7 +420,8 @@ static struct mtx vxlan_list_mtx; #define VXLAN_LIST_LOCK() mtx_lock(&vxlan_list_mtx) #define VXLAN_LIST_UNLOCK() mtx_unlock(&vxlan_list_mtx) -static LIST_HEAD(, vxlan_socket) vxlan_socket_list; +static LIST_HEAD(, vxlan_socket) vxlan_socket_list = + LIST_HEAD_INITIALIZER(vxlan_socket_list); static eventhandler_tag vxlan_ifdetach_event_tag; @@ -3610,12 +3611,10 @@ vxlan_tunable_int(struct vxlan_softc *sc, const char *knob, int def) static void vxlan_ifdetach_event(void *arg __unused, struct ifnet *ifp) { - struct vxlan_softc_head list; + struct vxlan_softc_head list = LIST_HEAD_INITIALIZER(list); struct vxlan_socket *vso; struct vxlan_softc *sc, *tsc; - LIST_INIT(&list); - if (ifp->if_flags & IFF_RENAMING) return; if ((ifp->if_flags & IFF_MULTICAST) == 0) @@ -3643,7 +3642,6 @@ vxlan_load(void) { mtx_init(&vxlan_list_mtx, "vxlan list", NULL, MTX_DEF); - LIST_INIT(&vxlan_socket_list); vxlan_ifdetach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, vxlan_ifdetach_event, NULL, EVENTHANDLER_PRI_ANY); From nobody Mon Feb 3 12:25:37 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 4Ymm1G4PcKz5n7R3; Mon, 03 Feb 2025 12:25:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm1G0MFWz41ML; Mon, 03 Feb 2025 12:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585538; 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+Z6h/TZ935kFxU1cyx7rIvR98Cx70EHFDRLkqsA8vw=; b=S3dM2hnJxu0UBHt+rRJ4PcbRil0NnYC/+Fejscm0oD6954X89IiFmbrz0vvYW0vz51Z0xO 1zAY2ou8UFxWy3QstOH8E9estcuQasFnY/2dwEXrXxyv5DIllOORBsRXBMqr7MTqFWuCdy v9fzQhhwOs3XpsR3GCRsIm51Ik0TiJ8LB9TeVLWVttEhHQEP4KO/FhhnAtUdPRaTi+QLgO uaQHdiUHqGGS0FBUW1IZJUMAManxLxfqh0of4buEsqAf511Vufvojd4Wotz1mXCO7KeSLL 2I1cvrWny+LW3TYBAI5QAOZaDUP60hyoGlJvZsrqz5uF+v7M0ab1twGMafYi2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585538; 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+Z6h/TZ935kFxU1cyx7rIvR98Cx70EHFDRLkqsA8vw=; b=V+l9/wXmsbzZF+PCIextWZYFTxFENA7nJlRVLnvSyiANoAs9eErcM4IHDP/VgYSyQO03Z1 +MZB906S6TNsJaJQKiyhwIu7AetjLhLls3IV2HUookZRcjdcocZBRrHsL/4bT3PmrsVB4m B/ZsfY2VQG4w/NHXrowu6mZAR0qx6ObYWiYm+3NOs4CpR92UNOhAs6TnxK0eeQGY4RTX6z e4z0cLG5OBt0hbub1MfuyoJLJQd9DaUVeI6N1MdeSEBZK+s5F6s78xlReIufqju2rWOOrq 7Wswv2WwbB0U8cLVZgGEAnBjAPMSdawSKVxHnFaUKYGoSj7k4kq4JBrnDtit7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585538; a=rsa-sha256; cv=none; b=iF0NqhqUXpBhOj1DTi8fEZFxYC/A4ee7MIBSxYKDEwR5QXWwRpbL8O0KFhimMG5JtEuW2Y nGbMIKItrUovtGvQPm2TRl+2qpavajWqQtMpcQCSpQW6MWTI9KTc+brd4AfcPyNc0AMq0K 5ML1XxOA2m1dYL8HE5N5pKcRhg1MijQRLcafYsC6OXiR3d3Hj/02w4Tm5pZlmzZ8syMStu w6YcCrpR7pUktJr8LcvbIK+ieIA1Y1c1ZOMxxdxvc08wtGRWVhGXq3O2M4Pklj/vfiTBzC b8YbvszSjYUasjwUi2aY3rPmSSFGgUvnL+coMypAulWfnZEy28fKgI84oOVq9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm1F6VzjzcZQ; Mon, 03 Feb 2025 12:25:37 +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 513CPbph099593; Mon, 3 Feb 2025 12:25:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CPbnb099590; Mon, 3 Feb 2025 12:25:37 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:25:37 GMT Message-Id: <202502031225.513CPbnb099590@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: 7d2a5c78a714 - stable/14 - if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT 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: 7d2a5c78a714732f3494c7d8668b36368ed6bc39 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7d2a5c78a714732f3494c7d8668b36368ed6bc39 commit 7d2a5c78a714732f3494c7d8668b36368ed6bc39 Author: Zhenlei Huang AuthorDate: 2025-01-27 15:54:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:24:10 +0000 if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT This driver does not need to retrieve those tunable during early boot. Meanwhile SYSCTL_INT can provide rich info such as description. Also `sysctl net.link.vxlan.[legacy_port|reuse_port]` can report the current settings. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48621 (cherry picked from commit 92632371b360010709fad60146f1aee0b8b99776) --- sys/net/if_vxlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 204fdc351df1..71d9223e366e 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -430,9 +430,11 @@ SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Virtual eXtensible Local Area Network"); static int vxlan_legacy_port = 0; -TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port); +SYSCTL_INT(_net_link_vxlan, OID_AUTO, legacy_port, CTLFLAG_RDTUN, + &vxlan_legacy_port, 0, "Use legacy port"); static int vxlan_reuse_port = 0; -TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port); +SYSCTL_INT(_net_link_vxlan, OID_AUTO, reuse_port, CTLFLAG_RDTUN, + &vxlan_reuse_port, 0, "Re-use port"); /* * This macro controls the default upper limitation on nesting of vxlan From nobody Mon Feb 3 12:25:38 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 4Ymm1H2nBqz5n7T8; Mon, 03 Feb 2025 12:25:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm1H0dXWz41Pq; Mon, 03 Feb 2025 12:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585539; 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=0BsRn8t8aoKtw6mpcpSTwe+AAh+s761Pvcly0BqcI1E=; b=ZIL90VNUdmd6vZ9YoxTsIQsVW7q8zR8h1lAXVh5mPVHe6eQBnzvvIlAMK0FyDrHcvDKqFE B1N1LdMjcX0bxG/YGMqiHYdXtuB+jAyKWFB9QBvSG1415PZ8zMPzWK6OU6r9wf48qdGbd+ T+zLYgtx9sSr+pNoCwXZyxxZiXpyYnV6UvKoNTc7JjZXN9gVMUz8HbLS8zE1EYmPw6s7yq tIpwO6hly+xnLrwDL8dTMQSofczpJQ/i2S7rf/cthjyZNVUYCRlG9Gopnt8EL/iWLpLzzl 5VXAPjnjfRuNTvX2kt8MS/uYzLTU2cFDh+fJDGDBFVkCSTK7pCICLhqmOC4bvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585539; 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=0BsRn8t8aoKtw6mpcpSTwe+AAh+s761Pvcly0BqcI1E=; b=jTIZ1UsQoo9oogU0HDDnB1jQjtqBhM4vTKqcjRqJoJhZqi3Is/XfaaPzGsi29HqLb4VD/v nBoChQLMuqJr8AC9aHwc7dsm/PcgY31QYNUcFryP+mWV/zTQEOzBsaLaFjwDgYiCky51nS ZpIlsMqlvDWxm4iidwWbLubjMIPCIAAcszS22NUimN3OsdVdH4yezJBpU0bE60xZ9wyFFp JDv0wGk5MIVrtJLzgKAV4CiwrSFDJ8UVVLDPH8JjabqJ4sQ2yblEvMKlHtAtWOD62oAWSE 6q9JEcS9b67DhNBVAIqujThvHe6J5sGz0OGsSNxT7jdPaYoONwt1Wwx9hDgnMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585539; a=rsa-sha256; cv=none; b=sl6BeX758fiJSd4hi8m28hbcubat1pLOWvs4vLBIEgNTqqmD7fO2JK2ErRQuiSWXj6kC5O 51UpDuA4VwIEBdcvt2XhWMDfu0i2GQalKKJE9jhmHoqkCXOf3hbbtVNTiMEip8KsKgw/9B bPdaCikEsRy6ojOSJpAQ7N9GuFEhNvEB6iOnfnwmoR2VGXfbroBl3e25wbj4ua3nff2lXC +MULwc0HvkeAvMBosyPxEsTCWz7SkjJmtXykQblfer/9ymrzKSHwwXuuDLELA0fwVkjUCQ szgQfhSuT2yU6MaU2Rw9O0OD9gpf8/erp3Av4IVdycUsO9eo+8Qg+on68dweDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm1H06grzcl1; Mon, 03 Feb 2025 12:25:39 +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 513CPcL3099627; Mon, 3 Feb 2025 12:25:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CPcbq099624; Mon, 3 Feb 2025 12:25:38 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:25:38 GMT Message-Id: <202502031225.513CPcbq099624@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: ceda6f83b119 - stable/14 - vnet: Fix style nits 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: ceda6f83b119ab5c86478bedeefe8c0270691897 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ceda6f83b119ab5c86478bedeefe8c0270691897 commit ceda6f83b119ab5c86478bedeefe8c0270691897 Author: Zhenlei Huang AuthorDate: 2025-01-30 15:59:35 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:24:21 +0000 vnet: Fix style nits MFC after: 3 days (cherry picked from commit 903c7cdac5b5b4b720aba7a48abffb48b2588c77) --- sys/net/vnet.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 5dec0433d31a..688a8eb24591 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -204,7 +204,7 @@ struct vnet_data_free { static MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free", "VNET resource accounting"); static TAILQ_HEAD(, vnet_data_free) vnet_data_free_head = - TAILQ_HEAD_INITIALIZER(vnet_data_free_head); + TAILQ_HEAD_INITIALIZER(vnet_data_free_head); static struct sx vnet_data_free_lock; SDT_PROVIDER_DEFINE(vnet); @@ -480,7 +480,7 @@ vnet_data_copy(void *start, int size) void vnet_register_sysinit(void *arg) { - struct vnet_sysinit *vs, *vs2; + struct vnet_sysinit *vs, *vs2; struct vnet *vnet; vs = arg; @@ -755,11 +755,12 @@ db_show_vnet_print_vs(struct vnet_sysinit *vs, int ddb) c_db_sym_t sym; db_expr_t offset; -#define xprint(...) \ +#define xprint(...) do { \ if (ddb) \ db_printf(__VA_ARGS__); \ else \ - printf(__VA_ARGS__) + printf(__VA_ARGS__); \ +} while (0) if (vs == NULL) { xprint("%s: no vnet_sysinit * given\n", __func__); From nobody Mon Feb 3 12:28:17 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 4Ymm4L0FFkz5n7wD; Mon, 03 Feb 2025 12:28:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm4K5CR6z42f8; Mon, 03 Feb 2025 12:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585697; 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=fwZzcVjOnvsHq9OaFyESwe+K0yzvCFqop22JWh3+hjI=; b=VHFNkLV4SsMOiWT4Cs0D8FdUpP4uxobjuKSUAunmPfrNgl6Fk/8JIO3+/fbGIu/58oNFlj pteGGd6eBfedYrxerpCoSpwWZSrIgndarbd+CRyS9b7vzBM8DTPdndFpXKLpV1rcRdn6yP wMpK33r1ir8Q6/zOZmcXkIMo8iV3AXy2TOU8rZcWTOpX1S/25WtRrIVgEbwm+CNptqSNbc bZRrOL1HeumVZ4AMjDh9yRqLcJ2ITFwYcj/2O8lSEMUMHE7RX+ndlZDmegned3bojeGUAj WGi3AGLkKkoF7oel86lfkx4Cd/iQ6Vx66Y43Tq23ClnPFHs7eopOT74ZZSMQLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585697; 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=fwZzcVjOnvsHq9OaFyESwe+K0yzvCFqop22JWh3+hjI=; b=k1ySioc1/+BZjmtzJe8B/aRfZf45Kcl1OhH9mLPN+hTLkkSEY8QEhd28w1dps0ENLAWnHl PT/5I1CRsoRGXcQ2nU402PMrlxmH6wHXqqEBFOHnvPYwgR1j6pT6XNZZdDw+RDP5bvBEf3 JWRJ2KgAZAU59chG8TTGHg9lyWgDm+pILeMHIes4dgA3Dcn8StgAeAedx4llL6L1LldTD2 d1pGns+kJhkmj5o9qWjijkq74tbhplNdvJHTwq5Jh6zLWsUkagFV385QlMgJPVdelaj8yY MjTZhuyfN5FJdrVP3j/v9LN9eC4gUTR5QSe+YVZKW/edaaFPu9Pnce9D6wa2rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585697; a=rsa-sha256; cv=none; b=jts2fZuB4Qo57rhJXipm7y60bor1wgvaCaDdy8kAoVQp32KULiidBBJAvATVE+oobAcCno QPb8Lxm7u/ct7e7jFd1/wppiKABAwAaZ/Jss7uci0phvWQliIbzL2yi69mkPScJATeEfhg IBP2oU/Dmp0uTG+swKIKDZ4XRM95eMfL+b+apM1WQY9z4l4JDj4DiqrUDz5a49XJomc4uk Xxz8uOq9awusikts20RJG/tzltJc4CxaADDd57oHC9neC0Itp9GzE1XKuyfcTOX8Z4S6tB iJfCwRf0DgTfcVnUNqs9hJfIPZrTDFPc23wC9D+uv68meDOrS8zZJHmVYO3TmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm4K4Vg7zc6X; Mon, 03 Feb 2025 12:28:17 +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 513CSHNB000543; Mon, 3 Feb 2025 12:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CSHZT000540; Mon, 3 Feb 2025 12:28:17 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:28:17 GMT Message-Id: <202502031228.513CSHZT000540@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: ab72295c6584 - stable/13 - ip6addrctl(8): Use static initializer 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: ab72295c6584035094a6e5e90deada0bf2e608c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ab72295c6584035094a6e5e90deada0bf2e608c5 commit ab72295c6584035094a6e5e90deada0bf2e608c5 Author: Zhenlei Huang AuthorDate: 2025-01-25 10:31:55 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:27:05 +0000 ip6addrctl(8): Use static initializer MFC after: 1 week (cherry picked from commit 7bb9ba61d35703c8a819c3745b8a2b1feb56923d) (cherry picked from commit db9074ea54c095d22eb0dec681eae163079dd41f) --- usr.sbin/ip6addrctl/ip6addrctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index b2921747715b..8cb4f05cc0a8 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -58,7 +58,7 @@ struct policyqueue { struct in6_addrpolicy pc_policy; }; TAILQ_HEAD(policyhead, policyqueue); -static struct policyhead policyhead; +static struct policyhead policyhead = TAILQ_HEAD_INITIALIZER(policyhead); static void usage(void); static void get_policy(void); @@ -75,8 +75,6 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - TAILQ_INIT(&policyhead); - if (argc == 1 || strcasecmp(argv[1], "show") == 0) { get_policy(); dump_policy(); From nobody Mon Feb 3 12:28:18 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 4Ymm4M1VQkz5n80m; Mon, 03 Feb 2025 12:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm4L5jM8z42nK; Mon, 03 Feb 2025 12:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585698; 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=2IklJTfwlI4NImenxi0q5pAwBH8mjgYA8KC/tMhGJMY=; b=MWIuKUyEfJTLFLdVPPWmc6hV8ME+Xekv9IqvCh5CZJFr7RfTUdWt33vXhNUbJBjgRc27pc G0TXXbO0TH65ItwU/qViaEosoLEp5ne/3ZKS+yEXplatG1IGTbRUjPxP6iTUUBzTxOrwSm VlE4eAHud5PU/m06RxKpBMuu9Jau+WiN97tsrP9Z1/zr62YNXbfvwAuzWfylWYl/pzUgYN HyW6tgyM0K7voZPuznsBL2ODZ83+X4lc068BTeOnBQRzyUbvi+b91VwuzzyL4OrbdGfRyx btT4r8VZcf/mhPx4wuRmBx4Gc2mY+VmObVyVS2BY17Eva9GLHqcjk692F/IPSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585698; 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=2IklJTfwlI4NImenxi0q5pAwBH8mjgYA8KC/tMhGJMY=; b=ygATiSq0qjzkRKu5833TlQXAypQngoUMaqFUrutXK6nNwwLzkPPmCmgf434szMrJ9YUM7O JdULr06j3djlSL2GhmQuqZjGXDT5FmR1PXYfs+tlHu6w5iF/SFeGDjssq+6G95mG7dHj1s itOZibpJWHO4JD1zJVikpvba5dOGJETqkL5bkmd3q6YFan26OGhlw3l0A+rZTrcamivSnV BCh/DRaOavf7StkAGDtiC4e4vXiA2HfgCMIZUYGG9mHYhrx8mtdABzFeSts8M/ChCYtI4y rsdwO5lZgw3kTywiXeW/vh9Q2e9sWWWkJbgKQu84f4aRVhmOU7kvylyJfL9avQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585698; a=rsa-sha256; cv=none; b=J0vNmek7/GcwEI+b0iR+4ivwiLhpB/nixyDaZqn/bau4hmfa/nURbd06dtyIMkoyNUgxnb 8YjGWv9nPemOfJ+p8gq4PtgtuUGdfPVP6sNJdXz+31XZVWByZvd6lYC1Y4ZbKsBCsMP1ez aKZWPxEfiqz1AekLjhDEgm+CEU1GbQCqwTUsabfaca+AxZt27XkzRngYC2zrpDtCgaJBIH Tb4WkQfFFVBa/bxuAOQqpfO+k/VWQjEhMYs4AJrC1LDxq39nU5VaA89oLCV+a/5qGI1vXf XW4abNwvjrIGU6p2BPXZTc9GXfFdTyYBGMyECTIeG8Nn71qoiKQwrKFftSz45w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm4L578fzc6Y; Mon, 03 Feb 2025 12:28:18 +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 513CSIlw000575; Mon, 3 Feb 2025 12:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CSIDM000572; Mon, 3 Feb 2025 12:28:18 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:28:18 GMT Message-Id: <202502031228.513CSIDM000572@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: 7a6319ece24f - stable/13 - if_vxlan(4): 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/13 X-Git-Reftype: branch X-Git-Commit: 7a6319ece24f2c672ca074c1266364ac018b3ef2 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7a6319ece24f2c672ca074c1266364ac018b3ef2 commit 7a6319ece24f2c672ca074c1266364ac018b3ef2 Author: Zhenlei Huang AuthorDate: 2025-01-24 09:37:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:27:05 +0000 if_vxlan(4): Use static initializers MFC after: 1 week (cherry picked from commit 5e0dbbc238e2e935c68e293314a90f2ce6e6ef16) (cherry picked from commit e2b6e11583eb13ee09a7cb0babc2a1d8f3bd952a) --- sys/net/if_vxlan.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 827772063ede..f9478da983d8 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -418,7 +418,8 @@ static struct mtx vxlan_list_mtx; #define VXLAN_LIST_LOCK() mtx_lock(&vxlan_list_mtx) #define VXLAN_LIST_UNLOCK() mtx_unlock(&vxlan_list_mtx) -static LIST_HEAD(, vxlan_socket) vxlan_socket_list; +static LIST_HEAD(, vxlan_socket) vxlan_socket_list = + LIST_HEAD_INITIALIZER(vxlan_socket_list); static eventhandler_tag vxlan_ifdetach_event_tag; @@ -3601,12 +3602,10 @@ vxlan_tunable_int(struct vxlan_softc *sc, const char *knob, int def) static void vxlan_ifdetach_event(void *arg __unused, struct ifnet *ifp) { - struct vxlan_softc_head list; + struct vxlan_softc_head list = LIST_HEAD_INITIALIZER(list); struct vxlan_socket *vso; struct vxlan_softc *sc, *tsc; - LIST_INIT(&list); - if (ifp->if_flags & IFF_RENAMING) return; if ((ifp->if_flags & IFF_MULTICAST) == 0) @@ -3634,7 +3633,6 @@ vxlan_load(void) { mtx_init(&vxlan_list_mtx, "vxlan list", NULL, MTX_DEF); - LIST_INIT(&vxlan_socket_list); vxlan_ifdetach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, vxlan_ifdetach_event, NULL, EVENTHANDLER_PRI_ANY); vxlan_cloner = if_clone_simple(vxlan_name, vxlan_clone_create, From nobody Mon Feb 3 12:28: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 4Ymm4N1cqkz5n7sq; Mon, 03 Feb 2025 12:28:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm4M6pkSz42wM; Mon, 03 Feb 2025 12:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585700; 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=I2yRdam16Hy88eAeOqGsdKbFh07ttKDK80XuoykHw4w=; b=IJtNhJhAKZzuxW2kb8ASKVs6TkfiAnXWpvtAk47VmOOFplDt5LfgjdBbyzk+3eZIXykCzH w7sYKLTrB9BcMzSalJKNKbvtNGtHnS6jXtQAQ+ucNnVQ0yOjg96BYVP+0EzG5H6yZquh1t cVXbX8N0WHPmaVkPruoOR39uIJhZzcJS5FzCxu1up32IKAFEpvBxCAtP3HbBcupxJgLPhF Pdn1g/v4KsPCNqeYVEjFvoLiwp5OrICVE9g8CsuSEEnOtoPTNIuJZgdrIFOPgw3RGYZYvy fUsmmfb3hdzNlWtBgZ76ONyMChLwSf7onsDEmQmxo7zyCY6/q3li5WOUrVwMaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585700; 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=I2yRdam16Hy88eAeOqGsdKbFh07ttKDK80XuoykHw4w=; b=ethNbU3Wt2LP48F3SqP5ZUgN6cXVE6WhGPvHd8rRDyxIHSc15s1RW1NWvJFcnSelKBin6w U81Y0gbRvkcSpjCvmc/XLr6zFUd1D/by0S3VsyTxFyIQQveLqN/EVeXJarZ5TnhTBtYx// VnczXqtvAQrGaq1FmTH/EKegVo87ufFH3yFY5ekrdiD6iaHtrveo9KIt04WmfaVW7m8p91 51940xnws6SkZTQBWMkRzR+YkU60HDnKLmqwuOpQ6Rrfzci+dAcsaCym6j94Uc0rGZIkeu GKxzyMfEdNqy7UWd4KbJy7xjmS9+3s92HggSxm0zoLau/F+Ex33jx24/vrrKzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585700; a=rsa-sha256; cv=none; b=gYgWcXqLAuqAkg06bPq7xiazNpgsdZmpH/0Qp9wVshVBR0h3crJIwKrvNY+T08w2fwFqzh glwQra6a1av+jhpF5nODrkw/s2LPbMoGZicHiMqMoMXnhELsvfMCu+X/hrxEMe60VCQ7K2 rdHO0VyEXCB/+5vFA+yeU8WZxyS1EIYewl0ksT0+3otYXoFbwgiUICSNcEKC6D6h8/HNN7 HWeEBWvzOVq6ocIFiHH42W5MJH4XW+nKosY2dET1u31/9P+VGX7cbPB++yTAFJmZJa8xyG PVm2pOMmPjp3F1jyIEhS3RaYNXEvWkxqdTR1c8KMkwHdO9OoZC2DMKA9AQUA4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm4M6Mlczc1F; Mon, 03 Feb 2025 12:28: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 513CSJxa000607; Mon, 3 Feb 2025 12:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CSJf3000604; Mon, 3 Feb 2025 12:28:19 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:28:19 GMT Message-Id: <202502031228.513CSJf3000604@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: 67e952ebaaad - stable/13 - if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT 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: 67e952ebaaad2f3db00c05b1fe23afdf95c32166 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=67e952ebaaad2f3db00c05b1fe23afdf95c32166 commit 67e952ebaaad2f3db00c05b1fe23afdf95c32166 Author: Zhenlei Huang AuthorDate: 2025-01-27 15:54:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:27:05 +0000 if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT This driver does not need to retrieve those tunable during early boot. Meanwhile SYSCTL_INT can provide rich info such as description. Also `sysctl net.link.vxlan.[legacy_port|reuse_port]` can report the current settings. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48621 (cherry picked from commit 92632371b360010709fad60146f1aee0b8b99776) (cherry picked from commit 7d2a5c78a714732f3494c7d8668b36368ed6bc39) --- sys/net/if_vxlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index f9478da983d8..737a2ae312ac 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -428,9 +428,11 @@ SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Virtual eXtensible Local Area Network"); static int vxlan_legacy_port = 0; -TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port); +SYSCTL_INT(_net_link_vxlan, OID_AUTO, legacy_port, CTLFLAG_RDTUN, + &vxlan_legacy_port, 0, "Use legacy port"); static int vxlan_reuse_port = 0; -TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port); +SYSCTL_INT(_net_link_vxlan, OID_AUTO, reuse_port, CTLFLAG_RDTUN, + &vxlan_reuse_port, 0, "Re-use port"); /* * This macro controls the default upper limitation on nesting of vxlan From nobody Mon Feb 3 12:28: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 4Ymm4P43jgz5n7wF; Mon, 03 Feb 2025 12:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymm4P0l61z42hR; Mon, 03 Feb 2025 12:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585701; 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=k3qpXcYV1an7aLTc2mCsnyxRcIXq19Ahjz+/MJG5cnM=; b=JI07z6FhE10OBvN+3lPuUjnJBvXsT20CKn0uDQwItLw/8iYsCUzbASxVhXPBPagbnWVrZL n62o7iMqb0cOc8SdUapjVtnqJEGPiaSLvYDqRnP7TMOnLVGx8TbZTtOdkrRn1sbsGQsw// oC/1riNnavNfRKbOWB7ZjV5sGfu9klcewwbTIIe0MXwcajVdoT7TZEa6V1AB5KN+AV1oKB 3rVlU/jGfHMJIpVb5uFdlCQVO8e88BXGsbbqkNrrFxAtZbOdJreKHKv72driAM1CJPo0uZ LisveSJ/GnfhHLUHIrhk27BVxshq+p81ln78EXZvSSabKbdFM29mqR9Yy/fg8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738585701; 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=k3qpXcYV1an7aLTc2mCsnyxRcIXq19Ahjz+/MJG5cnM=; b=fyQz9xv6zyWuJxVEiOviZF92tj2NRF/xA/l6ROVPYnwDx+U7T8UU7N38DN02N1CpxVb74/ RftBmNj7uN8ZzcWeerge6I4oRNSzLdluCTMZjJTmZhEGZs90h/O9/gwLD8M8BmCsCI50S6 Pna80ZRMCXmzE0Zk8cxKYfUhrwDejkO7aYOrohy/Y1foG0lCQoeiVBz1ogtizv36UsjRoW KEXWpHF14vK/0RHNxfvoct0pHeOICupauoRIEHXVAdKy4ZVkmyx34+CxFAC0hS5zIlrZkF sc9je738qMv2NETJ4NtQ44DWKxYnnGqaXrX6oJk8c/j1412k552G3OHNyY48bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738585701; a=rsa-sha256; cv=none; b=FwNW9Aq/Lzsz6a28gYHOKy3ipTfcgoKstAgf/wGKx7UgBXEatq8g3rbWh0PsddNvBQw35V v9FhmXS+EARuey1FyxUU6lVMexl6m8/xn/RTigNOocpIcz+1o61jz6FkRHtP6pLcWp9w64 1cy0y2e8P5n5V1BKzKeoz3I6SOYM8Qsq+A0FISGKxoE7mWJQYLvM8IzsRFjs+ET5SDmp4F ggyN1AF7CVxQuawpKOS4UYsKZoQWbxv91DNYiN90+mYKef6noFBrZMdkmqGCSkMH2ScAeq 0anmicQ+9HuU5iMW5NcRfRHxUhV+8D7dtZr+7jj2fMzd11WEeqf70ggWTpooFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymm4P0Cv5zcl3; Mon, 03 Feb 2025 12:28:21 +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 513CSKM8000644; Mon, 3 Feb 2025 12:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513CSKJ3000641; Mon, 3 Feb 2025 12:28:20 GMT (envelope-from git) Date: Mon, 3 Feb 2025 12:28:20 GMT Message-Id: <202502031228.513CSKJ3000641@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: 0cc5ddd0b9f2 - stable/13 - vnet: Fix style nits 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: 0cc5ddd0b9f20666b6f7362f4f469962b148b832 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0cc5ddd0b9f20666b6f7362f4f469962b148b832 commit 0cc5ddd0b9f20666b6f7362f4f469962b148b832 Author: Zhenlei Huang AuthorDate: 2025-01-30 15:59:35 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 12:27:05 +0000 vnet: Fix style nits MFC after: 3 days (cherry picked from commit 903c7cdac5b5b4b720aba7a48abffb48b2588c77) (cherry picked from commit ceda6f83b119ab5c86478bedeefe8c0270691897) --- sys/net/vnet.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 9bcc0a779d59..da5fc5b52a72 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -204,7 +204,7 @@ struct vnet_data_free { static MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free", "VNET resource accounting"); static TAILQ_HEAD(, vnet_data_free) vnet_data_free_head = - TAILQ_HEAD_INITIALIZER(vnet_data_free_head); + TAILQ_HEAD_INITIALIZER(vnet_data_free_head); static struct sx vnet_data_free_lock; SDT_PROVIDER_DEFINE(vnet); @@ -480,7 +480,7 @@ vnet_data_copy(void *start, int size) void vnet_register_sysinit(void *arg) { - struct vnet_sysinit *vs, *vs2; + struct vnet_sysinit *vs, *vs2; struct vnet *vnet; vs = arg; @@ -755,11 +755,12 @@ db_show_vnet_print_vs(struct vnet_sysinit *vs, int ddb) c_db_sym_t sym; db_expr_t offset; -#define xprint(...) \ +#define xprint(...) do { \ if (ddb) \ db_printf(__VA_ARGS__); \ else \ - printf(__VA_ARGS__) + printf(__VA_ARGS__); \ +} while (0) if (vs == NULL) { xprint("%s: no vnet_sysinit * given\n", __func__); From nobody Mon Feb 3 16:29: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 4YmsQZ2sQ1z5m2Z9; Mon, 03 Feb 2025 16:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmsQY6XV8z3lGC; Mon, 03 Feb 2025 16:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738600165; 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=KAt99I3vntJAWAjwuKMVJxv+l0Pbr5Pu3tv3jzguIcY=; b=UTf6wyH/4nzWNftUcHstTxY1pIeaoTnKFq9OcB+kiHuDXQaBXnbnhfiAijPgOXOkeZp1Er Likc5f+Z4MNW79qNYZviJZptZ74H6YfH8GR3CQDNwn69SpvRgtiPeTkiq9+THiQAKAqnEN ssPytenAZ0rwt7uYtZMESuz5v9UAU50MHJip+pOc4Jey45K0Mm3TddYeEDpS8iJBIW5xkL spTQKrcUGWn+5ZLfgJNoGrAh6tfy0VFwSvGkV+UavcblCoc4K9qVxyN7rvrhumIs6etKSd jEwxMNxUYq82PIZLJ7K23iCfcaBykv5/MYIF0nm/4svqsX6WLaSmfZo+pYgpeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738600165; 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=KAt99I3vntJAWAjwuKMVJxv+l0Pbr5Pu3tv3jzguIcY=; b=ZpDEOIOT51xg2n9d4QN+eHS9BHBYOn97rDhEQMEQ8T4HQ+hFJ+wWufZecs+m8N9rEVayWG aAn4Z30xOHCPtpgPuUGsUQGO/Ujl3vgt2uVe3ycgJun2aJ8uFzw/iQg4pD6pMGVhX7vPPf v0prAH228kF0u5rYBtabSB82DAuUUtAMPmj9AGSDl3UHQ7AXg+zVm3cuNRxIyNTXgNg3rR 6NusVbZYEsWXY/JEeQGn8QtrecXtLEkTGKZdk33lGCmqfFFUKABzBwvsa3Yd3yjzFfJZrv OzhXBxFlzlTpMyQpvcXUJ0PO6F+c7RtPO+6gkTJGS3l/f58CGz88SK1/7f6sWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738600165; a=rsa-sha256; cv=none; b=RUN7Tq39hTmmfN7X+7XbPW8ausJ3ZZymtEQbEfN8OBqXghHMLKQyvNnb55tsFwOFeR6BRe MPC5fSGkM6GHS7EeL9sndFvy35Y9U20xmaaCHFn2vC0aqYUNRiZR5djKSC6ExM2BxndcPu T/AmBuQeAcKwV5U17eKYb+te7PoSc56jIkeBqydLPTGRK2XFcaVidVtkc/JXagxh1X/C/L tOWQy3WeixPRKLrutnGJUlhFBULQsq+bRIrlgaImX5EJuXa7ScXbVAR8ox5vvInBYdaGew EBIu/C87NPc6chP8FzqbDB9gelpeuQLzOafqLb3CLExahCRPizy0mmfs2PWRiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YmsQY4Q4pzl0h; Mon, 03 Feb 2025 16:29: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 513GTPg8094334; Mon, 3 Feb 2025 16:29:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513GTPL7094331; Mon, 3 Feb 2025 16:29:25 GMT (envelope-from git) Date: Mon, 3 Feb 2025 16:29:25 GMT Message-Id: <202502031629.513GTPL7094331@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: c59932350657 - stable/13 - Install sppp man page only on i386 and amd64 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: c59932350657220fa06dcbe62d1d876cb202746e Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c59932350657220fa06dcbe62d1d876cb202746e commit c59932350657220fa06dcbe62d1d876cb202746e Author: Zhenlei Huang AuthorDate: 2025-02-03 16:28:37 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 16:28:37 +0000 Install sppp man page only on i386 and amd64 The sppp(4) module is built only on i386 and amd64. This is a direct commit to stable/13 as sppp.4 no longer exists in -current and stable/14. --- share/man/man4/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e687a2d66ce2..7de8ebb0e1ac 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -549,7 +549,7 @@ MAN= aac.4 \ spigen.4 \ ${_spkr.4} \ splash.4 \ - sppp.4 \ + ${_sppp.4} \ ste.4 \ stf.4 \ stge.4 \ @@ -872,6 +872,7 @@ _qat.4= qat.4 _rr232x.4= rr232x.4 _speaker.4= speaker.4 _spkr.4= spkr.4 +_sppp.4= sppp.4 _superio.4= superio.4 _tpm.4= tpm.4 _urtw.4= urtw.4 From nobody Mon Feb 3 16:29: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 4YmsQb4NXWz5m2sx; Mon, 03 Feb 2025 16:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmsQZ5pYHz3lBD; Mon, 03 Feb 2025 16:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738600166; 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=qKbNyMpliGSfLPnKMUJaSra6tjuNmqSjqmEU6E+SDms=; b=r6xz/dUCoGMn4Cwv/VfIbhMm1EXxZ92nQE48djVrlDtbWYbgD6i6MVY/n+RO52I64WwLo8 uJFtjGh6Vq75c+XBT5igC3nG6rZCmqfsIGHOInq+S7H+szH+rEB5IIs2V8QnhkHilxoJuq rwWbM7qwpetA0mqZ+4s632BVdzC3EqTRhO5jo4Qwiuh3sXkDx/WMvMm7l3xIkWojRQJk/A 16KL89bAdIV7yc/DnuPVKyQCPRJJykMIAZ2J0DUqfGz9xCSekcH+WzXvEEPdjWGvdolWB0 HlvcsDMtkX3SXols3XLHNGiYkjVRc68X8mJbWE3prqSZqRgtZoQpBMXjo3Wqdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738600166; 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=qKbNyMpliGSfLPnKMUJaSra6tjuNmqSjqmEU6E+SDms=; b=LJZ1NYm5pZ2H35+ZhDH7DdeKCTyj789lKt/+QV9zajA5nDKKmiSpuuksE0xf67+SSepmrc OWKX0coYHy7DA8DF3YUNcPqWx+xo9lJloUgVRDpqt7AQCFMtGPWU6cQoUafbSC3+X7ulGJ brqHslZu825SOA+kynV0YZoPFJKmpFvb0s4roeTbYTd4PLduMRmrKsv70iD3JNc5j8UlOU spmz4/C9dD+S5M/hVxEkq1R4w3qhDr66SvZohCQl6pv3xYgeHoXKeRm2FwvKJ07B0CsA3v K4EGwh2oPjvJhTRdb3IN1SvkGgd/C0brmKSHRDGwjjnNkkg517h9yimlU3zbkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738600166; a=rsa-sha256; cv=none; b=lDOEVUbKPeT+dcfA1nKZlB37xH/bHJNKUC8PPejQHAlWENkpxrQLV32dxYlkqlqzvYr/B0 o7lclvJ8zjN46IpXSKJp/DQeEShLto6izXLcbdTIZFvPlMXeKOVP+PVhfbE/ylu8BS8XZA xHQrOEwK/0jLV7bQp1z6X2+Z5HiZU9YA/PfE4bIUTu2ZY8HLImGbp1NEBuSuWZKb249BEb MwR/3KIuPCJKe+HtbABRVO8eRW1n09IvC6dXVN/ExiEEbYwBWAp90xduWa6A0AekOgW3G7 bNNsRmAzvpyzs9THkWC8xk4+CQA5LNW3C+nPvpUxYev1vZABPbalFMlb8Re0BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YmsQZ4yN6zkgs; Mon, 03 Feb 2025 16:29: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 513GTQ2B094367; Mon, 3 Feb 2025 16:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513GTQZ2094364; Mon, 3 Feb 2025 16:29:26 GMT (envelope-from git) Date: Mon, 3 Feb 2025 16:29:26 GMT Message-Id: <202502031629.513GTQZ2094364@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: 29f77be0d844 - stable/13 - ng_sppp: Build only on i386 and amd64 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: 29f77be0d844aa7e9b26fed8b550e12ad504b4d2 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=29f77be0d844aa7e9b26fed8b550e12ad504b4d2 commit 29f77be0d844aa7e9b26fed8b550e12ad504b4d2 Author: Zhenlei Huang AuthorDate: 2025-02-03 16:28:37 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-03 16:28:37 +0000 ng_sppp: Build only on i386 and amd64 This module depends on sppp(4) which is only enabled on i386 and amd64. This is a direct commit to stable/13 as ng_sppp(4) no longer exists in -current and stable/14. --- share/man/man4/Makefile | 3 ++- sys/modules/netgraph/Makefile | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7de8ebb0e1ac..8802e5fc35d6 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -393,7 +393,7 @@ MAN= aac.4 \ ng_socket.4 \ ng_source.4 \ ng_split.4 \ - ng_sppp.4 \ + ${_ng_sppp.4} \ ng_sscfu.4 \ ng_sscop.4 \ ng_tag.4 \ @@ -857,6 +857,7 @@ _nda.4= nda.4 _ndis.4= ndis.4 _nfe.4= nfe.4 _nfsmb.4= nfsmb.4 +_ng_sppp.4= ng_sppp.4 _if_ntb.4= if_ntb.4 _ntb.4= ntb.4 _ntb_hw_amd.4= ntb_hw_amd.4 diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index 05a3d9978748..137b90ddc3be 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -46,7 +46,7 @@ SUBDIR= async \ socket \ source \ split \ - sppp \ + ${_sppp} \ tag \ tcpmss \ tee \ @@ -64,4 +64,8 @@ _bluetooth= bluetooth _mppc= mppc .endif +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +_sppp= sppp +.endif + .include From nobody Tue Feb 4 00:29:47 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 4Yn44r4mn9z5mlwG; Tue, 04 Feb 2025 00:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn44r0hyQz46vp; Tue, 04 Feb 2025 00:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628988; 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=OFnRiGCTSw4aDXYvtrL7pgGbja9tBMtwMMeiEfQP+a8=; b=grsGbLBCGGQoSkYxbcX0unywRERfUMNYrgiutTgpN6slQ4D4E0LwYJq7mUwffpNd5GuAsQ Wtot68Xkye37yRwymOweLGUfLOxVb+XKVBeZ+br6bUYPQ0KRSc35Ggf2HbweARtm2MUBZO i8qerM47osQxnj7zhN9YxT9r1hVnk+fsRGE6LoRRE4wUng/enNwwlrLUNJiTk5anw37nKJ 90w5MS0SbyngV1OVKHCBi0ZXzwZ0z7v6cRnHMCsxK4Yn3aahREyG0bqTDHJ5/2C0cte54q ZN7y67iiKYBw3pXyY0082ZGEg3qRnkr+qmgxeI/jXE2zkITb+u71kMKoMAjWqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628988; 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=OFnRiGCTSw4aDXYvtrL7pgGbja9tBMtwMMeiEfQP+a8=; b=ibweVcxl0pDwVTk7/UXXKUhGJ0YCvT3yoeuRWTXSvoKLrvaN37OAUjPXA8GUsfo95T8AAm yRNTKXstRRp4X7YxRWL9Z7kWZfBFt4SJowv+HHiZTYYM1fL980S0zoVNb0btkBwPhFbEEu 05jZ6ScWbL9SAtmcoo9VGCAGKijP3FOnma81PAzqNWxwtoBQutBIC3SYQu65Tzm1ekqUmu XojhEKM7+paPq3IobswITrKvEGXfITmQ32JV9cUXzJiA2KUg/RP1H2jpw3SdvRd+uKYkQw iEA3ViKp9JyknA5iNNM8/CNgeDmPDGNdy4XP3pNvNBxHKsFMSUdKgRHVSMoM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738628988; a=rsa-sha256; cv=none; b=gb5FUbPZ4zKfaSTmELS9HCNYelHIciSYfkB3axmDfIdD6P+c0P3XqoeZpCIKEHxyi5QZkm O1SW/iLGJ1+/6nvSemhibhy8WseJ9NWB9hU64k+cdjbrpfrXOkRdzPQudgpx1EqE4y37LN ulNIkwLb/wKmy64qr1d/544HnQg38B6jAauUkK/NH+gdZ03M0Db0zCmCRrKVMEpi0pTU2G mc/5/a757x6rYg48zNmXjWUUq241ZnOMlIRIqLhlkJhgCC9ePq/yjeOk1gC3BfnaHHVXn+ WclxUZgwAy3b3EBHJrw73vkO6xKMTQthRjIs2sUFXsnxsvy7isRq65HQjlBmkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn44r0GyrzybZ; Tue, 04 Feb 2025 00:29: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 5140TlGa097440; Tue, 4 Feb 2025 00:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140TlTj097437; Tue, 4 Feb 2025 00:29:47 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:29:47 GMT Message-Id: <202502040029.5140TlTj097437@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: 40fb3c401e1d - stable/14 - crtend: accurately check for the start of .ctors 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: 40fb3c401e1d86dbf93c6d97ef1de9f600b76b81 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=40fb3c401e1d86dbf93c6d97ef1de9f600b76b81 commit 40fb3c401e1d86dbf93c6d97ef1de9f600b76b81 Author: Konstantin Belousov AuthorDate: 2025-01-27 20:38:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-04 00:28:37 +0000 crtend: accurately check for the start of .ctors (cherry picked from commit 21502f9a926c7e0c24ce230bb029fde4bf570a14) --- lib/csu/common/crtend.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c index d9259729bb0e..bf25c1d836a9 100644 --- a/lib/csu/common/crtend.c +++ b/lib/csu/common/crtend.c @@ -21,7 +21,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "crt.h" typedef void (*crt_func)(void); @@ -45,15 +45,22 @@ static crt_func __DTOR_END__[] __section(".dtors") __used = { (crt_func)0 }; +extern const char startof_ctors[] __asm(".startof..ctors") + __weak_symbol __hidden; + static void __do_global_ctors_aux(void) { crt_func fn; + uintptr_t ctors_start; int n; + ctors_start = (uintptr_t)&startof_ctors; for (n = 1;; n++) { fn = __CTOR_END__[-n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || + (ctors_start > 0 && + (uintptr_t)&__CTOR_END__[-n] < ctors_start)) break; fn(); } From nobody Tue Feb 4 00:29: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 4Yn44q68C3z5mmDx; Tue, 04 Feb 2025 00:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn44q06kHz471M; Tue, 04 Feb 2025 00:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628987; 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=/sg2J+oDe/9ldMUn6MP62hazUqI+8E8AWKMwtxT/9kE=; b=q04frMwSoJ2OP2fCjO1F4vHi/Ew9/vZZKClrqMkfyvYm5KnokKc5geAnL0RM+4wz7DdAmE d3p+Dudq8mYvaglG+029stgGTX8983SixpxzIz6kK0jaf/+MTSGkfpa3iE+oG22bf+ZWPi XPHk8pgVbIJnli7QFW+xjx4goYuCENkD0r1KN97BuJtE8vT5/nYg5ZH41E7e8ZdiHAh2KP K+xACa42V9XtVm+68KnwzaQWII+127RDMHSFKnESZmNCz98QJ4NwIlvet338HBfz6zGmNA TEiMm+ob3hagDRQzahkexwNhBsjGAlIv6HAIsv5oS0Cgh9U+ifabUAhJ7WFB6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628987; 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=/sg2J+oDe/9ldMUn6MP62hazUqI+8E8AWKMwtxT/9kE=; b=n+ZKl/oxHcKaoUb3gtXwPaY/wME+GB8Gt9tmNQqzT/2r3uWMCc1pYw601+HK298/s8IYe1 BYo2rHPyj16xr0yOgySZDZUMERBt+WtW9WtPse/uym9LUGLDkDqk3ZgeOf1L9LIDGL/A/t Q1NbPFoGlF8Ft4hSqrM5taEJBlKcxKnTAmUNXpiRHuJDatwubgh1tl0uIKI23Kwem2jJC7 gsBpb+Zeic/yQscIdDZPFXv4ydOzmTzlodHSjfHMbaMtEiJjQf5+ldT2BQurzrzfJ+bnd3 /IxL0P8J1/GInr7pVUuUL+yw9fXsxMEZHNBeO4EzA8B/4ClfWzxrHCmmqxU8Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738628987; a=rsa-sha256; cv=none; b=Amu0/NLtg0ZYWX/im0uoCzo970fsVirxT92uIK1SiFJ1gLS+dOhhQ1CtE2ts40AuKmMzyu OaxJX1BYuPcuizPhDhF3jlEsBIkr75wUtCZjCE9s35SVi21rkH3pb6kiXV9H282QVz07Ly ZNquW9tg97FN3p5RJj3ZrvcspJb78sETBwbce/KCEQT56RYYAfP0dvwCrB5O2mKO/LV9m9 cYTm5ZYs9c1YeX4e3ixKOhNfX7xjY19Zlcj6gcPqB4pdvsf7+jpaFaV0+XWKwf3dvompHR nhUAHLH6aHecraHo/Rw4muVBUxChkLHDrVPy2eEM3hmoLlk9PHajjEG8EwWQaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn44p6jGwzybY; Tue, 04 Feb 2025 00:29: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 5140Tk05097400; Tue, 4 Feb 2025 00:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140TkTs097397; Tue, 4 Feb 2025 00:29:46 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:29:46 GMT Message-Id: <202502040029.5140TkTs097397@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: 07324ed40901 - stable/14 - crtbegin: accurately check for the end of .dtors 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: 07324ed409012746c2b6ea4c06f00d39721c2378 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=07324ed409012746c2b6ea4c06f00d39721c2378 commit 07324ed409012746c2b6ea4c06f00d39721c2378 Author: Konstantin Belousov AuthorDate: 2025-01-27 19:21:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-04 00:28:37 +0000 crtbegin: accurately check for the end of .dtors (cherry picked from commit 6ee34bca48a9e0867d46b24a78855e225d46ddda) --- lib/csu/common/crtbegin.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c index ddeec986a431..da6cdf14d47e 100644 --- a/lib/csu/common/crtbegin.c +++ b/lib/csu/common/crtbegin.c @@ -67,19 +67,27 @@ static crt_func __DTOR_LIST__[] __section(".dtors") __used = { (crt_func)-1 }; +extern const char startof_dtors[] __asm(".startof..dtors") + __weak_symbol __hidden; +extern const char sizeof_dtors[] __asm(".sizeof..dtors") + __weak_symbol __hidden; + static void __do_global_dtors_aux(void) { crt_func fn; + uintptr_t dtors_end; int n; #ifdef SHARED run_cxa_finalize(); #endif + dtors_end = (uintptr_t)&startof_dtors + (uintptr_t)&sizeof_dtors; for (n = 1;; n++) { fn = __DTOR_LIST__[n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || (dtors_end > 0 && + (uintptr_t)&__DTOR_LIST__[n] >= dtors_end)) break; fn(); } From nobody Tue Feb 4 00:39:22 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 4Yn4Hv2G7Hz5mnH0; Tue, 04 Feb 2025 00:39: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn4Hv1TF9z3BrR; Tue, 04 Feb 2025 00:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738629563; 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=NkOd2w2EOU19iXPAkSfpRUDw06+DKFtqSfkkbCCXXqE=; b=aQVGzpqt8lZzb6R4tgNeMeq+jwTQIl9zQimOKvVNzdqdm7ObtVFsqoGXI1uCe5TbWRoPDJ sYNTj34lPlqCBfQeH99qIdxf0KzGesSkd5bmoc/1rY/TScF2q3w28kTOuLBptftBgP+jFE tVJpSQehdsQPmAi4OF2bWJeWUEpYo2zt8liyLB0TjV5fL5szeM9exIRL5nPGCGvt8JqRS2 brtxKj8pVkgwqXCeNzhwibj6H8KkkFPfu6Xm1Lbl5cAkLYHQioEfGOpZu9dPFqPBjpwLyX V5C8ILQN/Dx5T3XPO8Jnq4c2lozYvAP9YadO5vk2dt3AgoIAEncLf2eZ/2/y6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738629563; 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=NkOd2w2EOU19iXPAkSfpRUDw06+DKFtqSfkkbCCXXqE=; b=Nl64HO12mzsFSOTgXJd1BECVL/E8qwh+1h8GmB8oxgOmQ7C17FLohI44/ObAtssASLoL2O gRHomQ1XmqRguDypu/YPRk5TjskUCow83xd3mxOhFrBZQi1JbOVNqmTJiJvJ/OoXQ2ceez 3irFt2rPo5K2oGU7ZFnVW4H2yYmLw3feyBw6U1Ofheeq845dRSyR/wEfqU8q8FIIpIdotq FS2Er7inXvqw2LDAAWgnm/Vre6JKYJbdaqxwgWtNXCfEOVPF2LFgtgAs9XtIAkOBVaURjr DoR2qZa1TTBh8olJSUQJ8HIV3VNtFbSYv+XAGw4BikilizeFflp33bibLyrgHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738629563; a=rsa-sha256; cv=none; b=jwyIlnkk+L01Pc0D9xA32cwZYaNqosAOZaeHHKfbdZzdOhlmwpdIf0frl/nqHmURGc9/gr 58o5+EbWI5htrACZAIlHY9rSvLASLSa004YRsSxOGb6+mf5NjiSk2PmHFbNqNuTd4WIIyD TXLXrDJf7pdCvYMYv3NiZnvlIL1YmsmfbjaXWc84wEk1YFFGUxTDtSjQ6rY+VHIicZFUqt gJTsRtzMjj/QuKmqtLgWzroCsczNZDe8TWqIIJCGZWxFAFsafDqS1FAGLdFdIgb2qi6Fd3 PqXZoIFoAlPcDxPtAmVTvkjF8GLgSfOfbytfSAT7D76bP5F3FNOscbTEr4xVXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn4Hv0cTrzypX; Tue, 04 Feb 2025 00:39: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 5140dMC5015805; Tue, 4 Feb 2025 00:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140dMT9015802; Tue, 4 Feb 2025 00:39:22 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:39:22 GMT Message-Id: <202502040039.5140dMT9015802@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: 52549be4088a - stable/14 - bsdinstall/zfsboot: Remove unused global variable 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: 52549be4088a8c49dcb58cc21c393ea5de71ba9c Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=52549be4088a8c49dcb58cc21c393ea5de71ba9c commit 52549be4088a8c49dcb58cc21c393ea5de71ba9c Author: Alexander Ziaee AuthorDate: 2024-12-14 23:02:55 +0000 Commit: Alexander Ziaee CommitDate: 2025-02-04 00:38:54 +0000 bsdinstall/zfsboot: Remove unused global variable In an AMA session on the FreeBSD Discord, it was revealed that no logic remains calling GPART_BOOTCODE_PARTONLY. It was removed in aa2a0e0fc311 for FreeBSD 12. git grep shows no other references. No functional change intended. MFC after: 2 weeks Fixes: aa2a0e0fc311 (Enable new UEFI+GELI support) Reported by: Antranig Vartanian Reviewed by: emaste, mhorne Approved by: emaste, mhorne (src) Approved by: mhorne, carlavilla (mentors) Differential Revision: https://reviews.freebsd.org/D48086 (cherry picked from commit 347eb42dbcb352f3266e716a2101898fe054bdba) --- usr.sbin/bsdinstall/scripts/zfsboot | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 2b118e33ba36..6c6c81a7f010 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -206,7 +206,6 @@ GPART_ADD_ALIGN_LABEL='gpart add %s -l %s -t %s "%s"' GPART_ADD_ALIGN_LABEL_WITH_SIZE='gpart add %s -l %s -t %s -s %s "%s"' GPART_BOOTCODE='gpart bootcode -b "%s" "%s"' GPART_BOOTCODE_PART='gpart bootcode -b "%s" -p "%s" -i %s "%s"' -GPART_BOOTCODE_PARTONLY='gpart bootcode -p "%s" -i %s "%s"' GPART_CREATE='gpart create -s %s "%s"' GPART_DESTROY_F='gpart destroy -F "%s"' GPART_SET_ACTIVE='gpart set -a active -i %s "%s"' From nobody Tue Feb 4 00:41: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 4Yn4LD6y6pz5mndw; Tue, 04 Feb 2025 00:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn4LD4mZdz3CgG; Tue, 04 Feb 2025 00:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738629684; 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=ZwtR974pnFW1whagc27CHbYZvWNdSkJN10y9zc6Cvig=; b=p3tHvIhElX8OhlWakFMTk3ckDxCB1WVgXhxrZZnhpWpXgUzczPuetCvXaIrcWebh/EpvJt RxwATlbel/r9RbI6XFwPMUnIMpfkJQdFMZeWSsipyop1HkpvybceXLKG2hwGJt4wqcgjMh Ybhbg7YCCcR+hJVE1pZcY4NoHU7pH0nkjR8tydsbDvHdaTZV3NH3zc12+rwR+mso5VOwy0 V+JlgGNpmhFNjMJ7CF1PK3Qx4y6fcXBPghRPrPY9JG0Ysdl3ee+0O42v52t385x2nEyaLr 5e1H85bpG/OoUMt5yN4S8KKBWRr+HupGPsm1VhIrC/SBzRQmqm98kWrbM/zi1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738629684; 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=ZwtR974pnFW1whagc27CHbYZvWNdSkJN10y9zc6Cvig=; b=EI8s5eN6optl9oqjahuwGlzkBv5yPesLNKST1IZeUkHC0s/ARtcCG9clxHCsDYYqkNhRGI Mb2REIn1vIIKZJYKiJuB2XfdjIRTz4GydSfLkpSaYLoi1+/PIUhk0nMBIATep5e9s9o3QC n+PcNw68Z3KHpmDG8gUVcUrh8MumXmKJhQQ71HigkpRS5ll1Q2wysjpJ8pKBvGaCgjS/sI ULYaaf8Pb9ramJLPsH/fC1wxrQrf5zbObK6GrXBHL/Fh06c39bsPSs5yClaeeG7Lmo5duN wqL7xqir5BmpDfuAO/PnrgjpCs2t5xjg/JTiWXnh6e5GVbtXEyE69vDWJYomfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738629684; a=rsa-sha256; cv=none; b=FLEZqhMyJwzAdEuC+hiGo3uiokJ6nMjndVUpOLF7ApdWyQboRKqBYLBX2RlrPYe8Ce7TVv 6HrSDJDPsKmRkvXwcW22wUzpBmLccd+prO1s5a/+kVFLN0nn0Fx+b+s83R1oA84hQTfEc6 ITRZyileTWaNtuh3Eee4vrZs8be/aHMeXW1nLvARWeGBp/jnJjUvJkhN1Ne5WubqhpXwi9 bH1VNJ1XKQmWJvSb2FXMNUgh38PLWwaUEasdNKPQ3HNmy9snCjcezDrqqgJnAyKfBxmQSj A8xTIcvIUDFCcuMBofjZipOJ/EHfrcoCmgbFLDd/HqE9gOwnupH8AEDoT/DkYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn4LD4Hhpz105M; Tue, 04 Feb 2025 00:41: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 5140fOH0026461; Tue, 4 Feb 2025 00:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140fOWw026458; Tue, 4 Feb 2025 00:41:24 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:41:24 GMT Message-Id: <202502040041.5140fOWw026458@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: 3b936c9d3b56 - stable/13 - bsdinstall/zfsboot: Remove unused global variable 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/13 X-Git-Reftype: branch X-Git-Commit: 3b936c9d3b56b99cf4286b1980ac506582602acd Auto-Submitted: auto-generated The branch stable/13 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3b936c9d3b56b99cf4286b1980ac506582602acd commit 3b936c9d3b56b99cf4286b1980ac506582602acd Author: Alexander Ziaee AuthorDate: 2024-12-14 23:02:55 +0000 Commit: Alexander Ziaee CommitDate: 2025-02-04 00:40:54 +0000 bsdinstall/zfsboot: Remove unused global variable In an AMA session on the FreeBSD Discord, it was revealed that no logic remains calling GPART_BOOTCODE_PARTONLY. It was removed in aa2a0e0fc311 for FreeBSD 12. git grep shows no other references. No functional change intended. MFC after: 2 weeks Fixes: aa2a0e0fc311 (Enable new UEFI+GELI support) Reported by: Antranig Vartanian Reviewed by: emaste, mhorne Approved by: emaste, mhorne (src) Approved by: mhorne, carlavilla (mentors) Differential Revision: https://reviews.freebsd.org/D48086 (cherry picked from commit 347eb42dbcb352f3266e716a2101898fe054bdba) --- usr.sbin/bsdinstall/scripts/zfsboot | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 117782763267..83e7929f19f2 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -201,7 +201,6 @@ GPART_ADD_ALIGN_LABEL='gpart add %s -l %s -t %s "%s"' GPART_ADD_ALIGN_LABEL_WITH_SIZE='gpart add %s -l %s -t %s -s %s "%s"' GPART_BOOTCODE='gpart bootcode -b "%s" "%s"' GPART_BOOTCODE_PART='gpart bootcode -b "%s" -p "%s" -i %s "%s"' -GPART_BOOTCODE_PARTONLY='gpart bootcode -p "%s" -i %s "%s"' GPART_CREATE='gpart create -s %s "%s"' GPART_DESTROY_F='gpart destroy -F "%s"' GPART_SET_ACTIVE='gpart set -a active -i %s "%s"' From nobody Tue Feb 4 00:58:41 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 4Yn4k946y0z5mqsm; Tue, 04 Feb 2025 00:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn4k93b1Yz3Hxx; Tue, 04 Feb 2025 00:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738630721; 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=AqczcKpdVr1H6E7WOYpQ2miruRNIK44127xhIkDHhfg=; b=UJpbBNIFiyO+qKqADZ59N0199xKuKdKTHdNcROuocDXgfz6Q22zeJvoOseR7ZeXtN2y9lb lzJAEXyhZtGyrqmf2Uf72S8opM+VGwYs2VFMVR5Tz8sh05URWUz3xQbulx0A5toAsJTG0h hBEPKi8Qtv0pwD90b2Aq3o1IleFGqAPc8O46i4ieadoZgeujXidvfRfCu6ZMyVy/RG8I1U IXS0iBHQV9C+k81pFo3QrBjbDkdq8qVbBrGnR2y5Oq7inmwx2vJAtLnAtB1Y9oHJ7vl6CE ZPWhKnebuhTxJ8mFFeUlexAWFsRhROpblRn0Ce5qF90G9SrlECPTs0Bc8WwXiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738630721; 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=AqczcKpdVr1H6E7WOYpQ2miruRNIK44127xhIkDHhfg=; b=r0J/95/88Tv8ME/3tkdKYs6GIK4t7nqM0olT/xU50wQ6jNYFeX9VqatuqcESgm/JZrh3QP Xnj9JQ7J8dZrrcPP8rJnFgLb9MkeewxHchsOzZaDsxebjnCMXw/eAhcWvIKtxSQr8L3qzp sFnc2z5AQ9D983cjZStjgm09LBOLPJ0iVYY6OKGE66iPUp8yqnXRMTTiP+EuI24zdD6wdA ON5ikDAJarv5Z7pFs8Xxva3yYFaB/JqtvTlfrWFpP14lYmq7vMR/tgnP2d7a1z9tTAqrtG x6YNrb8mhSj/gBS+so1rJAB0TvdR8ghBFkqL85P+gf7f0LtwRvyUfuKst4Ws/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738630721; a=rsa-sha256; cv=none; b=waXvwDDNoDSTlfrtFZiZlcezrb34oyNDeNEScYTr9P86LHs3nWgmmoFrvdp2JbJCKPaLK3 FqeJKUmsDXDn7me403gK4RWf4J54BjGqTx63nkzlZE6e2vTYIJOtdNnPj/leBVglnRoEe3 hQtFoOu2+RyXiiDEoPOiKlGfZpRy8JfI/rNSCBSUpNSioUGto+R9rmvaq67gYILFYhgmU8 r/OCLfIt0dw3wd3i561UZBnlhgdDmjJpozbavK/zMez3TxyXenc+4Y9gKaboEJe4Q4WdPp E5NQUMKzttnAfJJv8k5NO5S156KerJXYDfkvigLyf6VhFsJMGHHCFeZoSudVsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn4k92jxKz10cM; Tue, 04 Feb 2025 00:58:41 +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 5140wfn3053651; Tue, 4 Feb 2025 00:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140wf6f053648; Tue, 4 Feb 2025 00:58:41 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:58:41 GMT Message-Id: <202502040058.5140wf6f053648@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: b40f5ebc4581 - stable/14 - man.1: Improve search + spdx 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: b40f5ebc4581db41b2e355274b61aeb82f2877c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b40f5ebc4581db41b2e355274b61aeb82f2877c2 commit b40f5ebc4581db41b2e355274b61aeb82f2877c2 Author: Alexander Ziaee AuthorDate: 2024-09-28 03:07:07 +0000 Commit: Alexander Ziaee CommitDate: 2025-02-04 00:58:00 +0000 man.1: Improve search + spdx People are often stunned by robust manual search functionality on the community discord, so improve introductory doc regarding search by: + explain what search related flags do instead of using similies + consolidate and standardize search options in synopsis and usage + mention that a page or file can be specified in synopsis and example + call regular expressions `expression`, which searches to re_format(7) + crossreference the regular expression manual instead of egrep(1) + improve MANPATH xref flow and explanation, matching MAILPATH in sh(1) + mark up aditional semantics for their inclusion in apropos While here: + use consistent spacing and form (Ql) for quoted literals + clean a few linter errors regarding self xref and nospace + reset a list width to indent for consistency with style.mdoc + tidy examples + align files + tag spdx Outstanding: - example 3 shows no results on a typical bsdinstall'd system MFC after: 3 days Reviewed by: elliejs, emaste, imp, Jessica Hawkwell, jlduran Approved by: imp (cherry picked from commit 46a9fb7287f41eedf321d81a68a826f231d11bfe) --- usr.bin/man/man.1 | 140 ++++++++++++++++++++++++++--------------------------- usr.bin/man/man.sh | 5 +- 2 files changed, 71 insertions(+), 74 deletions(-) diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 24d9214682f1..820d6a5b33a9 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2010 Gordon Tetlow .\" All rights reserved. .\" @@ -23,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 26, 2022 +.Dd January 24, 2025 .Dt MAN 1 .Os .Sh NAME @@ -39,16 +41,10 @@ .Op Fl m Ar arch Ns Op : Ns Ar machine .Op Fl p Op Ar eprtv .Op Ar mansect -.Ar page ... -.Nm -.Fl K -.Ar regexp ... -.Nm -.Fl f -.Ar keyword ... +.Ar page | Ar .Nm -.Fl k -.Ar keyword ... +.Fl K | f | k +.Ar expression ... .Sh DESCRIPTION The .Nm @@ -60,6 +56,7 @@ is provided, restricts the search to the specific section of the manual. .Pp The sections of the manual are: +.Pp .Bl -enum -offset indent -compact .It .Fx @@ -94,37 +91,36 @@ Options that .Nm understands: .Bl -tag -width indent -.It Fl K Ar regexp -Does a full text search in all manual pages. -.Ar regexp -is a regular expression as understood by -.Dq Li "grep -E" . +.It Fl K Ar expression +Search full text of all manual pages for an extended regular +.Ar expression , +as described in +.Xr re_format 7 . This option requires .Xr mandoc 1 . This is a slow operation. .It Fl M Ar manpath -Forces a specific colon separated manual path instead of the default +Force a specific colon separated manual path instead of the default search path. See -.Xr manpath 1 . -Overrides the .Ev MANPATH -environment variable. +in +.Sx ENVIRONMENT . .It Fl P Ar pager Use specified pager. Defaults to -.Dq Li "less -sR" +.Ql less -sR if color support is enabled, or -.Dq Li "less -s" . +.Ql less -s . Overrides the .Ev MANPAGER environment variable, which in turn overrides the .Ev PAGER environment variable. .It Fl S Ar mansect -Restricts manual sections searched to the specified colon delimited list. +Restrict manual sections searched to the specified colon delimited list. Defaults to -.Dq Li 1:8:2:3:3lua:n:4:5:6:7:9:l . +.Ql 1:8:2:3:3lua:n:4:5:6:7:9:l . Overrides the .Ev MANSECT environment variable. @@ -136,13 +132,17 @@ argument. Print extra debugging information. Repeat for increased verbosity. Does not display the manual page. -.It Fl f -Emulate +.It Fl f Ar expression +Search names of all manual pages for an extended regular +.Ar expression , +emulating .Xr whatis 1 . .It Fl h Display short help message and exit. -.It Fl k -Emulate +.It Fl k Ar expression +Search names and descriptions of all manual pages for an extended regular +.Ar expression , +emulating basic functionality of .Xr apropos 1 . .It Fl m Ar arch Ns Op : Ns Ar machine Override the default architecture and machine settings allowing lookup of @@ -212,17 +212,17 @@ will search for locale specific manual pages using the following logic: .Pp .Bl -item -offset indent -compact .It -.Va lang Ns _ Ns Va country Ns . Ns Va charset +.Va lang Ns _ Ns Va country . Ns Va charset .It -.Va lang Ns . Ns Va charset +.Va lang . Ns Va charset .It -.Li en Ns . Ns Va charset +.Li en . Ns Va charset .El .Pp For example, if .Ev LC_ALL is set to -.Dq Li ja_JP.eucJP , +.Ql ja_JP.eucJP , .Nm will search the following paths when considering section 1 manual pages in .Pa /usr/share/man : @@ -251,11 +251,11 @@ environment variables. For example, if .Ev MACHINE_ARCH is set to -.Dq Li aarch64 +.Ql aarch64 and .Ev MACHINE is set to -.Dq Li arm64 , +.Ql arm64 , .Nm will search the following paths when considering section 4 manual pages in .Pa /usr/share/man : @@ -278,8 +278,8 @@ character. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev MANROFFSEQ" -.It Ev LC_ALL , LC_CTYPE , LANG +.Bl -tag -width indent +.It Ev LC_ALL , Ev LC_CTYPE , Ev LANG Used to find locale specific manual pages. Valid values can be found by running the .Xr locale 1 @@ -290,12 +290,12 @@ for details. Influenced by the .Fl o option. -.It Ev MACHINE_ARCH , MACHINE +.It Ev MACHINE_ARCH , Ev MACHINE Used to find platform specific manual pages. If unset, the output of -.Dq Li "sysctl hw.machine_arch" +.Ql sysctl Va hw.machine_arch and -.Dq Li "sysctl hw.machine" +.Ql sysctl Va hw.machine is used respectively. See .Sx IMPLEMENTATION NOTES @@ -304,11 +304,9 @@ Corresponds to the .Fl m option. .It Ev MANPATH -The standard search path used by -.Xr man 1 -may be changed by specifying a path in the -.Ev MANPATH -environment variable. +A colon +.Pq Ql \&: +separated list of directories to check for manual pages. Invalid paths, or paths without manual databases, are ignored. Overridden by .Fl M . @@ -320,6 +318,8 @@ or if it contains two adjacent colons, the standard search path is inserted between the colons. If none of these conditions are met, it overrides the standard search path. +See +.Xr manpath 1 . .It Ev MANROFFSEQ Used to determine the preprocessors for the manual source before running .Xr nroff 1 Pq Pa ports/textproc/groff @@ -338,7 +338,7 @@ option. .It Ev MANWIDTH If set to a numeric value, used as the width manpages should be displayed. Otherwise, if set to a special value -.Dq Li tty , +.Ql tty , and output is to a terminal, the pages may be displayed over the whole width of the screen. .It Ev MANCOLOR @@ -347,68 +347,65 @@ If set, enables color support. Program used to display files. .Pp If unset, and color support is enabled, -.Dq Li "less -sR" +.Ql less -sR is used. .Pp If unset, and color support is disabled, then .Ev PAGER is used. If that has no value either, -.Dq Li "less -s" +.Ql less -s is used. .El .Sh FILES -.Bl -tag -width indent -compact +.Bl -tag -width "/usr/local/etc/man.d/*.conf" -compact .It Pa /etc/man.conf -System configuration file. +System configuration file .It Pa /usr/local/etc/man.d/*.conf -Local configuration files. +Local configuration files .El .Sh EXIT STATUS .Ex -std .Sh EXAMPLES Show the manual page for .Xr stat 2 : -.Bd -literal -offset indent -$ man 2 stat -.Ed +.Pp +.Dl $ man 2 stat .Pp Show all manual pages for -.Ql stat . -.Bd -literal -offset indent -$ man -a stat -.Ed +.Ql stat : +.Pp +.Dl $ man -a stat .Pp List manual pages which match the regular expression either in the title or in the body: -.Bd -literal -offset indent -$ man -k '\e.*archive' -.Ed +.Pp +.Dl $ man -k '\e.*archive' .Pp Show the manual page for .Xr ls 1 -and use +using .Xr cat 1 -as pager: -.Bd -literal -offset indent -$ man -P cat ls -.Ed +as the pager: +.Pp +.Dl $ man -P cat ls .Pp Show the location of the .Xr ls 1 manual page: -.Bd -literal -offset indent -$ man -w ls -.Ed +.Pp +.Dl $ man -w ls +.Pp +Show a manual page in the current working directory: +.Pp +.Dl $ man ./man.1 .Pp Show the location of manual pages in sections 1 and 8 which contain the word .Ql arm : -.Bd -literal -offset indent -$ ./man -w -K '\e' -S 1:8 -.Ed +.Pp +.Dl $ man -w -K '\e' -S 1:8 .Sh SEE ALSO .Xr apropos 1 , -.Xr egrep 1 , .Xr intro 1 , .Xr mandoc 1 , .Xr manpath 1 , @@ -422,5 +419,6 @@ $ ./man -w -K '\e' -S 1:8 .Xr intro 6 , .Xr intro 7 , .Xr mdoc 7 , +.Xr re_format 7 , .Xr intro 8 , .Xr intro 9 diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 3d1f4d2e9fe0..341a57c6d7dc 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -733,10 +733,9 @@ man_setup_locale() { # Display usage for the man utility. man_usage() { echo 'Usage:' - echo ' man [-adho] [-t | -w] [-K regexp] [-M manpath] [-P pager] [-S mansect]' + echo ' man [-adho] [-t | -w] [-M manpath] [-P pager] [-S mansect]' echo ' [-m arch[:machine]] [-p [eprtv]] [mansect] page [...]' - echo ' man -f page [...] -- Emulates whatis(1)' - echo ' man -k page [...] -- Emulates apropos(1)' + echo ' man -K | -f | -k expression [...] -- Search manual pages' # When exit'ing with -h, it's not an error. exit ${1:-1} From nobody Tue Feb 4 13:35:42 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 4YnPWf5Tx1z5mqRP; Tue, 04 Feb 2025 13:35:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnPWf4dmbz3rlR; Tue, 04 Feb 2025 13:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676142; 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=K5/rhFRN5SIVRAmuBZE5LXHfCRi0hCHkMc2UwjknYT4=; b=E5375oQIgGh2wLZyWljyrPLXAU4VeQB/2Y9Ny6gIhPFlTw/HgPqfDzRhPOQeAuFGA/slfH b+oKJDSSwJYS31ARgUDAxWF4vgQCvjGYjD6tWzlLnRm9U9nIwAw7ngDNlCq+IpV94qy1xm koA9EqxZY0yR2jQO3f/uoA0PQalfAWsAMmqvMzbR2eFUbiZuttvGEipHQ0p5NVAXCSi7i6 //pmKK0PiPr0g7Q1NhuZ1e164on5zOyVWLJh8Qt+9NUiOuGn0fvQgXFkkgd1gVGaXBPYjB 3LVOIEyA2JbSjffsEpeMXm0Eb6ZuYRTZs5IwG4kzDvPXxPQhcPXepEmsRPLf5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676142; 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=K5/rhFRN5SIVRAmuBZE5LXHfCRi0hCHkMc2UwjknYT4=; b=Tcbwlz/m2PTLxkLIsBJxKh7BzpJlf/u5kICndBeORM0cAGxZRTWY4IWrGCaBiDw63oJIK2 B9bU7CFT6LwnZWvUyCQFzcVh3WRo9Uwk4mFxHxOulRsxdJULQEExV5ggqnJUVTM/CK0n/2 L34VvYICsg8+boimRKkIqpfQO6INJ3yAUTOvl0ePgERHHRl+thpDeiy355mW1IYvc8Qsb2 04fStJYRlQF+8W+0WB7EqX0H/M28dkuW+IbB+h/pEpIIaD0GRtsF53dwoAh6zJ68YZFn6l Z2rdyB1hD5UfDLltP9YXIz19UNIFJp3oTOmKjGTLuyk8OeG/ZuKJ/r1FtGQVaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738676142; a=rsa-sha256; cv=none; b=ImEm/DtoFhlBJyj/ahdwRnb58siBYmRHTouYS5BS7dwRuM/EDa3rMd71UxV9cy0QkIePJS NBOc3GnU1GmHnP/m4EzHj9zfcRMhRBOYWylEPCQmVEnJr2enHQPIhzzZ/ZpUQ3BpNyjHgy YDuSAwzdDs3v0P2Xeh07eVPSwHgRInzfN4+kym0i6dwJNCUPoESbNQqq0nKsNWtoGO1Ecf 1B+4UTf6RTIp5Pqfei9xqy6pjkOVo+TSIuQnGix84rynuDfhr6w2TppnSV5crigIuDrR5D fq3VsAN43yL8FVwtnhoh70iJYF1Fd1KOeZ6T4ASrcAjWnTt6PNqWTc06W1Tn6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnPWf4F1dz1MFV; Tue, 04 Feb 2025 13:35:42 +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 514DZgXv071571; Tue, 4 Feb 2025 13:35:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514DZgrj071568; Tue, 4 Feb 2025 13:35:42 GMT (envelope-from git) Date: Tue, 4 Feb 2025 13:35:42 GMT Message-Id: <202502041335.514DZgrj071568@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: 22d06df419e0 - stable/14 - gvinum: Emit deprecation notice upon drive tasting 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: 22d06df419e0fdf7670e96d4ba88e33933cab6da Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=22d06df419e0fdf7670e96d4ba88e33933cab6da commit 22d06df419e0fdf7670e96d4ba88e33933cab6da Author: Ed Maste AuthorDate: 2022-12-12 21:07:26 +0000 Commit: Ed Maste CommitDate: 2025-02-04 13:35:32 +0000 gvinum: Emit deprecation notice upon drive tasting Reviewed by: phk, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38607 (cherry picked from commit 127b443124d1e720b246ad381648c436c3d240de) --- sys/geom/vinum/geom_vinum_events.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/geom/vinum/geom_vinum_events.c b/sys/geom/vinum/geom_vinum_events.c index fa7c1710c3d9..ec24fbff8a28 100644 --- a/sys/geom/vinum/geom_vinum_events.c +++ b/sys/geom/vinum/geom_vinum_events.c @@ -40,6 +40,8 @@ #include #include +static bool deprecation_printed; + void gv_post_event(struct gv_softc *sc, int event, void *arg1, void *arg2, intmax_t arg3, intmax_t arg4) @@ -180,6 +182,13 @@ gv_drive_tasted(struct gv_softc *sc, struct g_provider *pp) gv_setup_objects(sc); gv_set_drive_state(d, GV_DRIVE_UP, 0); + /* Emit deprecation notice. */ + if (!deprecation_printed) { + gone_in(15, "gvinum volume manager"); + deprecation_printed = true; + } + G_VINUM_DEBUG(1, "drive '%s' relies on deprecated gvinum", d->name); + return; failed: From nobody Tue Feb 4 13:38: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 4YnPZh34Rkz5mqZd; Tue, 04 Feb 2025 13:38:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnPZh2YjGz3t7L; Tue, 04 Feb 2025 13:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676300; 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=v8g0MVWJbMpzryCcyM2D3SCuwgPt390Wqsoi5VZ/CGs=; b=a+AA+DCvDfa0HgTC2rKtaY144Kxf5qTrfeIJ1g9Y1Wd5oMB5kogFfZ+Kx4FFzFjnUpPzDw TpfO1oRuBkhDb4S+LNNzzHjEaTPgD34UMwPqYr7a09lUeSZ78DwaiCmGKcmhMQb6am8Sfu EI6PSuYaCVJQHtgRnAAny+qnocT4SPUFU7Tlt0EBiUg5ZywrwjUMXjgoXUhxi9mk3GUY5A QbVUcZeE5u7O7XXaxnPs0RZGIBXId5/tyUaLJaF5ZDNj8KQ8ivtM0EVROxdmSNJidu8iIi WuxBQApMA9G0HBjfuzv8z+h2OxVZa5tdFLZdwyvHpvgfs5ds6lM+S6lGXzMl1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676300; 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=v8g0MVWJbMpzryCcyM2D3SCuwgPt390Wqsoi5VZ/CGs=; b=egfa5uN6ID1H+XryTySHQYWhrXgqn8F4rK0/4ZAG+cujFd9v1PwbuwX5vPEwQYhSMvyZ6N 8xXiCKuO7Vq6W0KzxzGDCImYv0YmW5Nxe4LY9fbMgrNwOM8W3UhnC6moppsOlVsphNJXmo HgTtpkfSnJ+gp+uNngE06Emh6HHeWZvvbBVg9NQRG+xSO3xm8KMysq4t1ftUKM7Nfze3tB 940hHPx6wZHI5wF7QJ5E7MQ2+NU0SwUAf35O3EWC0Yr34FDlz1R5h3MXau2icY+Mprv7aZ TTYUK2DkQABvuidWdM4uNT6Uy1jXB3YGDcU2JN88Q05heDdfdAXtnbUcVim8ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738676300; a=rsa-sha256; cv=none; b=fJ2g//+rUge/H0tfh50UUSy+NMZpKjFoM/wH+8QBcyQRSukNzOrF8rX6B7wBZKPltAOeJl C5unu5ooccpirsJwj7I5qIaPv77BBSXdUuyqmYDJ3tQaN5xAvonRo7nF8rmv+50AOqOkJy tao9rgy/n92O1910+rPN7F+L98PXb2Iq6b1CkpOyOqAKL2BHQcdn3/EuQfp9BcVxq1mcuM Gb2F9Zwo7n4aNu9M/m17nZhO6eq5MyV2l+tARVsv9WPqa3YfDSee1vNNU3Hy6O+PCUYeq3 SrI2mGe8j3xXm3hmof8wfu4MVnWgL40IF9s3Y79ACwHzjlY1OuNQJytIPKN/pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnPZh28Dxz1N8S; Tue, 04 Feb 2025 13:38: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 514DcK56072498; Tue, 4 Feb 2025 13:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514DcKN1072495; Tue, 4 Feb 2025 13:38:20 GMT (envelope-from git) Date: Tue, 4 Feb 2025 13:38:20 GMT Message-Id: <202502041338.514DcKN1072495@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: 036ce9b76e0a - stable/14 - vtfontcvt: Improve error message for unsupported DWIDTH 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: 036ce9b76e0ac5bb3a611a4b259a39e3158c25d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=036ce9b76e0ac5bb3a611a4b259a39e3158c25d4 commit 036ce9b76e0ac5bb3a611a4b259a39e3158c25d4 Author: Ed Maste AuthorDate: 2025-01-20 20:04:20 +0000 Commit: Ed Maste CommitDate: 2025-02-04 13:38:09 +0000 vtfontcvt: Improve error message for unsupported DWIDTH vtfontcvt requires that all glyphs are 1x or 2x a common width, reporting for example "bitmap with unsupported DWIDTH 27 0 on line xxx" if the font is expected to be 32 pixels wide. Add the expected / permitted values to the error message to make the issue more clear - for the same example, "bitmap with unsupported DWIDTH 27 0 (not 32 or 64)". Reviewed by: ziaee Sponsored by: The FreeBSD Foundation (cherry picked from commit 3433daae0d20d55503084c4d17b8a3e685657ad2) --- usr.bin/vtfontcvt/vtfontcvt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index d68516dda360..508e298257a4 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -451,8 +451,8 @@ parse_bdf(FILE *fp, unsigned int map_idx) if (sscanf(ln + 7, "%d %d", &dwidth, &dwy) != 2) errx(1, "invalid DWIDTH at line %u", linenum); if (dwy != 0 || (dwidth != fbbw && dwidth * 2 != fbbw)) - errx(1, "bitmap with unsupported DWIDTH %d %d at line %u", - dwidth, dwy, linenum); + errx(1, "bitmap with unsupported DWIDTH %d %d (not %d or %d) at line %u", + dwidth, dwy, fbbw, 2 * fbbw, linenum); if (dwidth < fbbw) set_width(dwidth); } From nobody Tue Feb 4 13:38:21 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 4YnPZj5VL3z5mqT0; Tue, 04 Feb 2025 13:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnPZj3WNwz3t5G; Tue, 04 Feb 2025 13:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676301; 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=X207W++ezoNRBO9BBilyH97+UGuclr8i0zSeNI0xGEA=; b=PKAcMtNVyfJhoUadpjCv8MJfekN+Z0HA6D7zQdHugwWeKhG+bUELrKgGG1M1o8wtgudPcU gF6IGSJkF0gviZ388RcaUOdxTSVqwav/VGls2SrPHE/teyaKljL4kBP5bAYCSxsQlZdn0Y I/UpTk/6YQEOcP+5B2tpkZXMqA3606PTJInNWcToaUAR2smgLGaLl05JY+Fw0fGSVc4542 0sLqaz96XhMERC7ZPHEKFfIExuax+pdOEMuIyyAMxNgEj1iiKd693oqChRiRSv4cSmk6sm cURfLVNuUq56fvVseUycuwgYyWK1M4+gn6Mz3Yl4cEeVgFk4wPS1+8IYrpcgBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676301; 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=X207W++ezoNRBO9BBilyH97+UGuclr8i0zSeNI0xGEA=; b=L4m9h3COakr5q3kEB+oF0GYLuAonPSkTGNBhOrWMVx3Bsc/SQOR7QhErX+/4fmW/6rhK8/ /e3iMpW1uBZw0nzFenAywIGakZ/H5N7KMgHed1x6SBZNMTGHHm9A18yZ2DV0y3VCQMGaCE mj1YC2eZveUKxSMjlF15TwB5KlI+oOj8tztosiLtE5fQfoQNkK0ZIY2z8+zAPTnxGQZquH vjYks6CtLdZaDp4uEC3suK7oHyRkRRzHRHMpIpycCZPlczYju4ByXGTKbwX0NvPh2XOUO5 121B1q5o5j3aPPGvt7mhO0OgeQk44Yxc7Jbrh4kz9jhe4Bho/XQanmFBIUPRzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738676301; a=rsa-sha256; cv=none; b=SdM/yx2YQG+hn7t+eGnRTzSBsdONxQYBpNcZIAt7LDyg/H0U3TvdMhoqmo8D8ZjFK93iB0 MLR/ICGAl3GqYf8HEp6KpEyewKX6v+xRoWDsHpISXPA/GbUU8oID6adtOABO7EY7N52MRQ 6khHq/OJzgOhMdUkq7gcKsoM4/cBnv0Jq6MmlqXhnpEsFTzw/EYYHpJXhx/qFiAsNOdfYw 37g4subWkoFC5ERQS98tj+e3zkPYwUGoThW8fvd2SGPJW1TDaMw+Tl6aIKeDQBpk+7fQdd pgSB3VT9jBe/h85TjR/kp6hdzbqlwqxkoWFMTvU/vuSiCil8yHXtXBZJbhCsTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnPZj36bsz1MsB; Tue, 04 Feb 2025 13:38:21 +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 514DcLj5072531; Tue, 4 Feb 2025 13:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514DcLbp072528; Tue, 4 Feb 2025 13:38:21 GMT (envelope-from git) Date: Tue, 4 Feb 2025 13:38:21 GMT Message-Id: <202502041338.514DcLbp072528@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: 83c799af92eb - stable/14 - Revert "oce(4): deprecate" 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: 83c799af92eba2a9b8edb6560fcf760b9164a622 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=83c799af92eba2a9b8edb6560fcf760b9164a622 commit 83c799af92eba2a9b8edb6560fcf760b9164a622 Author: Ed Maste AuthorDate: 2025-01-27 16:54:20 +0000 Commit: Ed Maste CommitDate: 2025-02-04 13:38:09 +0000 Revert "oce(4): deprecate" These are reportedly still in fairly wide use. We strongly encourage folks with this hardware to post a dmesg on dmesgd.nycbug.org. This reverts commit 4591322980a37d6ee38a3ed70569366e16ca71f6. Discussed with: brooks Sponsored by: The FreeBSD Foundation (cherry picked from commit 8b012980b8cc5f8619cd552ee6df7b98b97c5d62) --- share/man/man4/oce.4 | 8 +------- sys/dev/oce/oce_if.c | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 index 47b09cdd7136..a8cd9ae80734 100644 --- a/share/man/man4/oce.4 +++ b/share/man/man4/oce.4 @@ -34,7 +34,7 @@ .\" 3333 Susan Street .\" Costa Mesa, CA 92626 .\" -.Dd June 13, 2023 +.Dd January 27, 2025 .Dt OCE 4 .Os .Sh NAME @@ -55,12 +55,6 @@ module at boot time, place the following line in .Bd -literal -offset indent if_oce_load="YES" .Ed -.Sh DEPRECATION NOTICE -The -.Nm -driver may not be present in -.Fx 15.0 -and later. .Sh DESCRIPTION Emulex OneConnect adapters come in various skews and with different combinations of NIC, FCoE and iSCSI functions. diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index bf257b952a03..8a21cca81966 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -370,8 +370,6 @@ oce_attach(device_t dev) } softc_tail = sc; - gone_in_dev(dev, 15, "relatively uncommon 10GbE NIC"); - return 0; stats_free: From nobody Tue Feb 4 13:44:01 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 4YnPjF40lQz5mqYg; Tue, 04 Feb 2025 13:44:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnPjF2Fygz3vlP; Tue, 04 Feb 2025 13:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676641; 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=Bn8I24rbyupDPhzVre4dfGQ6uW/z2AJ9jbApVOEhZ1U=; b=chGQevepDhkzLD3R//JOFfvNQnK191JOeX121apEBz4El6gqMlnmzyGW1o+QrFjxDFFiYL 6FtMyLBPvQBfnfQJRkLL+aPho8nU8JntZNfHOZTpf7Z9SwQ+HjIZAL5Pk2cSAvjuYsB7h3 Cip5HMHjrtMFIKzYVOTIYtPlK9hD4XRMcqmd3Hbmaw7KLiHDHoTMvDvzGydizOAS9bgn4X DG2H+zQ4yBBOZFwlHazLPPkNkr7N+bRtvdPDuL4TCIMLVrdsmxfC6RHvAPNfiCfCE50a58 +X3gOyYrvlzZdNoWHifjqJ5uWAClYAqUyt8FbTHhMs2qxW7ifG8Kzpk9sH0RCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676641; 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=Bn8I24rbyupDPhzVre4dfGQ6uW/z2AJ9jbApVOEhZ1U=; b=L7U19R4YSyF+yqOFHAWyomWrqvKwJWceWKyvQAH+pcqtTqn2ACT9gXUN1iWX9t7QIv/mJ/ XNS7cA8lfMTZjIgJ9m+zbF6L/h0CuAi+CjkPnKWOdzai4z8PZk4PnR39wsffwsIWGlWSzL B+nh+he8QhHI3VprH/x6A/u/3MsEqunc0IkfkEz2UXPLuonM2unk6NZI6rq6fwttPj1ylL 6VgnIkAPlvhVyYDMSEg8gDNrCoqDh6O7mXMCUgChs5qAdMphWP3ReXZFzmOFuPHA+uJ4Gn +MlADdNE9ZfQCONUbX7irde3tB0rZvnGXOV685u/fa4cyTjRj8OkUIWSpvtbUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738676641; a=rsa-sha256; cv=none; b=OW64JoSaZdaugZNik9wGKCNByACLtoQL6EsWpPKdoY7whTi5b4VbCAWL1hnlVPmRdjjA/H sl11pCGV0v0QVPFYAggstE6sth6oB4CSp3C85qdM+i4Nff8h+jdKqBsxYNJtfbJkBjykk9 sSKs/YRwBeOKf++1MFDbm8+nUmzVkIZRLEP/gokDyH5TO9vZmj/lQS20HdEF0E8r0Ewf+l zn2ei8rlXTnyLMiWIveDUGag9Hp7/kBdPo7BSjQJbOQYfy02PFIssl/o3ZGkuGf/XRm0kD 5tUeCgNzJdZ6+u/KR67YF9UfuxfyRPk8hafLnzAJAG8BYhgQrQBu9/jjk/IVEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnPjF1n5tz1NPs; Tue, 04 Feb 2025 13:44:01 +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 514Di1bw090000; Tue, 4 Feb 2025 13:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514Di1QV089997; Tue, 4 Feb 2025 13:44:01 GMT (envelope-from git) Date: Tue, 4 Feb 2025 13:44:01 GMT Message-Id: <202502041344.514Di1QV089997@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: eefd3fe08d3d - stable/13 - gvinum: Emit deprecation notice upon drive tasting 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/13 X-Git-Reftype: branch X-Git-Commit: eefd3fe08d3d0d95670021d7dedd33ae5ed836c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eefd3fe08d3d0d95670021d7dedd33ae5ed836c0 commit eefd3fe08d3d0d95670021d7dedd33ae5ed836c0 Author: Ed Maste AuthorDate: 2022-12-12 21:07:26 +0000 Commit: Ed Maste CommitDate: 2025-02-04 13:36:37 +0000 gvinum: Emit deprecation notice upon drive tasting Reviewed by: phk, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38607 (cherry picked from commit 127b443124d1e720b246ad381648c436c3d240de) (cherry picked from commit 22d06df419e0fdf7670e96d4ba88e33933cab6da) --- sys/geom/vinum/geom_vinum_events.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/geom/vinum/geom_vinum_events.c b/sys/geom/vinum/geom_vinum_events.c index fa7c1710c3d9..ec24fbff8a28 100644 --- a/sys/geom/vinum/geom_vinum_events.c +++ b/sys/geom/vinum/geom_vinum_events.c @@ -40,6 +40,8 @@ #include #include +static bool deprecation_printed; + void gv_post_event(struct gv_softc *sc, int event, void *arg1, void *arg2, intmax_t arg3, intmax_t arg4) @@ -180,6 +182,13 @@ gv_drive_tasted(struct gv_softc *sc, struct g_provider *pp) gv_setup_objects(sc); gv_set_drive_state(d, GV_DRIVE_UP, 0); + /* Emit deprecation notice. */ + if (!deprecation_printed) { + gone_in(15, "gvinum volume manager"); + deprecation_printed = true; + } + G_VINUM_DEBUG(1, "drive '%s' relies on deprecated gvinum", d->name); + return; failed: From nobody Wed Feb 5 17:58: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 4Yp7Jr5Qgsz5n6dG; Wed, 05 Feb 2025 17:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp7Jr3HZ6z3Kny; Wed, 05 Feb 2025 17:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778332; 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=lSolSCfS6myTDXwp2ugsy8AIcq946qHa2aYJdMYrF5U=; b=sQHsEXUDw5J/Gd5gsVp6UabWOEB24yU6nXMPiz1Om9IhKtpIuEsctEvSpQqZFTA1A3ceAt RE5xh9xpc0BKTq8Hjv+++7dC0Xb5PaDGTw9z0RsTTDcMtRt7uI9uTlO63jFe58UIEXSP5r CVR09jIFuerSNeMv0eGkxAeSQhZ6RKQk7MvPhWPeXVAJhWkxDzaBJlIMH95jFzbW93GtxB +1dqI6BJKwiolBT3ZmnFceXARY7YrGa3+sktJnWMjYm4+g5tmkqQUYLGJ6LYb4bs0XApcw wj172gCJOTzjsY6rA0jIeRL1Pzp8whcRx/3+iMcBWJqujj2izxqs9/w8jx9uXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778332; 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=lSolSCfS6myTDXwp2ugsy8AIcq946qHa2aYJdMYrF5U=; b=gNhErYnmJ/iRJUI5PhIm8uBJgZ2OpzikKwWhnljKNoXc9BtK8GyR9/vX/WWq1F/byDaRzl Ngl4HX+jC4Nu/TYr98sc+67fBKmDJjUY7MPlg1bVtD6zepB7gnCKlxWo0Hg59G9wXtV1su zKe0vaI+U/OvcvGy8FiAgJ35ZJEqhJAI59wPhF433LgjRcPBcYqo33gHilOFGNz4FarN61 t5DdbrTA+u0XOV/+eyM+kMgJehN1D8rNl0PFZpi6lFTUhj2AXDZMbGOgjeZhMEKETTMUY6 otHtWLdr3ERfYepuY/X4p7lhjnrNOc0gzPj9C+1vIccxJt9T8yFv55oS9Ysfag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738778332; a=rsa-sha256; cv=none; b=HAP98xdqIBuHfgaFhsj+044HWzN1B/m/1cRnpS444ZtHTD+7kTmUuYyd9USrHqvpQwOPtl DnCbuyjE4sdftycnrw704QMdBIjMODt9xmYeSCTQ9c9dPCGHv816jLcO/RfVWpA10fuDit yoREqH/5zrBPMIIY+g4OUlg7ogXDdBcoy33ibOC8SjEVMNB6rB7MpS3w4mgk66ms5rgCgu qzxzYcKOCVYnganb6owllIBMQOBvR9XabVPeNL1GF2TxJnjLHYBPuxlrqB6NI3nVMyupH3 kv4xYkNtWpTqt3ylfzsuDMkF0ewFv3S4g7Ugh53AErZadfwHGAtpPBPb1iTsZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp7Jr2qK1z12rL; Wed, 05 Feb 2025 17:58: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 515HwqmN062111; Wed, 5 Feb 2025 17:58:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515HwqC0062108; Wed, 5 Feb 2025 17:58:52 GMT (envelope-from git) Date: Wed, 5 Feb 2025 17:58:52 GMT Message-Id: <202502051758.515HwqC0062108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: cb9ee81985f2 - stable/13 - tcp: fix the initial CWND when a SYN retransmission happened 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb9ee81985f2951b94294a87b203181401125769 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cb9ee81985f2951b94294a87b203181401125769 commit cb9ee81985f2951b94294a87b203181401125769 Author: Michael Tuexen AuthorDate: 2024-11-05 08:52:42 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 17:57:51 +0000 tcp: fix the initial CWND when a SYN retransmission happened According to RFC 3390 the CWND should be set to one MSS if the SYN or SYN-ACK has been retransmitted. This is handled in the code by setting CWND to 1 and cc_conn_init() translates this to MSS. Unfortunately, cc_cong_signal() was overwriting the special value of 1 in case of a lost SYN, and therefore the initial CWND was not as it was supposed to be. Fix this by not overwriting the special value of 1. Reviewed by: cc, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D47439 (cherry picked from commit 625835c8b5e897e54a1a023788a3a9c3b16631c9) --- sys/netinet/tcp_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index fb021608f7da..4dce11d1d580 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -876,7 +876,9 @@ tcp_timer_rexmt(void * xtp) */ tp->t_rtttime = 0; - cc_cong_signal(tp, NULL, CC_RTO); + /* Do not overwrite the snd_cwnd on SYN retransmissions. */ + if (tp->t_state != TCPS_SYN_SENT) + cc_cong_signal(tp, NULL, CC_RTO); NET_EPOCH_ENTER(et); (void) tp->t_fb->tfb_tcp_output(tp); NET_EPOCH_EXIT(et); From nobody Wed Feb 5 17:59:57 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 4Yp7L53B8Dz5n6q0; Wed, 05 Feb 2025 17:59:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp7L52LHRz3Kyh; Wed, 05 Feb 2025 17:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778397; 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=RJ4+w+kzwE4iEjCpOGm5Tj0KK1ZDZhr/94wVEDmrq4I=; b=plEhdlfZ8vuzy0UxI7pyfxRiXPiUTGkvNgLwMMkZrQkb7U+EISmv+S7FkDnYRZTF0dsjkT eE329sEC3bYnXTrMnIPmODYsYZZmTndrluoqQHoUZOXmDBL9RiDa/dBbdmsMDY1QwstDMv oRyKFEo+T2JUjZCPWasPmwfKF68oIxsVygW9Afmd+ASWmXg3CuPxjf9RzNQD+RrdJS82Yz NbqDp9o2NjHDBZmzCL8WX7umXafDXAezOWKFBPKZpgthKZ2WSjCKAzabWGHyvPJ0Oj0mQT WT+plOQxkfiCe4bGaafcLksv2ry9vgYRwQJEP4BBq4TzD2wgSjSt1LAxodPIlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778397; 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=RJ4+w+kzwE4iEjCpOGm5Tj0KK1ZDZhr/94wVEDmrq4I=; b=UYnheYbg9/ZA025NsA4Xi/rXj8TSej5auoTSp1U2DMtZQnYe8R7rENumRBWyix9oUDZXDG t61XQPYWz6RZExtQ0Vnt/gHg8tBOP45IuH1YKJ3eecm9uJKoB19+32CdUCdZd9sWQxgplQ STHdQK/BkK762wCM5mgSaj4gF2lIm/zyfWEuyE/pE+b9IjK2tLtzvml6m+MtnuGIVlZHIK Ta14nwtrG7LdkQJtTdxn8YQVFpNVsxNZUw6EvVdlbNlbxravyTTOc2tqfCI7Yo7Hhw0eDz 824VnOC7vAs85rdPgDLU5j/DyLXR95SUV9lqd9kiaUsLEJhd/KNy+novX1BjbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738778397; a=rsa-sha256; cv=none; b=TbeidUNYgug7QwlUYNqT9wEn2oLPCyqI31G6IPJQqPtNm9FC05kw1LfiEnq7ZR7f9MW6f+ 2wcWZ9sSfo4a+XZ9sgqdRR4+1zFl2nrBorIaN1Uwg0gbPtqaC6vjD/hALoy/b6gJDl4heA 97NK7mWpQFeWmAbT3A1h5N6ZNvr702FLTRrG6x9mOjaI8eJc58fBZP/+awtt/WLWg6j4FM CnaS24FPJt9DkQZJeG5ZT/WCsNBRl0ucqAXD1cxQjsGCrSP3rQAFFYBfgvulRxt0IrJ5/8 UzYj5/fv8B4mtFauSAR1ppbb2K8zF7Jl5BNv3q5kbq1Iu9yf5cea4ges8tKCSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp7L51hlnz12rM; Wed, 05 Feb 2025 17:59:57 +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 515HxvBc062541; Wed, 5 Feb 2025 17:59:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515HxvH6062538; Wed, 5 Feb 2025 17:59:57 GMT (envelope-from git) Date: Wed, 5 Feb 2025 17:59:57 GMT Message-Id: <202502051759.515HxvH6062538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f9e4eb3e8efc - stable/14 - tcp: fix the initial CWND when a SYN retransmission happened 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9e4eb3e8efc5a3c7b3c07ba7c894365570c46b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e4eb3e8efc5a3c7b3c07ba7c894365570c46b9 commit f9e4eb3e8efc5a3c7b3c07ba7c894365570c46b9 Author: Michael Tuexen AuthorDate: 2024-11-05 08:52:42 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 07:14:14 +0000 tcp: fix the initial CWND when a SYN retransmission happened According to RFC 3390 the CWND should be set to one MSS if the SYN or SYN-ACK has been retransmitted. This is handled in the code by setting CWND to 1 and cc_conn_init() translates this to MSS. Unfortunately, cc_cong_signal() was overwriting the special value of 1 in case of a lost SYN, and therefore the initial CWND was not as it was supposed to be. Fix this by not overwriting the special value of 1. Reviewed by: cc, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D47439 (cherry picked from commit 625835c8b5e897e54a1a023788a3a9c3b16631c9) --- sys/netinet/tcp_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index ad407d5c111a..65a9fbc84ff7 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -800,7 +800,9 @@ tcp_timer_rexmt(struct tcpcb *tp) */ tp->t_rtttime = 0; - cc_cong_signal(tp, NULL, CC_RTO); + /* Do not overwrite the snd_cwnd on SYN retransmissions. */ + if (tp->t_state != TCPS_SYN_SENT) + cc_cong_signal(tp, NULL, CC_RTO); NET_EPOCH_ENTER(et); rv = tcp_output_locked(tp); NET_EPOCH_EXIT(et); From nobody Wed Feb 5 18:23:04 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 4Yp7rm5ygRz5n8PQ; Wed, 05 Feb 2025 18:23:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp7rm5KLrz3T0n; Wed, 05 Feb 2025 18:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738779784; 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=Ot4exR5w2Rz1SjSJ6P4bcagd6GpaUyj+mka3neNyCkc=; b=U0fQXgrAhlpfipsQbxuRMNGahmkpzEInIc8Ze4uf1toZWSOgX6IkGDDF/w8B7553iwTWm1 g2yLTZeZZj8RWn4IrH7gRmOG1Kwsr0MAZAfL9L41tCrLvBmS3XhGKUbrw0EfAO1XB5kE7t UPdch4I6yc+D2P1UMRYYUbf9gxwZNdn//2Gzon72IwDx363vKDOYawBgOksyk+R6c3hosa iBz8VxnQmkpdqIkyQP7Ckt4XomK8QRc5FdowkCjLe6zlcZ9so4dYqBzEv3wubrDBxGEWiH UETare6lL36zAGxANKefHRmorzl2qt3BAoQEpkxg6KPHXeDo8vP/GNf4ckAPcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738779784; 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=Ot4exR5w2Rz1SjSJ6P4bcagd6GpaUyj+mka3neNyCkc=; b=gKsXUkMRP1inBDok1koVVoTxM3xjyOdiT1RJSbyWUEtNK6o+hD7W+DEEMqS3267uu3KUI5 VcFR0K6YFrFfSnoPSQ4bVIFTl4NvFj207FsSD+NVJMCg6bC4nKppa1FXfmKhN4F9CDb+fS KDgAByskDGFk/eKXiSHKrKHkgCMwDFTnbwl6OV0dm23Rp4bDxgUbhKz5hbAVUUeKvagdEY k44i1tYAL90LvPzKxKDgY8Cg07mA563UTNnedGga3Be0k20RQq6FcKncyIyr1ens+VUDDo X//T4n1yBJLfrrlxFsB6olZmMZKGKRfxNBEyfPqrS73cDERUmKbGLhPhTdCPiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738779784; a=rsa-sha256; cv=none; b=lg8+ymxEDbwxkFdUTEoPAsI57+q/ksawwYk6n6c3xZwj6+OEftDsSw6CQZ/SmxuNX5Y5K3 O7HkWpEAyBu0Vp4cX5/9tEgs5nLEkNC2r/D2G9siPYyhx45gpPmvNwNavqGTIX/QGtenHK XUwzPB25yAhgZBUCc1tLrLSi2jNyqK6FTl5/gUTzdXc4i60mmTuc1A3eaY19UssqW5Ljx/ 5nWcrzLaQgFTupOgMCHfFzhrTIpP8NOwrSdN9Wk9Lc5kmJ0tYF6/qwki4vnvhVjBdxGHZc t14dzaJicnsqHh3cdaMJTgjIcJe4uEz3KhZ9RZkyKsA1Crmezs4oe1oQr4farg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp7rm4t3lz13Bk; Wed, 05 Feb 2025 18:23:04 +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 515IN4Ms017748; Wed, 5 Feb 2025 18:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515IN4Dm017745; Wed, 5 Feb 2025 18:23:04 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:23:04 GMT Message-Id: <202502051823.515IN4Dm017745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 08398b84ef15 - stable/14 - tcp: define tcp_lro_log() only when TCP_BLACKBOX is defined 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08398b84ef15c9cfeb667d08968bfd54b991f643 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=08398b84ef15c9cfeb667d08968bfd54b991f643 commit 08398b84ef15c9cfeb667d08968bfd54b991f643 Author: Michael Tuexen AuthorDate: 2024-11-17 18:16:27 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 07:17:23 +0000 tcp: define tcp_lro_log() only when TCP_BLACKBOX is defined Reviewed by: rrs, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D47401 (cherry picked from commit 8caa2f5351ded559c68ba0cd4713e00136801bd9) --- sys/netinet/tcp_lro_hpts.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index cd757d5a6164..f563956ff7a7 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -61,7 +61,9 @@ #include #include #include +#ifdef TCP_BLACKBOX #include +#endif static void build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, @@ -147,6 +149,7 @@ tcp_lro_check_wake_status(struct tcpcb *tp) return (false); } +#ifdef TCP_BLACKBOX static void tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, const struct lro_entry *le, const struct mbuf *m, @@ -196,6 +199,7 @@ tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, TCP_LOG_LRO, 0, 0, &log, false, &tv); } } +#endif static struct mbuf * tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, @@ -208,7 +212,9 @@ tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, m = STAILQ_LAST(&tp->t_inqueue, mbuf, m_stailqpkt); if (m != NULL && (m->m_flags & M_ACKCMP) != 0) { if (M_TRAILINGSPACE(m) >= sizeof(struct tcp_ackent)) { +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 23, 0, 0, 0, 0); +#endif *new_m = 0; counter_u64_add(tcp_extra_mbuf, 1); return (m); @@ -219,7 +225,9 @@ tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, } } /* Decide mbuf size. */ +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 21, 0, 0, 0, 0); +#endif if (tp->t_flags2 & TF2_MBUF_L_ACKS) m = m_getcl(M_NOWAIT, MT_DATA, M_ACKCMP | M_PKTHDR); else @@ -611,13 +619,19 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) * ack will be required. */ cmp = NULL; +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 25, 0, 0, 0, 0); +#endif } else if (mv_to != NULL) { /* We are asked to move pp up */ pp = &mv_to->m_nextpkt; +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 24, 0, 0, 0, 0); } else tcp_lro_log(tp, lc, le, NULL, 26, 0, 0, 0, 0); +#else + } +#endif } /* Update "m_last_mbuf", if any. */ if (pp == &le->m_head) @@ -628,7 +642,9 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) /* Check if any data mbufs left. */ if (le->m_head != NULL) { counter_u64_add(tcp_inp_lro_direct_queue, 1); +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 22, 1, tp->t_flags2, 0, 1); +#endif tcp_queue_pkts(tp, le); } if (should_wake) { From nobody Wed Feb 5 18:42:03 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 4Yp8Gg6NkFz5mBDN; Wed, 05 Feb 2025 18:42:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp8Gg5vBTz3YK4; Wed, 05 Feb 2025 18:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738780923; 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=YizJq8r0RGXFyReSNaHax0M1clWG9gnT5onHLc0Jz3Y=; b=DVKAXShSH8tGamGAjZsXLXw3SPUasHHAiHf2e2J2QFLl28VNlmJSjLdUR4x1jEGCgFM2r8 dKBT2lVLqH15iix3vDYAW2CKxqTGCEGzlNtTrrzhNjxlsy+KmzG+K1RsBevnSilzUceael yaLshArEy2Kx6ySHvoIusJUdE+zMbqRNuTJMXi2PNruSriqO0zypU6m9ovcMG3IjW1Spn8 M95p15LEzzW3dS5qblmDl2QpvbDMH8/25I1TI3fgcvlQPnhrrtfMMBDsaz/bYKc6WAOOVL dfAo793wgrPag+n1OQOzXTIr2BFOi6aW+hzvSNf5TmCPrkowkdeWo2VGT2aEWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738780923; 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=YizJq8r0RGXFyReSNaHax0M1clWG9gnT5onHLc0Jz3Y=; b=ry0p1SZ/iHCBcSbqRCphvdt9a4OfHJ7JUM0p+DSG3PguNOdN/+rRh6ncNnw9bkmVg+Smwv jSuh2YdusFulJFo34kFUzlUAxV6DEOKbhPaj0jFTnCwqmDrUoD5U5dR75mxjEQVdt20CS9 mpfs9taE8FwF3RpRsEln4jyjjve/iwYMjf85lKlxC8IPof/wIIou3F48CwNjaOD/QdK+s7 PAdi5l7PEpJmMfZunMMlgElhQBicownuWtRY4VLZGjxMI6FOfrbnQcEIC8b4BNu8Zfpg4U 1oHrhMSzUEG2fzicJhDo62mUEJRIAOceQ/l/1b3WM+frXayMgP2HwUa+2uGsog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738780923; a=rsa-sha256; cv=none; b=rkmb0WCrMENpSUpIfuRcBjlJuoYXEiUquEp37NoYGMWbFu/UNgPiPUMI0K24NCpMVCOn4A BHzwUgpuRgBFL+k9fPruU41uyE6YcBbTl/QcHmlFuT+PF6nfpl6FTYkgzBVmeKL2ccx4ke AjaduQ/u5N3GVQEPzP76e2FRHa02lo+xAIvPZc3ihff00EWOEYSlLcA3HxWB3pKWlY1PNK cNyRgF46ZVPyoADU/KgdEfWXmA3j4uc6t0p1KVT0oVyldZeGck+/Gu52EMy+M3hzMILx78 Co8NDBCP4MHOLXKDlNHC+AJrQPzg59LPXiYxpDeFMIxeXlzOs7AJbmhPTzYNwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp8Gg5RcZz146Y; Wed, 05 Feb 2025 18:42:03 +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 515Ig3ee054498; Wed, 5 Feb 2025 18:42:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Ig3Al054495; Wed, 5 Feb 2025 18:42:03 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:42:03 GMT Message-Id: <202502051842.515Ig3Al054495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6bcc3ae6d61d - stable/13 - icmp.4: improve icmplim and add icmplim_jitter description 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6bcc3ae6d61d2a4d972bbd839016ab63c6394935 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6bcc3ae6d61d2a4d972bbd839016ab63c6394935 commit 6bcc3ae6d61d2a4d972bbd839016ab63c6394935 Author: Michael Tuexen AuthorDate: 2024-12-11 18:47:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 18:41:44 +0000 icmp.4: improve icmplim and add icmplim_jitter description Reviewed by: cc, bcr Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48025 (cherry picked from commit eba715c544ea89c6b402c55e03b388b77030b997) --- share/man/man4/icmp.4 | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4 index 6889a71f0dc2..caac0ee5d032 100644 --- a/share/man/man4/icmp.4 +++ b/share/man/man4/icmp.4 @@ -27,7 +27,7 @@ .\" .\" @(#)icmp.4 8.1 (Berkeley) 6/5/93 .\" -.Dd March 26, 2015 +.Dd December 11, 2024 .Dt ICMP 4 .Os .Sh NAME @@ -174,10 +174,31 @@ it will be used instead of the real address mask when the system replies to an ICMP Address Mask Request packet. Defaults to 0. .It Va icmplim -.Pq Vt integer -Bandwidth limit for ICMP replies in packets/second. +.Pq Vt unsigned integer +Mean rate limit for replies in packets/second. +The actual limit is +.Va icmplim +plus a random jitter limited by +.Va icmplim_jitter . If set to zero, no limiting will occur. Defaults to 200. +.It Va icmplim_jitter +.Pq Vt unsigned integer +A random jitter between the negative of +.Va icmplim_jitter +and +.Va icmplim_jitter +is applied to +.Va icmplim +for limiting the sending rate of replies. +.Va icmplim_jitter +must be smaller than +.Va icmplim , +if +.Va icmplim +is not zero. +If set to zero, no jitter will be applied. +Defaults to 16. .It Va icmplim_output .Pq Vt boolean Enable/disable logging of ICMP replies bandwidth limiting. From nobody Wed Feb 5 18:44: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 4Yp8KX098zz5mBL9; Wed, 05 Feb 2025 18:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp8KW5Lqrz3YrN; Wed, 05 Feb 2025 18:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738781071; 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=/P2bb/i+CLAxhxxEHkYU7Z8NN2Fh/Bhg/4yeTWaxxxA=; b=Dn1PWG15/lmNclyHWqcjefd0IHM+d3KikMqrb/9If72mIcD28cmNNhRAGO85DVV8pSFZUV K+P5XOuexYG88mlqHSGhQ3usBBjGJLQdKAavTzZntfbsMhtYgyvXBA77+DnIObNdVELC0G 8Td7GxMETxejVHXfwD+hS0EC2oLLmNQZNW4GJPyDoLsLT3nzdZVVu1haWn7RCSeFuXc+Ey M8SS16wC+8dU+CplCEHtypSRPf7JB+GF1IT1sCasjY9WZTc4OhBXAWzVPm66d4EsHuYgB3 dP5E5efRSI6If0vtzCIsP4nVSeTOD06OWdfu94eImnMf0OFkymAV03PWGkQJlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738781071; 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=/P2bb/i+CLAxhxxEHkYU7Z8NN2Fh/Bhg/4yeTWaxxxA=; b=bilmycz8/zogVVBVyo9niXYEfCXGWe/KuZ2g7LI/A323WRmyZpMKdi6dWWa0nKHiUN9mJo YessXfpVj9P18s4AVAxaiMKKxsI2CqQRnE3gkkUbcYH7cdG8rlarOS5DKVGs29QO3/+e8I 6NLgjaU8R4oxdvAE9yA5ySR6GAYooP60kjF9cF2JJ+WKMqN4tNShR4tOD0AdpwpoULBmge lwuvfdFMCYZE1ZzjTGDA43MxKFKFJx3PVSsO42exz0dtgveUV1uu1KaeuWFIe1Htxtc2SQ BpRODCXCzNugHn9J+meB50Ni9hneleA9Utd5MZ2tuaI/u6G5iZ6ybt+pU3SMmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738781071; a=rsa-sha256; cv=none; b=UlAhLb3v2OtqPxc2v+THod/EhF0G0oApU7dPiBLkvBdtXb3EV85TcAQ9+kvpmX0Sqk8CHK TFryOSqAhg2MwtsLlHf7yeW+FmA2p49IPXD05rsmj2tYYSRsWoqbkyX4Rv/fTu3HV9GedE 9RCppRdt8ylDtyh5QwQcTHwQp3Sv0CMPCwaJL5El1ft1jYWNVs5iAX+D2L7FTYehjYzGhU W+fWKiugsvkIcLMqkSqINjYSBfzMLyrq9x4pFkbCnOMz8VuuFjHnQ7pae4XPngzDwcmrt2 a2xzobd/7ZnYkppZNfNki5WV6ggPa82EiyZWvuhCtT7fMKjwUNgzWQpXKT1Lzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp8KW4ngjz13Qy; Wed, 05 Feb 2025 18:44: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 515IiVg6055306; Wed, 5 Feb 2025 18:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515IiVYv055303; Wed, 5 Feb 2025 18:44:31 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:44:31 GMT Message-Id: <202502051844.515IiVYv055303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6b8b1047276e - stable/14 - icmp: improve INVARIANTS 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b8b1047276eb451b88711536e001fad6d3d9c57 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6b8b1047276eb451b88711536e001fad6d3d9c57 commit 6b8b1047276eb451b88711536e001fad6d3d9c57 Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 07:58:54 +0000 icmp: improve INVARIANTS check Actually check the conditions that are enforced by the error checking code instead of a condition which is * checking a number to be non-negative instead of positive * depending on a random number Perform the checks consistently for ICMPv4 and ICMPv6. Reviewed by: glebius, rrs, cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 (cherry picked from commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 5ad1b2a664db..24a14c4d4879 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1150,7 +1150,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); + MPASS(V_icmplim == 0 || V_icmplim > V_icmplim_jitter); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index d6e47a29eede..138a7ce71bbc 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2819,7 +2819,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); + MPASS(V_icmp6errppslim == 0 || V_icmp6errppslim > V_icmp6lim_jitter); return (error); } From nobody Wed Feb 5 19:36: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 4Yp9TT4pxnz5mGlG; Wed, 05 Feb 2025 19:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9TT47jMz3q0Y; Wed, 05 Feb 2025 19:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784189; 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=7xTR9RsHak3P5ye3tUb8/PqfcUPO+z2YLDFWsCpU3ek=; b=IvRrumWOjIrAgnuCLaBdgucYp8yk5aX3yrc7FiNfbkXUcNZJ1b7E9n1WEYddleHDGHiRPq 7jQwuXDtYP9FF5JCTUEVdaIcthBQ2AVb+wC6dG1JlLeMaddNYwULv5lC9UjDZr48logYeH pTo1FOS9artjBl3kE4rScKamM51880sUqSC0T/7yebRJ6jxHzckYLlvbHZBOZq4iv51ndB ieT6NhJ9EatqJOtGTAlEoXFYFZtbqDLzQO1725XpQRhHKShGjRjCp1sb+dVqAXe63av+23 GojMKZNFsb39bkM5a8AaDZmpM80g3wmRSk8u4VtOCmAFIbPaarFFl+m9KfviMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784189; 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=7xTR9RsHak3P5ye3tUb8/PqfcUPO+z2YLDFWsCpU3ek=; b=rZb20GSKGXRnLLuAGYW2do9jz2QnhgSxGBPwWKaeyhADNWYRjnsZpqjlio352JQ8pUzGqC S+ojesZZVqqx18JD/pOfOKSKS0nTVSlasGy+HTiSI/NuHMTErFHsHIWzzEtDE+ToIRFzl+ 98X7vyOsm+TA0kLQRdH6X0uCJ/8L0vvA+PXVcuQJ5gXa5k7W2KSl0ixE4rSKsFg3NE5NK/ SkqUl0u5WAVq3EFWo9RIqvND//4nrgkM1ZzYGYJvFwEmkTdmId8jQDPkZzi7m19AjFniMz FvX9T+2xz2ZONmosi/oJ/MwueOzci0BOLpiVY30KEYroNV+1FLNoIt9pyrNmxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784189; a=rsa-sha256; cv=none; b=rBZmel/eSvcQCYQFCXSzGp3GVRR0MULV6nuMzIzgk3z5DfzGX4/T54OZMxr0ZF7gz7oLGg 3IP4G8/ySnmJDhsG5/vRtOaP2I0Be+f+sNd/nGgv9hznXUrMwt48O5shxzKyygJnAw/fGh JGmgurgiTTSPsWeufm4NmM/XY2mJu6bvzrGecGjKfFiUZTcfZyg5POvQCgy2OX2yfnFn5R ywosq0gl5w88ltWShTx0VkT9L/xvMozPO8ZMLeehCdVvYHE6+hEXNPGZDKYGQkNL/0qCQW IDkHQWlJPjU7OnGA+uYJibakRYfNw3MlS29oF3yohbZeN6OCGdY+8YDuQL4B/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9TT3hfBz14vc; Wed, 05 Feb 2025 19:36: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 515JaTQw049382; Wed, 5 Feb 2025 19:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JaTsT049379; Wed, 5 Feb 2025 19:36:29 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:36:29 GMT Message-Id: <202502051936.515JaTsT049379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8ed1a0c91195 - stable/14 - TCP BBR: remove assignments without effect 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ed1a0c911955bf9b589a07c3395f70df7d83fe9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ed1a0c911955bf9b589a07c3395f70df7d83fe9 commit 8ed1a0c911955bf9b589a07c3395f70df7d83fe9 Author: Michael Tuexen AuthorDate: 2024-12-30 14:57:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:36:39 +0000 TCP BBR: remove assignments without effect No functional change intended. Reviewed by: rrs CID: 1523772 CID: 1523777 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48215 (cherry picked from commit 895347fc10c5b06bddadcc2937fdcf298c7e1114) --- sys/netinet/tcp_stacks/bbr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 2c737360cbe4..eb4fd75bac3a 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7313,11 +7313,9 @@ bbr_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, p_maxseg = min(bbr->r_ctl.rc_pace_max_segs, maxseg); th_ack = th->th_ack; if (SEQ_GT(th_ack, tp->snd_una)) { - acked = th_ack - tp->snd_una; bbr_log_progress_event(bbr, tp, ticks, PROGRESS_UPDATE, __LINE__); bbr->rc_tp->t_acktime = ticks; - } else - acked = 0; + } if (SEQ_LEQ(th_ack, tp->snd_una)) { /* Only sent here for sack processing */ goto proc_sack; From nobody Wed Feb 5 19:37: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 4Yp9VR3Bz7z5mGhr; Wed, 05 Feb 2025 19:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9VR2VPBz3qHw; Wed, 05 Feb 2025 19:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784239; 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=+W9ARJSdMuW1/0To4oMbM5A7lSPDGqhUgvpVwzcJU4w=; b=wKzQ253cfsHedWik3lgSVyWq7OjPGAg+FKzu8IqtS6GQJgV51crBLdDduKwj1rBf1nWADm RVEmvvWUu4h/hA1B3ov46FtSBE0s757gBBGlmQOc0zqbLPB1VQtptMBBVmf2w/Vp/BZTKb qCiLd6kjvmyz0NuSpMgIR+EHZwpso6Zuqddsl2UX935dpwMTilXUtwM2/n0v3WY6GWeDVL Gi1TBcglSKa8LbGtqk7F8UkN2aM/jTTOXqfnrSZVAb7vG/YXnh2pLREPxN59OW3GBU0Pkl +sBW1qsk7fJfUJ4Zy3GwUelolf30wesXvHS9By3ZJSYq69CW3gNUNNAovu0I5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784239; 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=+W9ARJSdMuW1/0To4oMbM5A7lSPDGqhUgvpVwzcJU4w=; b=hODSqK3ZTGjc1xw+jOM6C73QEbPfQwr67owAVC6SRzzqdT2qyeSyDmDAA/sGdj6FWAAmuX Dygq0HCj+fR+yL2SIICEroNZSBjaI2JKHbZR25sUTBvV++3xsiNcO4vHuRF5+1knWf1fgQ SVs5x1ZU1FJPZ4FaQyPiQGocRnszYKJb+CgC1w4cq0nLTKMkqm+5FKY52PoN7ltsDC+YLp pkeVajLB2oW7WU0enMvcjo93fm25UXeO5LvVJuJMDUL3TdERlOAYTsNrK5VUQbivjJiObE ceSdkjVzT25giUv9wYS3xk8KPRH1MSeboCrtHN+E7AoiPm6Zc9Xc/D186eT8mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784239; a=rsa-sha256; cv=none; b=Tw2f8pY+6T3psKcHCNK0CRFv4ehEOvMipA8nVCCXxSfE/Wk/GdP/4ek2zntFkNPXzGUrVl s5h2dREePx222ur2yPStRcnuTt9Icy7qlZFC3GbINhIIldUkjAwZPiIIXLnd2yBtFjBJ58 ekTWCYDlXHvM80KJIzt1Tv2pym2sFaQ8gO4l5JwVBXGNpJGnULXkXEPBXP77T4sPWzl9M1 riGtuJFZ/XoYFr7V1eABIsac9o+71UN1bUs0nXHIi/nHY3SYCHFHpgKAxxefVREfXp/x0R M2ydjSlydYmGlE5V6RRhSZ+BM001BQxvhgYNk0NXKyww7rNHKvhEBZuzl1jVeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9VR1yCJz15NK; Wed, 05 Feb 2025 19:37: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 515JbJ4k049758; Wed, 5 Feb 2025 19:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JbJGI049755; Wed, 5 Feb 2025 19:37:19 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:37:19 GMT Message-Id: <202502051937.515JbJGI049755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ac863fd8298c - stable/13 - TCP BBR: remove assignments without effect 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac863fd8298cc1d58a88c0a668845b2c87c140b8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ac863fd8298cc1d58a88c0a668845b2c87c140b8 commit ac863fd8298cc1d58a88c0a668845b2c87c140b8 Author: Michael Tuexen AuthorDate: 2024-12-30 14:57:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 19:22:20 +0000 TCP BBR: remove assignments without effect No functional change intended. Reviewed by: rrs CID: 1523772 CID: 1523777 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48215 (cherry picked from commit 895347fc10c5b06bddadcc2937fdcf298c7e1114) --- sys/netinet/tcp_stacks/bbr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 5ebf82eb97d9..7faeadabf203 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7358,11 +7358,9 @@ bbr_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, p_maxseg = min(bbr->r_ctl.rc_pace_max_segs, maxseg); th_ack = th->th_ack; if (SEQ_GT(th_ack, tp->snd_una)) { - acked = th_ack - tp->snd_una; bbr_log_progress_event(bbr, tp, ticks, PROGRESS_UPDATE, __LINE__); bbr->rc_tp->t_acktime = ticks; - } else - acked = 0; + } if (SEQ_LEQ(th_ack, tp->snd_una)) { /* Only sent here for sack processing */ goto proc_sack; From nobody Wed Feb 5 19:39:16 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 4Yp9Xj1pKDz5mGh0; Wed, 05 Feb 2025 19:39:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9Xj0ZRSz3qwL; Wed, 05 Feb 2025 19:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784357; 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=v4Fco2odWZwzLfGZO3HAT4sOB/7i5oh13ZOBMacq604=; b=iS9Qe4sD9S4cotMjnFiQmp4TrqA7NmQtCAGit53MLufJUgAKj0PUqd3ecBP0GNyi9bpuxK aJ2Q8QczDXNuiw9pnQzJFGuMAfkZZNHSSDob2QT3UETiHRTP0kz/rik/LKjmgHnBNE2Sru WSe3/9lsxpvHRNaH5/kPUVuk1If7rQjjVtx2LElbvCFW/r02zMeQoa3XjGTFEycEQzbELT st2ZKNiD6/WVPBXZVxVWvFt4Y4xZulg78x28++BTAkF6iqgX6Y0mNsvhI9Y+UuffwGS8Oh dqX8rzzInJli1FSP2uLUYLrkihfjjoum9R0Rj/NTfqDDMY8Br4qHzu30piy/Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784357; 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=v4Fco2odWZwzLfGZO3HAT4sOB/7i5oh13ZOBMacq604=; b=YGMwYOQ3m7HX2oTzloFDIYrWI4sqPKp02GVH/dOMDtCXo+XF46ZAsEhcNuVzkz0VM4o2KZ HMSek0p2MoBjfWCBtIcheUsTk4r920AcmeYNEbqgEKXF+SDpBa84lgrsZfBn0JjJD6/bNY rue90AHTRC2pOOwCRnfAedOA63sp3Ph0Ee1WBg9KMJNO2jplzGpPgb/W+oQWugQJEkMBKd UJ8E0j9aoCZvsDC3LRHtsR/KM3sHEK9Vnt06pFKvlBH1ZIbaGQ4n3LSSX0Dj3qP7XRVwQl j+dbZbUsZjnxdgcAX1JJFKEAOBeIAdQFvikyAz26gYxF4Ay/whDeOeJuotgw6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784357; a=rsa-sha256; cv=none; b=H++aF5iGqjw8qDIhoJFj1S0DFws/3buhtOmf04ZOsJAdSrhxDZf4CdSD8QDSlGFkL4fKO0 u4w9YS83qjtjPJTB/XiQfcFLQkjH73hoaBc20fGxeMvrKzf8hDeOw5jEZKb8Nhioj//bpc o3SK0dzMN3zlT4MdA6ZusDQ9RA42LyjfvKmkg6V2r52meKbpLCiNnwHhKsCyuw/mjIdrEM ZSUlBINBZKphMtbdLpo13SFY6PpmWXHCFTDYBt4Awy2AEiuglIYTVntdi/k6bHAWQ2GBd8 5e3pNvNvGwhigTN5JxDZMuaktpoDqNkfqQ7TVRYLO3Wv4QhTHVU38blkDIB32w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9Xh6w9Tz14vd; Wed, 05 Feb 2025 19:39:16 +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 515JdG6U050458; Wed, 5 Feb 2025 19:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JdGI3050455; Wed, 5 Feb 2025 19:39:16 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:39:16 GMT Message-Id: <202502051939.515JdGI3050455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: b9c89008cca9 - stable/14 - TCP RACK: remove redundant 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b9c89008cca9346ffc68e8e1b954db3d338332b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c89008cca9346ffc68e8e1b954db3d338332b8 commit b9c89008cca9346ffc68e8e1b954db3d338332b8 Author: Michael Tuexen AuthorDate: 2024-12-30 15:00:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:39:26 +0000 TCP RACK: remove redundant check No functional change intended. Reviewed by: rrs CID: 1523811 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48216 (cherry picked from commit 16e8e99f1d412103d8f42e5ed740555c545bffc5) --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 8cdb6e1f9efe..061bc286e11c 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -23042,7 +23042,7 @@ rack_process_option(struct tcpcb *tp, struct tcp_rack *rack, int sopt_name, switch (sopt_name) { case TCP_RACK_SET_RXT_OPTIONS: - if ((optval >= 0) && (optval <= 2)) { + if (optval <= 2) { rack_init_retransmit_value(rack, optval); } else { /* From nobody Wed Feb 5 19:42: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 4Yp9cS3PFJz5mGBv; Wed, 05 Feb 2025 19:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9cS2s0zz3rYM; Wed, 05 Feb 2025 19:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784552; 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=6u6WAnfhD2yHSRIvINiVrmNPgAWZ3UnzM/wUh/5N8oI=; b=ppWjnfV3XLCXRhLX6NCIK9i11eMjBlquIUyMS1DrdajOMNrsiiY3PUOieuMQ9R7a0uJhGs nxuyWujCP0C681s8ZsMzj+JZBxTAhWaSaNLQsWXnYQCQOUsPdoe2+4Ok8as2XDJmR9+ouv 3kQsLpMQ7p3GZK0Ew5FsfKtgWjq37SwEAVs8zh4vjGrB2N7MLsFYIYQzWqJcB/h5F8QApM EJbGj6FPOtH4v2vZ4JEySOrTvyMt473+A+jY8S43eBZWe8+CQA6d3pAmM651MtBa2Bgi04 8kOaL99SNmkdO6oqVcRmKOQRbDLmHbLakLs/AdRbMM4OSQ8iAI2FbwhUom5j5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784552; 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=6u6WAnfhD2yHSRIvINiVrmNPgAWZ3UnzM/wUh/5N8oI=; b=wFyvyJeQ5mxeI136rv/Uvqu9VC/oZzF5XhjP6p6UnxxGOA8+8QDPAfeqH5LkAqns29Esum eW37yZZ0WDSht2wSX1gnTNtpRY71mxMWgA9DxNoRWdepvF1kT9ZoJ0JThswqI+qpoRtakX 1xxuoYUdmwyVGRpDx4W0ySAOWgap2zQ6yvK2xswkQM/3YX5mPPneiEgMBInKYaJQbXnBcJ SPlniwt6c11DQ73AlwIk4yP7zwpvflgzc/3NZMhAw0Op+1A1nnCZ/O0MCPGFCc8XVuMbX3 GtC6MAOVOKxn/ZF2cb+ovxt1gi7UXJagkvHMFANDvp4xyNs2MyMhBMk1toX85Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784552; a=rsa-sha256; cv=none; b=UAY2XNM7vdhTcHgPSy4plyedWkYj24B0oKPaWjfCyIUifsoY9qQsXcAWlfCIqX9AuQ6Ffm NHB1FQhkBthQZGblwrR/mLzOvhgRlcu2kfpBCKVtjuBWZGiJeNMmANClq15EWU1YMz0bBK aRiSkajHookvcc26ch5aToBMhvo231XE7IG+2MCfGRt09kNoNvYgWb0AbLd3p+2I8BryhL 4LHtOaA8eZK9nVqRI3C3ZYmD80V/I6PBCsva/DnHk4Xn6IvN/HSCfYouIFexdrwVUrxr7q 7Sc9TUNknTrDWjOoa3BFSfCLpmp0qd+WD78CJ/uIHJyHPVPiK5wb0mAyu9g0Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9cS2RY8z15P1; Wed, 05 Feb 2025 19:42: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 515JgWJQ067562; Wed, 5 Feb 2025 19:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JgWnQ067559; Wed, 5 Feb 2025 19:42:32 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:42:32 GMT Message-Id: <202502051942.515JgWnQ067559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0da0b392e2e4 - stable/14 - TCP RACK, BBR: ensure return value is always ininitialized 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0da0b392e2e44a3333753c1e238e9ed706f8af9b Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0da0b392e2e44a3333753c1e238e9ed706f8af9b commit 0da0b392e2e44a3333753c1e238e9ed706f8af9b Author: Michael Tuexen AuthorDate: 2024-12-30 15:02:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:42:51 +0000 TCP RACK, BBR: ensure return value is always ininitialized Do not return an uninitialized value from ctf_do_queued_segments() in case no packets are actually processed (all are skipped). Reviewed by: rrs CID: 1523774 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48217 (cherry picked from commit b5739c8b12226c791bc8e7a4ac6e48965333509a) --- sys/netinet/tcp_stacks/rack_bbr_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index b218f449475f..9fd1817192c9 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -478,7 +478,7 @@ skipped_pkt: if (no_vn == 0) { CURVNET_RESTORE(); } - return(retval); + return (0); } int From nobody Wed Feb 5 19:43:12 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 4Yp9dD4QKyz5mHLw; Wed, 05 Feb 2025 19:43:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9dD26JCz3s8D; Wed, 05 Feb 2025 19:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784592; 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=KcbydVfSpBF1k4Xz/jQs4LHe9uUNSOiYeI7Dc6Nw860=; b=R03MaHKL2HqA+pFeMoGWhlv5nU9E5K9vrS6fZFE5lUKMOAn29+H2RlnMhJMUon2VZEHyq/ CFhri2obvzGqeSt67WWDYWzhZL4S7BHEE+LZzWxZpUeQUsy65Qls7XvmcLVd3le8vUem1V F/JzQ7Gvcg16mB6t/Wkpr/MvHeofz/LeuyQjXZ7JyKWcLLaE75Eshd6b60KCbf57q7Bo0N wJFOhWA+KyZvfsdGOY7ArC/lFZbgGWJMyFONPWcYXSQKdI2SLD/K0AoOoKGcngBzpSSepB gjJ7nq7MQIAHjDgGDrTQQmjK7FPzn0v/lmvPWq5iJzKZ+YWROxFgpaN8DDIq5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784592; 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=KcbydVfSpBF1k4Xz/jQs4LHe9uUNSOiYeI7Dc6Nw860=; b=veGwuqb+yAw6BGLat4Bc/s6Bje2yu5nDrPHAf/Hjt5fam3yy30RtNoy+6gT7g5uO8K2RuE GlwuM+4p0uN2LXIg43On6i8zRSqZOjpvh/36+h3ldlHnIKqAjzClORxdIV1303cPFoTGhn VAFUJxR8UY8COBvSFkmYy0tfEbAtbpgU5zyRwxjfjvLvmahRkdACsuYTU95yHJcXOEsO5i CCDcJPx/KJAaJdG6zPRQBnNqwjVK8+bJJsnWV2M4D10IyggkyBJHk4DYrYH5heed2vWSDL 6Fiu7YWGRQ3s5nWBitr8lFfBpQQWou4NdXG7YypM+qhHCOzY0aSiHkd78q6Sdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784592; a=rsa-sha256; cv=none; b=YK5Gk9FGHg5HOSXg+OCy/3qZ+HBRHqyHpNCrhcc6guzATXWc+VfnOuSFyssczzCsPZaX/T 4BWJg3f/dqlpARFHrHLLVzoNBL+ioFTHpIhrv4tqYIDROrWPA/65R/8jpKhPgSLzutOzoc iOPbalofiG9D5liARy9LC5nsdtfvBhA/xZ0nBKKdxXgg3MuQAl3NElq+8w28yQYgWD1RRS 0AKkFbl0jpq3HDtXccyDMPX8BdRn528GVEynHrcCRlwuz8rFsXOji5V8nk/VAJKk0hWBEw ddcEsDMfPVwfHzBYhpO6jG4ZziiLL4JCAsR0LOluAuz9yLXEr8rEDPgmjGWpBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9dD1bpqz15KW; Wed, 05 Feb 2025 19:43:12 +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 515JhCsq067894; Wed, 5 Feb 2025 19:43:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JhCbD067891; Wed, 5 Feb 2025 19:43:12 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:43:12 GMT Message-Id: <202502051943.515JhCbD067891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 60682a028156 - stable/13 - TCP RACK, BBR: ensure return value is always ininitialized 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 60682a028156289bbcc69de20198151c44fa5265 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=60682a028156289bbcc69de20198151c44fa5265 commit 60682a028156289bbcc69de20198151c44fa5265 Author: Michael Tuexen AuthorDate: 2024-12-30 15:02:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 19:28:20 +0000 TCP RACK, BBR: ensure return value is always ininitialized Do not return an uninitialized value from ctf_do_queued_segments() in case no packets are actually processed (all are skipped). Reviewed by: rrs CID: 1523774 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48217 (cherry picked from commit b5739c8b12226c791bc8e7a4ac6e48965333509a) --- sys/netinet/tcp_stacks/rack_bbr_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 0a608b92b248..1426043f5326 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -520,7 +520,7 @@ skipped_pkt: if (no_vn == 0) { CURVNET_RESTORE(); } - return(retval); + return (0); } int From nobody Wed Feb 5 19:44: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 4Yp9f914GZz5mH06; Wed, 05 Feb 2025 19:44:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9f85Q80z3sZn; Wed, 05 Feb 2025 19:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784640; 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=C7kQb3ea9+vEaUL5Z87bgeQY9Ra9hZYkUeG+sOJwzQQ=; b=p3GQEBno2bOSBwrOI5LG+BMB0eqMtDm50/DpocqS97inC+zBefkdb48Otx4VvAnVgVW+dP KxqtsfpSwyEoWkCq2a4x21qC0uG2XlMaq1AbXzLaS7NQQX3iAP+FgThXj9tzu5+hn2UuQT 8Q7v3Pd2mPdZf4Qxpm0yvaz+1MElgVgEGKYGMgxozh9EDi6h52pMbAS+ggt1bR0b8TxNnW QWDPLVzVNTFBhz3tSMo1AVQ8e9ms4B2ilFfNb9EfQv2dhesdqCvW3PGloVGlBPgrL9tuhh uJmKMyt2zZt/Jg9zM7xsk436Z1+FZGQPimiysA8lsJ14vE6XAfhndIxtKMp1kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784640; 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=C7kQb3ea9+vEaUL5Z87bgeQY9Ra9hZYkUeG+sOJwzQQ=; b=Sa/b/sdeb4yZ3QwVdLeinTUw5tPCojliMcgQ4laKeMZKfp8QKY56+BUnMKazzpQ40d278L 2C7OGjrgT8Z1Ed34OgZSla95/5f8hYPDVIKPorLkxe1+s85LTxs1wmEtzPBDVvIsySnAVR ipb1AzahFpsrZwUarCEI/digcDWhYMqE5XcuWZ0ZJJUYRNuLPok/S1FgkVC+wz+foQU9BU BiimFPfdWi77uOq2cFzkRmcJgozsYkuqbmcTVVV+4loIykYkBGB2/8YcCjVEdj0AkoVNoe 9Jyp0M6E7qPRMDfj0lkbiR6ZVzvc0RTaIqByjJn6Hu0oSkZgNJjgEWZjsVIW+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784640; a=rsa-sha256; cv=none; b=UtLUEc4JLfudgF1AsSy8a57jETYEBw0HyBSXICQcbzaNSqFRznqBEK3Ez75BUcYeZHftrR kMkLavc/37W5hy3bgaXxt8JNAP9QksTqQ+OSfOfmu/cMK9KzLHWLwgC9V0DRl6ACyZoYZT ce3BTTnbCUHqpIVdiF2Ae2smkSAcbDeGhuOwTLzMT3Eklrr762Hj5BLvTS7S6UlIyFUiZ8 8A7mtm4POMDkevC67ItbX9Vgkt8MRMZq3lxtwl/g3FAP2MYJbLwWwcOxYsLhNu43hRAfgp v538xLJ4wVUuate/WAjNqztycsAJyFFSj2wFKYQpjbzQKtgmMKXe7nIP/1xm+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9f84wlFz15Mc; Wed, 05 Feb 2025 19:44: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 515Ji0kb068274; Wed, 5 Feb 2025 19:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Ji0wI068271; Wed, 5 Feb 2025 19:44:00 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:44:00 GMT Message-Id: <202502051944.515Ji0wI068271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: dd0d5ece19be - stable/14 - TCP RACK, BBR: cleanup of ctf_process_inbound_raw() 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd0d5ece19be1cfde6ca744ea03c2a49c35f2fa4 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0d5ece19be1cfde6ca744ea03c2a49c35f2fa4 commit dd0d5ece19be1cfde6ca744ea03c2a49c35f2fa4 Author: Michael Tuexen AuthorDate: 2024-12-31 16:22:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:44:19 +0000 TCP RACK, BBR: cleanup of ctf_process_inbound_raw() Instead of dealing with ifp == NULL, which should never happen, assume that this is not true. Use KASSERT to make this clear. No functional change intended. Reviewed by: glebius, rrs CID: 1523767 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48258 (cherry picked from commit 4940584bbf0b809130f6ac1a7a0c6b00d373af1e) --- sys/netinet/tcp_stacks/rack_bbr_common.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 9fd1817192c9..b78988b75c72 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -361,26 +361,15 @@ ctf_process_inbound_raw(struct tcpcb *tp, struct mbuf *m, int has_pkt) int32_t retval, nxt_pkt, tlen, off; int etype = 0; uint16_t drop_hdrlen; - uint8_t iptos, no_vn=0; + uint8_t iptos; inp = tptoinpcb(tp); INP_WLOCK_ASSERT(inp); NET_EPOCH_ASSERT(); - - if (m) - ifp = m_rcvif(m); - else - ifp = NULL; - if (ifp == NULL) { - /* - * We probably should not work around - * but kassert, since lro alwasy sets rcvif. - */ - no_vn = 1; - goto skip_vnet; - } + KASSERT(m != NULL, ("ctf_process_inbound_raw: m == NULL")); + ifp = m_rcvif(m); + KASSERT(ifp != NULL, ("ctf_process_inbound_raw: ifp == NULL")); CURVNET_SET(ifp->if_vnet); -skip_vnet: tcp_get_usecs(&tv); while (m) { m_save = m->m_nextpkt; @@ -466,18 +455,14 @@ skip_vnet: m_freem(m); m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); INP_UNLOCK_ASSERT(inp); - return(retval); + return (retval); } skipped_pkt: m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); return (0); } From nobody Wed Feb 5 19:49: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 4Yp9mT0lHbz5mHKk; Wed, 05 Feb 2025 19:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9mS6LcMz3tlQ; Wed, 05 Feb 2025 19:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784968; 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=lAZW+6yN9qLWL5ayCs/sGF/gC4Qhon6w86JPJdcWdm8=; b=ocQAiv6AFsjcOgxm9EoTs1Hylc0PgVUqgCe9VzdLDY6+PTEaE0GiUjlSCb7zoM+jK0G/Js vNOMxmwRqsHAiADdO7CJgEOSi9Q4SNemBy9kRXdPxtbFPV5l0PJuA+518yizJvP2Rdkr4Q G8+Vmjf757ztc8gMkXfRoTdzicETA/vm+Q0BzmZtrESvax8RFBqdJO2HoBH8xxrmFRXS6l sf3V1eIK0JoCQPbSW4o4eAhVAW/yo30NECE5ghb5AE+yJNh6rRSjpT1ch4Tjj/yFVc6g8T nnrgo7CcWluskeV+PZnbBQsc/7xVoF/BFjexGftP4Sl6RV/YGUtAbYyaywufkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784968; 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=lAZW+6yN9qLWL5ayCs/sGF/gC4Qhon6w86JPJdcWdm8=; b=DC+GDS3R1AZsqxOTW6XIyYn/1F6ei8c8R5FY2ZFAypd598k/5HyMABESzf2BHpg/S7T6xf TVc67v5DXQuF5iDGPc57QJPa86NO1FU6znoq+rw+wZp7yPIhkpuLVUd2YKSWcl4fSfVSxv r2o4uhVPOYxtHO4424c8nG4rjE5snHYhP72VyRd21rwDK2uxsUGVt1xYN08yZCOAFKQwPV ngDV/tI7B6LMHB1UWjnw9kBmWkhpdalHwVBclV1v160HXeDP/ATkJdqBojrDWsrI2CXzeD XRD3wG0216ARnwghtS4m5r+BCFoGG9MjgTHpvvd0sKwioLwXTRGjOFVlZvzWwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784968; a=rsa-sha256; cv=none; b=Lv1yTf13J8wd15vfR3/tV9CbHM2nQ2wh2W2jlS8aF1UozYmRI6bS6m1mre3rzGvblz+mnx e45hzMmY5EFCqvoS7EZc4hBfZfWevtlvym9GC7h4FL42L2pENFctMjPv9bePQPfRyCb9Rx BecNhJxbysnK5TldMdDGMpMks3bCX1I/Ir2v+pTH46Jl/YshYMgCEkyMCyxzx5N6w1SnUL lppyBuYZkJNpJJjamoxkgaLEdmnlp7twE2AGhpXqUAK0r+vSMvmqsvxWMqDt0nRkrh+gwR Y1kZ/BvMBCdHiMAAslTPuZdlBm8tmv5deuL7R4938EUgap2ZZ07XFFr14N3KxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9mS5wSxz15KX; Wed, 05 Feb 2025 19:49: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 515JnSGu069976; Wed, 5 Feb 2025 19:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JnSZX069973; Wed, 5 Feb 2025 19:49:28 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:49:28 GMT Message-Id: <202502051949.515JnSZX069973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 92d87203c00e - stable/13 - TCP RACK, BBR: cleanup of ctf_process_inbound_raw() 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 92d87203c00e5b47f5505702b2a86fae3c1cf063 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=92d87203c00e5b47f5505702b2a86fae3c1cf063 commit 92d87203c00e5b47f5505702b2a86fae3c1cf063 Author: Michael Tuexen AuthorDate: 2024-12-31 16:22:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 19:34:37 +0000 TCP RACK, BBR: cleanup of ctf_process_inbound_raw() Instead of dealing with ifp == NULL, which should never happen, assume that this is not true. Use KASSERT to make this clear. No functional change intended. Reviewed by: glebius, rrs CID: 1523767 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48258 (cherry picked from commit 4940584bbf0b809130f6ac1a7a0c6b00d373af1e) --- sys/netinet/tcp_stacks/rack_bbr_common.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 1426043f5326..4a1f167e90f4 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -400,23 +400,13 @@ ctf_process_inbound_raw(struct tcpcb *tp, struct socket *so, struct mbuf *m, int int32_t retval, nxt_pkt, tlen, off; int etype = 0; uint16_t drop_hdrlen; - uint8_t iptos, no_vn=0; + uint8_t iptos; NET_EPOCH_ASSERT(); - if (m) - ifp = m_rcvif(m); - else - ifp = NULL; - if (ifp == NULL) { - /* - * We probably should not work around - * but kassert, since lro alwasy sets rcvif. - */ - no_vn = 1; - goto skip_vnet; - } + KASSERT(m != NULL, ("ctf_process_inbound_raw: m == NULL")); + ifp = m_rcvif(m); + KASSERT(ifp != NULL, ("ctf_process_inbound_raw: ifp == NULL")); CURVNET_SET(ifp->if_vnet); -skip_vnet: tcp_get_usecs(&tv); while (m) { m_save = m->m_nextpkt; @@ -508,18 +498,14 @@ skip_vnet: m_freem(m); m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); INP_UNLOCK_ASSERT(inp); - return(retval); + return (retval); } skipped_pkt: m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); return (0); } From nobody Wed Feb 5 19:50: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 4Yp9nY5T38z5mHsq; Wed, 05 Feb 2025 19:50:25 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9nX6wwMz3vj9; Wed, 05 Feb 2025 19:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738785025; 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=xZwaZDQsjq8BPkb7Jb5dwgKIWML0ZDnXkj+4eq35Lqc=; b=sQvatFwnfyBP2WXyxjAgezO5UFt9cnBoK+ldVvLy0l1XoF9EY3Q71t5AupFakJF3IxgCwS 6+8m5pcs8PJ2Mkc8vOHqpL8ovB1ZozHyaU5an2C1R8g1fjWHrTBQVW4oLEeAeMq9TKrv6e P5MKn08dN3SflPXrV7cDCr1RsVXOIqCZP53lhSTDLw3qsUM3AaAtu2Yzq7FOvwpqlqvN/D Cy2/2E/7fi8gWhLBUUtdQSfI6xSRfAr6FNPiHERPS/1FZmW0OtXyJD/OZCW3vt5Xl4mR1R S6FCMG/GlHpghp7SQCa+LbsFghIrPpVjAh2j5VMRlihb2l7MkBoC1f7DV31t0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738785025; 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=xZwaZDQsjq8BPkb7Jb5dwgKIWML0ZDnXkj+4eq35Lqc=; b=LxeCzRHAiESKrLMF76kqMa+jPrFtyxN6TSheeeEG8nc0sYyOtJJwdEcnyftkqQV8JhHL1J /l15/fRpoirWMVRtuXt6Z6ZNXuQhxyiGXUifBXrC99zMZtWMq66UHIslTmlBRBvLJ5TG1O GvQHdCU5b1btGrb+j8JxJPwUAMKQ6RgvGgC/sazQODBMQBs9mmwA9gDTRK4LsCA1h3k8lu mgYXqIfPSGui3uaaYjrD6bDuf6aubSjOJ/jjGvrUbXbQNs7QjJi8jo2y0lHbRoJs7jILL4 5fsuodxW0pUNe9RIoqTJdX0e5gM08RLS6GoPU+Vka30MSOglZ4brUYGTugbSyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738785025; a=rsa-sha256; cv=none; b=BBtkQsaJxnQlMYLn0qsUKGgz7na9h5uTIrf+joh+Ckh7tRCJy1DRoyPVsl+ZPz51TRtmKr 1RO/dnAq1dcrNWjQ8Bq4OqXe2n26QCQXpMlC4CwXNpGVg3mMx2Nk2wvVv8Q8uaLbA5vGz+ QsJ3M5BGIHSIR7ZjyxbeGzBbqjJuo5EuQMDnRmQsyTjpF1qXpDWlC8vL8YkPZlTwiv6S0q hEUezR8KmBZYlfEFiGZeL586x44KyrulAj6vWx6/CUZu5LtWqm9Ovj6BvtRNbGQba++9tB dfYrOurK8ZgTYnqAq/GpLom/BrLg2H6enzjW27EzLQrnzCgfS4lA6Kl0qNa04w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9nX4SBkz14ZN; Wed, 05 Feb 2025 19:50: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 515JoOOG079302; Wed, 5 Feb 2025 19:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JoOPA079299; Wed, 5 Feb 2025 19:50:24 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:50:24 GMT Message-Id: <202502051950.515JoOPA079299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8d5e624d8daf - stable/14 - TCP RACK: don't use an uninitialized variable 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d5e624d8daf05b778ac3f10d085a670eef5a2c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5e624d8daf05b778ac3f10d085a670eef5a2c0 commit 8d5e624d8daf05b778ac3f10d085a670eef5a2c0 Author: Michael Tuexen AuthorDate: 2024-12-31 16:26:04 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:50:40 +0000 TCP RACK: don't use an uninitialized variable When storing the old beta values in rack_swap_beta_values(), ensure that the newreno_flags field is initialized appropriately instead of using an uninitialized value. Since the stored newreno_flags aren't actually used, this fix should not have any functional change. Reviewed by: rrs CID: 1523796 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48260 (cherry picked from commit 4f3a0c719780fdd57c660ceb353bbc71fc555600) --- sys/netinet/tcp_stacks/rack.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 061bc286e11c..3d13ff380a8e 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -631,6 +631,7 @@ rack_swap_beta_values(struct tcp_rack *rack, uint8_t flex8) failed = 2; goto out; } + old.newreno_flags = CC_NEWRENO_BETA_ECN_ENABLED; /* Get the current values out */ sopt.sopt_valsize = sizeof(struct cc_newreno_opts); sopt.sopt_dir = SOPT_GET; From nobody Wed Feb 5 19:52: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 4Yp9rG0y5Qz5mHnl; Wed, 05 Feb 2025 19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9rF5B42z40Zc; Wed, 05 Feb 2025 19:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738785165; 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=ZjaeiZ7C5BhukfdyZt2vgskI2b9fScUr4pqegyD3EIg=; b=AlYWZHu8l4hKp2SxkfSm9Eg+A28U1jdiZc222uR3zxj+qHaaN10F+friLPERaP4uxcSV71 fOdtnRyv/XtdSgo+X1Z/bw3IC5T8Xz0Lcg05u087RmKloNm7WF/dtuBO5Lxqtm3K3waQz5 Q03dnrG8BFEKj28EKawNJJA5zlOLr3/rdJ2+3APdvhGJRhNEWtIwVjU/mj+qcIpui/3Mur DmTyRQbqgH6PEe00C4BbEnziebQ4REVFyq6/mHtHsqBriXJjAVfI9hgwjtODY3g0sx+MFG QEVr308wi6nz888wqH0FOwQ0hRfDUaMFdbgcYqdoqHVD06pgXWLc/847vTPsiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738785165; 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=ZjaeiZ7C5BhukfdyZt2vgskI2b9fScUr4pqegyD3EIg=; b=leYDbwqREXuwe2bjOvVriUGIflMI4tibWyoWQlwhyGFykpzaemricWPacbXFTaqiiTijln S8E8jdrmGe1mca1VChmdJnycGcr5SDKSkawiFUqc+5UU5akRmDV64xS3LnzxRb57eSp/Ux b2Tc4lShZykAQdnVS32vW+vsmIpkagTZ6kkBArOXYI4xoyDZClOPYwhGGfchiLKsVpZHCy MCYCbGyFMXNdhqEhrF2hOTfVVxHe/tQHxn9pgbg19nBxMVkmRz8hc2Ql1lfF0tAHXGHAQN nSTpSXhEpC2E7sg2q4PsJisIwbJsTirD0hE/VuzHwn8ljK477+LnsKasmowsDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738785165; a=rsa-sha256; cv=none; b=LxHwPntJirjMq0i56qx3YVbi+4koccutDibv2tZRwoBJzjDvQfpxRPLK6iQbjP920lrcJ+ ucPU2xDInuctj82CwNgz3/29m842q00MV+/CLzNZJ3nOkPoY9BMdN0LRKNQ8NvbCsNfM4r Y7f/5mx8O9IBoV2fejzcTBidC0StXwii0UDgesPyS52SOx53hwOj11GtBMLXW05KIt58eI tuukYNAMWcDQmuaZXc/qLUKk84PcFxJ8kNX7lbibc+9J/zFgCHORfc7jTgzJrnqDE8XuFH gcOvf03d02oFvR4rsXFQyribmgBqf+SbaVoQxyg8Z9q58dWVzih/Rdpu0LRH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp9rF2tpbz15mh; Wed, 05 Feb 2025 19:52: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 515JqjpA086528; Wed, 5 Feb 2025 19:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JqjfW086525; Wed, 5 Feb 2025 19:52:45 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:52:45 GMT Message-Id: <202502051952.515JqjfW086525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: b638491bb878 - stable/14 - TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b638491bb8786b3093f291caf6e881d54ee1799a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b638491bb8786b3093f291caf6e881d54ee1799a commit b638491bb8786b3093f291caf6e881d54ee1799a Author: Michael Tuexen AuthorDate: 2024-12-31 16:29:04 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:53:05 +0000 TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE Actually implement the IPPROTO_TCP-level socket option TCP_BBR_USEDEL_RATE. Reviewed by: rrs CID: 1523813 CID: 1523814 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48261 (cherry picked from commit b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0) --- sys/netinet/tcp_stacks/bbr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index eb4fd75bac3a..47b4a1bddc6c 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -14560,6 +14560,7 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) { struct inpcb *inp = tptoinpcb(tp); struct tcp_bbr *bbr; + uint64_t loptval; int32_t error, optval; bbr = (struct tcp_bbr *)tp->t_fb_ptr; @@ -14620,7 +14621,7 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) optval = bbr->rc_loss_exit; break; case TCP_BBR_USEDEL_RATE: - error = EINVAL; + loptval = get_filter_value(&bbr->r_ctl.rc_delrate); break; case TCP_BBR_MIN_RTO: optval = bbr->r_ctl.rc_min_rto_ms; @@ -14704,7 +14705,10 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) break; } INP_WUNLOCK(inp); - error = sooptcopyout(sopt, &optval, sizeof optval); + if (sopt->sopt_name == TCP_BBR_USEDEL_RATE) + error = sooptcopyout(sopt, &loptval, sizeof loptval); + else + error = sooptcopyout(sopt, &optval, sizeof optval); return (error); } From nobody Wed Feb 5 20:28:18 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 4YpBdG5391z5mLb5; Wed, 05 Feb 2025 20:28:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBdG44Jfz3CVG; Wed, 05 Feb 2025 20:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787298; 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=wp5UnWgYQrm/CWYbuKwLz3zpA8MVfwo1IzsjJGvhppM=; b=U/IGlFjMDByqPd7nQvqbXqNjGgIdgOgoe5Dh1+tqFpSMkf65rsxl2LYIq5ZvNcW5UrHO4A JyAn7Fi34a4P2shfe2z9V6Gyp7tJ9sN4J62ryB8XywYHt7Btym33W+O7hgzM0gl4G6FkeB uxRSxAwzgv1y/EyKg+MdgLEOKmJ+WS7Yl28mJslLFmBtKIERJ+YEuj02ehCyk2dJ10bfRY wv2GaD7acn7oELroEug1wIUZqWtNHSiQvCzGLu8o74+j0pKPKy4ix3Jatyftru3d6q7QWE 44HS3SxSfMT7q/toCxXzceF00aClEi40lwc9309EbAeIuIjdzD1r8i6GlibpTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787298; 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=wp5UnWgYQrm/CWYbuKwLz3zpA8MVfwo1IzsjJGvhppM=; b=AUQ0yNagC/jq9QXVmIJYHiF4mBgQq2MsIFH445uIsmP7qVcjV3McGo4Ti7yIsYDy4kIWtH oOpNWI/cO8n5GQXbLq4QAfl5xTNsfGB1gUmWy9fLVpOXA+4ftL/daf3KXSTRBM/suM/0ft Vi0zNAQ0s14tLjkDcXUFYQHqnVRoQjAnlS9uQev5LRMpKGQpQ+5wKOtQHgRiHN+znF7oDw +YNQxAMeecQgZRKk1p2roG8f5EQBlT+4uJw22EHzgo2/yWVrqok1c/IhHZCHnAbMfYoWkk pJqcCyTio9WNZO+Z4EfaP+7tTF9zhAhTTSwxE+Nn5xoTtkItdQ5ZtR/ZBe9mVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787298; a=rsa-sha256; cv=none; b=jyO3QvYQFCXUQK9zYagmE734X0JWYROTHc9D+ZkWROKaRC/s5cn0RpoJmOo1R/oJtAnhkU ciunUefFDnBUC0N+dul8tq1iRGeNZ7WElNM1RS8c3tB+8jA9+GcaMsHS8JmYZgKYt4g+I2 8CTsqib/gGmnHqxfBbEgEIDFV4dzenX1xuG4k19PKMWeAsblyhoQTsZWFZOo3SKxcsJmZT H4WyqLvz543VOAxZVypby1F6EZLLDiWUBqhxYPEGyosuk2k5+SQFSOLkV5PPzT9ivKMqYK f/5l1A2XdDtSQNU6eJKTx74JsRdQGvXadI9nVogIILP5Ozfp+EfiEe45EQEnnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBdG3dXmz16Qk; Wed, 05 Feb 2025 20:28:18 +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 515KSI5u045705; Wed, 5 Feb 2025 20:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KSI2x045702; Wed, 5 Feb 2025 20:28:18 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:28:18 GMT Message-Id: <202502052028.515KSI2x045702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1d39f58d735c - stable/13 - TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d39f58d735c64e5878f4bfb1ec53397bd5008c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d39f58d735c64e5878f4bfb1ec53397bd5008c8 commit 1d39f58d735c64e5878f4bfb1ec53397bd5008c8 Author: Michael Tuexen AuthorDate: 2024-12-31 16:29:04 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:13:25 +0000 TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE Actually implement the IPPROTO_TCP-level socket option TCP_BBR_USEDEL_RATE. Reviewed by: rrs CID: 1523813 CID: 1523814 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48261 (cherry picked from commit b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0) --- sys/netinet/tcp_stacks/bbr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 7faeadabf203..1a67bbbdd08f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -14643,6 +14643,7 @@ static int bbr_get_sockopt(struct socket *so, struct sockopt *sopt, struct inpcb *inp, struct tcpcb *tp, struct tcp_bbr *bbr) { + uint64_t loptval; int32_t error, optval; /* @@ -14698,7 +14699,7 @@ bbr_get_sockopt(struct socket *so, struct sockopt *sopt, optval = bbr->rc_loss_exit; break; case TCP_BBR_USEDEL_RATE: - error = EINVAL; + loptval = get_filter_value(&bbr->r_ctl.rc_delrate); break; case TCP_BBR_MIN_RTO: optval = bbr->r_ctl.rc_min_rto_ms; @@ -14782,7 +14783,10 @@ bbr_get_sockopt(struct socket *so, struct sockopt *sopt, break; } INP_WUNLOCK(inp); - error = sooptcopyout(sopt, &optval, sizeof optval); + if (sopt->sopt_name == TCP_BBR_USEDEL_RATE) + error = sooptcopyout(sopt, &loptval, sizeof loptval); + else + error = sooptcopyout(sopt, &optval, sizeof optval); return (error); } From nobody Wed Feb 5 20:29: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 4YpBfL1GNPz5mLdt; Wed, 05 Feb 2025 20:29:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBfL0ksgz3Ckh; Wed, 05 Feb 2025 20:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787354; 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=3u8WdCqKsmWUGEqnL+1a/0RzehKVIt+nHryp9QM5kHU=; b=Jo2dBwM0k6mXeCqibGhUdlIRtbRLXVWtYQOhJzGwjY9jLvzEy1x/SSiBuAZF9qaHGQg71Q VifKPjf+i6kXKcF4Y7QKUMaHMkQwtbp6FcQyhawcblvcb7x670yZSJXbWAYUi7gYpFvToq ccli4Syf1JPVW59JnWtMdOtq+9zOlcYAboL87aBDBOUlBtbxrkgQABDbH/+WAytjOuszjZ ZtOcV2JiMQYFLmzgPJb57vvLaIWKbaX6SvtOqSH6b6F5kOY4YHQ9s1HjtP34//2pg6nBP1 HU99iurmf7JIRG+c0yO/9mY5oxsVaKpuOi5ZCt6+GnLPGnwBA0ej0lvK6o3/eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787354; 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=3u8WdCqKsmWUGEqnL+1a/0RzehKVIt+nHryp9QM5kHU=; b=k8x37US7EHtz1ukIcUpVq4K9ZgHNBIBIRQC/JQFDPZr5raHN8VrYbebWwSLCT8N4c0h+gl s7tAr70GukFlodPtuCXCZ61yISqeplW8hWZ/PZEk0xrLjGnLyctO9KkPStdbw5BE2kJq7E fmphoBLLleTgR3qLY97X13sWcbxdo8MO21U2yKFAFWXJ6ZbyNrCqp4lzJmA/apboVksAAF 3h5D0e2iK6Z3xVdbld/piXZ9ALw+LoJ3JgtKHwbo0698HK9mDg2A84eAsztqyQrlBUeINY 7RzAMPrS8m/oRRTyU5yL24yyoemSDtkizAmOtbWF7JPPTf7l+TVcRzJJT6X/8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787354; a=rsa-sha256; cv=none; b=gVohlfR8C3LA1q6Q/OXTDrBNH3+CBCJqm6hBU7CtxOUnD+yddvdpZp0t0XLx1WcButIf4k o9DHJejFE/Ut41EWOC/H4FYyrY5tMkczpxYhY8lORCkPGPTjGEwHb6TZ3FY7V1lWsdB6++ KBtEGTLz3zK3P/mapDV11l5GWyIIrPczt35/vKp6EtwMC4GOdZZ9o4JQA025qsxYPGS+k8 4zQIsto6VcHrBBF8njgEQQsS2NfIV15d2cxfaQzEDy5k+/6uClyLJf4TWjYB/11XYrc9nd m6JC8uJTnY4MCylKR6lHfcDEs3CfHQtooSYegVRYOtlO9UM8YIE//OEoFC2GhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBfL04GDz16cL; Wed, 05 Feb 2025 20:29:14 +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 515KTDun046095; Wed, 5 Feb 2025 20:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KTDuV046092; Wed, 5 Feb 2025 20:29:13 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:29:13 GMT Message-Id: <202502052029.515KTDuV046092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3520068b471f - stable/14 - TCP RACK: add comment 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3520068b471f03ee64613bb3c75d2a10866c3607 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3520068b471f03ee64613bb3c75d2a10866c3607 commit 3520068b471f03ee64613bb3c75d2a10866c3607 Author: Michael Tuexen AuthorDate: 2024-12-31 20:51:58 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:29:28 +0000 TCP RACK: add comment Indicate that the missing of the break is intentionally. Reviewed by: rrs CID: 1523782 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48273 (cherry picked from commit 0ce13b1d580f05f96e3d85afb0824f672cb0c7a2) --- sys/netinet/tcp_stacks/rack.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 3d13ff380a8e..393ca3ca21f6 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -22469,6 +22469,7 @@ nomore: return (error); case ENETUNREACH: counter_u64_add(rack_saw_enetunreach, 1); + /* FALLTHROUGH */ case EHOSTDOWN: case EHOSTUNREACH: case ENETDOWN: From nobody Wed Feb 5 20:29: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 4YpBfw1N2Jz5mLcF; Wed, 05 Feb 2025 20:29:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBfw0l97z3DFc; Wed, 05 Feb 2025 20:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787384; 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=irLUeCnopiOPUPZBNFh0wlE0VOOHLStc9T7vfwdflPw=; b=a5xXI+/BGN4bT9+BABhUlqr4oIbaRuBZRAEmgdoFR4jxx8rwNYz+8/kKWYcUrbw9csMZxI N8en+EBOjGUj29gC7dnK2nS8nU3yQud9tPCUsNlAeH6RnjmPG490pTbVtemLrMO709bb90 8fgFORUirhwt6sgjEVFAe+pvWjYvVnHBRvAjgeIUW+kWCsuqKsKu/oyiTxRScpq151Zir8 0ovN9vrd5iehwyxA4i1fivow3oUiCxQvXA01BGebzo7ceGd2vB8TUaS1sHj9q+HSUTRC9+ Ca2g5iKpCFJuxPnLsYYHN8lfI0zV6+GIr6W0dvPBNIL8FJr1nZuo9pWxOvNE9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787384; 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=irLUeCnopiOPUPZBNFh0wlE0VOOHLStc9T7vfwdflPw=; b=GNDOudFtOdYI+LsHGpat4AD0GMtu1asMeK/k7QPNLIinOrC2DCIB1yzhV2RDJBApCfs8x+ sFE8L5l3aiWSfk4Yb0cB6/+Di/S2K+rW7MZT4ajyjpVTfGcpa5Ab7l2RcIFNtyINkOFIdJ 1RRGjlJfTo0A2P9c1L+xqH0slwiz5oybI9R/UwGIY5d4tfZnth8xv6fZeYAeeaoYqCVOqo undoV28WKc6VxPDpG+MfRLt5d5URvDVlSLGkn7N/DrxSlbJYNkNDu4pdXicT6qXNkZPFbM qsItCAw0TTCAZhRyHOFv76in41KaNk7LOeyZNDjgLmrxhXYbM1VbceBklBRWRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787384; a=rsa-sha256; cv=none; b=t6tE7PXOLhw97k2MnrfU3r+iZJrxmcSi5qrUqC7M115Qnidf0IlKeLea6IHv0NeoNqB5BY 2r23Xs6XZBtxuM1/mCk/9SZri4tqDo31sMeQfl2iFyjkKPNFHT+YRTUKyZhQTrYjs5+rud r4ZZKNzPRY4gzyrO3iwvciLh/PIqYiZhfrxdvVeFCf8SOHVvEC67EnwciffSdlwdRMwVfI YmYFN3XXUNPsokBRlsJtV6PGiejl0eLYd4jw7z+HNk6vMN9qZWad2ViJ/AckUGDKowJ/x1 FGnmVjpJ4Om+PNapRHxbHzYF+taevu6AMQR4hYUL3VszXrTxqgeL8IU0MdgebA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBfw03HQz16Bx; Wed, 05 Feb 2025 20:29:44 +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 515KTh1P046348; Wed, 5 Feb 2025 20:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KThmT046345; Wed, 5 Feb 2025 20:29:43 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:29:43 GMT Message-Id: <202502052029.515KThmT046345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7db5c08dc637 - stable/13 - TCP RACK: add comment 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7db5c08dc637bb5e1fa8491f3a27214806cd6f1a Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7db5c08dc637bb5e1fa8491f3a27214806cd6f1a commit 7db5c08dc637bb5e1fa8491f3a27214806cd6f1a Author: Michael Tuexen AuthorDate: 2024-12-31 20:51:58 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:15:00 +0000 TCP RACK: add comment Indicate that the missing of the break is intentionally. Reviewed by: rrs CID: 1523782 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48273 (cherry picked from commit 0ce13b1d580f05f96e3d85afb0824f672cb0c7a2) --- sys/netinet/tcp_stacks/rack.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index ce1f2b88cef8..a61079d6e9a9 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18566,6 +18566,7 @@ nomore: return (error); case ENETUNREACH: counter_u64_add(rack_saw_enetunreach, 1); + /* FALLTHROUGH */ case EHOSTDOWN: case EHOSTUNREACH: case ENETDOWN: From nobody Wed Feb 5 20:30:38 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 4YpBgy3y23z5mLrL; Wed, 05 Feb 2025 20:30:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBgy3Bzhz3DH6; Wed, 05 Feb 2025 20:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787438; 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=SfEiEOyBWqyCKEak7bfMoJH/TUjyXcUXd6kohBWVkCI=; b=slZlPFvgu/CxrCDIjUChOqJRhQMT0QhIr7yp1JtECeOkwd3ZUcF4ihjmY0n0PQ2TTe169t 1co16MhZfbOgx7Af0+a9TG8VK13LSijEoQ64+etlgW+XwMkYPAP8GCemNabiZjjQVXv9Qo Svpc72lwMtPjSVqQmtaz3DT1tYL0KgNP1EgHvxTm3VlUl9Z6riGZsS0f2YkGVnyY6+IHqD ZwjieOQ/P8p6KzAHM1yw1Jlmb3mhV+v9NxdIktv/ORH5QReL88J8DHkgrXj+vCTQ7t6uCg APjdEFzMsyhR9rOi69XyCm9Ew4WphXxyOCDlchICjzv4ZLkMcpbuapNI7jSbqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787438; 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=SfEiEOyBWqyCKEak7bfMoJH/TUjyXcUXd6kohBWVkCI=; b=YYgobJAg9K6KYqqai6RvnLllgAq6IXuyKflRcIICqfRGx01l8Eoo67EkhPzDuokL99OaRx n5mHlMoDzIiNvAw4TsVAEEA+W4hQQTKiO+gc/0alzUXWyudAHdTWYAyWWoBrhIewjgLl90 23lgyYoVtLDcgL/bQnAqm81nj9G4RV99V08bfqVgH4WO0PCz70OZwe+V1w8IrVFgkpX7pZ za7TT9q7jCw0XSvzKNlDL6OlZJNEg08R4nIHAPPwDG06EAUNvUmW//vqq9rA32uny4dXto owUK/3nu33gszzVblt3i5QF1wR4a/7RO1WQuRSvwKb6M4DZC8I/GFv3P7eaY8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787438; a=rsa-sha256; cv=none; b=DBoS0JE2q52vOtWQlzVhrMWtkxfbgYdBaS3ueVhls9SHWloTI8TwpMbtTtv7AOCvHfCsMs 6rg7UjWGkDXw2dbSbwoW2he3eUoqcEnQ/Qx0Jox4VmtIcwka2clnz9V6NefhQNbrfrttaB 4e9pdfKVUeKoszG+4b3IrcayoZeM8WuK8dtnJdipff1CUghMcTP281FH2sCJxV5ctPqCYc SBjmEJqFXDWL3O7Tx6xk/8Zb25Vz7k5pG0hDh4NV+Otlrn4q+t+6nG4/qhyjrIryIAp8oD makqhjXaH0sPiZCVsCkeSS+bm8Z1MGGN79T9o9pc11c/RaCll6+ZfT/AG9BPVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBgy2ppjz16NC; Wed, 05 Feb 2025 20:30:38 +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 515KUcqX055326; Wed, 5 Feb 2025 20:30:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KUc7j055323; Wed, 5 Feb 2025 20:30:38 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:30:38 GMT Message-Id: <202502052030.515KUc7j055323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8ef4a2cfb30d - stable/14 - TCP BBR: fix condition when sending a tail loss probe 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ef4a2cfb30d2f980cfd330853b1963ce03892cb Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef4a2cfb30d2f980cfd330853b1963ce03892cb commit 8ef4a2cfb30d2f980cfd330853b1963ce03892cb Author: Michael Tuexen AuthorDate: 2024-12-31 21:03:13 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:31:01 +0000 TCP BBR: fix condition when sending a tail loss probe Reviewed by: rrs CID: 1523793 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48274 (cherry picked from commit 5ec914e06c96ff40bf0e6567359c0de039b59ed2) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 47b4a1bddc6c..b9cfdf312c8c 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -4613,7 +4613,7 @@ need_retran: */ if (collapsed_win == 0) { rsm = TAILQ_LAST_FAST(&bbr->r_ctl.rc_map, bbr_sendmap, r_next); - if (rsm && (BBR_ACKED | BBR_HAS_FIN)) { + if (rsm && (rsm->r_flags & (BBR_ACKED | BBR_HAS_FIN))) { rsm = bbr_find_high_nonack(bbr, rsm); } if (rsm == NULL) { From nobody Wed Feb 5 20:31: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 4YpBhW19RDz5mLv2; Wed, 05 Feb 2025 20:31: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBhW01ccz3FJ6; Wed, 05 Feb 2025 20:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787467; 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=MFXob1d/gI/6pgEhg1UuRWOTZrDKeQ4YSwYmvdAHF2I=; b=qCPr5G8hLafliVhN7/rKGWUrGl2c+y0hcNiHnOZe9WTvsmzwCNK5PHwBvZQaERZt8tapN7 VMln1d5a/VXUMj/FZcU1IUPMx5Zq/xV2R+B50G65gjlm/KnKEpeQx/by6tJsJrARVbPnWW 3IWW7HQIzP+70IQMC+lZcm72wtxe/T056+SkXqVxB2v6heq9LA3f6pf8UNBSaeJBxs4oaq Ogcb1VGk5Cv8Ovak6kYCRAa+gihtd1RoTvKhMAVmUFX7VJjK1Vu0Y3B79jri8PSijpVsfg AwJwB10HY/VlpzAQG76ZOHEZGlBlQYkZt/rbmkg6ctyE0D49nFExC3zgHluxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787467; 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=MFXob1d/gI/6pgEhg1UuRWOTZrDKeQ4YSwYmvdAHF2I=; b=MRNyKdiqzkHINbhn0IMLivkf/qkG1moHA3OvLcitHLfnMVtwkHUF9LTZ4pvVHHPwyirrYk 1gOhFXGfvoPDgR7lbv38OwRLAUGP149xMESpGPSSRxv7FMCnnvfzUMFWHVfAph6ui6s+xJ HkzC51edixP12s6/qxTOzD+GfcFZvZwFSXCkm7wVbFKwghKh32P2GHbspeIp4qd5ZUNRm1 DjsORF7N3a2VGyS5qpcfD+7VsDB/xm8ICqGp2rO1f2KwAt3fYGjwTja3/jZ/M6MQO59bcC 2b/0hcqbbrgLephV6Vzxx2WX9ef/q80DymEnoiMWJztpULHila3C/f1PnLVv/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787467; a=rsa-sha256; cv=none; b=i9EEdmPs+J9e1QZ+HCZ/PX3ZnaboaMSGth7LropPuvgXs4+hEnJnyu93BQgL6vwn8us/KX 6nyWU4gIZsOW4ps1wTsETWvltlCe6Vw4i8gQmnfYdhXpmiYpMT37YsuXFRdtzlXYCsltoW lcNhKcEZiKB7FMw/dR/IeNEMES7oEeQeX3ATHAZ9joKXkFAb6UHgho5gpYixUsxVg1l4lG M4+FLLpt1kbQHxXrJCQrw/UrKFw7y0H/WUM78qwRAEV/Q5c2Kt9gfx/xn2XBSd1/PsKDqM 8+SR95o38mwBC2rGQCn8FNbNWOH+EZZfjzxA7BghWCIPinl9KcmA7ydL0bBadA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBhV6h3Vz16Qv; Wed, 05 Feb 2025 20:31: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 515KV6O4057432; Wed, 5 Feb 2025 20:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KV6s0057429; Wed, 5 Feb 2025 20:31:06 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:31:06 GMT Message-Id: <202502052031.515KV6s0057429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 699d5634661d - stable/13 - TCP BBR: fix condition when sending a tail loss probe 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 699d5634661da034ba6a97b7cb4e2fab41d84779 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=699d5634661da034ba6a97b7cb4e2fab41d84779 commit 699d5634661da034ba6a97b7cb4e2fab41d84779 Author: Michael Tuexen AuthorDate: 2024-12-31 21:03:13 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:16:23 +0000 TCP BBR: fix condition when sending a tail loss probe Reviewed by: rrs CID: 1523793 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48274 (cherry picked from commit 5ec914e06c96ff40bf0e6567359c0de039b59ed2) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 1a67bbbdd08f..732879dfab47 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -4629,7 +4629,7 @@ need_retran: */ if (collapsed_win == 0) { rsm = TAILQ_LAST_FAST(&bbr->r_ctl.rc_map, bbr_sendmap, r_next); - if (rsm && (BBR_ACKED | BBR_HAS_FIN)) { + if (rsm && (rsm->r_flags & (BBR_ACKED | BBR_HAS_FIN))) { rsm = bbr_find_high_nonack(bbr, rsm); } if (rsm == NULL) { From nobody Wed Feb 5 20:31:54 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 4YpBjQ6SHYz5mM9h; Wed, 05 Feb 2025 20:31:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBjQ5zG5z3FgG; Wed, 05 Feb 2025 20:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787514; 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=PGjp26kqLzRRX48b3ZWHs+22dmCYrC4dU9WfJYQ0ohI=; b=nrRwWhgcB99G26JsXqVSLb7i9pXVZllNlHsp+Uz6dWfy7zehwwLiBEux9Mkm6JBXhMTG9f F4ACTy/5zOOFvFNEyM3nDHOoYBjVkwY5PfO5Fh+nG9LP/qsC6ydK6h8s91e4U1pjGOoMXx 8Ugc9rvLSAmCJ+kuQLaZi+A4GA4sSsViPAPt/+pARk0W4poy0FgIFteNg6aoWfzgc4j7FL kkPkEJ+tYBlUT1BVySfoqpTytunHf4nMzpBBTOohutd00I4HDDG6CQQWQP7a7iZdyIaBzs EaC/6AB1pAz5LeRyYeeIfiINHVoprsHhL/zrxMITWT/P0P0fxrEfjAx4ULoz9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787514; 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=PGjp26kqLzRRX48b3ZWHs+22dmCYrC4dU9WfJYQ0ohI=; b=fD2qbykhcJ4ZepFTW4fc9FgFq4YENVAgAypTJR++sQ3fb+AtnUVTTvRXztjsqtjoLZk0e+ pbNmCkGL/qxw1lkJFLDA/OrFf4qBEKbzU/eWfkQBHmj7ldmP/YNkvhCOrbqq78bRnp5Lt2 gkl+EOg2g1aOQ4zOWgb0xkLoZuz7Vk/2HoFX29gMtKw8JHY2UTXXwjeo2ctR+vfqy09O9T aeLuq1NSvKBeZAK6tr+G+L3tcmoh5XVmSFvK8jxXRSauPdOXpuprVE99MLZDToNI5Fu+uY mpuyleuMiZ0FkT28AaKdq4ynAErYjhfrnFOo79T4an77RSOL+7TbIAFUYgWljA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787514; a=rsa-sha256; cv=none; b=rJAxBTLEPsiZeHtUpramqnj3s9AC+5m7MtyIRzeDZV06eSd6fI0tbpmbz8TRvPVVHffQyg k5SnEC/1PD2xMlyihP0zAg3O1p8SSGGDi7LA53ZG+yncPlNIAhtmYzmfpNPJbEPBhvwgSI TwnWQfZCFaM7UHOGXzgsPP0nzKrt4649IpXNGwxR4l1bEO7wQOsqwr6ZbKd2kMRW7yTKr4 EAtJljSmkOtqoeqnWZrEyM9JM4sbkrsqEUZiLrUI4GrKtTBrlKTYW/27yqntvcEkeRLn/k Anj6c7fp4YFhySWkAZ2Jr70Ve+8lCWP35o7LcvXhGBju76mzjhBre4Y9VR21pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBjQ5Sffz16cp; Wed, 05 Feb 2025 20:31:54 +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 515KVsna062377; Wed, 5 Feb 2025 20:31:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KVsvn062374; Wed, 5 Feb 2025 20:31:54 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:31:54 GMT Message-Id: <202502052031.515KVsvn062374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8a246cebc105 - stable/14 - TCP BBR: remove code which is never executed 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a246cebc1051defe8af945590db3476e4f4676d Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8a246cebc1051defe8af945590db3476e4f4676d commit 8a246cebc1051defe8af945590db3476e4f4676d Author: Michael Tuexen AuthorDate: 2025-01-01 17:39:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:32:16 +0000 TCP BBR: remove code which is never executed USEC_2_TICKS() returns at least 1. Reviewed by: rrs CID: 1523775 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D4827 (cherry picked from commit 1781324db2bc22a971a33c5a063036b2775055c6) --- sys/netinet/tcp_stacks/bbr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index b9cfdf312c8c..be428ed8082b 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6318,8 +6318,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) } /* Round it up */ rtt_ticks = USEC_2_TICKS((rtt + (USECS_IN_MSEC - 1))); - if (rtt_ticks == 0) - rtt_ticks = 1; if (tp->t_srtt != 0) { /* * srtt is stored as fixed point with 5 bits after the From nobody Wed Feb 5 20:32: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 4YpBk035djz5mLvQ; Wed, 05 Feb 2025 20:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBk00Bvyz3Fqv; Wed, 05 Feb 2025 20:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787544; 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=RHQpM+e+8MbdRIv+ACupeuYR4ihGcFpcJOuV9SphRu8=; b=Z/GQUfv1DUhTyIKGobJP2cYCVMcfdOU5NlLLZaDN9AUHi6h9VEhO11ynXN/drlu7JWe0Rg MhXuy54jg6V9ccrnbqsoO9qs3j0F81fSD/Urtzbk9lx2GiIbcZfzc6eoRS1ptMPzeolw9P qCYYse2FBKfOyH84n1M+0hkqx9Jh6vyNMcuINzAXhSYFdUqbPDwUioghzEskReoqyNFIFp 5jaM+8JYVn1S+lAkOy/x9ELizSC1dhcgR/Ekma/wPoWrNKNeEcgZupmsMwYqwzHfZUQPQi IWsexdnEbsm0C6VdvPKYH/TqEFDdIfM4ZT7h01nwTNg6q6IJ7iC5DRpcEHJ0uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787544; 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=RHQpM+e+8MbdRIv+ACupeuYR4ihGcFpcJOuV9SphRu8=; b=dUPdhwqOR9DFPSg2a23DYd6trgGfYA5upHxeXTeC98B04TtLBXzzKpSpZc7ppqvizoUCEH 7srNXZ8t4yrAU7ZrHAGXUKk7VW0g20RGPA+TL9m5y5AeSqPZzKAMKM4H3Y1xJykFJH3+pm 1CZ03qWEsW3bMqKxuaAJhL9//rBtFWZQ70X0mUtYmcJAR/vyEruVZxI4+OJDztxA48owXI Zx0V6llrP1kdhJQpsqkg29k5uKbR1AYFbPMmoTSScz29eOEx0oPlMhGQl4+qlv/Rg99Qq5 knoPhWQncQvfl8pt3ZhPRIvHx7a+9lzScYmkiqOQVA3J+NIqHQuuyqpCNNcGVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787544; a=rsa-sha256; cv=none; b=eBRJOFqTJsKVFWNt/D/Z3H0TFOqAdTFNB9La+aro4xKqy9N6E8u32TsaXb58laaYXBBCQO VbpUYY0qvq3PDSbJ99H/nI31VlnoWYssZJqZNafnRSUcfpGIrXIgBTYBKJyAXB9AqRp8ua NVqe5leewpSGwibPKnOfWi8GcM+b8c0ZurO09KQhdHAugI1bCmykdO5cu+EI3G3sbhhxGe 2uRv1kVPNFUI+bE5iPIho16++25LCV6dU/T5D4unpBVNoLF7+MTDnc6zUKp59wBnOOVagc xYtTNgt67+wtuIOTyGgKzJrb6nonaPp3wr4JxgP7RzAdnhgfzUunevTJ4v0cgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBjz6tSWz16d1; Wed, 05 Feb 2025 20:32: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 515KWNHp062624; Wed, 5 Feb 2025 20:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KWNT7062621; Wed, 5 Feb 2025 20:32:23 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:32:23 GMT Message-Id: <202502052032.515KWNT7062621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c8828fec0540 - stable/13 - TCP BBR: remove code which is never executed 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8828fec054096216574882b8bcc85d2548cbbd6 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c8828fec054096216574882b8bcc85d2548cbbd6 commit c8828fec054096216574882b8bcc85d2548cbbd6 Author: Michael Tuexen AuthorDate: 2025-01-01 17:39:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:17:38 +0000 TCP BBR: remove code which is never executed USEC_2_TICKS() returns at least 1. Reviewed by: rrs CID: 1523775 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D4827 (cherry picked from commit 1781324db2bc22a971a33c5a063036b2775055c6) --- sys/netinet/tcp_stacks/bbr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 732879dfab47..cf3317d790c3 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6359,8 +6359,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) } /* Round it up */ rtt_ticks = USEC_2_TICKS((rtt + (USECS_IN_MSEC - 1))); - if (rtt_ticks == 0) - rtt_ticks = 1; if (tp->t_srtt != 0) { /* * srtt is stored as fixed point with 5 bits after the From nobody Wed Feb 5 20:33: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 4YpBks2l7yz5mLxh; Wed, 05 Feb 2025 20:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBks0lcXz3G5N; Wed, 05 Feb 2025 20:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787589; 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=E7n1ADHeoUfRUetR439mj/37NcfYKiiDAWTy8SklF3Q=; b=xlHmRg4P30pZi5TMBHvaFhxXlfpzGRZ20bS5zAUt5XqGYDTxsfpMFfb43nF1PRlc42K+J4 CSfMLvAYB3ke3YFm8N1kx/+E16Cr5ahw4djq+TC4XvmeagaCBSVwVgwhsPy0syrxksbcDI UPhF8t8NS5KlUkCWdv8pPN/HZ0hLrVOYPi/XoMQqcA8G08xzwkkx1uVawjhRKqR4h76PMp S854hrnFQX0rt04jPJ9sTvRdkr0Xy0X1u7eiwVxIKZCt/svLPkKsRKgRjNP1yATdHepRpx IZt36OwUXUe0yikQkZbdcvKmnkgwEvvtnADrCr+2cDI64PI8gZagqHW4n7PLbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787589; 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=E7n1ADHeoUfRUetR439mj/37NcfYKiiDAWTy8SklF3Q=; b=XkthPE1huP1OiJM+XTM2avCy1HBiYpoIXypk3lZbVDAfE3jr+PEhcXm6gsuvmA4hHIziUb oXrZs1FfUQIJuhXJNtM1ZLmXeC4fFtrHXdCZ1qqPmfeGKfouItTJyKiP+YSkvjoPOfaxap gmvjXhLTI4d5RwF02moxrimgK9ssow+kZ6I5/Brf92LZDynESLYODvCALSHgJYRpjyQW3C nhbT758PAkZei0xkVzMPko2dOzSUzi+Km28zxt54+hlTpTcAvAuOq7kpkY9kz2RhS1RG3h MLlzjT/Zuy3d3cpAyqYuBUNjRAveus10ovwP2PxW9lHps0nlBvH0We5PrN5fOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787589; a=rsa-sha256; cv=none; b=Z7c1e/7QJltYf6IFdrL6KI1osmFo0xbswpLv7sYzTWxm+GjS+NdJ25ZsPyFSGFJGD+H7+w e/Pn82Jgi5zjTwwOuXUjYJc5Yp8fEFQZxN+C9E93cRjz/bFVZCX0WI+QJy4nRvhcL29W/1 Md9HqUDs32Xx5ixOaOGmxpMljM9NKx/3f/48t17PuIMa0M5yRcu4Ci2rQzAAhSd9i+WN8s vQJvkzCiA7oCxuyLjjzBulRm754lrFz4s4SpvqyuRCPbABCsdNq76tlnNMcikX0A41rjg/ EN0XBL0Q0gGqq3gYMTrvQ6LOrjPZY32E2//GPhyo9DgjIp21Mq9Woa0yquykGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBks0Kp0z16d9; Wed, 05 Feb 2025 20:33:09 +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 515KX8RS063024; Wed, 5 Feb 2025 20:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KX8L1063021; Wed, 5 Feb 2025 20:33:08 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:33:08 GMT Message-Id: <202502052033.515KX8L1063021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 080caa0aea25 - stable/14 - TCP RACK: avoid using uninitialized tot_idle variable 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 080caa0aea258fe64b48fc43b38af5102c1a3a43 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=080caa0aea258fe64b48fc43b38af5102c1a3a43 commit 080caa0aea258fe64b48fc43b38af5102c1a3a43 Author: Michael Tuexen AuthorDate: 2025-01-01 17:42:00 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:33:29 +0000 TCP RACK: avoid using uninitialized tot_idle variable Reviewed by: rrs CID: 1540027 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48277 (cherry picked from commit 3b9da3dcd11f3d73281383c4ba383a4fcc4b9bbe) --- sys/netinet/tcp_stacks/rack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 393ca3ca21f6..9ac923ce760c 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -20205,7 +20205,8 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } - } + } else + tot_idle = 0; if (rack_use_fsb && (rack->r_ctl.fsb.tcp_ip_hdr) && (rack->r_fsb_inited == 0) && From nobody Wed Feb 5 20:37:16 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 4YpBqd16FTz5mMH9; Wed, 05 Feb 2025 20:37:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBqc4Mf6z3JKw; Wed, 05 Feb 2025 20:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787836; 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=gfzsUboTJei0BrWdFPTHXZP0VtEohS4yIFI7OsdE2lg=; b=tV6N2xXDkYTmLcG0jacURz2P1zv1jcYKubxD8Tgr1rhltMCTvi494BZvXorhbMBQKr2Eq4 ibEplpDeTePm2aZfofXmvb/waKWRVXg9BiBcEQzDAmpKiPRshHf87YfBgCEyVluGpEHYjY ++3KoiqKuqLc8EggzcYnXi/e2TRqIS33ZneYOb7+ib0hNG0VTPcf75LG7/8jU2xjmWcwcl 4kVpbH576URDq87Hgstp4aiAkz8CIFeofzsOA+22i7JS+2eR5WAobWYDRNxncawssqkqvM aR/kUg+O1QXF+3iPvkIi3/n697DGtJVZgHBZQnu/1WPIigKA7kBlCkBQDmQGKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787836; 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=gfzsUboTJei0BrWdFPTHXZP0VtEohS4yIFI7OsdE2lg=; b=NJ0N8XROcEg4ZRt9xUswQraHpZCH5On+lmcfzazB6UPM5sYkhL3V0xn9OYG9/keKwYPIAJ pNeIdm8ZY3c5FBMGD1dU0myL28nhypF/F39S0X/hJDkHynawMoxfypaVPlvfYew8fuaFy9 QID5QMcM5x9tZyFYZjeU2GDn1uHrFC8tvJd1bXRyGpTy67J3uDwqBPqHi9SJiX5VGnR2Eg vJTF6G63kv19yYPk51XfNObPDtJqWgbFFzRM2bSJqI0A2odS1qRylcLoPwsxbA6cp66yVX VNSyCEGpCf9e7+Y8HluE4TDy7O6rLXiUREvGSvNTmQythzEdD5UHOLDzuyM6EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787836; a=rsa-sha256; cv=none; b=oZWPJBUH7vbeLj43UqqGIk8M3X9xv3NQ6W7qqKfwsJr+S8RjbYd0/Q6/QeInTQpxlLR3XF ezIkGbey+mKn4F7fJ3S+1ej4ZpE9B5uIZNu9JD2TSdAPa7idQm5ys79UnpomFBdbzJDTio Hzj2MkKl8RheBIiCnBKz9GAZShPMX8BbZUWFSXBipFtr9WKIgzuW7V/nzPwqXscRB9MK7M k9PDFMxh5y3FO5fSFRpwI1YGA/Iso9YUWiTrwT0xTHxGLPK1JZt1KJ3xOq0swT7jg4oGQs QjTQXSsuYttWb8Relrlec/tpijXBqgnWU+QsNbkOcZAxYWdZX+TBKU+8Ia3A1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBqc3lY7z16bf; Wed, 05 Feb 2025 20:37:16 +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 515KbGmS064782; Wed, 5 Feb 2025 20:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KbGRV064779; Wed, 5 Feb 2025 20:37:16 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:37:16 GMT Message-Id: <202502052037.515KbGRV064779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3f45a8ffadad - stable/14 - TCP BBR: do not log an uninitialized value 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f45a8ffadad2986479e81af6a2c84910979fa61 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3f45a8ffadad2986479e81af6a2c84910979fa61 commit 3f45a8ffadad2986479e81af6a2c84910979fa61 Author: Michael Tuexen AuthorDate: 2025-01-02 15:17:05 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:37:35 +0000 TCP BBR: do not log an uninitialized value Reviewed by: rrs CID: 1523789 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48281 (cherry picked from commit c7e81cc04369dd7bdd00519109efe9d75f53375c) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index be428ed8082b..5a6276a84982 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -607,7 +607,7 @@ activate_rxt: TCPT_RANGESET_NOSLOP(to, tov, (bbr->r_ctl.rc_min_rto_ms * MS_IN_USEC), (bbr->rc_max_rto_sec * USECS_IN_SECOND)); - bbr_log_timer_var(bbr, 2, cts, 0, srtt, 0, to); + bbr_log_timer_var(bbr, 2, cts, 0, bbr_get_rtt(bbr, BBR_SRTT), 0, to); return (to); } return (0); From nobody Wed Feb 5 20:37: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 4YpBrG5q74z5mMQN; Wed, 05 Feb 2025 20:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBrG54MJz3JVZ; Wed, 05 Feb 2025 20:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787870; 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=jWkkGNnGyWDZxWypbPRDMyvPw5QPg8T28Ol2w1/fKw8=; b=YvV3yJnsYLKIst9SjxW1vO3lbrw8HbhwG729sn8m0fz8nH4rxgVfemVqb31Ux6IFYs4gQg NhPpbbrtw5V8m114rjMkYlljVtjqfim2miWskXec4FkpZm7Q1eICFu6etuRmc3tVHX7eVe ajYds9iD06gxf/t7r9TtBeQ3+TKPV00UqxxhlwZLPWDSAbSJotOggaJAg9UtepxuEJ6HkJ NLoDYozrrcreiZo3DK4q4uaZmsDQCmPtYWC6wtLSsZx8TZ2TUvv7httOgVhXBA/ht+0FZk nywVBXRj565Uod/9goPp8RNMdfcn5P5qdDJZraVsvlg+aL8XmYAGzqJoUW0MfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787870; 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=jWkkGNnGyWDZxWypbPRDMyvPw5QPg8T28Ol2w1/fKw8=; b=b+nnQcsY6kGmsOoIP+SbjPMDA4xD9rpxvPh7gtafJGzNsVhVB4hIpaWSbP99pn4WXhasEJ jTD7afKS19fonpn9Dx8BWCKxM0s9KMi8//ZHTYVttrh8OxjT8EFhPO2s6O7IQU/hURU7EP 8EuFUfgQ4VRFmS8OAe1L8kjbOTSMDQ9Hj+SCEKbHV/g/aVe0KrQSPWZh+QE/0IxkKoFtV7 mfIh8rnmgHrRKrcuT8pSrxsDwtpcsgHdFRcZHOsQ28Z0i8yckVRbbSevBWGhAdE9p1yaGz deobRUG5cvNgT/ZJbqr9kT7lKa7JBADjZm/D+kFMw6UncA3AjYj3rPkn515o0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787870; a=rsa-sha256; cv=none; b=wrXDgGbiwW7Nqi8WsL1qdW7K8/bdhAjgdPfS5CK+O2wgy2HwnKzdTOBTpa4UcFjyi2lItX 3acA1EgZ7IdbrJCfwCB/vWOM28R68/cgWh+o9dy+I5s0Pa5NWnDQb8joS9OzbzTw4oHv1p yWiU5z1gxxh+c2XomrHRfayWxxoejKFoBf0YixQ12LPFU2faG9/XqMV/LBFxCWj49NkqmZ mBSysk8v3jHil2k39/rXuxO7p620ztssHi2gYshwidKdw7QMx8pXPeLIMtGoYWSlRvG5to Oy3vkIBRO2jIWN3YaGPJHYZPriuefpZKsc0a0SIUnoLMy24bCJ0b97JHUtU42A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBrG4TKyz16dF; Wed, 05 Feb 2025 20:37: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 515Kbo7u065065; Wed, 5 Feb 2025 20:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KboTx065062; Wed, 5 Feb 2025 20:37:50 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:37:50 GMT Message-Id: <202502052037.515KboTx065062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f5203188413a - stable/13 - TCP BBR: do not log an uninitialized value 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5203188413a0165e77ab41b70d55d8239256aa0 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f5203188413a0165e77ab41b70d55d8239256aa0 commit f5203188413a0165e77ab41b70d55d8239256aa0 Author: Michael Tuexen AuthorDate: 2025-01-02 15:17:05 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:23:02 +0000 TCP BBR: do not log an uninitialized value Reviewed by: rrs CID: 1523789 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48281 (cherry picked from commit c7e81cc04369dd7bdd00519109efe9d75f53375c) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index cf3317d790c3..6f47f7ddaf84 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -614,7 +614,7 @@ activate_rxt: TCPT_RANGESET_NOSLOP(to, tov, (bbr->r_ctl.rc_min_rto_ms * MS_IN_USEC), (bbr->rc_max_rto_sec * USECS_IN_SECOND)); - bbr_log_timer_var(bbr, 2, cts, 0, srtt, 0, to); + bbr_log_timer_var(bbr, 2, cts, 0, bbr_get_rtt(bbr, BBR_SRTT), 0, to); return (to); } return (0); From nobody Wed Feb 5 20:38:56 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 4YpBsX4HfNz5mMb3; Wed, 05 Feb 2025 20:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBsX2pgLz3K6k; Wed, 05 Feb 2025 20:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787936; 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=nEYEtqw1CNndps5pG6S4OQvn6dWhbe9C5yG9NpEyhvM=; b=TtstYW3IqXqS03/4zrHrbWDaQxv5C7f2WpRkfryMU/n08viZGIt8u+l7/WxtKtRO89Jf7N VBqRbQ0F5f3m95vDVTtek3SLTGhr6Z++Jis8XKsi9vD8O/mDEX4eLXSxB8HgZnHGfVN9xK N7zalOp8JGKwIOwkex5EyupQaRAXNOYc5XgMptKaGRHmMYGzAGPp9DPMWsyoseIFTSgk9Z 62ZwXQnrpNgjQ6AqDFjaIIMV/6Ap0W/jsRyWg7EWW/tzG7Li4WZuNl/kCEuNz6UHB7UadD RqSlVgjJPhLv5+hiyVKr2byhGMLeUNTZbexR5ZdJyL5RkwyoPq7u066KisIWdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787936; 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=nEYEtqw1CNndps5pG6S4OQvn6dWhbe9C5yG9NpEyhvM=; b=OyTM8AEf89O1M9RxwxdNG8qz2CShCLw8O6VXXGzQEJAktJ4WMAz8xfcoBX7JmNa1OO2NXo Ki0jYs/c+OQU64fpm2uifaCRNNB6lnhk5/jnBTjKVs+XEsg8nUdpWBi/nMI6NuAdWZC4U6 Cbq9rSW3PlvWsXhY7qlyYQ0Kxf1IQWgUWspITI96Cay3oOVnlHGvboqaBJtoRWuYtoltHK 703FVLcOhTTbHzeN0RzoZRSN3Y3HNn30Wu0tuGyCia9LgYX8xV0q2oEDRZa9TRyWjWzoVT y4ryepAf6S1mrkr/m+juwyf/+dltriznmNvH2bKuj/JfWZFJ72h33tWYP07H4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787936; a=rsa-sha256; cv=none; b=Vm+S79hkhBsKyvd4Pxo+K9T35IgBESpwLQajY2GxdZ2RZOUbzudQD7BIYAq0CTKv1XXsSn wUh9EFyaH1abQY4fVCxbKpHj0e/HAXKnZCIkJDP6mu1cjpLeth0f6v4K/5yvWNC2hjSeLP v4mny+EQMmoxMD3iEIVON68WCLPEj0WfzSsvCe3PyVO2GVKN0Zq4H9qSxDLpAxzBQ6BDI1 NfK3rXNVcy8VsY6ZxVa8lHWZrkj4saRVrL1bv4Dnvhv3n1sawAFAQOXro7NOdLnH9xKbSs qcQGZKBlVdos0QpzgSzTjg/kNhievhdKxzw+gJJB1V0qVHkHSZoOPMdgHd1fZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBsX2PzYz16dG; Wed, 05 Feb 2025 20:38:56 +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 515KcusY065530; Wed, 5 Feb 2025 20:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kcu4p065527; Wed, 5 Feb 2025 20:38:56 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:38:56 GMT Message-Id: <202502052038.515Kcu4p065527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6aa2c8ed5eef - stable/14 - TCP RACK: simplify condition 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6aa2c8ed5eef2572fbb64d9512067a9693c97116 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6aa2c8ed5eef2572fbb64d9512067a9693c97116 commit 6aa2c8ed5eef2572fbb64d9512067a9693c97116 Author: Michael Tuexen AuthorDate: 2025-01-02 15:19:30 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:39:15 +0000 TCP RACK: simplify condition It is already known that rsm != NULL, so no need to check for it. Reviewed by: rrs CID: 1523815 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48282 (cherry picked from commit 8471791eb6eeedaedd4d70e1076cfd143bf12fca) --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 9ac923ce760c..040e882e157a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19092,7 +19092,7 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma log.u_bbr.pkts_out = tp->t_maxseg; log.u_bbr.timeStamp = cts; log.u_bbr.inflight = ctf_flight_size(rack->rc_tp, rack->r_ctl.rc_sacked); - if (rsm && (rsm->r_rtr_cnt > 0)) { + if (rsm->r_rtr_cnt > 0) { /* * When we have a retransmit we want to log the * burst at send and flight at send from before. From nobody Wed Feb 5 20:41: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 4YpBw40fgMz5mMXB; Wed, 05 Feb 2025 20:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBw33dm8z3KfC; Wed, 05 Feb 2025 20:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788067; 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=UIapjHefpqgmgrVYxNVA3D6Eejo35l/9zVT8t2Z/UeU=; b=AkGkO7Z+Sz+QTI65k99XM3PO5UPTZgwBRApBWU4hxkAA2QxHb7NsiYXUFXi0QGCZuYDB/a o7pomdr0VPIibcPWv0GY702QfO/OM8oIDUuIu5nK77OCuFGMncWhJhT1ZIw2HhgIbDYk1y cyZhPyDW/M+P4VLlKhjGhKhIM9NRg3wNeL97taQTSCgamzorUQ/EuR3S36zuhHchzrTaYM EriePSMlNmcBrrTCl4I9yT3CBIn/kUEMB6E9OpxDs9dQJkc55d3wStbfNDzqBicpUgId2l x86lOUsAImUamGG/KEvYdYmtwAZEcXylTBgic7noxxBpPf254P5C3J+etXiTQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788067; 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=UIapjHefpqgmgrVYxNVA3D6Eejo35l/9zVT8t2Z/UeU=; b=I6PXYlXNK96NoIWF2ynpL9qhaMxc9H7QkrWaVes0HalBtg0GsdMzvD2ObvVgsVFcCq6mip VQ/kBSjJFEmMYKZnFwPo3O1x+vffZtmIS5oB6KCiZeFpCTExkoK5zwqpkJTuhvw+vdbN6W luOPDyppAOHtze4E5W44quILVgLvmKOKWBYhx1bQeVcmntq9wPTmDeYT+fCSad/okx4B8I D3R0oCoT38qtzSKOjma6kNphIzIPf8JSKrZoO4UOWdeIfoe3XMb43E1MYP/7hiRGgsD6jk TobI8TLOSvVTbMeMFX/Urs/hKPCiZotnWlDqlExSSRGEyk1WHjyMfQLRdjiAmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788067; a=rsa-sha256; cv=none; b=tDSYpOL2ju2pE/gWYGi/bBSc5jrR5bBgqZn97h04BmYhFqWdZvSb3BSZIfp19ZHNH2BDxT pFVjuGnGTR1GxSeY2jWNfZcqdl1iCXEEIdC2kW6HdzUQS6wFHrrKVXHg1U/8klJ5swrQff I20knGaYGYdS1WQfhDgsuXdNsRBuBMOMjQrikc6RaRLgy1MioYyNvpXZg2C3BKFQhH6B2r 9fKZd9kgP4B4WFoQSUjZ5tsdX9u2kdwAL01GPDWut28uDxPVdIaMpYQ4p3B0pIKgghWloH mxjqlI6qp6QIpuysx9iTCQBmycMYhnoXV1lAxKweJgS4y19Zpx3vaizTIZgAIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBw33CfSz166J; Wed, 05 Feb 2025 20:41: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 515Kf7CM075872; Wed, 5 Feb 2025 20:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kf747075869; Wed, 5 Feb 2025 20:41:07 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:41:07 GMT Message-Id: <202502052041.515Kf747075869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 53da007da1fa - stable/14 - TCP RACK: remove un-needed assignment 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53da007da1fab1c7dc21574207f8c51764b0d8c1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=53da007da1fab1c7dc21574207f8c51764b0d8c1 commit 53da007da1fab1c7dc21574207f8c51764b0d8c1 Author: Michael Tuexen AuthorDate: 2025-01-03 13:20:19 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:41:26 +0000 TCP RACK: remove un-needed assignment No functional change intended. Reviewed by: rrs CID: 1523768 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48292 (cherry picked from commit deb4252e9e7c8d2eca9be6333caa434061f3f594) --- sys/netinet/tcp_stacks/rack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 040e882e157a..6bed750145e9 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19706,7 +19706,6 @@ again: } rack_log_output(tp, &to, len, tp->snd_max, flags, error, rack_to_usec_ts(tv), NULL, add_flag, s_mb, s_soff, rack->r_ctl.fsb.hw_tls, segsiz); - m = NULL; if (tp->snd_una == tp->snd_max) { rack->r_ctl.rc_tlp_rxt_last_time = cts; rack_log_progress_event(rack, tp, ticks, PROGRESS_START, __LINE__); From nobody Wed Feb 5 20:44: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 4YpBzd4v44z5mN6w; Wed, 05 Feb 2025 20:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpBzd4Ghlz3LqW; Wed, 05 Feb 2025 20:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788253; 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=epmvh6JftmAZFSzN9wJK/YZd/SJNoFrWEytGxn3oFe8=; b=txD5ldPm8lydqcrLoPuW0fpad0HTTzYnbbtvGh/t3ynNPWOzooPRX1wnQphRmykUw1MojU tI6LeydwvewMSFFUciAJJoAM3K5c2ddO1QMWvRCYskOfqhcA0Ukk4zI5THgcpj7BRXY5fA DF4yJjYfn6KzAPtPK/hLhblHHdL1BJgAHB9O+Wl2UQiixaxqVemiEOI0uH7vEjpVaaY0Dt EpLWUOlhqUuYO52n6oVmtG6c+YHIi2CKvLQk0+uyRBtne3E6kgVFRjUC4Xi4W0kg6ItVhf T13+vKT4g310Fd/F3et3VID0fzkNc8Yn2IHINXCm4y/m3MAbZJjdKAopQQ440w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788253; 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=epmvh6JftmAZFSzN9wJK/YZd/SJNoFrWEytGxn3oFe8=; b=wgx4FQZf81gqtIZQ63X9yIoX6jgd31XydxyxoCquGchfQtXr3/rkJv16V1sXVNInxsrwmL SXRSklgYUnpTHfaV3ziupNJ7XDa/dHOUMDCmObZxhXl64DNXgDEzwlsJMNjQla7SsvYmEu RUkXwwSerdFuoMMXV6J/FmFaFh5PmM5HzDncN67HRC1vQ2U3fiM+NjyhSX7tIYMSkKA8cU Sw0+ZJJRz1HnB2rcPu+5SNT9HmFryOTeZi7kQQ3+CyrCoAFnbpur+lqFPd5lKhvnljsdEV 4jPzD1qFwH29OYeP4iWoVVMcYebSUmXrio9SDFlTvjOhKIxflFxzgCc1w8YdNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788253; a=rsa-sha256; cv=none; b=oXjrY2wzZxTK+dJM+VSmNQ7RmxCRCtLN0rGNBTiuXTLWZZZ3HwaMpYDZz/C1iiWFj4uxEg HTogDa+OBq053AuRx1RZFSwcc+wxcX+4+ChVrkiaWVYh2su9j3yXYQn1UqoFtjD9RePWQ3 PPBo/A00vS0phP9/cTRdSgSEpiOUuZBUOZUFQ8lyCjZelypzAjhzJ4YRLREDnNoYN3wHoS l9AaAHdPxF4K7I1re+IOqJvprpW0r4/J3JDQ+lYmeQXGTXCpM7N+U+P1ix0ZgH27FFMz9I K7yjSh+aPOmk2qJ6JjzZjiHGjx4fLq17ou4fLs3pgINi9PV6TXHGT8za4NFhVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBzd3cBNz175D; Wed, 05 Feb 2025 20:44: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 515KiDRW083447; Wed, 5 Feb 2025 20:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KiDsU083444; Wed, 5 Feb 2025 20:44:13 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:44:13 GMT Message-Id: <202502052044.515KiDsU083444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0450ed7766de - stable/13 - TCP RACK: remove un-needed assignment 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0450ed7766dea376c5559801cf711d435f67a3db Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0450ed7766dea376c5559801cf711d435f67a3db commit 0450ed7766dea376c5559801cf711d435f67a3db Author: Michael Tuexen AuthorDate: 2025-01-03 13:20:19 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:28:35 +0000 TCP RACK: remove un-needed assignment No functional change intended. Reviewed by: rrs CID: 1523768 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48292 (cherry picked from commit deb4252e9e7c8d2eca9be6333caa434061f3f594) --- sys/netinet/tcp_stacks/rack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a61079d6e9a9..86495bf3291e 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16066,7 +16066,6 @@ again: } rack_log_output(tp, &to, len, tp->snd_max, flags, error, rack_to_usec_ts(tv), NULL, add_flag, s_mb, s_soff, rack->r_ctl.fsb.hw_tls); - m = NULL; if (tp->snd_una == tp->snd_max) { rack->r_ctl.rc_tlp_rxt_last_time = cts; rack_log_progress_event(rack, tp, ticks, PROGRESS_START, __LINE__); From nobody Wed Feb 5 20:45:18 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 4YpC0v2Bbmz5mNJR; Wed, 05 Feb 2025 20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC0t5mW6z3MPh; Wed, 05 Feb 2025 20:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788318; 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=0ru83RTJs2m0z+Qr1HNMjOkT9hHuVylBZwxwRpt0D/I=; b=o0ccKHBnDFsPjkCcxYucAh5gU7MHeJSpy9cSuTFzJjz/HjEtPyWgYhGQJBUuIeIO59NYrF BLyWYR+bQxt0V6/Hz9YFRxq3di6siL+F7+xr9enygedw00FszPi6q73uklEzcKRJnBIR9z 6s9krtJ2mlClF2uaL6fTyqvIgkTVPrdqHM+TXMYylF0LMkdv5ZU2Ae5bA2MffigRtqnYTp dXcVWolLGbdG7mM7tFU5gDNb6ndWznA668BnqftppLT5Vs6ghcEJDvOWmJz3wYF49dBfDy rkpl+JdroVL+067KQhUOFrxTaR/3+Z6FwDxTeOrFfdXgsG1xDFWy5BLcUK02gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788318; 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=0ru83RTJs2m0z+Qr1HNMjOkT9hHuVylBZwxwRpt0D/I=; b=npPAJoxT17j+4wB6F2Zv2a8VDpast/NCK6gIV8Kz2Wo3lQgB4r1+QSEn1cVuxJfukoitl0 AkwgjkGtwad2jCHK8cNT+7BwJGiyeY1xmt0/LijY4VWvGmpDFF7pufjvI3GgJfGs/NFwcO LcRKP3ga7iEYOfZl5bk06W5i0Oc86ivBbFaXG0tle+uo4c5Nq/qmLYSjU9aKxlz8UWpRVe bpB/wt8aUciyW69MzSpy1VGHdC1FiDla3DobHdwcqAZ9RqsvDFbyjPDwzQ9IrLSSNY9fZA fOm5SCb0ACQLK5UH/hoakl9xZGoyi/cFzXQuz/h8GdnVEtxokbulH5+LrhFPgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788318; a=rsa-sha256; cv=none; b=J8u1/bH1huUuo8nWCuNe0a2B8AzPyVKVw/haR6MOW888K9LwyjpT73AdfmC1GJ1I13KwLO yX4BkeZBBhOGAPKNwWSqw3jeto+HMx5TH0zDNG3pShHxFyn5BPTN/MaDrUebu4b3fJcImQ jfo3i+hYrCLw3CE4IdajCLSnXCUtqfXxvYvADP9o913hq6nb7OksG4qYuOVxIdswRHWdHW iEOoFsZOyuY/NQXpPSZwc7GZKZKDujvGP0Xu4KiCi7W/ry9JuWjgBOiouRj+bCzoyBxlm4 JqR0opbTZ7++jfuyuCFXiCXbSc6MW2ZbAVD0oScATQEnK2ywPpypgP6gwFrOtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC0t5MW7z16vm; Wed, 05 Feb 2025 20:45:18 +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 515KjIG3083968; Wed, 5 Feb 2025 20:45:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KjIOd083965; Wed, 5 Feb 2025 20:45:18 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:45:18 GMT Message-Id: <202502052045.515KjIOd083965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c3322bb4680b - stable/14 - TCP BBR: simplify expression 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 commit c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 Author: Michael Tuexen AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:45:17 +0000 TCP BBR: simplify expression rsm cannot be NULL, when calling bbr_update_bbr_info(). So no need to check partially for it. No functional change intended. Reviewed by: rrs CID: 1523803 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 (cherry picked from commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 5a6276a84982..762fb53fcdd7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6701,7 +6701,7 @@ bbr_update_bbr_info(struct tcp_bbr *bbr, struct bbr_sendmap *rsm, uint32_t rtt, bbr_log_rtt_shrinks(bbr, cts, 0, rtt, __LINE__, BBR_RTTS_NEWRTT, 0); bbr_set_reduced_rtt(bbr, cts, __LINE__); } - bbr_log_type_bbrrttprop(bbr, rtt, (rsm ? rsm->r_end : 0), uts, cts, + bbr_log_type_bbrrttprop(bbr, rtt, rsm->r_end, uts, cts, match, rsm->r_start, rsm->r_flags); apply_filter_min_small(&bbr->r_ctl.rc_rttprop, rtt, cts); if (old_rttprop != bbr_get_rtt(bbr, BBR_RTT_PROP)) { From nobody Wed Feb 5 20:45: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 4YpC113YnSz5mMyd; Wed, 05 Feb 2025 20:45:25 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC102dljz3MVt; Wed, 05 Feb 2025 20:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788324; 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=0B78whOHm6rFpkm1Vbttjx1HbkGkCsEKdDKaYsHR8yk=; b=o+t31Wbttz+3bW0x0DaSRUwlWlhBRXdbQ1gKuZzi08mv86GX9bxZcvTBztwifkvKOCHIZL xnWLnpSDJtMmKb7HjPzAJJRKVtQ77fG2B9XLfiBAAGAnDnLhISuezWsa6lJlPJiamKLwdU asW/L+Cv68bNz4rjNfDZGHiq45swerWd/7ZUsscmYscdkhop0M3M5Alaufvb6dKmBj5T3z zUrJV/EartHjRT32iv91VJ4dMR5m1iKWHqc3a2qpdECJY+AGlfnAS+UduBlitHFscXgzQ5 E4Kn1QDs/b0trU5rWeefnD+Qrlv8QWI5EmvP7S0ObiqVzik7ez4U2FdUX2uQrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788324; 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=0B78whOHm6rFpkm1Vbttjx1HbkGkCsEKdDKaYsHR8yk=; b=mjO801eziW3iNBqNqMxIbw9xpRMmrGxSmf0UDHUg2EoQwxjX23qnhDUWO5qSudX54kivS4 oku+1e6HXaonGvfIpR69FxXkhsu8CdWb7RKZjnKO4n97XODGq11oiA4GQyHQVtsoGCieXq l0++9bkEqilwery6JGjFJI2xy2lM3bWN4bdaIh0zEmoZMb467Ve3mSb9sae0Of7XObiPKD emC6gQ4ifDbEdIkja/UstbsaGQjLqIsKq9M5IvbVDUOwTOwVVB1wCBUNAdiFtTUnDdA8MD vaG5IEVwMz/3Vf3NZq2//XBkjj7D6gJoLqj15rr7xH7e90ta88avAPIEGEYElw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788324; a=rsa-sha256; cv=none; b=hjx+G17vxRlKwDq7VEkeG+SQyAtWtgkwvaWTDzYB6Bl3aAgTYifcwmidnqQjhekM+a8xe2 WI2UdwYy2DP6sJhplEh9rwbKaz99lbH40dpQ1QyOLTwDJcNJfv1Dvd5eT4HxqDLF3fgUvV qKq2lpJTImu/aIyOX+9P7frL6ozXtKOTHQ46XzrBSR38imgzFXXAqrgNSZ2Ptnk/88JxPK st/rsqH5i2qdJmHgk+qLyde8Q7wKnrJShH5Iqzlwa2OFz9b+kAk6K8P50eS71dbaA8CVmO vUqNrhc5QvJPn+7728hmlpBxEPFzaF+l69gpCbNVMMU6S09N4WCJ/zx2OnUJfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC1021NSz16fF; Wed, 05 Feb 2025 20:45: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 515KjO0A084111; Wed, 5 Feb 2025 20:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KjOG8084108; Wed, 5 Feb 2025 20:45:24 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:45:24 GMT Message-Id: <202502052045.515KjOG8084108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0d93b08b4942 - stable/13 - TCP BBR: simplify expression 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d93b08b494225969358c1af8ed65e99b137aed8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0d93b08b494225969358c1af8ed65e99b137aed8 commit 0d93b08b494225969358c1af8ed65e99b137aed8 Author: Michael Tuexen AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:30:35 +0000 TCP BBR: simplify expression rsm cannot be NULL, when calling bbr_update_bbr_info(). So no need to check partially for it. No functional change intended. Reviewed by: rrs CID: 1523803 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 (cherry picked from commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 6f47f7ddaf84..07430a0564d0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6745,7 +6745,7 @@ bbr_update_bbr_info(struct tcp_bbr *bbr, struct bbr_sendmap *rsm, uint32_t rtt, bbr_log_rtt_shrinks(bbr, cts, 0, rtt, __LINE__, BBR_RTTS_NEWRTT, 0); bbr_set_reduced_rtt(bbr, cts, __LINE__); } - bbr_log_type_bbrrttprop(bbr, rtt, (rsm ? rsm->r_end : 0), uts, cts, + bbr_log_type_bbrrttprop(bbr, rtt, rsm->r_end, uts, cts, match, rsm->r_start, rsm->r_flags); apply_filter_min_small(&bbr->r_ctl.rc_rttprop, rtt, cts); if (old_rttprop != bbr_get_rtt(bbr, BBR_RTT_PROP)) { From nobody Wed Feb 5 20:46:14 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 4YpC1z1z8jz5mN2R; Wed, 05 Feb 2025 20:46:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC1z0T3Dz3NNL; Wed, 05 Feb 2025 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788375; 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=QHmqgQ2opCiAGqqQow1DNtdTxXFqsfu2dPRunRjFRCc=; b=t1W9xdqsm9tzZ7xKbc+eRerE3UnO/JWHhqgGbZYkupYhiZ1cIrBLcKvQ+c7UK+tf78JzJm S7iltt9gZgfbfIVjcracHTBCgCi1FwJfJOgQZ4PP/0aVfFLfIl3PefKKPJ40S7+fydkcVb jhwjnM893eCPAt7A7w4MX82svcxbm7yIQLiF6hA4VHGV8lZi+CObmEPb4u2dxKS5Q3SbtD KihdA9cOuR3qTWdZyBErLqGRWefEOgGFKIhDD9mR64D3pYcZo97MEmErZChIlQlZwSbqJJ 1NRQgw6wreF+EBg9F6PROsbsYNTkpnmYG/EaGjynceGBWxRvgH325g3e/TePZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788375; 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=QHmqgQ2opCiAGqqQow1DNtdTxXFqsfu2dPRunRjFRCc=; b=MN9gEsyRJvH/WZldccT+wsJ3xCpMGmsYBwqWYyK79DOoi7FdfHSmvsS6XP17GmJn1g8V1r yJ5F4KsKOZA1SAcPgJ6GfNQ+10gULBx0qSxrQwzicicWdJiJCXPE4wAr+U1dIzyp5kNLQA YW2SPGhNBEzgBNkVpNbh04gcP9oiqtun/HVSiGna9tHZWIgrJSoN+DuHEWmjkn3es1hC/L yVgpUnSBDxn466dcRMo6aWqn1iEM6jyWGVezvk4j5hMT+O53o0C1v0tG8s1juCDKUQ8OKA XLgL/zejC/y4C8P3syZeOakhj5facUePbxlN+oybMy/2b1XX6iiBLijKNGn6zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788375; a=rsa-sha256; cv=none; b=XJ3KdTEM5RGq4MY6XnEerh2n5qR1YyIOHTaZAVBM6i9ZZgL4a8EIONEWHpYOpPdh1X4FA9 EYrj9nvr5PlO1GNdBhwBsH6qTb5S7yw+nqo2inTqfloLMpcK73P2MwsY4uvUgViI9SDnF5 Nve+ODV0Kyz/o52RR1lC4R27ZRAsNfyPStJtRnWg8CQ/Z62zyHDc1VblIb6AwUyJjSHnnx Fj0n8haERoqyCdUQs8J3x6XSq+DYWrghLdijRrKd0yujVZ3qbZIDPWhKHb2YFBDSIO3heH RmnR9EUCwJu7jZrJjp8G1817tpI0bXc+Nb7SCwFI7BuAgNYwXmJbe0y6I9tPjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC1z04jBz16PC; Wed, 05 Feb 2025 20:46:15 +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 515KkEN9084476; Wed, 5 Feb 2025 20:46:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KkEYf084473; Wed, 5 Feb 2025 20:46:14 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:46:14 GMT Message-Id: <202502052046.515KkEYf084473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c178bc193490 - stable/14 - TCP BBR: fix integer overflow 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c178bc1934901cf825c813bed2f3559c4e35dff7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c178bc1934901cf825c813bed2f3559c4e35dff7 commit c178bc1934901cf825c813bed2f3559c4e35dff7 Author: Michael Tuexen AuthorDate: 2025-01-03 18:44:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:46:22 +0000 TCP BBR: fix integer overflow Use 64-bit arithmetic. Reviewed by: rrs CID: 1523806 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48302 (cherry picked from commit 88766e7af52bbde32b14ad48fb76798a3ba4650c) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 762fb53fcdd7..1d030230748f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3842,7 +3842,7 @@ bbr_post_recovery(struct tcpcb *tp) else if (bbr->r_ctl.rc_delivered == 0) lr2use = 1000; else { - lr2use = bbr->r_ctl.rc_lost * 1000; + lr2use = (uint64_t)bbr->r_ctl.rc_lost * (uint64_t)1000; lr2use /= bbr->r_ctl.rc_delivered; } lr2use += bbr->r_ctl.recovery_lr; From nobody Wed Feb 5 20:46:21 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 4YpC251x1vz5mN5F; Wed, 05 Feb 2025 20:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC2518RMz3NPN; Wed, 05 Feb 2025 20:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788381; 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=PU4eYl2FUz0ZhCc8l5jYnO7mGkq5JCXLgNk0nmw2qcA=; b=QQSFI5Tvrd3kmotM0aeGNA8IMecnwvWOfVEI5ziw8dsJ+J2QrCWSSP+cY9yUbbUeMBvX0l 6ZpgXHAahLJIljCIfjKkkJCcS3y77JKjjfp4Bj2zmcC+HqPP1A6LOPHF70siQrkOnfD2VQ iKygvxnG/jogMDm6OHZdfS+4BhHs4LM3Sr+py0rwyvYeqQYq7atU8UirFQj7EpbcNKkUNc NBBJIYSn63HWCJP37qbIfrh6JzRv3IyY0EWQKbvt/gl52EDrb/ZUAjWRPsA4dV7fNDOc93 eTIb74lxllDzxyirK4rHGAgB4j5JG7WOehfY48ezCWZ4c/SbNhqSb+b/wDiNWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788381; 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=PU4eYl2FUz0ZhCc8l5jYnO7mGkq5JCXLgNk0nmw2qcA=; b=tgYRhWw+L6y953jVCNXYBl6XzxZxUnUy13Dm97lz4pdq9K9KNReylshQGWYcOJ4tRvnBZo H3RCqIbwNNxOJojTwkHeKyT0BYitEjgRuuPZW4hzdDRl70N9DyaxbkzrkNJ+HXX04gj17r HazwlnyPqiltmIyub4xCe2Fy6Cq9FHaZFX7Ff3/n//11f3NYXoTifdQLa44FzQnlvBAZa0 A33qsrws6G+KfKCz+j2z0LW2pd1EDZpv0C9bKc1j/8njq+3+W6Vmux5GO6PF1mTQFguHUJ uMqlPaldqHc1Hsu1+zvP8qi0J7pVz8DpnMPzWdNw2D9GJ/AUmZEu36J1Am+QKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788381; a=rsa-sha256; cv=none; b=FWTsS/7bI/t+ECQ5ZwHfvD9qK4LS8qnYgz296RQ2mmr25hCFatNZPoS/EWLn8ObA9eLqd5 MIn9RAwmXaRLRXndDluC6O3vHBd1aAfNTTXrVkGOxJr2ktM2MzinIV2E62Zj2TbXuON/JK mKrYGjSiXwedMDkyHJNTOXNLwT8peQAMyW1jbWqpjKlcVz2JvFQ55b+KFRjpMzRZF9jwsN 8rZPRIWrs6hhIEcUZgcHvnOlr8UqL8t1p1kM3RJR/W5LYDt/+GWXT59psMRNwmNw10/lnj DTB9Zhnvt9ZC2Hr1Tg+hK7rRa11IbkN+NaBWT4UCBPPdt7A71EsBYDPN5055sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC250jP6z16tT; Wed, 05 Feb 2025 20:46:21 +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 515KkL9b084620; Wed, 5 Feb 2025 20:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KkLQY084617; Wed, 5 Feb 2025 20:46:21 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:46:21 GMT Message-Id: <202502052046.515KkLQY084617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ed530aaa4722 - stable/13 - TCP BBR: fix integer overflow 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed530aaa4722b0b7bacc25735699f3603a613318 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ed530aaa4722b0b7bacc25735699f3603a613318 commit ed530aaa4722b0b7bacc25735699f3603a613318 Author: Michael Tuexen AuthorDate: 2025-01-03 18:44:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:31:38 +0000 TCP BBR: fix integer overflow Use 64-bit arithmetic. Reviewed by: rrs CID: 1523806 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48302 (cherry picked from commit 88766e7af52bbde32b14ad48fb76798a3ba4650c) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 07430a0564d0..a8c2ad547a5d 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3857,7 +3857,7 @@ bbr_post_recovery(struct tcpcb *tp) else if (bbr->r_ctl.rc_delivered == 0) lr2use = 1000; else { - lr2use = bbr->r_ctl.rc_lost * 1000; + lr2use = (uint64_t)bbr->r_ctl.rc_lost * (uint64_t)1000; lr2use /= bbr->r_ctl.rc_delivered; } lr2use += bbr->r_ctl.recovery_lr; From nobody Wed Feb 5 20:47: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 4YpC3D1Mznz5mMyw; Wed, 05 Feb 2025 20:47:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC3C6F1Rz3PBG; Wed, 05 Feb 2025 20:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788439; 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=zrlG8PzLvFSD6Sqh43qVDvNPQ0s6/vxM9fwgE7lsAT4=; b=fHc89CCMMcv9bFMUlqM0KOTxgYSgTBMTH+hZyuNoqhzLUQop6gCERjy01b305mdaGknUQG +lFtLoXaN17eBXXGuNZiLsOqQ5alIn2dg9rA+lCmmgXjCh6upg9LIm6FkEsUq9hO7MmTi6 9eootfxvtoweYKa3uSFWZh2eoszAREFi/nmpMsHtHdw+NDN6HZAL8WwDhuO1Gbp+XqZsqc 8mho6UIJjDSl4JOqKvQPzy0pSuGlgf6dDS8mp+XM2QI5u/nLJvtJfXrPEbvQTwBPKAxrtk bh/cJK1jLKvjdOsgVQnTTE4q6Dfgd6wivA0slI7i7jwt6tqe99mSAAbxYuzZDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788439; 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=zrlG8PzLvFSD6Sqh43qVDvNPQ0s6/vxM9fwgE7lsAT4=; b=Ccqz09rTvQlbr90BPxvnpIbWNTyO5TQhVZeAbCc3dbK1wTbUyq3/L6S26DD7UZJW9JWRIE ehbjLoqZcQTYWLPHXuazWuPuZHh7zkpJD24gpIs3nRB3RHvwGFft2rXkub3OQ+vNyGgSSY ukzI70ehzhO7hCJZ7KJPZI+PfMX1oiJiPVGolaxIdZH366lSDQmRhjmQZPcpdIDwCcbf8B 0e4Nbivesk+y/amtZ3T+OoeCoAQwXrjqP0IutYxML/d66X6VxQANkTh0WXPBC0RK9IolaQ 7w8SwJTOt8sag/ZRtlXCwMESok3v+zWCNFZ7Vpd0R/5WTp2fn7WXfRHMmtoBHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788439; a=rsa-sha256; cv=none; b=DsF78hw+s4DErk8o2Iu7EXWJi60BwY8oJL/w0yGPMVqSmHVGr4ncFytSMzfsgR+mcHzu/0 TNCrQJSG5cWyPzWvxLEgrs9aZGM9iTX6uPw+NXrcLcZMgx1gSbsa1TDe0uMjCPt0RXcKkJ Oiexqy0aTgfyfHSN5qr1w5yxl9onOMjNOtiRIUCVxdCOrQYt+WNPjMLknRtvhCyaFaavVm Cm7j9d08OW9LLlBQKXm++mR+2QAUvR5W+OaTQ2IrfqVNSx9TW0YnPBf3XQ0lcj/UJRqu7P cu3wg8UPVxP8nqmQw94Q3eYlI7V5sKlSqwmCoW45vewULqHOLMXkrpl6nSb+pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC3C4xKjz1768; Wed, 05 Feb 2025 20:47: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 515KlJbX085027; Wed, 5 Feb 2025 20:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KlJgq085024; Wed, 5 Feb 2025 20:47:19 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:47:19 GMT Message-Id: <202502052047.515KlJgq085024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 221ac9e07859 - stable/14 - TCP RACK: remove code that cannot be reached 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 221ac9e07859fd50e98a1ef035c3019983065af2 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=221ac9e07859fd50e98a1ef035c3019983065af2 commit 221ac9e07859fd50e98a1ef035c3019983065af2 Author: Michael Tuexen AuthorDate: 2025-01-04 14:22:40 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:47:30 +0000 TCP RACK: remove code that cannot be reached No functional change intended. Reviewed by: rrs CID: 1523797 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48301 (cherry picked from commit 41af5eeefc2c11d0e301f9f4476ba50214a8a584) --- sys/netinet/tcp_stacks/rack.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 6bed750145e9..a8542c093f74 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15630,12 +15630,6 @@ rack_timer_audit(struct tcpcb *tp, struct tcp_rack *rack, struct sockbuf *sb) if (tmr_up == PACE_TMR_DELACK) /* We are supposed to have delayed ack up and we do */ return; - } else if (sbavail(&tptosocket(tp)->so_snd) && (tmr_up == PACE_TMR_RXT)) { - /* - * if we hit enobufs then we would expect the possibility - * of nothing outstanding and the RXT up (and the hptsi timer). - */ - return; } else if (((V_tcp_always_keepalive || rack->rc_inp->inp_socket->so_options & SO_KEEPALIVE) && (tp->t_state <= TCPS_CLOSING)) && From nobody Wed Feb 5 20:49:37 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 4YpC5t4xFVz5mNPg; Wed, 05 Feb 2025 20:49:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC5s3pGhz3QWj; Wed, 05 Feb 2025 20:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788577; 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=DjPjENrsCyFcCmRX59QE+3LZrenCtKrRZrZxyStno3k=; b=ysqfRIRVITNBIxOGmGqqQ8eOKS8BclxjPHbO0KXasEekL/I60AP5BtZDMK05nyFSu+vj6K 5Fj8dHnQxOrfcxkdbYngmmmUgc91EloiRNkF3hrNUiqhOT6NbOkhBRczOralcD3hatd6Ig wN+k7Q1RFyrG/rZFB4XAKqc0+7f5puwkZhNoIsfCKqfsdrAmQ3jBEB4kObg1wtk/AvLPKC qd4N85RXAvqNoHx/3ef261AImzFmUfBRqSiV16CRtJBhW+Lw1db3AKHGlNMY9Gul9avioO K55/USxR9WMGNNSIf3Kf3oCtOLz86oA9mzM+zEPU8fluEkyzxC17XiyO4GZV0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788577; 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=DjPjENrsCyFcCmRX59QE+3LZrenCtKrRZrZxyStno3k=; b=xHgi0yDr8OWOrCLXECLHkM1LS4sUDSEdPCa9BUzd7kguj6Xof8hgF4Tj/FzGlQO/hOaNTT xEk6k9ySzcl21TzmcK2YRSE/T3ox346fb7DROcjv20bmpyZ+yVSvj2MRT52CvsiPQzIGkS YvCK99p8j6VDapsGB3R0hkn6DrkV5JrtFN5EG5g0Y0zCPiniJ+094QbNhy+G+MAGxtOSoF Car97l90uxxn5NfhlFuIMgWdwW/rNcKcksYScA5f4Y2QbJHNaqOTTZR6349Ni5mCzCDI61 EChDWFMF1fGztHMGJMtzhi5xUu/YrRu/qSWR+BTW7qePYTk0pwIDAv7lIDF96w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788577; a=rsa-sha256; cv=none; b=CMfl1RXOomioC91cMB3ID/wlo5Kx10vnWgl2d21fB6/159YYyangiGfDTmW99+AnrQ1jyU e2etqL/jG/SWo1Zg2sPGJqWWlYjHG7cY98v38PuYJu2Nu8fAFnqoO849slk33MDTn02hbh kZqHwCJhJPQIeejFGVNKP3gp79ITtCkju8EXyGceozokUhe8SutG4vBKIM4ZE8/lN3+Mug YLDYmtTp/lpdbxMcTFaBhV7ccOjtcYeLd2PISe1bwq6BLAgvDfDGv0HB4q7SgdSUKf2uoB u2r7pGU6V+W0hMhQUu3+SzMfvMA43fIvREinuaMyguk/8YEP2BIxqCrJApGpJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC5s3Lxfz1769; Wed, 05 Feb 2025 20:49:37 +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 515KnbFY085813; Wed, 5 Feb 2025 20:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Knb78085810; Wed, 5 Feb 2025 20:49:37 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:49:37 GMT Message-Id: <202502052049.515Knb78085810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2632e532c431 - stable/14 - TCP BBR: simplify expression 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2632e532c431b3ebb1320a50b5ab78f9f24f3627 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2632e532c431b3ebb1320a50b5ab78f9f24f3627 commit 2632e532c431b3ebb1320a50b5ab78f9f24f3627 Author: Michael Tuexen AuthorDate: 2025-01-04 14:25:01 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:49:42 +0000 TCP BBR: simplify expression There is no need to check partially for bbr->r_ctl.crte being NULL, since this can't be true in this path. No functional change intended. Reviewed by: rrs CID: 1523810 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48312 (cherry picked from commit 305c40dc552f9c150eacce95c181798031368cd9) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 1d030230748f..144b3f25e9c7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5542,7 +5542,7 @@ lost_rate: bbr_type_log_hdwr_pacing(bbr, bbr->r_ctl.crte->ptbl->rs_ifp, rate, - ((bbr->r_ctl.crte == NULL) ? 0 : bbr->r_ctl.crte->rate), + bbr->r_ctl.crte->rate, __LINE__, cts, error); From nobody Wed Feb 5 20:49: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 4YpC6929x6z5mNFP; Wed, 05 Feb 2025 20:49:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC683jqwz3Qkf; Wed, 05 Feb 2025 20:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788592; 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=lKMzKji2h4P8i1v0pWjxqO1XmfqqaX7Dd+IyUUQDsJA=; b=syhWo3Ab+RLI/I3WgAoJAH/waKImX3oQ9VkYpZiJ09z+amvDGakDFCpXPf0t5z7oD94uiI 0hFsoYsn7fhRDLPVqoR13fKzCw0QlLLXCvKBkZ+UMqyMcCO/ZUf5SkdPMK7S1Z4fsPnaQk QN7Kdq8GWpGx5nPl8nZPIhdljWgePn4xUN8ivoj7MMyNcZQEnLWohSpI8ZbeI+fYG/Moii m+0aeoVaBGl7S4DT5usEIHbjyhhDhQUoNWqIr+o3WivzmQbdH4YIaXXq6phC734Sm90Fbu cfheRRUFmuK5/InD6eSius5I7rpW/EbLnFlyDo1iaam73tjU3oNFWndg/Mn0aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788592; 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=lKMzKji2h4P8i1v0pWjxqO1XmfqqaX7Dd+IyUUQDsJA=; b=yn3uOAHOgT/GGotJbxlETrJ/M81IEaVdnTEmKxejYP+S1x6c2aakMBgTVw0YhikayNF9BU InZp4WGfHo7wiJ4sKYJdj8coDmAllIpB1y/JhbrrOxfS11KOlULmSRm941hhp1NaPGxRkc SHLhBCXg13Vo2TOc2CZoAVzuwB+mq0cNo72jSuyuG/IDi3CY6QusoGDSxlDsef+PUlctTs rd0nkMu+9DlqQeXrjHH1lp9hoLwIQywYnO50zeSFqchlivEKJddsU7Nn/sCnrLB4US7frZ 0i/uLeeOdtgUyu7otdVPr0JvJN9VglYIzwBgdXluj5J8Yy5SKnMpwBDojJqbwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788592; a=rsa-sha256; cv=none; b=tAAulK4VK1161dgdBTHHiWhCsMlvQrXadYz0328n4GDfHWkO28KoktcSRlxSxIfn8YjrHS o1D4dYb98WO7qgaxIYvQ74PiLQt6JCvVZjcp/xrwwPBEKLIJUVeTTrIwY+qNrnsmT5UVPL nof3IdB6nxYTPojwnt4shOb37VmuPbwtsG5phyaIOWaF27oigPrZwwWAglHjW/ZnTVxcj7 DCIolRZWpE7i8P//zpm4Qxn8hRA+u9VTnnSqN35stbDsv2Tyl+uwmzKw2zjc+snLaj4Jtc ynHfXkvXWlN4HhbAhsB1BjVZvoLDswNfvWueye8cJjTB0Y1EHG4piQ8qHEqX+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC683GPgz166j; Wed, 05 Feb 2025 20:49: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 515KnqFX086008; Wed, 5 Feb 2025 20:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Knq19086005; Wed, 5 Feb 2025 20:49:52 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:49:52 GMT Message-Id: <202502052049.515Knq19086005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4f5788dfca2b - stable/13 - TCP BBR: simplify expression 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f5788dfca2be357dd3ac7b27493bf08d4351e63 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4f5788dfca2be357dd3ac7b27493bf08d4351e63 commit 4f5788dfca2be357dd3ac7b27493bf08d4351e63 Author: Michael Tuexen AuthorDate: 2025-01-04 14:25:01 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:35:00 +0000 TCP BBR: simplify expression There is no need to check partially for bbr->r_ctl.crte being NULL, since this can't be true in this path. No functional change intended. Reviewed by: rrs CID: 1523810 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48312 (cherry picked from commit 305c40dc552f9c150eacce95c181798031368cd9) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index a8c2ad547a5d..12152fbddcd9 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5586,7 +5586,7 @@ lost_rate: bbr_type_log_hdwr_pacing(bbr, bbr->r_ctl.crte->ptbl->rs_ifp, rate, - ((bbr->r_ctl.crte == NULL) ? 0 : bbr->r_ctl.crte->rate), + bbr->r_ctl.crte->rate, __LINE__, cts, error); From nobody Wed Feb 5 20:51: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 4YpC7k3NTXz5mNqx; Wed, 05 Feb 2025 20:51:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC7k189Wz3RsH; Wed, 05 Feb 2025 20:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788674; 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=D4wKYiy3RD70d9wiCHZPECiNBfG666OxZVlQQybM5gk=; b=etJXUVHvtkOboAD3MHaZIRebQLGvsoiHr7l224n2IjhnyIq0l5jJY027Y0L7qBcFOfYbWv Lwm1vEtgGB+QAzRqvQEXekqvlvRQArNrIuoYKgXeXBKY0/UqBFLaHyUgRaPkR/E9QK8cCW +Ltn6Kel2VNTw9qxNT85gwjNpHKQ5s6FSNOTA2eN9P61DdahDCpPrw9N9SFiAOo4fLgawt m2zNLwjJojR6ezVi1oJQYBd8j2ruXbywi1OSwIHGXHQaMcxHTpRLfHf0i+yVz5Jhr+3GEU 66dciuAobzNKo7zAuOUQOhxeX3b9Lp11Ql0XKd3vy8hpioPHrQNlJO5wSJbXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788674; 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=D4wKYiy3RD70d9wiCHZPECiNBfG666OxZVlQQybM5gk=; b=lTURPa49Wz6CCYqHlThjW716O3fb/1e0sSDTWqy+aZWN87AcF68ZWofdt35Yk94py0XJ5D +BygB1K7awvJRSgUj8faan47FUZDz17cs57AFx9VFRnv9/ExiRBFOK2SERBT8OnIxR307h jKYP4ZybJnLocAPhLRWLVwIN20xGaqx4ROqdOY7WL64xh5YmofVf2LkGq2XYgDgCv1JJ2N eGFCnWtUJRd1zPreaZrtd/G8wUN7H3X+ELFIy7ONXsT6TqJhI0Lea1zwkEiwoVnBuDLdYJ avLvf2pcbkOg4FYclVxNEsM+fqS9Ma8xZHrSbOmbrTbKgJEUJkm8TbRn6tH0zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788674; a=rsa-sha256; cv=none; b=wrJvxj3XZUFfb4ECrw6IDIijvRgiVJmYFdDO7RRl1bt8sQWdHVrZge6CMbM4qFsFnt7VPa M25cvgHMZi0qnuFj7RRmUlqOS1Y/AnHbQnhqirH5KSguuXLZmyD0x4tk06JdnEydm8p3CR cLnQXNQabKnvyZsySCgDwcNIfcj8w5VkaYtmHNaZL6LFjgeRJ+nnvxLyXN3LXBIRi8c9JU /YxC1Dxyew1DuStbOp/bcoNWsz1bdLLUlbq9A7mnGf1g12SAoHh/TSldDt6VYOZinRExBf bHlv/YVwURi2PV4Kt41nwUF5b6iZvaYyxG6xqvYcJFeHiMmkEjfJ7opDt3CKEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC7k0hRBz16w1; Wed, 05 Feb 2025 20:51:14 +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 515KpDYN099645; Wed, 5 Feb 2025 20:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KpDDZ099603; Wed, 5 Feb 2025 20:51:13 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:51:13 GMT Message-Id: <202502052051.515KpDDZ099603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6ab740bc90c1 - stable/14 - TCP BBR: remove code which is not needed 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ab740bc90c188e757124533e6c4b67e40becb67 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6ab740bc90c188e757124533e6c4b67e40becb67 commit 6ab740bc90c188e757124533e6c4b67e40becb67 Author: Michael Tuexen AuthorDate: 2025-01-04 20:08:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:50:55 +0000 TCP BBR: remove code which is not needed rc_bbr_substate is a 3-bit unsigned int, so it can't be larger than or equal to 8. The wrap around already happens. No functional change intended. Reviewed by: rrs CID: 1523795 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48320 (cherry picked from commit 4bce1a19fcfac0c9f22c11278daa510546ccd3f2) --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 144b3f25e9c7..6c6bc5d1532f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10302,10 +10302,6 @@ bbr_substate_change(struct tcp_bbr *bbr, uint32_t cts, int32_t line, int dolog) bbr->r_ctl.bbr_smallest_srtt_state2 = bbr->r_ctl.bbr_smallest_srtt_this_state; } bbr->rc_bbr_substate++; - if (bbr->rc_bbr_substate >= BBR_SUBSTATE_COUNT) { - /* Cycle back to first state-> gain */ - bbr->rc_bbr_substate = 0; - } if (bbr_state_val(bbr) == BBR_SUB_GAIN) { /* * We enter the gain(5/4) cycle (possibly less if From nobody Wed Feb 5 20:51: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 4YpC7v4YN4z5mNl7; Wed, 05 Feb 2025 20:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC7v2X4Lz3S25; Wed, 05 Feb 2025 20:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788683; 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=e6lZ7xoG24bhzpWtZwkx1ms3KbMpOqS88sGF74i6y98=; b=yXSeIprzpSkSFIJGiR2JDjPejV3mIM5hp47eTZsn9LYAT2p7HfG6MostHE9jt6y7Vng/gQ BrvMY+/RBQV71R2P8B5pukr27o7eQxukb3Eyx2mWLjIHOe5xtbbG+rAws9sTp8zFXZYX0g 3x3RFipKeXAq+aRfiBANM49ZfzVGei/871+dV6rCDNoX6IqJ83C7oOGSIRtiQBpa40MdRc hsWS73hf3AHS4Rm9cs8vgxBUb0zDIlCVrGY6KBOrMC8GQzUhQtaI0KSGPM6fqB/ugRkIYi a4uUjmIJH04k74m36L/Br+j3BWwdm+9TqF07wP2Jm+cph9IbiLDMK55zIKUJdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788683; 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=e6lZ7xoG24bhzpWtZwkx1ms3KbMpOqS88sGF74i6y98=; b=DH+L+t8Gp9BlRCol0pEkVEi/gewUFV/YnalrD92v0dlzNe+JtyrcK0QV836KtxacKKz0gi 5nOu35iyFXA6Nr75Q1SEw82MDVtAM+YxafXbzGV2yJ+WsempdiSRhvb93mVEXyPRHlCtM8 zf9WfCLnpcuvN38EVKCmXszm2XG1fh1Ic/6fOhnXKkHK3YNYt0WJPcDzvYpnBmmJGLu35Y sZD5DZTPgdbslag6Ha/aPnre9MxQT0KCdJ3LqHc8X3YxlBbnZazWYx/sYQ3CHFeieZwm5g SzGrJzjgdSev9KokdaJrFg0Fkf1ik/q9yy5SKh4ogixotzFEy2BnM4YwPvYgzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788683; a=rsa-sha256; cv=none; b=egrqSBTPS9wIR6n3OmF7BoO6jMtZ1nIkgfULR+sTLu8lNpnKNZO6Bmwm2QJneia4+uTZ0Z M+zu6FBvvCUlXyOndoaWfKjK2M+Mm2IREB38NgkbqHo1XJTc5O5WI3KDVUv3hxu+7bai1S FgFxIe4D9xx17pzmVYuASzcnCnbGwlwg2LbWRZtft7ZGOPR8X9YmCAXJ0EhLFB/Bx/vNYT xWKBMBT1n9BupxV3B9pHaP/4QTG4RND9uSjaaR8aUFQQGjNHBFSKrqwsUxR0pBE5K+r0/S Zcqvfr+Eac3Z6UunsUSUaZ+H+zl1lh+k7Y8hdIt4/GGGNcidwc4pir+i510Z7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC7v1By6z178n; Wed, 05 Feb 2025 20:51: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 515KpN2p099808; Wed, 5 Feb 2025 20:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KpNcc099805; Wed, 5 Feb 2025 20:51:23 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:51:23 GMT Message-Id: <202502052051.515KpNcc099805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 264b7dd11fa1 - stable/13 - TCP BBR: remove code which is not needed 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 264b7dd11fa13858843eb11e8e33849effdf529a Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=264b7dd11fa13858843eb11e8e33849effdf529a commit 264b7dd11fa13858843eb11e8e33849effdf529a Author: Michael Tuexen AuthorDate: 2025-01-04 20:08:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:36:13 +0000 TCP BBR: remove code which is not needed rc_bbr_substate is a 3-bit unsigned int, so it can't be larger than or equal to 8. The wrap around already happens. No functional change intended. Reviewed by: rrs CID: 1523795 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48320 (cherry picked from commit 4bce1a19fcfac0c9f22c11278daa510546ccd3f2) --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 12152fbddcd9..cc39884a3e33 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10370,10 +10370,6 @@ bbr_substate_change(struct tcp_bbr *bbr, uint32_t cts, int32_t line, int dolog) bbr->r_ctl.bbr_smallest_srtt_state2 = bbr->r_ctl.bbr_smallest_srtt_this_state; } bbr->rc_bbr_substate++; - if (bbr->rc_bbr_substate >= BBR_SUBSTATE_COUNT) { - /* Cycle back to first state-> gain */ - bbr->rc_bbr_substate = 0; - } if (bbr_state_val(bbr) == BBR_SUB_GAIN) { /* * We enter the gain(5/4) cycle (possibly less if From nobody Wed Feb 5 20:53:05 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 4YpC9s651tz5mNSX; Wed, 05 Feb 2025 20:53:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC9s5KR0z3SkB; Wed, 05 Feb 2025 20:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788785; 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=sbxSVb6Xj7g+ZgyEkX/IoOdQEQ5dnupi6CVtSW2M3h4=; b=YsLRT5KUD1ZlmoBNJmMjUUaUvG7K67QZu+crmb9Zcvb5tH7DNOjf5CsLLsXQ41v/CG5BZv UveGvT1fkRZnnQj9dUImOmND/SaM6B6iVlX0yaqpVTSBPdgUz0xNzhA+xuhL+NMBTfLcTr mtRjcPgpzFM5MVPMSopkvGSZMh7IQNUIS4Hscl/Wq3tpqv6iLtjAHzQZcdhj3BrERI2oMP f4YMAeUR27teZ/NdBTGUiGf7KWRNonz2sTAFVityhMjDUNoXZXmpfxIPBglwzWS4dNgQp1 kCFRW1PvmDty0eUKSpACKoOEAtgCWwZRkQUGtHzuT1E+er18qbtS4N2gBDBQCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788785; 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=sbxSVb6Xj7g+ZgyEkX/IoOdQEQ5dnupi6CVtSW2M3h4=; b=LOeq6b3yHNiYmTcreAMytBxjR49gP6q9fumBtf1ri0ysalX+MxWYiSMagHEV2ox6L052zB 94Go1P0msixhkieVB4JASwn0c8ywMQdeLF9U3OXRdbwRh78K0BVDHeMzDmfT6iM/QLgxjX g6SvtVkR0lJ0v/ghqPcfTyHl7j7JL7zAkYlx0PzzUJ7myCcGnk36RCRd4b0aIxhuANpy6m YKS8e12g/nOOemm7h8nG2cc3p5gC7XKAa+J2rK0XsMnAKtbgUSxB8Jn1MoJ7rfA4o1ZMUT vKbw6CEa5oQsjeT6ae2w+0SfoWDA2uA06RauPnQLqk+0JtRGfnrhAqjk8kKu1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788785; a=rsa-sha256; cv=none; b=w44KAzbo5Mmweh+2/y7/39oydjnDaufEIH/VLGbUe5alVjwVLmZ+/btSkfakLNDS0Tkv61 CLU2syVMt95odOFgEnfJLQ00DYQRnbG9uIMzmluv7WsjqKj48GKBxSC/tBIb3rhUNw8eWh aX6yDhq0Aio1CeQxAT5+QGMGNF8Ii7GHCf3970zftBBqEIPdXD50kPlx6qoOQ5udWy6hWy H/ar7bIPgUxEVz5Psd80OTD4NA98OPbaAhhno1Zkcefz9Ql71Z8A+pqDLsx0Va7LCx6amH S5Wd4s67a9mHVENlTRj/YicdS/DggffsbzjwwFP1p8BRkiSuRavP3H56Dsu8/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpC9s4mQtz16wM; Wed, 05 Feb 2025 20:53:05 +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 515Kr5Y1003107; Wed, 5 Feb 2025 20:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kr5Vq003104; Wed, 5 Feb 2025 20:53:05 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:53:05 GMT Message-Id: <202502052053.515Kr5Vq003104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1d8bbe5ba370 - stable/14 - TCP RACK: remove variable with is only initialized and not changed 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1d8bbe5ba370f909192818d3be9075caa5fb0730 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d8bbe5ba370f909192818d3be9075caa5fb0730 commit 1d8bbe5ba370f909192818d3be9075caa5fb0730 Author: Michael Tuexen AuthorDate: 2025-01-04 20:11:26 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:52:35 +0000 TCP RACK: remove variable with is only initialized and not changed minslot is initialized to 0 and never changed. It is not clear to me under which condition minslot should be set to which value. Therefore, remove it and the code checking that it is not zero. No functional change intended. Reviewed by: rrs CID: 1523812 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48321 (cherry picked from commit 84e894ce1309b426aa5d1a20ec194401f35dc478) --- sys/netinet/tcp_stacks/rack.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a8542c093f74..c9fd18be1ede 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -17681,7 +17681,6 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str { uint64_t srtt; int32_t slot = 0; - int32_t minslot = 0; int can_start_hw_pacing = 1; int err; int pace_one; @@ -18013,11 +18012,6 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str } } } - if (minslot && (minslot > slot)) { - rack_log_pacing_delay_calc(rack, minslot, slot, rack->r_ctl.crte->rate, bw_est, lentim, - 98, __LINE__, NULL, 0); - slot = minslot; - } done_w_hdwr: if (rack_limit_time_with_srtt && (rack->use_fixed_rate == 0) && From nobody Wed Feb 5 20:54: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 4YpCC30GNbz5mNZ7; Wed, 05 Feb 2025 20:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCC232RZz3THn; Wed, 05 Feb 2025 20:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788846; 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=6/Ss+2diVY6GYePf6XksdYsrd+TqfK6QR/pCYvxrtrE=; b=XPAp0ViT97subYephvRcjYvuH9OHxhqLc5IUhuVdWZSWTUoj5/W1rGUj340wq0hHhoMXdP iPGqEJzlCYnryKU15Ix9R6ZhVOq+9cJysNDr6TXmzzl6v4eTKrkN9VZHaceVEBFYA+92aO WWEVlryM1Uq7o5J3srzZjw5o99J6BvM/0JvjDqqkW+RvUekptabCeJ7oYrcID6a8HJADTf p5iI3/aVU6DITywPUh82zh40r3vmD52JuMgz9FYJyAfGRCZgXGoPx363SDUbRjprf1F4S+ w071F3gjQ0//Jsi1sPAQRCdWOXYoSIAJILnvx+XxsXOByJ/QG6CySDIO9lDvxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788846; 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=6/Ss+2diVY6GYePf6XksdYsrd+TqfK6QR/pCYvxrtrE=; b=a5hyllMdlxWVFooqSjpD3m5hTaIjs9cI6pb9vopWf3BOEGo8lFm4eO34zVh/k9QdvW5scr BukgKZpE5BfoE+Q9aQ/coZ9d1GypTac5dliFND7rrJJythVlBbWs1mJNb3hNc8+1wVajDR WrMBcj8txV6F3g0/d1Ae5oxB0BbQ+Wv1XgSgiCppZpdeibQ9oH+LomqDWO7CRoZ8zSmnTg pKTfiwSllO7I2qyWOz0YQkGOaXOHNOl6hoi0L0AAfnaxkFTTdyFLsJg24RqtA9BzTfrHL8 j6hPmZqUjTD/DWK3oEIqY+q6SxSRzVilEsy8RrU1qqbihlyN/5fFdeuJonrMsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788846; a=rsa-sha256; cv=none; b=RlpJfnPoDOk+kXk9o8g+dJL5OWNB+fyb6xD/YONZcqtf2LtkDdchH6MEJOcXve2LUlHZOv gQe8pMFLhK8PJmYIBZE5qsaWP2ZoN3b3KSr5bbtjARVrVjdMk/Oe3Wkh7qEQw6zyxQgk/2 y82qsKSpkSoLfVGyVBFvgv6k7l0XeNuCxW0lPVFXbVGtjSYvaaWqYZh6oeLDvgzA7ekqwM AZkYun+wMQi2i1pdvmk7P34HuzNaluzUaOCyxrb1WrC0wbLzm1kosFmqT7seiRqLqGeyIs ZTr5hLXmHYL+54nvdcN+0Ds7zt/67GoLtrPy+R2/FZP5nanyubWDcCRKtAAxFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCC22Yv8z16Pj; Wed, 05 Feb 2025 20:54: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 515Ks6Qt003523; Wed, 5 Feb 2025 20:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Ks6aJ003520; Wed, 5 Feb 2025 20:54:06 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:54:06 GMT Message-Id: <202502052054.515Ks6aJ003520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 86ec7e524a5d - stable/14 - TCP RACK: fix TCP fast open 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 86ec7e524a5d6934b6da618e94dfc35927dba3f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=86ec7e524a5d6934b6da618e94dfc35927dba3f1 commit 86ec7e524a5d6934b6da618e94dfc35927dba3f1 Author: Michael Tuexen AuthorDate: 2025-01-06 19:35:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:54:19 +0000 TCP RACK: fix TCP fast open Do not jump to a place in the code, which requires several variables to be set (segsize, minseg, idle, len, sb_offset), which is not true. To avoid using these variables, start the HPTS timer explicitly. This fix only applies to the client side using TCP fast open. Approved by: rrs CID: 1523766 CID: 1523770 CID: 1523786 CID: 1523801 CID: 1523809 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48322 (cherry picked from commit bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42) --- sys/netinet/tcp_stacks/rack.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index c9fd18be1ede..a2325b88751b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -20154,10 +20154,11 @@ rack_output(struct tcpcb *tp) (tp->t_state == TCPS_SYN_SENT)) && SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent */ (tp->t_rxtshift == 0)) { /* not a retransmit */ - cwnd_to_use = rack->r_ctl.cwnd_to_use = tp->snd_cwnd; - so = inp->inp_socket; - sb = &so->so_snd; - goto just_return_nolock; + rack_start_hpts_timer(rack, tp, cts, 0, 0, 0); +#ifdef TCP_ACCOUNTING + sched_unpin(); +#endif + return (0); } /* * Determine length of data that should be transmitted, and flags From nobody Wed Feb 5 20:54: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 4YpCCY0jgmz5mP0c; Wed, 05 Feb 2025 20:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCCX5BxPz3Tph; Wed, 05 Feb 2025 20:54:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788872; 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=s+ea3vZ5OaO3+2ncEIEbmHJ58PDEXAjCo++9OM9UnP8=; b=KucacIZjCkTKWLUgTU7RzEjmfdGD9KufhAb3NU8O5tmCD+8a4g8By65W8zwrMspCjWDQXF hRad3DsN2I8dRlY2XCcbUUwRjHFEUEActBoD+x7X+B1CCJGMg8tddR9oqA1nLXW3cjn3cz OJbOvuLwSzBfNh1EMv0oG3m4Aw/9iSkYp11bGG1ZiKg/IuJsuKIFqCRl+5DTlfy9ip6SIx rVHfVQxuFidyyYz5rI6maEMPZZRLD1oLbBLW6tnEkVN1QJrtWd8nTOfhPdeX476K26sV82 5j/UimE+bylGsmIUcNHsi5/z3LPGDO2W2wcy3x1zCdMwDDttDk095xdIFeErRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788872; 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=s+ea3vZ5OaO3+2ncEIEbmHJ58PDEXAjCo++9OM9UnP8=; b=YfGpEzs5wMzZetJahMxlSUnc/FnUhvN8MAxaiBLc7MUOUs1vxCa9AkwYA0+9InE748dWjK NDw5dMfJTAO961xuyYozg9GtjMDBEouWSCdNxcdLbUD4DlzH3lkaNP5KsQEmka67MNJ6ZT 4Jxt9Cj49gWfM9zIpgD1pMLDe72zEDICe5/ycmVJgCEMFDCVGA2PfdJier75F+OMaYprbj B3v4BlJeP20+cpugpXwA3zHC3TKEehfreFJ8W1kTVaq3xM+/C/nxvEdH5c60zwvbofwN9i NItVIkqqd2nVd4zasLyCaxE+ZA0uFc9z2XvpJtFFWY6vh463Ehwd272LxwaCMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788872; a=rsa-sha256; cv=none; b=BSl6Tk9VC3cnmlSWyKKFB7Uqw9hznfPs4IfNaOZ+wgTdWSq6P6UUYS4rWAKJilnBq4tXKy D8A9qmcBzz0EpcvuJCUY8gCqytQwzzvi7Hi14Nx4/dURmcaR24xID2vW7al6cW/Fk66Xed WQtiWgQ5x8DzDoPznoxe+4cjnInapmGoweBDrLNn8kkwm/O+o51aDUEfQCHMgdDH3KNq6N fxwbYus8eWRv7UC7vrqcqPmPO8EJ/Fs2jmm/VC172UTCWA7+92AeIHmBZj+Hh4ChlniN8s hMcwdzdjTlCYDXfHbpPzumBNphhHD2DYt+m0pIJ6+LNz/1DacbA549FA2aCSlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCCX4pg1z16Pk; Wed, 05 Feb 2025 20:54: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 515KsWLl003748; Wed, 5 Feb 2025 20:54:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KsWLY003745; Wed, 5 Feb 2025 20:54:32 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:54:32 GMT Message-Id: <202502052054.515KsWLY003745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 9698788212e8 - stable/13 - TCP RACK: fix TCP fast open 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9698788212e8f772885098a511fafe7fc5d4e4df Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9698788212e8f772885098a511fafe7fc5d4e4df commit 9698788212e8f772885098a511fafe7fc5d4e4df Author: Michael Tuexen AuthorDate: 2025-01-06 19:35:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:39:50 +0000 TCP RACK: fix TCP fast open Do not jump to a place in the code, which requires several variables to be set (segsize, minseg, idle, len, sb_offset), which is not true. To avoid using these variables, start the HPTS timer explicitly. This fix only applies to the client side using TCP fast open. Approved by: rrs CID: 1523766 CID: 1523770 CID: 1523786 CID: 1523801 CID: 1523809 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48322 (cherry picked from commit bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42) --- sys/netinet/tcp_stacks/rack.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 86495bf3291e..b4c4a6ed85dc 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16366,10 +16366,11 @@ rack_output(struct tcpcb *tp) (tp->t_state == TCPS_SYN_SENT)) && SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent */ (tp->t_rxtshift == 0)) { /* not a retransmit */ - cwnd_to_use = rack->r_ctl.cwnd_to_use = tp->snd_cwnd; - so = inp->inp_socket; - sb = &so->so_snd; - goto just_return_nolock; + rack_start_hpts_timer(rack, tp, cts, 0, 0, 0); +#ifdef TCP_ACCOUNTING + sched_unpin(); +#endif + return (0); } /* * Determine length of data that should be transmitted, and flags From nobody Wed Feb 5 20:55:16 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 4YpCDN36psz5mNml; Wed, 05 Feb 2025 20:55:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCDN2LL5z3V0D; Wed, 05 Feb 2025 20:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788916; 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=0kJ3PaZM2dTUw4ZRhIkVbQ9B3dt4m+ryQI5C/LlzFvE=; b=YnL+JVcOUveC4TGTqJlhRWaD5fgYnLWSiC7Q82dtElxlyW3rK9xG6its/asZVx99srJ2QQ WwbcqgNgADmramNMOchNkXjELBiVW+kbKEuznzHF7SdoYkmp0+CK7by7tbbgGo9CLqoUGD 5YGUNZOOtyzGxgFruxmbzzlRhKBebCdoghOEiGUXQ9QE0phlcENFfgH9lQ+DwGdNlJPJlS Kd9Ej+OLA0mCXPaovE1qhRzQN6xJRTe/if2oM480JkkV5IpVnBOBn2X4tdVC7M9AxEkigO FYQKqO8lUt/VYHUGDJSsjl5FmwzbZWPsabcQAp67NfbiWczw9adzWRbcpt7dNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788916; 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=0kJ3PaZM2dTUw4ZRhIkVbQ9B3dt4m+ryQI5C/LlzFvE=; b=OCaKILkqr+cqbI95nm/bydKWOMOLl9Qt1KoxoQHnpIg8ZNz2D0mBNXS3NIuy13YANJY1AV /3MUZQ5tVTNEARlj7qlwKyZBhrPBykKFQVTsxB6IuiFfT6E7pMOY14USKIFzdAiajOfVas T4ZWuT+AeUIxZqSlJD48ws6KkiBuH5qTu6smEvJjdKDEyC2AQu9kLCVfqhybpMxan6RkWP vz+4M5dXcHR72wBh2s35P3yncZXNZctLClekY1n2EQarpjomhQ5QXhHKR5ipliyZIkMLdT GKuFXstmdqlR8GhcDsLLLxqZdR4gg8so8HyILMrKWfe/tye06zy+eHKaISMyGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788916; a=rsa-sha256; cv=none; b=hbWQM1CELZVxxKVFNJTQcpYI64RSU6lBpgLaHY82O7I8JagnoMpP1tK/U9xR3wxe0S3Z1w 9cDFinJL25MVvZVley0xaOAYOsauUarBbhPXFtxnRq+iMIZw0jqNBeGoHJiH2lk7Xlvd9y OEYKG6Emz5EPDJRAUUPb49KDYJOoSpj21oTbkj9Pb7vL73TBNhyEXEfrJZYYPP4JZi6ITn 149aY4RHd5MVTPpZdALR+4OvuqkZJ09oyhln6U9Ux/i9b5dOIrUzC0KGZzur4yFYroOM4i VKO6UueLx9Xc45skz6qwR7KmXAa6/0Q2b9yevgP6jzr5tufmsloXbgOMJ2Yx3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCDN1xzNz179H; Wed, 05 Feb 2025 20:55:16 +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 515KtG9T004105; Wed, 5 Feb 2025 20:55:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KtGum004102; Wed, 5 Feb 2025 20:55:16 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:55:16 GMT Message-Id: <202502052055.515KtGum004102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2a704e9ca7e9 - stable/14 - TCP BBR: remove dead code 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2a704e9ca7e940d960ac493d015af59f0326b9b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2a704e9ca7e940d960ac493d015af59f0326b9b8 commit 2a704e9ca7e940d960ac493d015af59f0326b9b8 Author: Michael Tuexen AuthorDate: 2025-01-06 19:40:33 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:55:36 +0000 TCP BBR: remove dead code bw is unsigned and not zero. So it cannot be smaller than 1. No functional change intended. Reviewed by: rrs, cc CID: 1523791 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48323 (cherry picked from commit c28fefe1dc44b69743dd18d038440da38a2867a7) --- sys/netinet/tcp_stacks/bbr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 6c6bc5d1532f..73751e984125 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -2992,9 +2992,6 @@ use_initial_window: /* We should not be at 0, go to the initial window then */ goto use_initial_window; } - if (bw < 1) - /* Probably should panic */ - bw = 1; if (bw < min_bw) bw = min_bw; return (bw); From nobody Wed Feb 5 20:55: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 4YpCF51Yh0z5mNV8; Wed, 05 Feb 2025 20:55:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCF514HDz3VN4; Wed, 05 Feb 2025 20:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788953; 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=uBBM+HLWxO5iTUqBdn3PAM41IZDHaIeUcgzEm2k5TDU=; b=OcRrcMpSfP+Gdcf7ffTVIHWeETvVajAvkUWaW9ZKUCE52XT6VIpXpxDYxNgQmWA4nkTkxE 4xXjbJJyXIoQZTsT9bXnByiP07jg6YQXuIzQwC3YZki/fcCZ7UlPq3IZGg6ip6lRgGs5Kq Z5eAA6iYLYkmngqSC5g8zK0vX9UqPgaH3PPoOH3jXvoa4qG3bj10EMUSQgfxFw3Jc6+DWM +T+jKd3IcxqTIaHsJ16UXuJiZL3A8iaqj0nux/e74G5YQruKoKVAOBfL1p4k+Yz7HHoQiS flQBXn7ZxOAckbK+Q4vJO2/WAb0keCR45Rrbayuqq/a9J+ODYyz5XAy4pI5wiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788953; 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=uBBM+HLWxO5iTUqBdn3PAM41IZDHaIeUcgzEm2k5TDU=; b=VVzaG8LHgoRTHYBB/+LF+TT0uv8TEMLBI0rmJXkzcxq/U9BoeZPShnQBnQV0AY2k5MTvPw 0hhHqg87OToi4GUSXMDsMotY/tOotpGq0/mjDoXdchq15eUUNgHewR03plo1gJHTP+u6LS CAYi4ffBxD3JsWbIg7hHEtVlYqoqXKUBw/EN0nC1PviPfj7mOdKGooxDpaP1lcFERajOZi UIosVDp2iCGGOkHwsXaT4Unoa3wp2chivtkTB7VOsBfOU78mvrgVY1A+RdELS/UzeKeeKo d/zLCIe/aAT7Cg20xzMua1AOJvVohUy023wDveR522KIhMFUdxGSc9vGEEuX8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788953; a=rsa-sha256; cv=none; b=THRjkGFnuEJWSARs4GZTZ9hGqOsN1aMvBQxt1XCNqEWIkOQF/k+PlweacvbsvRqMdd0+jl YpkylRO8aBdaXYTQhHGeojX5g9LV6XzecrbqO1JUisIBlln1hiHbXVglp3owI0Z4ji0ZTj R/z8GaxNwNVdZb8q41a4pgd9aGjABdR3Jjn1XTRqsDRYNMMlvOlGH1+Q1lf2X4X1wsbq3H 5UE1vMUQ/qrdORNjjK3JPsZEAJM1B8OO0+6TuCxypouvHVh1TIehVj6ctpJhECZRMan8ig o282IynEBBdTMauUPcy1a6h0j4lj+FgOSbELo99762DaLLktRWVBqIql+h05PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCF50cxgz16wN; Wed, 05 Feb 2025 20:55:53 +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 515Ktqik004403; Wed, 5 Feb 2025 20:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Ktqcj004400; Wed, 5 Feb 2025 20:55:52 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:55:52 GMT Message-Id: <202502052055.515Ktqcj004400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7edc7c8f6f97 - stable/13 - TCP BBR: remove dead code 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7edc7c8f6f975ee437124534bbd59ee4ba42b66d Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7edc7c8f6f975ee437124534bbd59ee4ba42b66d commit 7edc7c8f6f975ee437124534bbd59ee4ba42b66d Author: Michael Tuexen AuthorDate: 2025-01-06 19:40:33 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:41:04 +0000 TCP BBR: remove dead code bw is unsigned and not zero. So it cannot be smaller than 1. No functional change intended. Reviewed by: rrs, cc CID: 1523791 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48323 (cherry picked from commit c28fefe1dc44b69743dd18d038440da38a2867a7) --- sys/netinet/tcp_stacks/bbr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index cc39884a3e33..1fd41b568e1f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3008,9 +3008,6 @@ use_initial_window: /* We should not be at 0, go to the initial window then */ goto use_initial_window; } - if (bw < 1) - /* Probably should panic */ - bw = 1; if (bw < min_bw) bw = min_bw; return (bw); From nobody Wed Feb 5 20:56:58 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 4YpCGL2QG9z5mNqB; Wed, 05 Feb 2025 20:56:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCGL1yybz3Vpt; Wed, 05 Feb 2025 20:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789018; 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=n0D+4uqGZ6rh2yVZiiZBa6ZN3QcNt9qKhymtJ+QvrvM=; b=WAV5kRbvlxyn413sd3JUlDfozE31KBY+lb6yBeDqAKpDa5qQQeNoyHPEEeDt9QW9ABMzOM MjO47CPI+ISn/qZSDq1fc9Axgd74G9Awwbi2LH8bv+SRK8AGTyf/EKqMd8clFvJXs/KZ8Q p9U9mzm3HqwY8tkGOZdDtV+jKBo3Ex7lp9uzPi33bLl5brx5bH8X1uKkD5S1UPyf/fyiaS CMpkyGDJnGQ81fLYat/mfWBY5trj2v5viR1RN7la1qo9NaoCbazwqIuTJ0CyOBqf9LPt6m ALg7xiUqb8nHdSusdtadG8MSUYGW2Hd/w2hKgPwransIhSJhK1v5OFI25hFC4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789018; 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=n0D+4uqGZ6rh2yVZiiZBa6ZN3QcNt9qKhymtJ+QvrvM=; b=nKd+bcEa1gHNKnDHoBWUfRsTdihmTSyzmmrUNkiWM7OxKodoNQ1fLQ9cc4C8TfITJUF29X 7Rlb2v8HgFjGIg0/OZKOkCiiBwqFy/wSpJExsFNChh1KmpHkvUuMAI++pq8VaH2MFrmNuh 9+XuXvXLzMN1UvPFjN1q3hMx7z3GcTJT3Axbwe30cAXp/lMwtx9aftf1T/S8poZGIXz4k7 nQm4WzMTt8HpOwjW5FTYlzVhITXrplfS/pD5CFLJE4EqkNX0Ek89+RXQ2sTJPN78hE0/S1 pgXr8UaKP+3KBKxXnOMppcXprICotDVSTy7cHS0AJa0iplSL5D33hBlHuaee7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789018; a=rsa-sha256; cv=none; b=hYAFlwjCIB6xd2XV5Sk5awS1CrG1iAMIeoe4EVgH5+mZnHMrHCUw24siyK+A4dnoEvvnDu tBV9wozb2+MVGASCdAmC56tqCQGeSh2++Vo7EqI/ByYoSalB8xqzPwgIrWtfJF3V72y7N2 wULxtZbZsrnh34oP6dc0M/hoIiX9j8eX80wtVr22g1xGHb09cPW7gjqLx6pROKlDekEVIH fHljhZOJaMpopo66zNgyr3UnHeYLip8+zqm6oKylUcjGbJCmAhvXcF4jO+wuVJ3vimJ8O1 ubzgZ8zeaJfbUAZjFND++eIzwqC/nlm3J74h/uI/RuQb6rFbVplraR2qkpttkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCGL1Jm3z17Rq; Wed, 05 Feb 2025 20:56:58 +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 515KuwnF004843; Wed, 5 Feb 2025 20:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KuwBp004840; Wed, 5 Feb 2025 20:56:58 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:56:58 GMT Message-Id: <202502052056.515KuwBp004840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c6f745a3e334 - stable/14 - TCP BBR: remove dead code 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6f745a3e33430e83af1d09e96fc670be6ae2118 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f745a3e33430e83af1d09e96fc670be6ae2118 commit c6f745a3e33430e83af1d09e96fc670be6ae2118 Author: Michael Tuexen AuthorDate: 2025-01-06 20:25:58 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:56:52 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: rrs CID: 1523808 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48338 (cherry picked from commit 061727efe1e355fb2fde1b05e92718543d05bfe7) --- sys/netinet/tcp_stacks/bbr.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 73751e984125..ce13ec9a54a2 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -978,14 +978,6 @@ bbr_timer_audit(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts, struct sock * and we do */ return; - } else if (sbavail(&inp->inp_socket->so_snd) && - (tmr_up == PACE_TMR_RXT)) { - /* - * if we hit enobufs then we would expect the - * possibility of nothing outstanding and the RXT up - * (and the hptsi timer). - */ - return; } else if (((V_tcp_always_keepalive || inp->inp_socket->so_options & SO_KEEPALIVE) && (tp->t_state <= TCPS_CLOSING)) && From nobody Wed Feb 5 20:57:04 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 4YpCGT0Qt6z5mNt7; Wed, 05 Feb 2025 20:57:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCGS3hKMz3W3t; Wed, 05 Feb 2025 20:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789024; 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=YWbBy7lmK6GxYGD4XGKB0ICw329UC6QbHthDNXP2WEU=; b=M43E/PVhaIdVLyZVjQrfpFgCLx8g59fEjF6O00ECKHfL40nvunoD7i+wFm+DZcIPcOCyN+ LL+4xA2zF/UtV2na5F2yAu6oeEuRze5VnPzC2MHfmSH3se2Q9cXI336KteduEbA9lYcjGi cuUDGskMcK4WuPv9M+ApztmgT0FqTRYeDb2nD79YeiuMjZLmFoYzbG6GI7CUXPyqnM1KeU yulkcmfsaXlYcFHyTAz9PtFMqL8DrhGag076wnljUSQuzXIkk0onYvYMHXD9Xq81srCNsc ZyFTEYYiG1DmlKJLQtTqJKkruxcjnL1Nq36e7E+vRYhPPcgOjJUPVv7BROOM/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789024; 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=YWbBy7lmK6GxYGD4XGKB0ICw329UC6QbHthDNXP2WEU=; b=pXJXOSDb/yQXSeL3TYL7CyA4ByFY09DnXQcY+RM7Sv8eaTn5ztufBkUHZbxXOymfwzYlVK qk6Fm/x958He9JldtXfTd+KYjR6LSrOi9Zutf9Xw1Yooq216jlxQHfsJMrd4F0GenpyAFK kNMUCDeuXbjl8DR7gA9sjTPDAfutRAiZ1X4ionJjFZo6QyMefFacJPfeA08sKhedxNO1ii OJFCED4qNKDg1Xz60UhzR+QMrta0ZSCVS9xiWsvGkh9DyDYFfyk6qbZDn32NG3t5K551u8 tcUVFRSkdAxRT4NT8WjaEIN6UOp+egQueEMCr8d/+QMJnjA0tMy1f/XK6Epl/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789024; a=rsa-sha256; cv=none; b=W2S18FT/VuRXhtKakSDc1pa8OLEJQEKCVEFS+SpK0UjYYfatGqnaQe8Y5BQ14dsS7PZUPf B891d9DsyIYKCX8Ygb5jb+/bqDUaLAI8ezAOGfZLf2hoQpv8E/guuQShI9RkeUQOs6Ysib 8zbPZXL7mNjdNkvfbX+4zg8gSkQ4vid9hiLT6HwYy41xahvG3qFtSKoS9hizOCrYAef9+1 GXpH+Bt7bIwsGBqIj9sJIV9nQStTyw8b0aiQYrvcSzHD5+vY5aUVltWmdPgvwuYlzSQ7Wx WVTP9RGepDdBuvPh2gUvAkpv/rXr/7ZKouOHJae0hbjqfszg3Czw16lA4Ecl9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCGS3HMWz17VV; Wed, 05 Feb 2025 20:57:04 +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 515Kv4Kv005006; Wed, 5 Feb 2025 20:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kv4Gw005003; Wed, 5 Feb 2025 20:57:04 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:57:04 GMT Message-Id: <202502052057.515Kv4Gw005003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 88844461a715 - stable/13 - TCP BBR: remove dead code 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 88844461a71597a3b57f747cc17b12c5582aa36d Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=88844461a71597a3b57f747cc17b12c5582aa36d commit 88844461a71597a3b57f747cc17b12c5582aa36d Author: Michael Tuexen AuthorDate: 2025-01-06 20:25:58 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:42:09 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: rrs CID: 1523808 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48338 (cherry picked from commit 061727efe1e355fb2fde1b05e92718543d05bfe7) --- sys/netinet/tcp_stacks/bbr.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 1fd41b568e1f..7193978f4ff0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -986,14 +986,6 @@ bbr_timer_audit(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts, struct sock * and we do */ return; - } else if (sbavail(&inp->inp_socket->so_snd) && - (tmr_up == PACE_TMR_RXT)) { - /* - * if we hit enobufs then we would expect the - * possibility of nothing outstanding and the RXT up - * (and the hptsi timer). - */ - return; } else if (((V_tcp_always_keepalive || inp->inp_socket->so_options & SO_KEEPALIVE) && (tp->t_state <= TCPS_CLOSING)) && From nobody Wed Feb 5 20:57:53 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 4YpCHP3wPNz5mNvk; Wed, 05 Feb 2025 20:57:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCHP3PWnz3WN8; Wed, 05 Feb 2025 20:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789073; 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=7dZi0JBn0Vu2EOWobzIbT2r6gZ65HcfO+yiw18bnHzs=; b=Atk4OK2RVy2Mb5pTYBjQTo54+o8IJA7844n5A0W1S8RtBhBvEfuzxU9gJ4uZxyYLr1Savk JshEfw4mabZd0B1RodsEAGt7/GSeU4TTUPWCZPtg2lebGAdNlxS139UA4DH1Rv6r6iPKdw 0V/S6FYxAiv/JeXlPATdnLRhmmGUX0iZ5zvE7oq+8KricxxsiVHISr7AoLR/xZE8v4Jntj tCGNWWsyJRhS2wsmet6kWjg6u3nxckCpwVrjzSuE6NeoYJmdP2S4pUISOxtAOYbpSlrkdc SOZx1fqWHGd1KOREOtz+lPaoA0M2NjnQZlgiDxOzZlL39iKBQbwZiQ5vXIOyjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789073; 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=7dZi0JBn0Vu2EOWobzIbT2r6gZ65HcfO+yiw18bnHzs=; b=wEqFJbBhOxMPB0bJJAjwWLOefPTT6hoi0uNQuVoq/eP0YE7oSOB4nq15oJlSWHbGUN9n2S 6YC3Fvxq7iCYWNqDadoH9DQmAjONtIW2lUu3RACM7J0FUXJTgEckUlRA7lAtwl+N9nlqU0 60a/t2yK/wBoFr41WhmM3DNlWLg5ez3bwlUbMfUmpTNi1XhcFvweTD1WA+clmwSOfYiMZk vA9mrkXMGn+7Eu22z/Hy/jWQkE/JFOkmsjsem6hBwHtiLwsZkFRzNcfO9DMjHUNjzUwVx8 1JCyKfJmttO5z4bCNikjRC22EpxIYBRzige4YST3qUcp9STt6XDOf8oN9nmkhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789073; a=rsa-sha256; cv=none; b=UrIjwWUTCgYQ5K844CBxno3M9GH0aFuh8BXV8CX41u5f3ZpG1p+qRAK9bb1tfHdmQUtnx9 jKWXtJJ6ZOXQIU1BHsj62zfxD86tWgenjR+1a2DMjLA+UvB+6KzEB6w2RQK/Guytw2vn7D ACWcIegDuOrP0GKj3LF8ufQX+BqKL6dn61eDhYRsBqpusf6U/yuY20Y0YLfYCe5R7z8OED uRT9EwJWoSjgQdSBCoR0FZPvxxAS5gsct5rTbllu40eF8MFr3MHCf6/9VcdWJozFTz0yAC NWx/ZJPycaeRXBGg74qXb9648RkshIptxAZxC7e05Fct9tNTE1cJ5IIccflBsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCHP2whcz16Pl; Wed, 05 Feb 2025 20:57:53 +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 515KvrGj005350; Wed, 5 Feb 2025 20:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kvrfd005346; Wed, 5 Feb 2025 20:57:53 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:57:53 GMT Message-Id: <202502052057.515Kvrfd005346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 992f67691ada - stable/14 - TCP RACK: fix TCP_RACK_PACING_BETA socket 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 992f67691ada56b4bd73e2cc1c20d6e6813a88e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=992f67691ada56b4bd73e2cc1c20d6e6813a88e0 commit 992f67691ada56b4bd73e2cc1c20d6e6813a88e0 Author: Michael Tuexen AuthorDate: 2025-01-06 20:38:34 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:58:12 +0000 TCP RACK: fix TCP_RACK_PACING_BETA socket option Bring back the code, which was accidentally removed. While there, indent a comment correctly. Reviewed by: rrs CID: 1540026 Fixes: e18b97bd63a8 ("Update to bring the rack stack with all its fixes in.") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48340 (cherry picked from commit e8ec28047df5185582a95c5211ed75682fad5ec5) --- sys/netinet/tcp_stacks/rack.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a2325b88751b..2fefcdcbf01d 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -24092,14 +24092,13 @@ rack_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) error = EINVAL; } break; - /* - * Beta_ecn is the congestion control value for NewReno that influences how - * much of a backoff happens when a ECN mark is detected. It is normally set - * to 80 for 80% i.e. the cwnd is reduced by 20% of its previous value when - * you exit recovery. Note that classic ECN has a beta of 50, it is only - * ABE Ecn that uses this "less" value, but we do too with pacing :) - */ - + /* + * Beta_ecn is the congestion control value for NewReno that influences how + * much of a backoff happens when a ECN mark is detected. It is normally set + * to 80 for 80% i.e. the cwnd is reduced by 20% of its previous value when + * you exit recovery. Note that classic ECN has a beta of 50, it is only + * ABE Ecn that uses this "less" value, but we do too with pacing :) + */ case TCP_RACK_PACING_BETA_ECN: if (strcmp(tp->t_cc->name, CCALGONAME_NEWRENO) != 0) error = EINVAL; From nobody Wed Feb 5 20: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 4YpCKb1CP0z5mPF5; Wed, 05 Feb 2025 20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCKb0hxrz3X5q; Wed, 05 Feb 2025 20: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=1738789187; 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=OHHZjgpzcB+TeuqUcelMufYF+U96Wa66R0lR6uNpc0s=; b=u3szIBKEb+wm/8bkeDusLnz/CCQFPoAj7FbM4Ceu4OzYJFvoJB+EHUD8QxkI2auaY0Qgdf rfB+MoHiJeInqND366pzF5NdMcE7YWcSH0NURqZpeKuxWI7N5K2eeTETyiZLirmrbqZ74a VfE9hnMgcVoQasH6/+FKu8nw1Lh01Swdr5ZK+PP2b7KdTtlP/M38HUDCqBsmJgt4DoLGIM jqVnBp7OivB3NuCZjlFnO5UmB/priQRuaCBh48EMg5qYN9J9WS3L64+GYJ4fFUa9cLtQWL aPQvSUBvdIAeVBHdL0Q8Ak8nMhhMyxF+zORPP0iyVJRDQZU8Mg+wg56Dt1U6FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789187; 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=OHHZjgpzcB+TeuqUcelMufYF+U96Wa66R0lR6uNpc0s=; b=p5Ma2xtLfbh4LeN1bpxvPXL3ndfG773+iJCMSE9lZTjwtTMXICF12mzrMm2dW7xP5hqTV2 g+tJgxg+cUv59jTbCpRua/lMCcOD/w8QIfAPN65wylB/1+bU91k1IdLxLO9sRRFE7p5YFm 3jF8pWgZwemdLXw+3LKCQPgoPWHP3ZWAqQWm+8TLabtUWFUVMe+OQIBHPIXoo5Q7R10xk0 1V3QdoTYHOMQfHb7eOoaRSShQiSnZRjh3EhGDgRq3mtYbmP681laWGdevTS/pakvSNX0Xf /e/nhaHV8VqFUT1j5vM9t/wHTOTHKH9jILCiUl2HEVCX1mhlK2IDNVoIki+fjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789187; a=rsa-sha256; cv=none; b=aQKMXWpm6NxslycN17TvkfCqw0oVNiMJrMmkuTSM1k3vBFhCoNt2e1YskLICYJ7vW57XBY va6+Lq/rc0nYyHe4EumlC/FlrTR4rxhOeGi4genAjFWhnESbghMKTOCp9JFOIE/gLcH00t uFS6M5YbLtE7IYVdKSBCFXaL1XcWkOfEA9Y7RtcbKli4HJEE2hfWTgmAow0xeZvjml+PR0 e5AiNPxfX3iwY5QwgwUmaIbNsBW5lo1GU37lJtjONYty384FmPvnjlChOMLq6CTc2qwHHd XRomMGvCEKQtXxWRb1KZ7iU/dJFOnXg3s5qKjugKLEUJTpFPWOCyDB36RAe6jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCKZ6tH4z176f; Wed, 05 Feb 2025 20:59: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 515Kxkex006004; Wed, 5 Feb 2025 20: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 515Kxkqx006001; Wed, 5 Feb 2025 20:59:46 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:59:46 GMT Message-Id: <202502052059.515Kxkqx006001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0cc48e631781 - stable/14 - TCP RACK: don't log an uninitialized value 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0cc48e6317819a1ed2bba523b7014940ef2f9b61 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0cc48e6317819a1ed2bba523b7014940ef2f9b61 commit 0cc48e6317819a1ed2bba523b7014940ef2f9b61 Author: Michael Tuexen AuthorDate: 2025-01-08 22:15:54 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 10:00:04 +0000 TCP RACK: don't log an uninitialized value reduce is uninitialized, if the code path for logging is reached via goto old_method;. Reviewed by: rrs, Peter Lei CID: 1557359 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48346 (cherry picked from commit 4c89d59e0cdac4d83fb5841aefae9214545b2273) --- sys/netinet/tcp_stacks/rack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 2fefcdcbf01d..fd8054febb54 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -17699,7 +17699,7 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str * the peer to have a gap in data sending. */ uint64_t cwnd, tr_perms = 0; - int32_t reduce = 0; + int32_t reduce; old_method: /* @@ -17736,7 +17736,8 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str slot -= reduce; } else slot = 0; - } + } else + reduce = 0; slot *= HPTS_USEC_IN_MSEC; if (rack->rc_pace_to_cwnd) { uint64_t rate_wanted = 0; From nobody Wed Feb 5 21:02: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 4YpCPH4rtjz5mP4y; Wed, 05 Feb 2025 21:02:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCPH47HNz3Xrc; Wed, 05 Feb 2025 21:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789379; 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=FPuhQoogiHzTU+VRtsraIGSaPy3WAGNsXm0+DncFPi0=; b=r5gooklk+0w1fVUz1VSvVl97Kf4rrBMhvcxsLzisXCx2dNJ6WYVis/NRLuMgKl/M2+WRBe HcIt9aLMoh3gYqRfj2gLEs7qRh8r6xaYNdG6gih9ncvFcb3s0HTS/9PcwL7E4nZY+mkCkk lRvAjVvfMfchQ5K1sKJYTihz+tpJoWJ3v2YpDTyx0bYlRXfVhZo6YwwWlFiq9KZaLZIUdW QI3zCMIBVlzxhvmNENy+fXmZMapcLK6YbFh6hr6wtkvpuhCtLyV66Cz/ZtVzccvNQs/Dgn 0833lMgjh7wkmprLijDBEMfJt8nhVqJws+cro8jJWByspAX7UM3diC53O4n65g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789379; 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=FPuhQoogiHzTU+VRtsraIGSaPy3WAGNsXm0+DncFPi0=; b=D+pGYD+PRx2Tuu1a+IMvqcsDFCxVvoFEtwyqF9/bB0pwhT9/fvOQuEN3wXsqxhmFV7bJw6 JYfAAuArdwKRVOUto6bNI5k02oC9bYeKN0yQm5WEu4XGqmFZTx7llVT5u1hWix2EUEPyST HOP8QVJ3RE08gbylWi+ezPuBtkE+lZiAL5x+lNTswvGNGuDqdsF3nGCGVGRzF7m6TUKhgR YltlJqjw8O7Xo+EdDa2NOOr/S/BSTduvFKIUZ1ceSd24NXWeMixdGPJ/olUpHqpUXKX797 ZkP35RJdv2pFdGlSzauFeuIVamGOpC61t+qd0ixMvtvESQadYxQJiCV0lX/pOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789379; a=rsa-sha256; cv=none; b=Y5glq/1a4+jXltA7UsGy6EhR0XS5nT4uK3/9eogG/v+vvNmeQn/JOKosXpu9pHqUsbLStz StwIRxXpFSLop0dVzUI6ORu8JPvWHZZmmJ9+i6jg60zzlZYkKgpIwpZzq01TUq0tOskevI Nv5ARg+KsVPNg07kdqdkHU0wy5/8Y/BANHVAfJn45JtkA/zcZzMeVWzp+agETZBnxEcCGX PrgJQQSUZbWnQVD+Oxxg9Va7egfcd58pyRhFaUEviUgssnaM9tCZLoKCn259Sfyw45ESuy 9ishACd5A7ACUqLt/Tm8DrRN4o8U8QvRbJ1OgGdjSN7mlCf4hf/pzAOvKOCdWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCPH3kYPz17B7; Wed, 05 Feb 2025 21:02: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 515L2xfM023200; Wed, 5 Feb 2025 21:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515L2x6A023197; Wed, 5 Feb 2025 21:02:59 GMT (envelope-from git) Date: Wed, 5 Feb 2025 21:02:59 GMT Message-Id: <202502052102.515L2x6A023197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3cf7769f1f18 - stable/13 - TCP RACK: don't log an uninitialized value 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cf7769f1f180ac310c34e6389ee645c5928d808 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3cf7769f1f180ac310c34e6389ee645c5928d808 commit 3cf7769f1f180ac310c34e6389ee645c5928d808 Author: Michael Tuexen AuthorDate: 2025-01-08 22:15:54 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:48:07 +0000 TCP RACK: don't log an uninitialized value reduce is uninitialized, if the code path for logging is reached via goto old_method;. Reviewed by: rrs, Peter Lei CID: 1557359 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48346 (cherry picked from commit 4c89d59e0cdac4d83fb5841aefae9214545b2273) --- sys/netinet/tcp_stacks/rack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index b4c4a6ed85dc..093baca4cf0a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14419,7 +14419,7 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str * the peer to have a gap in data sending. */ uint32_t srtt, cwnd, tr_perms = 0; - int32_t reduce = 0; + int32_t reduce; old_method: /* @@ -14456,7 +14456,8 @@ rack_get_pacing_delay(struct tcp_rack *rack, struct tcpcb *tp, uint32_t len, str slot -= reduce; } else slot = 0; - } + } else + reduce = 0; slot *= HPTS_USEC_IN_MSEC; if (rack->rc_pace_to_cwnd) { uint64_t rate_wanted = 0; From nobody Wed Feb 5 21:03:42 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 4YpCQ647RVz5mPHr; Wed, 05 Feb 2025 21:03:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCQ63X8Tz3YHw; Wed, 05 Feb 2025 21:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789422; 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=FkN1eqcrLYsKPZEXT+eHxmngM/qrC72apVKk32Gpi3A=; b=J7zGCrrOflk7Z8WeaFMhLj2TL7IEeNeDbiT0Q6y5yCoOhDWE0zfolCMj8+Rcm6cemaKU1R IF0z8vLS0p1fjVKs8NaOhioJ3rQr4RELN6w5sFZSlnkiLIKwq9cfFykshmQ+sgwWB31LlE DpzfFp80OrjvRGy7MrMaebgBVTJ90mvLSXu43UJ5VedDiHTWYaiFQ7/rFEydnjrLWeAAxr grCyXkjfDOQNeOv73IyZjwlIgSJjntytlfaqAeHwW3QBN6qokMWrmkLdxdzv8HbvfCjniR dmmPCF3PLDMO6lbfbgD2U57m7oikOcUiRlbpuq6jwj8wNGJ1NOZAC8F/zZNT4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789422; 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=FkN1eqcrLYsKPZEXT+eHxmngM/qrC72apVKk32Gpi3A=; b=RQOjkDaIicnXt2dude5k3sCsqyDadki6VTCy3BMg2CwMNe4CXAoii9SmUpozApdpHz2ffY arkBricc4vw7PSftQfTS22O7ry5TB6/WFY+vRc3/Zqh4h9xvlz2XaMXhiOE9WKGAFZICXS F9nN6wI0I9sR01rKR/YLJGcQeaNYAcilpeji69eLk/dNk0UHGKY87a13ewF3fm8DRb6mA0 zgYKuj4zR3YBaKHk79WrlYkpwajwwGDaQCh4p7kbXQkdLowgExwY/DBq8DWlsZkL1iY8jm dF26Jr6woz8CmRX/LiSQ6KwYbpf0hlhYFkG2Pyc4o1NgScLgwPG7l0qwsBikxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789422; a=rsa-sha256; cv=none; b=SW0WYiY3tnJ1vpA2V/JsVg6qxTmwO7VlhPJ5Nu4/PxcDOvwOtA1lRs7R8DIWjlh/t0nz0p pzvDFDHBYa5YhcSZA0IZ9S6b4jbooyj4ldEfsMT5KFYe74EOFFCsJqcp5LbsiToiT8jKTT PjwL61lXYX159wFRhSyt/Ks6wPh9wM9VBamD04cAo3MVuDqz76SFMCGi76VdIih6hpTNcc VcjTyNJckMd+7DostbYNFBNfVK8FFZvi3h/a4rQA7aiofZJ/LAzz0WKeXDOhcyKQv3FUe2 2hhcnu4sy+MAcDs0Cj3zz33t0BohCC1DhPCEhq2dKavY6uxLbO5W2dmPacsdcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCQ62y0wz17B8; Wed, 05 Feb 2025 21:03:42 +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 515L3gT2023532; Wed, 5 Feb 2025 21:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515L3gmK023529; Wed, 5 Feb 2025 21:03:42 GMT (envelope-from git) Date: Wed, 5 Feb 2025 21:03:42 GMT Message-Id: <202502052103.515L3gmK023529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f28415489639 - stable/14 - TCP BBR: remove dead code 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f28415489639df69d4bcda74c1199a6b062ab5cf Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f28415489639df69d4bcda74c1199a6b062ab5cf commit f28415489639df69d4bcda74c1199a6b062ab5cf Author: Michael Tuexen AuthorDate: 2025-01-09 05:27:05 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 10:04:01 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: Peter Lei, rrs (earlier version) CID: 1523802 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48341 (cherry picked from commit e7fbf52a3e38c4bc4249e6541fe7e42ecc119656) --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index ce13ec9a54a2..66fab54bd010 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6770,8 +6770,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, t = cts - rsm->r_tim_lastsent[0]; else t = 1; - if ((int)t <= 0) - t = 1; bbr->r_ctl.rc_last_rtt = t; bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, 0, BBR_RTT_BY_EXACTMATCH, rsm->r_tim_lastsent[0], ack_type, to); @@ -6812,8 +6810,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, t = cts - rsm->r_tim_lastsent[i]; else t = 1; - if ((int)t <= 0) - t = 1; bbr->r_ctl.rc_last_rtt = t; bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, uts, BBR_RTT_BY_TSMATCHING, rsm->r_tim_lastsent[i], ack_type, to); From nobody Wed Feb 5 21:04:14 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 4YpCQl13vVz5mPfR; Wed, 05 Feb 2025 21:04:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCQl06rXz3Yjn; Wed, 05 Feb 2025 21:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789455; 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=iDheeTJO4zX7qN20qrQLQuBOPlexROTqJs6H4LHBuHk=; b=DpY6B3OXsaceTxv5PeGCL2h57xaaC1ULkycF6yzOkhB453/PLbti9IS4FgegOjm+4As0HD 69XBOZr7KHSPHA80WE4VCDe0q94Neee2efMwxHB4iJJ81uK0Gk7G7eW9VGY/ecDcEDPKi5 Z+jfhgXRH0ucXwEqYXzIZsCEhyiUQivjkq7w7Rv2YZAY3HRFV/X5Q7PQwrH4vQckbPy29V E9t+lX6RMSlf5fpPntGMx4bhyBF+kfz6To5QBBKm/MTtgqjgpbC2WpB1NmpRWPdp90HR1u vP7ScTJclVbqyt0BhOA/sJN+xfW9UtOWK0jZlPs7kH7wEVbwhGYunpbwOYXy0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789455; 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=iDheeTJO4zX7qN20qrQLQuBOPlexROTqJs6H4LHBuHk=; b=T/5A9PqjHcYLF3FMI17dKlWGJv+v//oarorXeONrvSosdUboXRHOXfbdlLetoLy+zT2sYD 49fost+cm63oTMkqIvCU7NFCbb8NEv5QKjdqpW9yVj1PoZ1WkPVG2HCLoPj2gIy1Ez+DR1 cMyf1SDZK8T7AlatgxNFR06HJ3iInSc2b0/U+auV8oghp2AoG/K77zmyyR2bqkQ4fnB9Yr gca7qJqOvhqdpsXMzTjZNjVlerrqIWa6OAjQ9wWUgf7adYaATotAr4CTMd2byG4mlo9F/S z26HvrsCaC900mLSCISqy/PvpMguwAbNpl1qhf2rU+N5GHaQf2P8RcdPSOT2oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789455; a=rsa-sha256; cv=none; b=O/vAWHKQJuQrCMukWHAMo+XIyAIKskeWc0i0aQ7Ax8ihV4l448Td92uJnoh3xtx3G+j3Vq 61EWniDdm2t55CcLWuUUST76/4HOlfeEn/xdfRNpv842ZSqrRrnSO838EskYMIBsFZfrx0 rSmZqJtbeCYrzhtgJVV6YBzJi80HSwsRXSmV9QMARTzmyqV45nKLEaJmPGwJAKssNpQN0H ZHXY9/w+ATJLFgkN8rvy75eoUK4PnybQdgVOrK/udkjz5ZlnFf8cyhAWwC7/A9Gpkp1yGp rS4WDGKD8olvuhDxH4GzWi5FLq9ri2AkOsksZb8N/pfwdQc56RQZhDzG371Vyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCQk6gDLz16x5; Wed, 05 Feb 2025 21:04:14 +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 515L4EaV023815; Wed, 5 Feb 2025 21:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515L4EeS023812; Wed, 5 Feb 2025 21:04:14 GMT (envelope-from git) Date: Wed, 5 Feb 2025 21:04:14 GMT Message-Id: <202502052104.515L4EeS023812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: dc66be9b6258 - stable/13 - TCP BBR: remove dead code 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dc66be9b625829dde2972a16e65af4424a1f629f Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dc66be9b625829dde2972a16e65af4424a1f629f commit dc66be9b625829dde2972a16e65af4424a1f629f Author: Michael Tuexen AuthorDate: 2025-01-09 05:27:05 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:49:29 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: Peter Lei, rrs (earlier version) CID: 1523802 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48341 (cherry picked from commit e7fbf52a3e38c4bc4249e6541fe7e42ecc119656) --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 7193978f4ff0..32ee306f633e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6814,8 +6814,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, t = cts - rsm->r_tim_lastsent[0]; else t = 1; - if ((int)t <= 0) - t = 1; bbr->r_ctl.rc_last_rtt = t; bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, 0, BBR_RTT_BY_EXACTMATCH, rsm->r_tim_lastsent[0], ack_type, to); @@ -6856,8 +6854,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr, t = cts - rsm->r_tim_lastsent[i]; else t = 1; - if ((int)t <= 0) - t = 1; bbr->r_ctl.rc_last_rtt = t; bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, uts, BBR_RTT_BY_TSMATCHING, rsm->r_tim_lastsent[i], ack_type, to); From nobody Thu Feb 6 04:14: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 4YpNzX5dF4z5n0Ph; Thu, 06 Feb 2025 04:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpNzX4kCbz3D35; Thu, 06 Feb 2025 04:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815288; 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=fbcVxPuzFJWugKT8ijyNCvCWjlK7NDELlrQIB0HmxAA=; b=sK/bdKiolQI9sYC6EOWyYRx9Bvgbiy1FByAmArkZOENBOgVixsWKvuPPQb4kdVRzJ2SmwP LziT5vLtT6Spkg7tKcXQijbBTFhUiZcPh9B3aVyjER4cRudhkbjWuwWsWe9AyYnh9LgiDB MhkHgK4469IjG6UisEG9cP98hfWuyn8olkyUpRe2zBpJAQkaaYI5t1EC9pJ+9Nu1MfQPw9 b7cEQSyfcrmipCfbBnpbfeqlNcNqcvKXD5WSJSmoi4Ce5OpCwQXasuyysUOkxMNDOrKjfN sZrIQYamRuixNkJ75quTl8ZmQIG68pdAKBZPH4FGKkVhq4W6bJi/SkiSqApQ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815288; 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=fbcVxPuzFJWugKT8ijyNCvCWjlK7NDELlrQIB0HmxAA=; b=aB2BuhAEBnxT3L87j9wna4dWiuJ/nyl9xrzcGf3EoDeplexm+DNdA/C+CArppx4knUwgWs SryXhgQwgTd+5kH7CCNL7BhOAmzYkfnVABfZzgaoz9EzNfxcxZ7yJW8ELCu2vwFlzB3zbN OH/vCwgFHb/PwRBu8Mo4usHaCP40ab9hrm/ZE5xiJQvvKeSCw/5EvuyBfvtjhQgOsxZ9Vo oLuGlEJMQS4j2KBptrO5kRwF2vqEGL2KsF07h6PPXOPpBORYRnfoIAKbL85a/i5XBoCkcj oSmq8BWJIL37W/Jpbzu57APzFrc98xynPJWuYTN7LL0JZz8yY8cS8KQS7bCTJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738815288; a=rsa-sha256; cv=none; b=iO4F2L7fc949mVORXseoPxpr4oYErSsEAKi7dDuWsirwjMUk1lFK0hV40eaUew5qZgARPR aHuzLbl5zHsIbIU89Wq3XeFFCeakxzAJOq2lqKhVkSh9kuJKgPbD5JeEmGFzOKQEc2NKIx M2XZ1cDehm34LNcGXbx80LNKeLSy5Int4z1ln/TVbyejOov5KJx4vnVuvKX8d75vUC2oSj Mg177503DmctH9w8lJ/KNpVnNJT+8KHRJjiun5rZWGEp1AhBDiRO8oXHMemVKBAZU7HeVC nHIDU++TrFlQqbMqaarAWdrcyiUbVGDQqBbh8xFoHL9UNWPZ0+/xpDop6NdsnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpNzX4GT6z6v7; Thu, 06 Feb 2025 04:14: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 5164EmrS027914; Thu, 6 Feb 2025 04:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5164EmfE027911; Thu, 6 Feb 2025 04:14:48 GMT (envelope-from git) Date: Thu, 6 Feb 2025 04:14:48 GMT Message-Id: <202502060414.5164EmfE027911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1dbcd9a15c9d - stable/14 - vmimage.subr: Redirect etcupdate log to stdout 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4 commit 1dbcd9a15c9dfcb9ce433fa8109c65b8690db7d4 Author: Colin Percival AuthorDate: 2025-01-29 19:38:18 +0000 Commit: Colin Percival CommitDate: 2025-02-06 04:14:21 +0000 vmimage.subr: Redirect etcupdate log to stdout While we're here, send the etcupdate log from generating base.txz to stdout instead of /dev/null (see e972e408d19a) as well. Reviewed by: emaste, gordon, jrtc27 MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D48719 (cherry picked from commit ace4637ee0c666c6f5a1c664f8956f7302234edd) --- release/Makefile | 2 +- release/tools/vmimage.subr | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 152c2edfcf06..d9d5d459b5bf 100644 --- a/release/Makefile +++ b/release/Makefile @@ -142,7 +142,7 @@ base.txz: sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ - -L /dev/null ${NO_ROOT:D-N} + -L /dev/stdout ${NO_ROOT:D-N} .if defined(NO_ROOT) echo "./var/db/etcupdate type=dir uname=root gname=wheel mode=0755" >> ${.OBJDIR}/${DISTDIR}/base.meta sed -n 's,^\.,./var/db/etcupdate/current,p' ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3761faf94810..04c0d5bb2bb5 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -60,7 +60,8 @@ vm_install_base() { mkdir -p ${DESTDIR}/var/db/etcupdate etcupdate extract -B \ -M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ - -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate + -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate \ + -L /dev/stdout sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ -D ${DESTDIR} From nobody Thu Feb 6 04:17: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 4YpP2C1X5Qz5n07c; Thu, 06 Feb 2025 04:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpP2C0tCCz3DPJ; Thu, 06 Feb 2025 04:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815427; 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=e3Ffq3gtq4VleY7Ra0Q13rdVYV0/9wMV9AwEBsn6QH4=; b=wq2CXcQ0htWwwloZmgdAnSRz5EhT6/rXDcc89LfQYgTV+Vd8aVDuw0IgBA/eQmAH5id/gF 5G+Z/zMorcfgt/dJ+jjJtfqRwfygJOZavVFMnv+PbE6S02FgCUmmaEdQP8WFCKetTsg0PC 30JMbYxFPpwjvXV+JpMj/Zd5F0ZL7zT2K5jNs3h6FBUPtA5vmWExVXNIgR9DrxCsFZfz5N FnD24ulx/u3LDiew0Mp/aPnWsBYJnncEF0sYt+htwkYBtip3dqhZ/gWaz1tkwO5SW7tqn6 DS0zrgBkrnlElvk+gQeQK1njT58fAL44op3zYbIlwmxi5yfu9kbxbSk5xDxrrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738815427; 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=e3Ffq3gtq4VleY7Ra0Q13rdVYV0/9wMV9AwEBsn6QH4=; b=ilkehTQQRz4/25/ObDR+xRM33/RhH4ofUGQ61WmMfrQfQG9bS7MDB0Aa4UzYJU+8hwWSyi HslSwYVNfZwGtEewEk/gzTr/iziGt0s/zvzFTWcS7yW8frfnent+UGvT+8iLOL9V2r/C98 G0sX/nKNNvnKUWU5hpbnDIdvVzfUUBuJhz03SKd83eKBSPsjeBUQhIOaPiZFu85LVJhQLA kjvXXP2CjacbFKhEJdha1C+aXkVCwl/HORwS38gKeU5IKQv71ESDiUPRM6dpEqyaW55D7S W18vldnXPyTc2pg7YQXEmkWuqkwVlBQkvMK+tpvsR5VVCiOOP/1RXMQi38Yz5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738815427; a=rsa-sha256; cv=none; b=aAFMTQqeq1MEA148/0UY2kBi1gh4lzSw9wakkF1U3mNGiQiNH1QyuFwHX+HxIIm7JLSjt7 Wcq5eBqKhDvnjBfga6LOCxM5NycLwL76Qhe6nGENO3XWfG7dNrhHxB0oDgX56sKJlg+vKo s61IMMMw18ofW54RFyFJ1sP/IdUnMNmILpUB7CCz3SApgBZircOaaJreXEiNjvoUKgVyGC Z9JR0cxc9yqnYHIunzwaVgwqGU1GHX0WSCNGKym/qMjQaPwNzyXnBezOIQXDw3zRAWjnUC GzqzTkQMMe6EJGGL6oFwSnzYb4Ktmo/RIhzsp1+8QMchiy5ufsN6/IEizYwuuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpP2C0708z6hs; Thu, 06 Feb 2025 04:17: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 5164H6uN028729; Thu, 6 Feb 2025 04:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5164H6Km028726; Thu, 6 Feb 2025 04:17:06 GMT (envelope-from git) Date: Thu, 6 Feb 2025 04:17:06 GMT Message-Id: <202502060417.5164H6Km028726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 00db5c7152e8 - stable/13 - vmimage.subr: Redirect etcupdate log to stdout 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00db5c7152e858aa010feb0f6c981d0cfd5f40ea Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=00db5c7152e858aa010feb0f6c981d0cfd5f40ea commit 00db5c7152e858aa010feb0f6c981d0cfd5f40ea Author: Colin Percival AuthorDate: 2025-01-29 19:38:18 +0000 Commit: Colin Percival CommitDate: 2025-02-06 04:16:23 +0000 vmimage.subr: Redirect etcupdate log to stdout While we're here, send the etcupdate log from generating base.txz to stdout instead of /dev/null (see e972e408d19a) as well. Reviewed by: emaste, gordon, jrtc27 MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D48719 (cherry picked from commit ace4637ee0c666c6f5a1c664f8956f7302234edd) --- release/Makefile | 2 +- release/tools/vmimage.subr | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 9feb4d170a41..2ad822084737 100644 --- a/release/Makefile +++ b/release/Makefile @@ -122,7 +122,7 @@ base.txz: "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \ -D "${.OBJDIR}/${DISTDIR}/base" etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ - -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" -L /dev/null + -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" -L /dev/stdout # Package all components cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR} mv ${DISTDIR}/*.txz . diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index c4daf3039f8a..81ea88255c96 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -62,7 +62,8 @@ vm_install_base() { mkdir -p ${DESTDIR}/var/db/etcupdate etcupdate extract -B \ -M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ - -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate + -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate \ + -L /dev/stdout sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ -D ${DESTDIR} From nobody Thu Feb 6 15:11:12 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 4YpgXx0hYMz5mbLF; Thu, 06 Feb 2025 15:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpgXx04RHz3wQr; Thu, 06 Feb 2025 15:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738854673; 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=ras3Iw5reYYwKPF1njOfke1jtJa5jP4L/97w7JJ853E=; b=sC2RfQGa9LGUTY9LvGC48H9RmIQJkU1LIW5KXIzquaUZIsKsGDSYDQpmFmI1l7BlIBto4Q UzHCXoxIMHZFXylL1YMHkGo//FBM46TTjnArCcXCnfcPmJ5HYKcxI3GU2/rL8jRY2o6MbD Ymk7DLKI0d1eQcgbsc2U4F2KCq0wHuFxF/o2hMquli1shXJsL5r1Dn8v+rOEZQkG+5x2YV kjSpHUPWNZWtz0XF8bvBhA1PxQEugjwWoxfqwAimcfJ/HAAMxng1WlXpTwzeRRFKvjtbCX kOJs2lVV59AY5X87NmGPu3dLm71cnAH4Ve4qQIbwmxsJL3LpSh7FmQtSQcyd+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738854673; 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=ras3Iw5reYYwKPF1njOfke1jtJa5jP4L/97w7JJ853E=; b=t7TkNfW2v1CBOw/542wIgdZGDcMt2JwUPB4PU8PD8qmTVqszvjCXDOr7Q1B4TdLcQK2OrE wFautEalZQ7rCatL1dE9sQyIR5+sSLpKFKQXqoovE4n+sNR4yIYvGMT70hVDeB4KZDCZkd MjLYuKpv4W0Z6Q9iQH/ki83Q91Kh8Nyt4x06h2xwWHG6k2gQnRsq8vOslWlOHf3PedXqX/ 0wnLXT2oeipFRHBEvBg8MEACB1V3E+Nd1d4FexburreKNC/eGeDZ3bStjhRij7WD0LN/gD dWC0of7/JiqB7By5ojEIvdMtXFwV3eY0oZow0ELKXG1ML8MzwlPrYGpIcTUqCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738854673; a=rsa-sha256; cv=none; b=vZlQTO2/T61qsIDdWgnw2+65Vr0DMYLY7qLJUNXqG/s78+UbtbFCEjbLzj4A6VyrVExcsR Djf8nUNVcnIa+hwN0lruhDDpb2+RTpmACALS6j2sdxZN6AB4fgnR1LE39M+69tbVjEllTI tPj4esvK3Ibcrde39UoLcBZVHQZNlxbb6/4dxh7kTFDEZ/GlDo8t+Oh+T+nqYhx+0cPnYa A46Fr0Y6zFXGaFc9jWFBOJsgoGuiihzArrvhfFYgi87hnZccT9p/Hxkbx8rGEhmTGFBs9X 1cr+5Yln3BBq3RkA3ZU+GEh2Uuc7LdErBsu1bkyiwAvWfzD81TweZ4qEAxwWFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpgXw6bwjzkBn; Thu, 06 Feb 2025 15:11:12 +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 516FBCSt057996; Thu, 6 Feb 2025 15:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516FBC2o057993; Thu, 6 Feb 2025 15:11:12 GMT (envelope-from git) Date: Thu, 6 Feb 2025 15:11:12 GMT Message-Id: <202502061511.516FBC2o057993@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: 2a777f20309f - stable/14 - ota: Merge One True Awk 20250116 bsd-feature 2dce54b053d4 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: 2a777f20309f4b4361efefdd4071f2a895d884de Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a777f20309f4b4361efefdd4071f2a895d884de commit 2a777f20309f4b4361efefdd4071f2a895d884de Author: Warner Losh AuthorDate: 2025-02-05 16:26:01 +0000 Commit: Warner Losh CommitDate: 2025-02-06 15:10:46 +0000 ota: Merge One True Awk 20250116 bsd-feature 2dce54b053d4 Jan 14, 2025 Fix incorrect error line number issues. unput has no business managing lineno. Thanks to Ozan Yigit. Jan 05, 2025 Fix hex detection in is_valid_number. Fix indirect field specification with non-numeric string eg. $("foo") in indirect. This is not illegal. Thanks to Arnold Robbins. Jan 01, 2025 Fixed openfile to not try to read from a directory. Thanks to Arnold Robbins. Sponsored by: Netflix (cherry picked from commit dd78d987cb38ef162d40aad86229f1dc19884f78) --- contrib/one-true-awk/FIXES | 14 ++++++++++++++ contrib/one-true-awk/lex.c | 7 ------- contrib/one-true-awk/lib.c | 2 +- contrib/one-true-awk/main.c | 2 +- contrib/one-true-awk/run.c | 15 ++++++++++----- contrib/one-true-awk/testdir/T.errmsg | 3 --- contrib/one-true-awk/testdir/T.misc | 8 +++++++- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/contrib/one-true-awk/FIXES b/contrib/one-true-awk/FIXES index ad8bce2645fd..b3bf38f0aa1c 100644 --- a/contrib/one-true-awk/FIXES +++ b/contrib/one-true-awk/FIXES @@ -25,6 +25,20 @@ THIS SOFTWARE. This file lists all bug fixes, changes, etc., made since the second edition of the AWK book was published in September 2023. +Jan 14, 2025 + Fix incorrect error line number issues. unput has + no business managing lineno. Thanks to Ozan Yigit. + +Jan 05, 2025 + Fix hex detection in is_valid_number. + Fix indirect field specification with non-numeric string + eg. $("foo") in indirect. This is not illegal. + Thanks to Arnold Robbins. + +Jan 01, 2025 + Fixed openfile to not try to read from a directory. + Thanks to Arnold Robbins. + Jul 28, 2024 Fixed readcsvrec resize segfault when reading csv records longer than 8k. Thanks to Ozan Yigit. diff --git a/contrib/one-true-awk/lex.c b/contrib/one-true-awk/lex.c index c135db4dfb67..c97c16ea6567 100644 --- a/contrib/one-true-awk/lex.c +++ b/contrib/one-true-awk/lex.c @@ -225,11 +225,6 @@ int yylex(void) while ((c = input()) != '\n' && c != 0) ; unput(c); - /* - * Next line is a hack, it compensates for - * unput's treatment of \n. - */ - lineno++; break; case ';': RET(';'); @@ -629,8 +624,6 @@ int input(void) /* get next lexical input character */ void unput(int c) /* put lexical character back on input */ { - if (c == '\n') - lineno--; if (yysptr >= yysbuf + sizeof(yysbuf)) FATAL("pushed back too much: %.20s...", yysbuf); *yysptr++ = c; diff --git a/contrib/one-true-awk/lib.c b/contrib/one-true-awk/lib.c index c2ed4f2607ac..27ebca8e7601 100644 --- a/contrib/one-true-awk/lib.c +++ b/contrib/one-true-awk/lib.c @@ -897,7 +897,7 @@ bool is_valid_number(const char *s, bool trailing_stuff_ok, */ #if 0 /* no hex floating point, sorry */ - if (s[0] == '0' && tolower(s[1]) == 'x') + if (s[0] == '0' && tolower(s[1]) == 'x' && isxdigit(s[2])) return false; #endif diff --git a/contrib/one-true-awk/main.c b/contrib/one-true-awk/main.c index 7d3ef84a580f..361c23e70861 100644 --- a/contrib/one-true-awk/main.c +++ b/contrib/one-true-awk/main.c @@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20240728"; +const char *version = "version 20250116"; #define DEBUG #include diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index 286a601f3311..eaddfdecbdd3 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -35,6 +35,7 @@ THIS SOFTWARE. #include #include #include +#include #include #include "awk.h" #include "awkgram.tab.h" @@ -957,16 +958,12 @@ Cell *indirect(Node **a, int n) /* $( a[0] ) */ Awkfloat val; Cell *x; int m; - char *s; x = execute(a[0]); val = getfval(x); /* freebsd: defend against super large field numbers */ if ((Awkfloat)INT_MAX < val) FATAL("trying to access out of range field %s", x->nval); m = (int) val; - if (m == 0 && !is_number(s = getsval(x), NULL)) /* suspicion! */ - FATAL("illegal field $(%s), name \"%s\"", s, x->nval); - /* BUG: can x->nval ever be null??? */ tempfree(x); x = fieldadr(m); x->ctype = OCELL; /* BUG? why are these needed? */ @@ -2373,9 +2370,11 @@ FILE *openfile(int a, const char *us, bool *pnewflag) size_t i; int m; FILE *fp = NULL; + struct stat sbuf; if (*s == '\0') FATAL("null file name in print or getline"); + for (i = 0; i < nfiles; i++) if (files[i].fname && strcmp(s, files[i].fname) == 0 && (a == files[i].mode || (a==APPEND && files[i].mode==GT) || @@ -2386,7 +2385,6 @@ FILE *openfile(int a, const char *us, bool *pnewflag) } if (a == FFLUSH) /* didn't find it, so don't create it! */ return NULL; - for (i = 0; i < nfiles; i++) if (files[i].fp == NULL) break; @@ -2400,7 +2398,14 @@ FILE *openfile(int a, const char *us, bool *pnewflag) nfiles = nnf; files = nf; } + fflush(stdout); /* force a semblance of order */ + + /* don't try to read or write a directory */ + if (a == LT || a == GT || a == APPEND) + if (stat(s, &sbuf) == 0 && S_ISDIR(sbuf.st_mode)) + return NULL; + m = a; if (a == GT) { fp = fopen(s, "w"); diff --git a/contrib/one-true-awk/testdir/T.errmsg b/contrib/one-true-awk/testdir/T.errmsg index ee2450acd1f5..6609223df3f7 100755 --- a/contrib/one-true-awk/testdir/T.errmsg +++ b/contrib/one-true-awk/testdir/T.errmsg @@ -100,9 +100,6 @@ non-terminated string { print "abc } -illegal field $(foo) -BEGIN { print $"foo" } - next is illegal inside a function BEGIN { f() } function f() { next } diff --git a/contrib/one-true-awk/testdir/T.misc b/contrib/one-true-awk/testdir/T.misc index b8ed3c1c45f9..b233d167789e 100755 --- a/contrib/one-true-awk/testdir/T.misc +++ b/contrib/one-true-awk/testdir/T.misc @@ -415,8 +415,14 @@ $awk 'BEGIN \ print "hello, world" } }}}' >foo1 2>foo2 -grep 'source line 4' foo2 >/dev/null 2>&1 || echo 'BAD: T.misc continuation line number' +grep 'source line 5' foo2 >/dev/null 2>&1 || echo 'BAD: T.misc continuation line number' +$awk 'BEGIN { + if () { + print "foo" + } +}' >foo1 2>foo2 +grep 'syntax error at source line 2' foo2 >/dev/null 2>&1 || echo 'BAD: T.misc syntax error line number' echo 111 222 333 >foo $awk '{ f[1]=1; f[2]=2; print $f[1], $f[1]++, $f[2], f[1], f[2] }' foo >foo2 From nobody Thu Feb 6 15:38: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 4Yph8s2vwBz5mchR; Thu, 06 Feb 2025 15:38:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yph8s16hnz44Tt; Thu, 06 Feb 2025 15:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738856333; 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=6WPohXQDZ8/DBg0fTYMCJwsipvlMMbOIeYaaFMkPJes=; b=VJEUR0BrbBRHP/dlRJbLwkxjeIUY/14xsQTpPy4ICMMDGVMVdBGnQy403C3TP+TR0sNisx E5dpykxepSq8CDSDGO07IcqD2prXhZCrS+WmLKWqtStsxb4OMbrnAlqoGOulHyEAcksTG4 XTBDDh0xT05Jgam+NTcLhBjbZOrv2zRcc/R1uh1GwPbmH/LbaicNnc4r29Y7zNkux77+3l 7kiafBzH0YnArBrrhizM4Sb67A63EPASr+Rkyts5h2RLn7FjBPkivBE4bV2J2UTT2DjrnC plXHKctHPp9wj8uoqtV8M/ch0r4FwjZp5phmqANkztar9M9vER94NqGmw06SRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738856333; 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=6WPohXQDZ8/DBg0fTYMCJwsipvlMMbOIeYaaFMkPJes=; b=tGadBgkuDou+kzq98qFnz5+dE8Z6C672NjK1ZKFw4cc2uIyzRb3Tf0iWq4yBp1VOcDHouX OIdzoNzUdPJVjemPgxPppUHUHZFM6t/W6u++Xq7vE5EYOVKu00YYScjVhqFo2O2cQhbaOo s/7mXhUaT3/SK/4ox5z0V3hbb2ht5bnZbQ7HpHAO+cexmxZ8/Avj7q56dTvRZEXXib7hO/ 26SGGQrk//gbL+ZtCfwRcf6VMYQ0GA/skIUxJju6QNjAHTy/z3mn10Am6a29i7Cj2hUeD0 iJSgVgotgWnI2tiYv4U8GElPyRaO4V8E39b0a+tzNVzfAEKRmUaq+olOWYjzMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738856333; a=rsa-sha256; cv=none; b=BWYgBxaif8ESdI0ee2UXlRgZ6iqAon9uJ/14RdnBQqkZsWQG+LRIfbCzfaTsq+RS0IaZxZ 90ds1SUE3Vf9761Gq2i825cWKM+gEMBc1846/FFToEMWCILWNRgHfTf9v2wuhGYMPlOhq5 ohoa0G7WZLITJFQ5SFpshvSbE6LwrlWIrnHMNOq5uv+ZlZtQW0MHJT/aA9l35Y9d7e8No/ svbWHK3UAKvwPtEKbZYjbO+UYtbQKw2nbgauPrYBTiXr/LCIn+slz5+HIHai8TxLZMfAjg 8zcRq9p9MHz9bQ8Qk2nNRW32t0UmebgnfF8GFLRtpqdXoPvBPAZoDWYco5+c8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yph8s0kFQzl9M; Thu, 06 Feb 2025 15:38:53 +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 516FcrA0002430; Thu, 6 Feb 2025 15:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516FcqqH002427; Thu, 6 Feb 2025 15:38:52 GMT (envelope-from git) Date: Thu, 6 Feb 2025 15:38:52 GMT Message-Id: <202502061538.516FcqqH002427@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: 4ef48d172bb1 - stable/14 - sysctl: Refactor function parsefile() 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: 4ef48d172bb11f01174fff871d69623eed59d626 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4ef48d172bb11f01174fff871d69623eed59d626 commit 4ef48d172bb11f01174fff871d69623eed59d626 Author: Zhenlei Huang AuthorDate: 2025-01-30 18:20:41 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 15:38:04 +0000 sysctl: Refactor function parsefile() Let the caller open the file and pass in the file handler. This can benefit an upcoming change so that we will have cleaner logic. No functional change intended. Suggested by: markj MFC after: 1 week (cherry picked from commit 6193855fc76c591ffabe6168cd674e6ec0dafa8e) --- sbin/sysctl/sysctl.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 13161e9a3be4..883923b4a50f 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -67,7 +67,7 @@ static int Nflag, nflag, oflag, qflag, tflag, Tflag, Wflag, xflag; static bool Fflag, Jflag, lflag, Vflag; static int oidfmt(int *, int, char *, u_int *); -static int parsefile(const char *); +static int parsefile(FILE *); static int parse(const char *, int); static int show_var(int *, int, bool); static int sysctl_all(int *, int); @@ -132,6 +132,7 @@ main(int argc, char **argv) { int ch; int warncount = 0; + FILE *file = NULL; setlocale(LC_NUMERIC, ""); setbuf(stdout,0); @@ -227,8 +228,13 @@ main(int argc, char **argv) if (argc == 0 && conffile == NULL) usage(); - if (conffile != NULL) - warncount += parsefile(conffile); + if (conffile != NULL) { + file = fopen(conffile, "r"); + if (file == NULL) + err(EX_NOINPUT, "%s", conffile); + warncount += parsefile(file); + fclose(file); + } while (argc-- > 0) warncount += parse(*argv++, 0); @@ -569,15 +575,11 @@ parse(const char *string, int lineno) } static int -parsefile(const char *filename) +parsefile(FILE *file) { - FILE *file; char line[BUFSIZ], *p, *pq, *pdq; int warncount = 0, lineno = 0; - file = fopen(filename, "r"); - if (file == NULL) - err(EX_NOINPUT, "%s", filename); while (fgets(line, sizeof(line), file) != NULL) { lineno++; p = line; @@ -613,7 +615,6 @@ parsefile(const char *filename) else warncount += parse(p, lineno); } - fclose(file); return (warncount); } From nobody Thu Feb 6 15:38:51 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 4Yph8r3DS0z5mcx7; Thu, 06 Feb 2025 15:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yph8r0b1Mz44Z0; Thu, 06 Feb 2025 15:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738856332; 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=YNoWn15A4Xq4tX6tJabs3rqFeq0MyvgI4WESE9UREZc=; b=hNyO5zJ/WNJ/r7IVCJbbXqlFchSHS+mn4VXzInOt5usapYuKRvEWcibOcrWRl1addpr/5x c/K6FuZg434iquHzvnVgWX4EDFSJVUQBaQNNEQTN1yBpzbyhjNLo4AfcBH4QtgsS928UvJ Sj3RFaSGRHGumo5LxCdBhu4/34xyDYtOvPu6mObg5Te/gKSbnOxX0w+sHUh3+rj57+VT1a AsjZnsoqxAsRZh8qD7EOMdFS687emldkSBChes7fDbhR4xPEzfPh3e5ueXo0Me4j/nbroQ nr/bnID0LV9MeT0GxCr6qm0Lawkndt1QVxD3Ojpgsz6ex+y5GCH0sTAqtkU0RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738856332; 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=YNoWn15A4Xq4tX6tJabs3rqFeq0MyvgI4WESE9UREZc=; b=Zgm9QgPqYNFusauQX0iNcgd9QoDRyY8JSe7KQzz70EHmWCwdGNZJbrn7+6uWJXgvebe2G9 bbKIw7xtp5hZeQfexh9HvV2NrDHkx7s5tlfJp+WcY9sq51uimsTNxFtUyouP5nECm5zy/W avrJPh5WcseHiAvjIKTnkEXxvbsIQlM3UujrHyjk5jOsHOQ58kj/M11c7jaSWEZiOTLbYN pvbi8Hct1cbL4aQshPi0ZinhjvqOjzifgEmjr1wZU8Clg09tWmN0wmLRrA6nBoPXF9Tlou vO8wfVh0/k4vhIJdlFV64yDJGbclcaEOfvUJrP//TVk4ZBexjDZNhoP/hu22Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738856332; a=rsa-sha256; cv=none; b=ppB2JJc5FWGNspPCTRXaxqM7FHs8EpTQwbdWEdgLgLaBulGcnqoeBtFlV/5Mmrn63y3DIx B02bt1TSaeibN9Einwk4N6qpvGj13k65qORxbCgDUD5Yz9zrmnXcu79b+YZf8YyO6CzQgF QHSdYS4YHd5oN56XcCmC0WxOHzm8qH80EStvDUSluDWUlgA2PVL4xTO/tBBujQVszp7NmI JvtPEGXoRWUt4bAfBDCdOyQxsXAQWlPUt819qlbgFk44M/8+cAJtEi2sqTxAc4ojTndO6T 1zaCCOigBMg5znxoPK+w0d5PeoFHMnkr3W5mWunYj8m7RQsqf906D57Me7x6Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yph8q75JXzkxJ; Thu, 06 Feb 2025 15:38:51 +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 516FcpKQ002388; Thu, 6 Feb 2025 15:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516FcpNq002385; Thu, 6 Feb 2025 15:38:51 GMT (envelope-from git) Date: Thu, 6 Feb 2025 15:38:51 GMT Message-Id: <202502061538.516FcpNq002385@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: b709f7b38cc4 - stable/14 - ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail 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: b709f7b38cc4e99fa5cfef6613773a6848ed31c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b709f7b38cc4e99fa5cfef6613773a6848ed31c6 commit b709f7b38cc4e99fa5cfef6613773a6848ed31c6 Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 15:38:04 +0000 ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail This will make it easier to manage address selection policies of vnet jails, especially for those light weighted OCI containers or slim jails. Requested by: dfr Reviewed by: dfr, markj MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D48679 (cherry picked from commit 6dcdd79a251b5e62ff9ce562ad451e92dec39408) --- usr.sbin/ip6addrctl/Makefile | 6 +++ usr.sbin/ip6addrctl/ip6addrctl.8 | 12 +++++- usr.sbin/ip6addrctl/ip6addrctl.c | 85 ++++++++++++++++++++++++++++++++-------- 3 files changed, 85 insertions(+), 18 deletions(-) diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile index 6fc277d39e63..356c524629d8 100644 --- a/usr.sbin/ip6addrctl/Makefile +++ b/usr.sbin/ip6addrctl/Makefile @@ -1,6 +1,12 @@ +.include PACKAGE= runtime PROG= ip6addrctl MAN= ip6addrctl.8 +.if ${MK_JAIL} != "no" +CFLAGS+= -DJAIL +LIBADD+= jail +.endif + .include diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8 index cf8f1db4a8bd..9c7877c1305e 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.8 +++ b/usr.sbin/ip6addrctl/ip6addrctl.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 10, 2024 +.Dd January 29, 2025 .Dt IP6ADDRCTL 8 .Os .\" @@ -37,16 +37,21 @@ .\" .Sh SYNOPSIS .Nm +.Op Fl j Ar jail .Op Cm show .Nm +.Op Fl j Ar jail .Cm add .Ar prefix precedence label .Nm +.Op Fl j Ar jail .Cm delete .Ar prefix .Nm +.Op Fl j Ar jail .Cm flush .Nm +.Op Fl j Ar jail .Cm install .Ar configfile .\" @@ -62,6 +67,10 @@ is invoked without an argument or with a single argument it prints the content of the policy table currently installed in the kernel. .Pp +To operate inside a jail, the option +.Op Fl j Ar jail +should precede other options. +.Pp To modify the table, the following operations are available: .Bl -tag -width indent .It Cm add Ar prefix precedence label @@ -100,6 +109,7 @@ In the configuration file, lines beginning with the pound-sign .Pq Ql # are comments and are ignored. +Note that the configuration file will be processed before attaching to a jail. .El .\" .Sh EXIT STATUS diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index dd5df48048aa..b42a839c62eb 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -36,6 +36,9 @@ #include #include #include +#ifdef JAIL +#include +#endif #include #include @@ -45,12 +48,18 @@ #include #include +#ifdef JAIL +#include +#endif #include #include #include #include #include +#ifdef JAIL +static char *jailname; +#endif static char *configfile; struct policyqueue { @@ -61,6 +70,7 @@ TAILQ_HEAD(policyhead, policyqueue); static struct policyhead policyhead = TAILQ_HEAD_INITIALIZER(policyhead); static void usage(void) __dead2; +static void attach_jail(void); static void get_policy(void); static void dump_policy(void); static int mask2plen(struct sockaddr_in6 *); @@ -75,27 +85,51 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - if (argc == 1 || (argc == 2 && strcasecmp(argv[1], "show") == 0)) { + int ch; + + while ((ch = getopt(argc, argv, "j:")) != -1) { + switch (ch) { + case 'j': +#ifdef JAIL + if ((jailname = optarg) == NULL) + usage(); +#else + errx(1, "not built with jail support"); +#endif + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (argc == 0 || (argc == 1 && strcasecmp(argv[0], "show") == 0)) { + attach_jail(); get_policy(); dump_policy(); - } else if (strcasecmp(argv[1], "add") == 0) { - if (argc != 5) + } else if (strcasecmp(argv[0], "add") == 0) { + if (argc != 4) usage(); - add_policy(argv[2], argv[3], argv[4]); - } else if (strcasecmp(argv[1], "delete") == 0) { - if (argc != 3) - usage(); - delete_policy(argv[2]); - } else if (strcasecmp(argv[1], "flush") == 0) { + attach_jail(); + add_policy(argv[1], argv[2], argv[3]); + } else if (strcasecmp(argv[0], "delete") == 0) { if (argc != 2) usage(); + attach_jail(); + delete_policy(argv[1]); + } else if (strcasecmp(argv[0], "flush") == 0) { + if (argc != 1) + usage(); + attach_jail(); get_policy(); flush_policy(); - } else if (strcasecmp(argv[1], "install") == 0) { - if (argc != 3) + } else if (strcasecmp(argv[0], "install") == 0) { + if (argc != 2) usage(); - configfile = argv[2]; + configfile = argv[1]; make_policy_fromfile(configfile); + attach_jail(); set_policy(); } else usage(); @@ -103,6 +137,23 @@ main(int argc, char *argv[]) exit(0); } +static void +attach_jail(void) +{ +#ifdef JAIL + int jid; + + if (jailname == NULL) + return; + + jid = jail_getid(jailname); + if (jid == -1) + errx(1, "jail not found"); + if (jail_attach(jid) != 0) + errx(1, "cannot attach to jail"); +#endif +} + static void get_policy(void) { @@ -445,12 +496,12 @@ flush_policy(void) static void usage(void) { - fprintf(stderr, "usage: ip6addrctl [show]\n"); - fprintf(stderr, " ip6addrctl add " + fprintf(stderr, "usage: ip6addrctl [-j jail] [show]\n"); + fprintf(stderr, " ip6addrctl [-j jail] add " "