From nobody Mon Sep 1 13:36: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 4cFqfM6drvz66VlC; Mon, 01 Sep 2025 13:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cFqfM64fSz3fG7; Mon, 01 Sep 2025 13:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733803; 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=npPr0/lQsFFeB9NijqhiJ1NXQA9TJTVX7/LL/+kmt3I=; b=x8H2AEd3hOA4HW2LH4A8NZsWW1P5UFj4B4tpszOknbYBiSDN3VwI6ufDy11owEFzla7f6H UENxfiOpxPuPw9O8qjpgVtoIvw0SFWZB1JsX6+Dsh+7znlowUYNVAKJ04ct1v4xdMyGMpw cKZ5v5Rp+vD2Vx+9Fq9rA380XvOGdAJ2GljV43c9WduXCrIRyxo1dcHUF+31HkoZsJzp7d EiMe7FBaffD3flbQgmIiDkdEKSzqBSqc4cMcOV0BHXbPJC0TYsUaLA1Ko7gKDG/KKHpqUG cPxyPTaJVMBJgpgc2a4j9TCmcTnXvyt+4491vrs2lA9IEqaGTJE/nIuKrCrsFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733803; 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=npPr0/lQsFFeB9NijqhiJ1NXQA9TJTVX7/LL/+kmt3I=; b=cF5yPRcK5N2+NVdEPeWuXKFC3mT4Fq1dztQXZy61UQ7/iJxND+NcHTAnOHH8TyEKs7jMKP jWU0rb0ZZsUCU7LAgfGNqWs3I8dt+W07rEZZ+z+kAcX2fFqntPhSqRMnNgXFnTxrk3j0ES sTRs6wgOFr0L21I3cWdLHQrANMBkfUt32IBcBEOomGz7LCnxVMq/x46O3t3liKSXSks2GA CXwUaf9wp9H0TBW/TJMV6BXM8JIFfNuk9LNc1+JCS7rvbduPN1UFh/dRCXMD1flpGyNK/z UPIaN5Sl1Y/VSd0WeTQmFM7mOfQgvxRpomRqQcpXx3qLJXg0iD6Jgck3R09hbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756733803; a=rsa-sha256; cv=none; b=Q0DZMAB1mlsmM4a+owaaXFZpjC216ELckbcgr0l3qpsHTGqQXqAWmsTkjqkdjMaSkXqZ6x kXb/Upzay6gc4X2DBFobELTVF023fBHh/8YJH2hXJpYVrCIepuuCGb11TT35GIHABxlbP/ TKlI4qUlOouvpF91x7mN9CwIzQ7ZGgRqMxhLJAE+UbjlvYkZgmK3IT7raaMuIkVdKd+3XQ 1SHST3E6qyAFB5Z8eiAdGw19v7QOm1uoJSRX8u+Hwejd/xnwGFhbtE/qGWxoeoIY6oMIQK gmu66Qc2H03GYmBpM7pmeJCL1AUWCoeb0k8prvuAeivHIcsz307Zvr51UAJeKA== 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 4cFqfM5g9zz11g5; Mon, 01 Sep 2025 13:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 581DahNu051389; Mon, 1 Sep 2025 13:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581Dah0q051386; Mon, 1 Sep 2025 13:36:43 GMT (envelope-from git) Date: Mon, 1 Sep 2025 13:36:43 GMT Message-Id: <202509011336.581Dah0q051386@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: 135478abe3bc - stable/14 - ifnet: Don't include ethernet.h twice 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: 135478abe3bcac1c5195b7e4d75e9f2d6ab40221 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=135478abe3bcac1c5195b7e4d75e9f2d6ab40221 commit 135478abe3bcac1c5195b7e4d75e9f2d6ab40221 Author: Zhenlei Huang AuthorDate: 2025-08-28 04:29:06 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-01 13:29:42 +0000 ifnet: Don't include ethernet.h twice MFC after: 3 days (cherry picked from commit 393356f25fb8b76e38b10347f0ad40d4a23372ba) --- sys/net/if.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/if.c b/sys/net/if.c index 39854489f5f7..07369c4512cf 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -76,7 +76,6 @@ #include #include -#include #include #include #include From nobody Mon Sep 1 13:36:44 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 4cFqfP0lBkz66Vh7; Mon, 01 Sep 2025 13:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cFqfP01kVz3fCy; Mon, 01 Sep 2025 13:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733805; 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=uBBwHFOx016dm8yK390w6L8HvGA1qJ7RcqSFEDT99nc=; b=dxvRXwOpwUza+0GVHQ9b33SDEMNgd+ESv/40cgIroafJZ9vVFrxOFQOmmlc8cMUSyQB50R eaeA1MzWm3uoTyMZwsjcfB5z0fe+5k7OuAdL45Frnb7nNoPT1DFGGoGaK1fTI+U8E/+SkG WmWq8QoA/ZCXAiwEMpZufzyrb8cxlgNR/dv5dirbd5AgUcdsHyC5oMiEwkrK4l1FEEN8Kh 0NDshDx71vp1BFzxxDIatZ9a4CoC/IdzGAMhVx77fsgQ33nGLn6R7oO9+tQ9G6KayH6dWu hP9mMvw9ZczkSM6aCPL25bVSzfNOf1sMpEIkHe38a9EhXCOVuIscLm+R+Cuxng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733805; 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=uBBwHFOx016dm8yK390w6L8HvGA1qJ7RcqSFEDT99nc=; b=iISIFlU37Nzy+Fjy1yBdNbTDJCTyVTWx27Pxuw52h8F23+qgSV/CRsVpgx322NHThT8Zf6 tOalLXmtBpDJo/Ly+HQ/XJgVBV+Sy7rzDVnWMZr8JiLs39+qIMWLtIuEGn69fsSoxd2PNd 9NIGg67p+036DGwZOpv7iuKEjLDM4T2B6AgIghDzc1AiD/Hmcan66jPhnqZrFdyuqtRzPJ NLw5vCbjriLPppK9rHOGed+kMpDmIMAetlkSvzFzHTDlROB7TIg0wi2AYxq1456+wTHVEm sLfikvcyKWD6OyrwSny6zUzsLgIoMVQWNEq3QrFiizh2XXv8ocLLs1S5133ULA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756733805; a=rsa-sha256; cv=none; b=u4Q6CKsNlpjrgOqaQKl3UgDDMFJC80VFt0P1YQ6Fm0wY3mSO91brYh4AvWAyo32fpTjy4o +TAIxU1wIjSRgMSKg1xzrPNKnpCrB0OS6dK4aAWjleZSWINTTd4f1vMFYjJxJfNimNnPPY ILFZKMT96ujT0pFZd/5nOc3bbLtIatv1YbjRR7QopBc5w1PkewSMOD3EeSloS33TXAzaTV NpBOS3+mlNCjgaMsynZXKKC5dmkVCnC6ypitiw5bBs9hziTjcn+vUhXYfpJdDZYZ5KJGY5 8Pk+YgHm3H8JAriIIf1T+LGDrvzh8lkazrKXaFZaEAUhSmSTOD37tPhcjYq0nA== 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 4cFqfN6dMtz11ZH; Mon, 01 Sep 2025 13:36: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 581DaiRS051422; Mon, 1 Sep 2025 13:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581DaimI051419; Mon, 1 Sep 2025 13:36:44 GMT (envelope-from git) Date: Mon, 1 Sep 2025 13:36:44 GMT Message-Id: <202509011336.581DaimI051419@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: c4e5df1cb25f - stable/14 - vtnet: Do not compare boolean with integer 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: c4e5df1cb25ff2cf588806b482ade663a8ecfdf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e5df1cb25ff2cf588806b482ade663a8ecfdf5 commit c4e5df1cb25ff2cf588806b482ade663a8ecfdf5 Author: Zhenlei Huang AuthorDate: 2025-08-28 15:59:21 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-01 13:29:43 +0000 vtnet: Do not compare boolean with integer The type of variable promisc and allmulti was changed from int to bool by commit [1]. [1] 7dce56596f36 Convert to if_foreach_llmaddr() KPI MFC after: 3 days (cherry picked from commit 80dfed11fc1c61ce9168db01dee263447619e859) --- sys/dev/virtio/network/if_vtnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 0292458bfc40..479c34b4f2ee 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -3814,9 +3814,9 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) if_printf(ifp, "error setting host MAC filter table\n"); out: - if (promisc != 0 && vtnet_set_promisc(sc, true) != 0) + if (promisc && vtnet_set_promisc(sc, true) != 0) if_printf(ifp, "cannot enable promiscuous mode\n"); - if (allmulti != 0 && vtnet_set_allmulti(sc, true) != 0) + if (allmulti && vtnet_set_allmulti(sc, true) != 0) if_printf(ifp, "cannot enable all-multicast mode\n"); } From nobody Mon Sep 1 13:36: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 4cFqfQ3JWTz66VlH; Mon, 01 Sep 2025 13:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cFqfQ0wcNz3fGG; Mon, 01 Sep 2025 13:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733806; 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=0sIZCxUHjBN7OCxHoF9Os9QhbTS2EfvDNQTdF5aOGes=; b=NTJw+5zLcxJt8QdNZYOOnAvy5aymO9BwvsMIo1fYKoJvNsD4I1WmSibW9Ga9UWaxuVvlXj jftv3LAcwNJJ6x3JMYW8Fz6ZVEevfgbvElV+jHMPAbtxteS58w7rF/VV6NCOuRyhSgV3Rh BOQ7BuXy/nhOQexf49+Z05urz37QKj1TWHwVQF+s8H29ZLa0Ro8iFjZyLNpgjNzaD0SOsp FaRrEtcVEj9xUrEBfXRC/iIQeX2yGXhByratd1vrKoNqDN2pcpltR+hoWOBGVitriwUAqH o8RxqGq3CXK31Ec4rpzvcFKzREinrxMwDt1mLzL38cWXJzmh7gs+vHqBj3UL/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733806; 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=0sIZCxUHjBN7OCxHoF9Os9QhbTS2EfvDNQTdF5aOGes=; b=So6raXiqktgs+vGr9B95KL3h7A/ovQfhD6tp82ZSPMSowoPehUAyHIwphM0F9FFApfDfR1 p0n451qO7MHAGYq8zfc1sQAot7ZzA8doXxG1lPf12+metn7XE7t632MX+AidTMsyGTgUAC fuEGMD4ESwa7R2Sk4/fqsf7sBNFOXh7Z+tzzp22+S6KxOS49yk6olKBKKxzOpHQcfme06q 0rZDrKum2cKKKCNZjLRhbAF5/IP/+DKbb98mzdJ862OiDkolHQS2J/uo7ZE8Xb+QPJIqrH S7lYYuLMN5PIRzUcwN4/oEGcqUmDezP4I2Is1PFiBB0NgGqSTCzoZQE4l2TWpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756733806; a=rsa-sha256; cv=none; b=cE60aSsMMWIy6xSkzS8qt09WRTBx1BoF51AydqQPTiKmXrhsIbZJF5cfojIXmmbqwR0C9Q htrLpJaaTWRgCapsyncKfqnXtxI4X3XZ+LhfbtbDzkck01yOLN7F7yG+JNoFJRI/tgqtu1 LbUOtY5gHqiJnApLixrH24xMSZTc5yIX0WeRCzAKoclp+t2d5W43fdjcV1zhnC+5quMP3R CJG//JWrA63Ro7HIOo7lOdQQ+h3j3P3WtTRnB27vry2tSIKm3h9Fj8LLwo0LISkRYYXknX NAo82pUo+pOkX1Lat+LKfpKiPVyTTOuqEKtNDvRmXJaa/oCrC4Y7ZZ5S/v3mfA== 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 4cFqfQ0CQ9z11tn; Mon, 01 Sep 2025 13:36: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 581Dajx1051462; Mon, 1 Sep 2025 13:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581DajF2051459; Mon, 1 Sep 2025 13:36:45 GMT (envelope-from git) Date: Mon, 1 Sep 2025 13:36:45 GMT Message-Id: <202509011336.581DajF2051459@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: 91c0ef0f5a2a - stable/14 - witness: White space cleanup and some style(9) tweeks 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: 91c0ef0f5a2afa17489b603a2f82edaa28e3cce7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=91c0ef0f5a2afa17489b603a2f82edaa28e3cce7 commit 91c0ef0f5a2afa17489b603a2f82edaa28e3cce7 Author: Zhenlei Huang AuthorDate: 2025-08-29 10:00:57 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-01 13:29:43 +0000 witness: White space cleanup and some style(9) tweeks MFC after: 3 days (cherry picked from commit f5377665253b2b107ee8a4690ad2e6682375b304) --- sys/kern/subr_witness.c | 134 ++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 78 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 5b9f8afd9565..58066a738cc2 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -57,7 +57,7 @@ * b : public affirmation by word or example of usually * religious faith or conviction - * 6 capitalized : a member of the Jehovah's Witnesses + * 6 capitalized : a member of the Jehovah's Witnesses */ /* @@ -132,7 +132,7 @@ #define LI_SLEEPABLE 0x00040000 /* Lock may be held while sleeping. */ #ifndef WITNESS_COUNT -#define WITNESS_COUNT 1536 +#define WITNESS_COUNT 1536 #endif #define WITNESS_HASH_SIZE 251 /* Prime, gives load factor < 2 */ #define WITNESS_PENDLIST (512 + (MAXCPU * 4)) @@ -159,20 +159,18 @@ * These flags go in the witness relationship matrix and describe the * relationship between any two struct witness objects. */ -#define WITNESS_UNRELATED 0x00 /* No lock order relation. */ -#define WITNESS_PARENT 0x01 /* Parent, aka direct ancestor. */ -#define WITNESS_ANCESTOR 0x02 /* Direct or indirect ancestor. */ -#define WITNESS_CHILD 0x04 /* Child, aka direct descendant. */ -#define WITNESS_DESCENDANT 0x08 /* Direct or indirect descendant. */ -#define WITNESS_ANCESTOR_MASK (WITNESS_PARENT | WITNESS_ANCESTOR) -#define WITNESS_DESCENDANT_MASK (WITNESS_CHILD | WITNESS_DESCENDANT) -#define WITNESS_RELATED_MASK \ - (WITNESS_ANCESTOR_MASK | WITNESS_DESCENDANT_MASK) -#define WITNESS_REVERSAL 0x10 /* A lock order reversal has been - * observed. */ -#define WITNESS_RESERVED1 0x20 /* Unused flag, reserved. */ -#define WITNESS_RESERVED2 0x40 /* Unused flag, reserved. */ -#define WITNESS_LOCK_ORDER_KNOWN 0x80 /* This lock order is known. */ +#define WITNESS_UNRELATED 0x00 /* No lock order relation. */ +#define WITNESS_PARENT 0x01 /* Parent, aka direct ancestor. */ +#define WITNESS_ANCESTOR 0x02 /* Direct or indirect ancestor. */ +#define WITNESS_CHILD 0x04 /* Child, aka direct descendant. */ +#define WITNESS_DESCENDANT 0x08 /* Direct or indirect descendant. */ +#define WITNESS_ANCESTOR_MASK (WITNESS_PARENT | WITNESS_ANCESTOR) +#define WITNESS_DESCENDANT_MASK (WITNESS_CHILD | WITNESS_DESCENDANT) +#define WITNESS_RELATED_MASK (WITNESS_ANCESTOR_MASK | WITNESS_DESCENDANT_MASK) +#define WITNESS_REVERSAL 0x10 /* A lock order reversal has been observed. */ +#define WITNESS_RESERVED1 0x20 /* Unused flag, reserved. */ +#define WITNESS_RESERVED2 0x40 /* Unused flag, reserved. */ +#define WITNESS_LOCK_ORDER_KNOWN 0x80 /* This lock order is known. */ /* Descendant to ancestor flags */ #define WITNESS_DTOA(x) (((x) & WITNESS_RELATED_MASK) >> 2) @@ -219,20 +217,18 @@ struct lock_list_entry { * (for example, "vnode interlock"). */ struct witness { - char w_name[MAX_W_NAME]; - uint32_t w_index; /* Index in the relationship matrix */ + char w_name[MAX_W_NAME]; + uint32_t w_index; /* Index in the relationship matrix */ struct lock_class *w_class; - STAILQ_ENTRY(witness) w_list; /* List of all witnesses. */ - STAILQ_ENTRY(witness) w_typelist; /* Witnesses of a type. */ - struct witness *w_hash_next; /* Linked list in hash buckets. */ - const char *w_file; /* File where last acquired */ - uint32_t w_line; /* Line where last acquired */ - uint32_t w_refcount; - uint16_t w_num_ancestors; /* direct/indirect - * ancestor count */ - uint16_t w_num_descendants; /* direct/indirect - * descendant count */ - int16_t w_ddb_level; + STAILQ_ENTRY(witness) w_list; /* List of all witnesses. */ + STAILQ_ENTRY(witness) w_typelist; /* Witnesses of a type. */ + struct witness *w_hash_next; /* Linked list in hash buckets. */ + const char *w_file; /* File where last acquired */ + uint32_t w_line; /* Line where last acquired */ + uint32_t w_refcount; + uint16_t w_num_ancestors; /* direct/indirect ancestor count */ + uint16_t w_num_descendants; /* direct/indirect descendant count */ + int16_t w_ddb_level; unsigned w_displayed:1; unsigned w_reversed:1; }; @@ -266,7 +262,7 @@ struct witness_lock_order_data { /* * The witness lock order data hash table. Keys are witness index tuples * (struct witness_lock_order_key), elements are lock order data objects - * (struct witness_lock_order_data). + * (struct witness_lock_order_data). */ struct witness_lock_order_hash { struct witness_lock_order_data *wloh_array[WITNESS_LO_HASH_SIZE]; @@ -296,7 +292,6 @@ struct witness_order_list_entry { static __inline int witness_lock_type_equal(struct witness *w1, struct witness *w2) { - return ((w1->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK)) == (w2->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK))); } @@ -305,7 +300,6 @@ static __inline int witness_lock_order_key_equal(const struct witness_lock_order_key *a, const struct witness_lock_order_key *b) { - return (a->from == b->from && a->to == b->to); } @@ -416,7 +410,7 @@ SYSCTL_INT(_debug_witness, OID_AUTO, skipspin, CTLFLAG_RDTUN, &witness_skipspin, int badstack_sbuf_size; int witness_count = WITNESS_COUNT; -SYSCTL_INT(_debug_witness, OID_AUTO, witness_count, CTLFLAG_RDTUN, +SYSCTL_INT(_debug_witness, OID_AUTO, witness_count, CTLFLAG_RDTUN, &witness_count, 0, ""); /* @@ -761,7 +755,6 @@ static int witness_spin_warn = 0; static const char * fixup_filename(const char *file) { - if (file == NULL) return (NULL); while (strncmp(file, "../", 3) == 0) @@ -836,7 +829,7 @@ witness_startup(void *mem) w_free_cnt--; for (i = 0; i < witness_count; i++) { - memset(w_rmatrix[i], 0, sizeof(*w_rmatrix[i]) * + memset(w_rmatrix[i], 0, sizeof(*w_rmatrix[i]) * (witness_count + 1)); } @@ -990,16 +983,16 @@ witness_ddb_display_descendants(int(*prnt)(const char *fmt, ...), { int i; - for (i = 0; i < indent; i++) - prnt(" "); + for (i = 0; i < indent; i++) + prnt(" "); prnt("%s (type: %s, depth: %d, active refs: %d)", w->w_name, w->w_class->lc_name, w->w_ddb_level, w->w_refcount); - if (w->w_displayed) { - prnt(" -- (already displayed)\n"); - return; - } - w->w_displayed = 1; + if (w->w_displayed) { + prnt(" -- (already displayed)\n"); + return; + } + w->w_displayed = 1; if (w->w_file != NULL && w->w_line != 0) prnt(" -- last acquired @ %s:%d\n", fixup_filename(w->w_file), w->w_line); @@ -1080,7 +1073,6 @@ witness_ddb_display(int(*prnt)(const char *fmt, ...)) int witness_defineorder(struct lock_object *lock1, struct lock_object *lock2) { - if (witness_watch == -1 || KERNEL_PANICKED()) return (0); @@ -1258,7 +1250,7 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file, w->w_reversed = 1; mtx_unlock_spin(&w_mtx); witness_output( - "acquiring duplicate lock of same type: \"%s\"\n", + "acquiring duplicate lock of same type: \"%s\"\n", w->w_name); witness_output(" 1st %s @ %s:%d\n", plock->li_lock->lo_name, fixup_filename(plock->li_file), plock->li_line); @@ -1744,7 +1736,7 @@ found: /* * In order to reduce contention on w_mtx, we want to keep always an - * head object into lists so that frequent allocation from the + * head object into lists so that frequent allocation from the * free witness pool (and subsequent locking) is avoided. * In order to maintain the current code simple, when the head * object is totally unloaded it means also that we do not have @@ -1782,7 +1774,7 @@ witness_thread_exit(struct thread *td) n++; witness_list_lock(&lle->ll_children[i], witness_output); - + } kassert_panic( "Thread %p cannot exit while holding sleeplocks\n", td); @@ -1949,7 +1941,6 @@ found: static void depart(struct witness *w) { - MPASS(w->w_refcount == 0); if (w->w_class->lc_flags & LC_SLEEPLOCK) { w_sleep_cnt--; @@ -2000,18 +1991,18 @@ adopt(struct witness *parent, struct witness *child) child->w_num_ancestors++; } - /* - * Find each ancestor of 'pi'. Note that 'pi' itself is counted as + /* + * Find each ancestor of 'pi'. Note that 'pi' itself is counted as * an ancestor of 'pi' during this loop. */ for (i = 1; i <= w_max_used_index; i++) { - if ((w_rmatrix[i][pi] & WITNESS_ANCESTOR_MASK) == 0 && + if ((w_rmatrix[i][pi] & WITNESS_ANCESTOR_MASK) == 0 && (i != pi)) continue; /* Find each descendant of 'i' and mark it as a descendant. */ for (j = 1; j <= w_max_used_index; j++) { - /* + /* * Skip children that are already marked as * descendants of 'i'. */ @@ -2022,7 +2013,7 @@ adopt(struct witness *parent, struct witness *child) * We are only interested in descendants of 'ci'. Note * that 'ci' itself is counted as a descendant of 'ci'. */ - if ((w_rmatrix[ci][j] & WITNESS_ANCESTOR_MASK) == 0 && + if ((w_rmatrix[ci][j] & WITNESS_ANCESTOR_MASK) == 0 && (j != ci)) continue; w_rmatrix[i][j] |= WITNESS_ANCESTOR; @@ -2030,16 +2021,16 @@ adopt(struct witness *parent, struct witness *child) w_data[i].w_num_descendants++; w_data[j].w_num_ancestors++; - /* + /* * Make sure we aren't marking a node as both an - * ancestor and descendant. We should have caught + * ancestor and descendant. We should have caught * this as a lock order reversal earlier. */ if ((w_rmatrix[i][j] & WITNESS_ANCESTOR_MASK) && (w_rmatrix[i][j] & WITNESS_DESCENDANT_MASK)) { printf("witness rmatrix paradox! [%d][%d]=%d " "both ancestor and descendant\n", - i, j, w_rmatrix[i][j]); + i, j, w_rmatrix[i][j]); kdb_backtrace(); printf("Witness disabled.\n"); witness_watch = -1; @@ -2048,7 +2039,7 @@ adopt(struct witness *parent, struct witness *child) (w_rmatrix[j][i] & WITNESS_DESCENDANT_MASK)) { printf("witness rmatrix paradox! [%d][%d]=%d " "both ancestor and descendant\n", - j, i, w_rmatrix[j][i]); + j, i, w_rmatrix[j][i]); kdb_backtrace(); printf("Witness disabled.\n"); witness_watch = -1; @@ -2125,7 +2116,6 @@ _isitmyx(struct witness *w1, struct witness *w2, int rmask, const char *fname) static int isitmychild(struct witness *parent, struct witness *child) { - return (_isitmyx(parent, child, WITNESS_PARENT, __func__)); } @@ -2135,7 +2125,6 @@ isitmychild(struct witness *parent, struct witness *child) static int isitmydescendant(struct witness *ancestor, struct witness *descendant) { - return (_isitmyx(ancestor, descendant, WITNESS_ANCESTOR_MASK, __func__)); } @@ -2183,7 +2172,7 @@ witness_get(void) STAILQ_REMOVE_HEAD(&w_free, w_list); w_free_cnt--; index = w->w_index; - MPASS(index > 0 && index == w_max_used_index+1 && + MPASS(index > 0 && index == w_max_used_index + 1 && index < witness_count); bzero(w, sizeof(*w)); w->w_index = index; @@ -2195,7 +2184,6 @@ witness_get(void) static void witness_free(struct witness *w) { - STAILQ_INSERT_HEAD(&w_free, w, w_list); w_free_cnt++; } @@ -2220,11 +2208,10 @@ witness_lock_list_get(void) bzero(lle, sizeof(*lle)); return (lle); } - + static void witness_lock_list_free(struct lock_list_entry *lle) { - mtx_lock_spin(&w_mtx); lle->ll_next = w_lock_list_free; w_lock_list_free = lle; @@ -2298,7 +2285,6 @@ witness_voutput(const char *fmt, va_list ap) static int witness_thread_has_locks(struct thread *td) { - if (td->td_sleeplocks == NULL) return (0); return (td->td_sleeplocks->ll_count != 0); @@ -2574,14 +2560,12 @@ witness_setflag(struct lock_object *lock, int flag, int set) void witness_norelease(struct lock_object *lock) { - witness_setflag(lock, LI_NORELEASE, 1); } void witness_releaseok(struct lock_object *lock) { - witness_setflag(lock, LI_NORELEASE, 0); } @@ -2589,7 +2573,6 @@ witness_releaseok(struct lock_object *lock) static void witness_ddb_list(struct thread *td) { - KASSERT(witness_cold == 0, ("%s: witness_cold", __func__)); KASSERT(kdb_active, ("%s: not in the debugger", __func__)); @@ -2654,7 +2637,6 @@ DB_SHOW_ALIAS_FLAGS(alllocks, db_witness_list_all, DB_CMD_MEMSAFE); DB_SHOW_COMMAND_FLAGS(witness, db_witness_display, DB_CMD_MEMSAFE) { - witness_ddb_display(db_printf); } #endif @@ -2674,9 +2656,9 @@ sbuf_print_witness_badstacks(struct sbuf *sb, size_t *oldidx) /* Allocate and init temporary storage space. */ tmp_w1 = malloc(sizeof(struct witness), M_TEMP, M_WAITOK | M_ZERO); tmp_w2 = malloc(sizeof(struct witness), M_TEMP, M_WAITOK | M_ZERO); - tmp_data1 = malloc(sizeof(struct witness_lock_order_data), M_TEMP, + tmp_data1 = malloc(sizeof(struct witness_lock_order_data), M_TEMP, M_WAITOK | M_ZERO); - tmp_data2 = malloc(sizeof(struct witness_lock_order_data), M_TEMP, + tmp_data2 = malloc(sizeof(struct witness_lock_order_data), M_TEMP, M_WAITOK | M_ZERO); stack_zero(&tmp_data1->wlod_stack); stack_zero(&tmp_data2->wlod_stack); @@ -2751,12 +2733,12 @@ restart: sbuf_printf(sb, "\nLock order reversal between \"%s\"(%s) and \"%s\"(%s)!\n", - tmp_w1->w_name, tmp_w1->w_class->lc_name, + tmp_w1->w_name, tmp_w1->w_class->lc_name, tmp_w2->w_name, tmp_w2->w_class->lc_name); if (data1) { sbuf_printf(sb, "Lock order \"%s\"(%s) -> \"%s\"(%s) first seen at:\n", - tmp_w1->w_name, tmp_w1->w_class->lc_name, + tmp_w1->w_name, tmp_w1->w_class->lc_name, tmp_w2->w_name, tmp_w2->w_class->lc_name); stack_sbuf_print(sb, &tmp_data1->wlod_stack); sbuf_printf(sb, "\n"); @@ -2764,7 +2746,7 @@ restart: if (data2 && data2 != data1) { sbuf_printf(sb, "Lock order \"%s\"(%s) -> \"%s\"(%s) first seen at:\n", - tmp_w2->w_name, tmp_w2->w_class->lc_name, + tmp_w2->w_name, tmp_w2->w_class->lc_name, tmp_w1->w_name, tmp_w1->w_class->lc_name); stack_sbuf_print(sb, &tmp_data2->wlod_stack); sbuf_printf(sb, "\n"); @@ -2824,7 +2806,6 @@ sysctl_debug_witness_badstacks(SYSCTL_HANDLER_ARGS) static int sbuf_db_printf_drain(void *arg __unused, const char *data, int len) { - return (db_printf("%.*s", len, data)); } @@ -3069,7 +3050,7 @@ witness_lock_order_get(struct witness *parent, struct witness *child) & WITNESS_LOCK_ORDER_KNOWN) == 0) goto out; - hash = witness_hash_djb2((const char*)&key, + hash = witness_hash_djb2((const char *)&key, sizeof(key)) % w_lohash.wloh_size; data = w_lohash.wloh_array[hash]; while (data != NULL) { @@ -3090,7 +3071,6 @@ out: static int witness_lock_order_check(struct witness *parent, struct witness *child) { - if (parent != child && w_rmatrix[parent->w_index][child->w_index] & WITNESS_LOCK_ORDER_KNOWN && @@ -3116,7 +3096,7 @@ witness_lock_order_add(struct witness *parent, struct witness *child) & WITNESS_LOCK_ORDER_KNOWN) return (1); - hash = witness_hash_djb2((const char*)&key, + hash = witness_hash_djb2((const char *)&key, sizeof(key)) % w_lohash.wloh_size; w_rmatrix[parent->w_index][child->w_index] |= WITNESS_LOCK_ORDER_KNOWN; data = w_lofree; @@ -3135,7 +3115,6 @@ witness_lock_order_add(struct witness *parent, struct witness *child) static void witness_increment_graph_generation(void) { - if (witness_cold == 0) mtx_assert(&w_mtx, MA_OWNED); w_generation++; @@ -3144,7 +3123,6 @@ witness_increment_graph_generation(void) static int witness_output_drain(void *arg __unused, const char *data, int len) { - witness_output("%.*s", len, data); return (len); } From nobody Mon Sep 1 13:36: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 4cFqfR4lRjz66Vnc; Mon, 01 Sep 2025 13:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cFqfR2fglz3f4s; Mon, 01 Sep 2025 13:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733807; 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=jpp870z7c4QkD6sf2bUX5RekHKXnpNjv9ubjtY1w6vk=; b=RSl2y5hpF8tu18BzL459FQK2aOKckuVtjQur6gkZMef7O4zMzTeOBNLXqZpgJKPXvHiDNX 8kZnbAFXlWRT6Qfon68O4GgHSNSahvvNEzaoXZHoCQra6fMGFUWJuTKWyXrXA4d/WIuXUC w2OZ/tnh9+x5C4nrNW89maz6/5JNkHG6YPPEmATwxV9owCmrFMc9azOeTwz7kTmc4px2QS UpupUrpvuCMc0ugCGK7oDeu1F1t8XDflJV9rx6jxd8MVo9BmwVmoAYPbXfXiCWPXFtIrB4 2oA0fr0HvGHUnuYh+xgFh2KNvhO4GQ35ImLEhiQTW8ZfzVXqZ3W/eXVZ2a1HOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756733807; 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=jpp870z7c4QkD6sf2bUX5RekHKXnpNjv9ubjtY1w6vk=; b=IEHVyYua1i+WBIsbHLZaGoRS2u+2csLEi60JbCr8u/oj/OukY6laG+zHk85bf7qUajA2Mz FLSzCSWlEi/0cNH+IW9T/9/8vxVon//4gmazfygn1BuHN/4hJBO/9rhZK4VisFXw5PRog0 EZD0S49tz/yXZ2lM2W3BeUSx4dbHKGkZUudTsoL3IavlKFQ0htZWsjmMzTS82wrPWFSwIn z7Ylo/W5cXvBQRiCig2+uAl0m627/B0Ay9eovgBHfRQ5tvPOXWA0joF/VQKK2oIMH9845w 5DpYVo7pEZddhC8ErXwOWwkSZZvELLlvRtyYOoLKvIjXN9+DwEz+ZN5B8EOF0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756733807; a=rsa-sha256; cv=none; b=R7luzEchL4NeIB3y/qfkuC9RAzn2Up8UmC+SzFmszdcUzzPmu5miL0+AUmeODnYi2z/uqm eqmRTbrLhm6+SoZTUxieXyckcZXAA+R+NxY7ZdsUStGElZn0QSMByFDRu/VXbAVz/BPeE4 i6tIGxEFsIBPx7FN0J7OMf5Qq6SJPAK+HfAyWmoL2QiKoO9/TDOKJeXCDoY6bsQ0o5LVlI /Vw9IK+QkTY9bizw9EngbBE5Be5F5LOBJ5WiwMYNeCF92EfETx7tYcMGBgAOV+Dkg8wSXr Y27e/wBpu2bK5wYs+9oFcwiTYgTHzPwNFyDDwERyHqXwbletMNvaNS6StiqLdA== 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 4cFqfR0l7Xz11g6; Mon, 01 Sep 2025 13:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 581DalJj051496; Mon, 1 Sep 2025 13:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581Dalbu051493; Mon, 1 Sep 2025 13:36:47 GMT (envelope-from git) Date: Mon, 1 Sep 2025 13:36:47 GMT Message-Id: <202509011336.581Dalbu051493@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: 00d474e24217 - stable/14 - git-blame-ignore-revs: witness white space cleanup and style(9) tweeks 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: 00d474e24217870bf0c237dd3cfed31196230503 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=00d474e24217870bf0c237dd3cfed31196230503 commit 00d474e24217870bf0c237dd3cfed31196230503 Author: Zhenlei Huang AuthorDate: 2025-08-29 10:01:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-01 13:31:32 +0000 git-blame-ignore-revs: witness white space cleanup and style(9) tweeks Hash is updated to match MFC commit. MFC after: 3 days (cherry picked from commit 2ddb9cbe42039ccbf8de96c8d3e74e94c14c9560) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 22cddb7b766d..cfb69d1f45e8 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,6 +8,8 @@ # # This file is sorted in git log order (newest commits first). +# witness white space cleanup and style(9) tweeks +91c0ef0f5a2afa17489b603a2f82edaa28e3cce7 # iflib style tweaks a2989d11eabeb869b8c845a097d4214755d9a99f # queue(3) single space after all #define From nobody Mon Sep 1 14:16:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cFrWv2WFsz66ZYX; Mon, 01 Sep 2025 14:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cFrWv1WSMz3lTX; Mon, 01 Sep 2025 14:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756736171; 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=U28Y6o4N4dKDsadXnmqcRgUK8qOsY9qmMDp4rcqlbIw=; b=PR0xr1fAZTkCFiW+1PcKkIxj87rKsIlQ8zh8lf528/PJTtlYeL/lLTm/7wtSdMK9QZXZWU wuG46PC7jbQwqOzeJzEMchrCweWVdemAGQeiCyuFx5nSFkrNYFfg+BF878YcSgOnfB6aux hAr8RlmJPa2dGQN0RX30hhLPAjtumdRCu7KYHja2cYCHt9iAZIKKs2ShiY8lE7epn23I3V RA3PzVrb/SZRGlTkG7pGNR2F7wBjVPZRNj7k6lBr7WszUKjeqkruRNnNzXg/BOOO0CNJWr OgSDI7gyGLEKrNIH64SgkmRlVg0iPZrOIFdPtDZ2e3QMuaCY/K/O7d8bRtsYmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756736171; 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=U28Y6o4N4dKDsadXnmqcRgUK8qOsY9qmMDp4rcqlbIw=; b=X8oWef26IC+74dm60h0ll5SMQ1oVMZnUlPJonngulwVTk2EYkgwVHUcTu8bKA6b7SbY7Mj Qv67CN3FM4lNA59K351IbBDgNOzm1eD/sIp/OXPPV3yOKt9UIMJuAdHAjQB0mjtKtYzN8M OssxXe5nTZuj/hDXtPhqo7L6WA63h7TDnThant4nQNqQMeh4N0mzY8jvPRVnfDtKUX3Fu2 o9F7ALFDzH4vACM1GtbOT0SBlwCjHvInrkiGM9tcuwBO7njCRrGQbHl0WC0NMzztHASRjA qQRpcG/YMaH76qsXLlSXR2vBp7R03lBZRXETnKss0IGX4231SBN/EknMDBgf9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756736171; a=rsa-sha256; cv=none; b=jdYpp18wUwPYG49pqKe+r5QNQpAu+m0hTq9wTJOWQM0TY4xFyTGRKGL1QxljmRWwOJ58eD 3C9I2LXiUqBPL6F/+nPWVxwsD96KSirzf5PkN+wlACaG2wo5qQ/isvgG98Jy6It854jHRR LdsYDAfjMjGwe0Vltfp+B7fGJ50VQ9lWwQYSFpbKLB1Wl+0gZ146vAtVVqSJ0+/lQ1TjoR BhY1LHoNX26BciscovifLws3Lhpp7ye6ttLzYvhLJdRzMykETeN2FY+4WwRvmPpgx1QpZE 2fCSHYlGxaM9a5KXXtE7YJGhA2zKDeoiTdQxsRSU1KNebcp3BOI8PwFCulQcsQ== 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 4cFrWv16DKz12Vs; Mon, 01 Sep 2025 14:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 581EGBUG026663; Mon, 1 Sep 2025 14:16:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581EGB6K026660; Mon, 1 Sep 2025 14:16:11 GMT (envelope-from git) Date: Mon, 1 Sep 2025 14:16:11 GMT Message-Id: <202509011416.581EGB6K026660@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: eb808098834b - stable/14 - route(8): fix `route not found` exit code and warn with netlink 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: eb808098834bc0997fcbe7ca9d7ff12663eff9d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=eb808098834bc0997fcbe7ca9d7ff12663eff9d0 commit eb808098834bc0997fcbe7ca9d7ff12663eff9d0 Author: R. Christian McDonald AuthorDate: 2023-09-19 16:46:49 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-01 14:14:43 +0000 route(8): fix `route not found` exit code and warn with netlink Fix route(8) incorrectly returning a zero exit code even when unable to find the specified route with route -n get . PR: 274426 Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41882 (cherry picked from commit 2a78083fc2a14af863afb098925b0682698a2838) --- sbin/route/route_netlink.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 2870d256aadd..610918f51f30 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -271,22 +271,27 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs hdr = snl_read_reply(ss, hdr->nlmsg_seq); if (nl_type == NL_RTM_GETROUTE) { - if (hdr->nlmsg_type == NL_RTM_NEWROUTE) + if (hdr->nlmsg_type == NL_RTM_NEWROUTE) { print_getmsg(h, hdr, dst); - else { - snl_parse_errmsg(ss, hdr, &e); - if (e.error == ESRCH) - warn("route has not been found"); - else - warn("message indicates error %d", e.error); + return (0); } - - return (0); } - if (snl_parse_errmsg(ss, hdr, &e)) + if (snl_parse_errmsg(ss, hdr, &e)) { + switch (e.error) { + case (ESRCH): + warnx("route has not been found"); + break; + default: + if (e.error == 0) + break; + warnc(e.error, "message indicates error"); + } + return (e.error); + } } + return (EINVAL); } From nobody Mon Sep 1 20:15: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 4cG0Vs1mlZz678cR; Mon, 01 Sep 2025 20:15:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cG0Vs15txz3fFN; Mon, 01 Sep 2025 20:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756757749; 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=qW9lf7z6+hYuZKAF0GhU51HasIG4HTBZENNRvrfX8b0=; b=CdWw0Ry6Nz+Is0SgiP0+S5UjEHf/v0jwLnB3/C7JP2DzWKthrRK5x2ZHIoIPeGYdstySio 3g9ekJ+R0nX4+IfTpt6Ft1pdb9BSjTlL7TCFKmDRwKShWFhquzQIi1YlHLTn+vjg5flSBz 1STIhePhxgvufXza7qc/ZULrZ4SXfjf7vE8ffstg8wwtUkrsw4x78DbJrH/u81/fHU+3MC bcLbYEez1tGCKka8K3eYtPEnD7qaPXTgfxlAg2NT1t6S7UgjWImjb5C78DnKHvxPG/CQk6 82R8vp47AFQ6e7FAIwraTclazZZMyI5Hv9rwElvgZw1kK6v2qEGb/Ei+JpDFSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756757749; 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=qW9lf7z6+hYuZKAF0GhU51HasIG4HTBZENNRvrfX8b0=; b=egDse6JiFKwaOQKyomGUcSmEI5F12550nl7FdAeMlz9PkoHcRqh2613lw5hd71yRXYVRgX xTXqbRPDMHQ/VOCczrLok40TF24uBJ78EeO3PvZymFT1NVUk8hpXRr4AM9EnVtGVA/mFFx j7vE400sOoanGhfap847dPsk912+eNqSvMKyrpzN+/9bh25l+a/PeaOyeXLauhQsGHvOdV jzbTl9KgL1ZOzZA0PPLDZpFKqFup54pi375QDyw65PLNj6kYxKSbgS40PIEa6mQjpz84nh aClS+e7Z+I8y4e1TXaRs2d3W0U7EYixImzcKfFEP6COrGjDwvK3pWxHJuQhd4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756757749; a=rsa-sha256; cv=none; b=SVXL7rNm/huduyjVbd8KSkjlsRhtdVIIMeAQSFfG4j2gMXktEahPUtWQ1kNa+BBo6Rs6JF XC6Dhchl5PSnYzTaS+oTu68CWlyzcvwd01fXnNQmM/wn4VKLHXjB/m+EWf0yos1FvOKLUa Ck0rDZbFFVk7yvKdFMDUkBUMAw5LaQCrdbErt9hi9UAlIv1Uj5hua/5HfMkINOdjXuszUq O3uZpEbiatsPwt6dRZcgmSh1lULmHuaWpIHKDtKSdhzLeFKej6Xsvk1pDCf1TsnGBz1Uwj ixRJ2sUu2Kc0d3nu/Vonx79Qlfs9co6skNg8/n2u+AUXQV32gNUGn2nO1XSZ4A== 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 4cG0Vs09zWzKv; Mon, 01 Sep 2025 20:15:49 +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 581KFmAX007796; Mon, 1 Sep 2025 20:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581KFmqj007793; Mon, 1 Sep 2025 20:15:48 GMT (envelope-from git) Date: Mon, 1 Sep 2025 20:15:48 GMT Message-Id: <202509012015.581KFmqj007793@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: 4558fc4f91dc - stable/14 - Merge commit 7a66a26658f4 from llvm git (by Fangrui Song): 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: 4558fc4f91dc1d3909083ea664b384595f66c3ae Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4558fc4f91dc1d3909083ea664b384595f66c3ae commit 4558fc4f91dc1d3909083ea664b384595f66c3ae Author: Ed Maste AuthorDate: 2025-08-28 12:48:17 +0000 Commit: Ed Maste CommitDate: 2025-09-01 20:15:35 +0000 Merge commit 7a66a26658f4 from llvm git (by Fangrui Song): --discard-locals/--discard-all: allow and keep symbols referenced by relocations In GNU objcopy, symbols referenced by relocations are retained. Our COFF (https://reviews.llvm.org/D56480) and Mach-O (https://reviews.llvm.org/D75104) ports port the behavior, but the ELF port doesn't. This PR implements the behavior for ELF. Close #47468 (tcl has a use case that requires `strip -x tclStubLib.o` to strip local symbols not referenced by relocations.) Pull Request: https://github.com/llvm/llvm-project/pull/130704 PR: 258820 Approved by: dim Differential Revision: https://reviews.freebsd.org/D52198 (cherry picked from commit 959806e0a8448ef5df372468b8deddc20d976702) --- .../llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp b/contrib/llvm-project/llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp index 075455c03415..7de9b4dd2ea1 100644 --- a/contrib/llvm-project/llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp +++ b/contrib/llvm-project/llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp @@ -368,7 +368,7 @@ static Error updateAndRemoveSymbols(const CommonConfig &Config, // (like GroupSection or RelocationSection). This way, we know which // symbols are still 'needed' and which are not. if (Config.StripUnneeded || !Config.UnneededSymbolsToRemove.empty() || - !Config.OnlySection.empty()) { + !Config.OnlySection.empty() || Config.DiscardMode != DiscardType::None) { for (SectionBase &Sec : Obj.sections()) Sec.markSymbols(); } @@ -390,22 +390,23 @@ static Error updateAndRemoveSymbols(const CommonConfig &Config, if (Config.StripDebug && Sym.Type == STT_FILE) return true; - if ((Config.DiscardMode == DiscardType::All || - (Config.DiscardMode == DiscardType::Locals && - StringRef(Sym.Name).starts_with(".L"))) && - Sym.Binding == STB_LOCAL && Sym.getShndx() != SHN_UNDEF && - Sym.Type != STT_FILE && Sym.Type != STT_SECTION) - return true; - if ((Config.StripUnneeded || Config.UnneededSymbolsToRemove.matches(Sym.Name)) && (!Obj.isRelocatable() || isUnneededSymbol(Sym))) return true; - // We want to remove undefined symbols if all references have been stripped. - if (!Config.OnlySection.empty() && !Sym.Referenced && - Sym.getShndx() == SHN_UNDEF) - return true; + if (!Sym.Referenced) { + if ((Config.DiscardMode == DiscardType::All || + (Config.DiscardMode == DiscardType::Locals && + StringRef(Sym.Name).starts_with(".L"))) && + Sym.Binding == STB_LOCAL && Sym.getShndx() != SHN_UNDEF && + Sym.Type != STT_FILE && Sym.Type != STT_SECTION) + return true; + // We want to remove undefined symbols if all references have been + // stripped. + if (!Config.OnlySection.empty() && Sym.getShndx() == SHN_UNDEF) + return true; + } return false; }; From nobody Tue Sep 2 14:09: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 4cGSKK0TDqz66mmF; Tue, 02 Sep 2025 14:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGSKJ6md7z3ht9; Tue, 02 Sep 2025 14:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756822149; 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=HncT726frYPMrRoD1Opv3oXmc6XRuamlaecOw466Ymo=; b=JQHwZlZ8DcNTC4aX8PHU7a4Y+7nfKNlEWGEOSvg9Fb5NEAb95How+N18TRZGhROuMMRa0y nibnbqXHjB2Kii1XpbFMJqlobY7MwVnO92Viwy5bdzQkuInC3CDfXXF29bQHFE2ayw4ihk 8mVn2JMMrVxubyO46KfvWoxFFK98A/yPwr0s/wklrmbXoMq63SRfyKpicZSpqZ81ekVEyK S4m5WASB3JHmrNSbSW6SgZI+STyrDPj6NRxOBO6JaGMWWKc0i3BSRPybHefxshXid5NG2d Iu4D0SRKPlbpKMHtQxnXvfeaUTUy6bljVhQuIeYLw9S1rXnd+MnTLzG1uxm0PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756822149; 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=HncT726frYPMrRoD1Opv3oXmc6XRuamlaecOw466Ymo=; b=wsY86OniBCRJHcZhTbCGElvHIovI6I1mlB8FsviaNfczWaPRcACAw7M3U2tnZq5R5e/a7q dvGSQ3M71F7xWvMV5tZtUZ7YIBBpOIBhYqbrF3g3fJViTnFVb+ZhtjxqxaLk+KWvCmgu2M M1Y7QeAHVsnpztm2LQmcL1isdcagIQwsFcxDEnKMJPoq/ziVzEY9Wt82MoMXGpw0tpJ+qY yzY04ldbc375DuIaHBoixD6pUzatFtHryzA37qJYeFPPwxs9rNX94o/vV7Y9OEgvQpffx6 WcQFH4kiJKGA3PNfwB88/p+R/KHlZyTJ6wihudQZRq2s3Tey8WxoAtU1KStnvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756822149; a=rsa-sha256; cv=none; b=GIbEHMdWLShPXpUx6G6Id4haDwLdx/U/GMEpFFSqQ8KBca0pPq+CpFOhFFaZTL3i6CNUQF MDr55TVHaK7kk0QGGwXAIwi5eXG/XXUGxvU5UaF+VPab7LWYqjOGZGdwuqT2mksb3m37ZN 1hboMragQteyQDXz+EGPFj1uhumlqMfyQxMEgMKx/OYCG4QuE2ExPUcHAb0OXD9H0eWZA3 bfI3gDWNbv9FLhanBwHf3ePjbwL0+4vIvr1W0rI8FPaGSJ/st9oEV5SaIkoUhFdluU/25Q yLaO5VIJf0oDwPfp1wbH4BwBFL/t4lllgfgH99VycECOd2JJUX+XWqxj5dTKBw== 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 4cGSKJ5td1zpqv; Tue, 02 Sep 2025 14:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 582E98Tf025093; Tue, 2 Sep 2025 14:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582E98Ot025090; Tue, 2 Sep 2025 14:09:08 GMT (envelope-from git) Date: Tue, 2 Sep 2025 14:09:08 GMT Message-Id: <202509021409.582E98Ot025090@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: 6ec314485100 - stable/14 - tests: xfail readelf phdr count test w/LLVM binutils 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: 6ec314485100d738c818269e9545ce08fe42d000 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6ec314485100d738c818269e9545ce08fe42d000 commit 6ec314485100d738c818269e9545ce08fe42d000 Author: Ed Maste AuthorDate: 2025-03-28 20:13:27 +0000 Commit: Ed Maste CommitDate: 2025-09-02 14:08:52 +0000 tests: xfail readelf phdr count test w/LLVM binutils LLVM readelf does not (yet) support phdr counts that overflow 16 bits. Temporarily xfail this test until fixed; see upstream issue 132216 for more details https://github.com/llvm/llvm-project/issues/132216. PR: 285547 Reported by: markj Reviewed by: dim, markj Sponsored by: The FreeBSD Foundation Fixes: 1cae7121c667 ("Enable LLVM_BINUTILS by default") Differential Revision: https://reviews.freebsd.org/D49561 (cherry picked from commit 5df8159d56a681e388a2fff1c1c24a4830b741d6) --- tests/sys/kern/coredump_phnum_test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/kern/coredump_phnum_test.sh b/tests/sys/kern/coredump_phnum_test.sh index e01c5d86a252..a1337d5ad1fb 100644 --- a/tests/sys/kern/coredump_phnum_test.sh +++ b/tests/sys/kern/coredump_phnum_test.sh @@ -80,6 +80,11 @@ coredump_phnum_body() atf_fail "Helper program did not dump core" fi + if readelf --version | grep -q LLVM; then + atf_expect_fail "PR285547: llvm-objdump does not support large phdr count" + # See https://github.com/llvm/llvm-project/issues/132216 + fi + # These magic numbers don't have any real significance. They are just # the result of running the helper program and dumping core. The only # important bit is that they're larger than 65535 (UINT16_MAX). From nobody Tue Sep 2 14:52: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 4cGTHK55Gsz66r2r; Tue, 02 Sep 2025 14:52:29 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGTHK4SDdz3pVX; Tue, 02 Sep 2025 14:52:29 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756824749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tYWb9KAXd48FPYJu4JeTopsHH+jL89xhlDVBLk0zRxM=; b=K6T7iZ0+h2joUTH8NWhKdK3kr+IAbJzONJ2HZUiHxq/R/MAaZBbSf+zddu0kkFd46MQVRv vUv3lUnqieKy7oKQ8DGWmxYoVk6gAD3R+yhHIHN/u6Ykl6nrHOH6aUp4Y9+iVDVZl2tPW5 mE6umbdVYI5yqfmTWExU8Xq+foANcx1nveGpPQQI/FBEqG+NQUOdCJ1+Z1AFgA+epwkq/A 2V9XmUiKQIWuFUnhQUxCWv42ycezh4JJSHH+L6AUshxeqytCivnBMEM4PNFT7x/m4Q1t1M H2ranw9mPgYvXbl2z0yoO8LnJjzcDzcC1yQ1bWyFoH0z+lPh1/mFsrz7HTzovA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756824749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tYWb9KAXd48FPYJu4JeTopsHH+jL89xhlDVBLk0zRxM=; b=SbZ93CqnwZ6NrLO68kSznONSH+uDkolkp4IYUbBveNVlgnAEt7ek2vpmSqpNrweKG8MZsC KRbsrl0p2vJsRJTZocr/FK153MgRqwmi7J6VJSQFRJEqdCIXxUl+ZqhWWnmFEqETLxbOMz AAe8fH0/pf+9alE2JwxaiN3Qp01sw5+WF2SMZkaajsEXnlR9PMa2QWAUQ68rgl/39MHXwY 7ARbp9OvCoSAowZyqaUkRv4n1KW7UOepnOFj/+1e7YpDw/LdV9sbL+pITrDCETuUouHnwc 5nC2oeWe6FHur+vBbkhbtPtPOoYzV3mzAiZN42Re7P4TYaYOG45qVrBBpAucng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756824749; a=rsa-sha256; cv=none; b=WhGghJ1UsSVewl7sjdMKn6F9dyh7HfVo0XKUQAnl+nlpA0m9JnLHB60G3Y/q2w2IjozOqZ zXM2ZSBdnz2Y4MT0oUqCWFln4hO66ghKVvMurBQW+x/34EcrgwRaIgbgmn4zznbSEMHcUh LMaCfSKMo4lus9npr7rd+GG4IZPyxbOsAFVoQxpx1qJXEmQvSR3KY8UUks9naMA8cs7Erj 4ZOWNiyodw2Tlwv92soCO2wqgyUF5vGnVSvP/rWjsEUn/RblaH58uX/i90RIpnhpwH92Il 9XeBi2D0kfmFQ+yX5cCetkk57FEsbnfXIJYvqEXvQnLdsb5EBwD7WGYh1kXQ9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cGTHF6YkfzPDf; Tue, 02 Sep 2025 14:52:25 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 135478abe3bc - stable/14 - ifnet: Don't include ethernet.h twice From: Zhenlei Huang In-Reply-To: <202509011336.581Dah0q051386@gitrepo.freebsd.org> Date: Tue, 2 Sep 2025 22:52:14 +0800 Cc: Justin Hibbits Content-Transfer-Encoding: quoted-printable Message-Id: <1D876234-4AC4-4AD0-9ED1-CECC9BEE8DB7@FreeBSD.org> References: <202509011336.581Dah0q051386@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" X-Mailer: Apple Mail (2.3696.120.41.1.10) Oops, this breaks LINT-NOIP build. The if_etherbpfmtap() in if.c = requires ETHER_BPF_MTAP which is defined in ethernet.h . Hi Justin, I'd like to MFC commit [1] rather than reverting this, since the = preferred ones bpf_mtap_if() and ether_bpf_mtap_if() have been in 14.0 = [2]. Any objection ? 1. 2a3716432d20 IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() 2. 950cc1f44fbd bpf: Add "_if" tap APIs Best regards, Zhenlei > On Sep 1, 2025, at 9:36 PM, Zhenlei Huang wrote: >=20 > The branch stable/14 has been updated by zlei: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D135478abe3bcac1c5195b7e4d75e9f2d= 6ab40221 >=20 > commit 135478abe3bcac1c5195b7e4d75e9f2d6ab40221 > Author: Zhenlei Huang > AuthorDate: 2025-08-28 04:29:06 +0000 > Commit: Zhenlei Huang > CommitDate: 2025-09-01 13:29:42 +0000 >=20 > ifnet: Don't include ethernet.h twice >=20 > MFC after: 3 days >=20 > (cherry picked from commit = 393356f25fb8b76e38b10347f0ad40d4a23372ba) > --- > sys/net/if.c | 1 - > 1 file changed, 1 deletion(-) >=20 > diff --git a/sys/net/if.c b/sys/net/if.c > index 39854489f5f7..07369c4512cf 100644 > --- a/sys/net/if.c > +++ b/sys/net/if.c > @@ -76,7 +76,6 @@ > #include >=20 > #include > -#include > #include > #include > #include From nobody Tue Sep 2 15:06:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cGTbk6ssqz66rnc; Tue, 02 Sep 2025 15:06:42 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGTbk69Ydz3rly; Tue, 02 Sep 2025 15:06:42 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756825602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zou9pyr6zWyQ3YH9mWmkTSsve4XHIrqRlGmr4B/4ASY=; b=Kya8Au9vwEjcoySPNShQxRfEzTJuojwj4Li3RM5LarkiOwhzmY/E9R3cqKyhErBGw3NRwD bFQbnlLjoDdBPd0URYzEOP0XvysHc1X15E5+3BM6MYl28DehRQJSOJrrNslf4eo9KCSbQu 21NfJ8dQ9OjzQvYkkGSAlL863/07oceUU8E+ykIh9sUenWvvSb5dSctJrHyMogdzbbP/dk QRmsZxc6mEth58an7niCsVb+QAyt2yjAENDe8bwZZyV9mI0OzsXmWEQ2Ix3YwQFu4BLIux RLmccdSHGjVCJzY0HapHP04SjpiegPQYyGum7HAPH834vl7C9k07EUNJJl5QiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756825602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zou9pyr6zWyQ3YH9mWmkTSsve4XHIrqRlGmr4B/4ASY=; b=F+8n6fv+2lmoLE38lv6diAPMBehjBki56OqSBZ1WODoL2Gtp5R9JIxTfSaQeJ7cBSZ6/mY T8sNBfdYaBLMaoxDMJ2+AIszED4ruP+KjEMk1yyUhVDh+gloGU4ZBi59YRswxT/gWFy7Ra bFn+SHGLNID16lThLAfDevYd3zaVBkek5FNLXWM8908IQdtR60wKM3+4ulSPFMna/h43e7 3IlgRwHZHEM8Gd8dT03o/oKKp7dbOeb6RiCtmBxfj40su7lOh0ZuMZd/r/kd58lfKnVC95 zLp+c5Q/4mu4wmltNCpmcaEOQz03bG0ePp4JBk3t2bpWhdLJ1RNubeHn0kDKIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756825602; a=rsa-sha256; cv=none; b=pQrrzQVKgTYm6oHhbFSQ5Z/AwF8QmPVPMrJzNpsqQXqHBINr8WzuQcF5Mq70X7ZbrNhp8K KPWgPOjeKNhOKnTjPJsbfBt5Jg00r/seFgZFRe7XoS/fT1iZAzTaPINevgrvPTvTRXk7MA uh5XL/2Bj9BtVWL4A5OOCVc6OPdYHPrGVgthsn7jiQIrXt2KfTQfx2ZYAlp8TvkNd4M2im Jcoe8bK00cvj8EbMcpN0oDUdnILZjlmwqmVwrnkCwEVm/2gfg77daSC5Ue3OV2gA24XW/c 8EPBFt7bJ8lV8xBakCkq9m6kwdIWqdWOF2B+5yGjE0Re6ns5kW5JiL9ChbcppQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ralga.knownspace (unknown [IPv6:2600:2b00:a720:d301:9f03:382a:d672:81f0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhibbits) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cGTbk4C9dzPk1; Tue, 02 Sep 2025 15:06:42 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Date: Tue, 2 Sep 2025 11:06:34 -0400 From: Justin Hibbits To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Subject: Re: git: 135478abe3bc - stable/14 - ifnet: Don't include ethernet.h twice Message-ID: <20250902110634.382a33d2@ralga.knownspace> In-Reply-To: <1D876234-4AC4-4AD0-9ED1-CECC9BEE8DB7@FreeBSD.org> References: <202509011336.581Dah0q051386@gitrepo.freebsd.org> <1D876234-4AC4-4AD0-9ED1-CECC9BEE8DB7@FreeBSD.org> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.49; powerpc64le-unknown-linux-gnu) 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=US-ASCII Content-Transfer-Encoding: 7bit Go for it. No objections from me. If if_etherbpfmtap() and if_bpfmtap() are public APIs, though, we might need to keep them as stubs, since removing them would break the ABI contract. Might be better to MFC 2, and rewrite if_*bpfmtap() as wrappers (aliases) to those instead. - Justin On Tue, 2 Sep 2025 22:52:14 +0800 Zhenlei Huang wrote: > Oops, this breaks LINT-NOIP build. The if_etherbpfmtap() in if.c > requires ETHER_BPF_MTAP which is defined in ethernet.h . > > Hi Justin, > > I'd like to MFC commit [1] rather than reverting this, since the > preferred ones bpf_mtap_if() and ether_bpf_mtap_if() have been in > 14.0 [2]. > > Any objection ? > > 1. 2a3716432d20 IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() > 2. 950cc1f44fbd bpf: Add "_if" tap APIs > > Best regards, > Zhenlei > > > On Sep 1, 2025, at 9:36 PM, Zhenlei Huang wrote: > > > > The branch stable/14 has been updated by zlei: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=135478abe3bcac1c5195b7e4d75e9f2d6ab40221 > > > > commit 135478abe3bcac1c5195b7e4d75e9f2d6ab40221 > > Author: Zhenlei Huang > > AuthorDate: 2025-08-28 04:29:06 +0000 > > Commit: Zhenlei Huang > > CommitDate: 2025-09-01 13:29:42 +0000 > > > > ifnet: Don't include ethernet.h twice > > > > MFC after: 3 days > > > > (cherry picked from commit > > 393356f25fb8b76e38b10347f0ad40d4a23372ba) --- > > sys/net/if.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/sys/net/if.c b/sys/net/if.c > > index 39854489f5f7..07369c4512cf 100644 > > --- a/sys/net/if.c > > +++ b/sys/net/if.c > > @@ -76,7 +76,6 @@ > > #include > > > > #include > > -#include > > #include > > #include > > #include > > > From nobody Wed Sep 3 02:05:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cGmD42zkxz669Mh; Wed, 03 Sep 2025 02:05:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGmD42KBGz3g0X; Wed, 03 Sep 2025 02:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756865140; 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=CPoqmJ62ZCBHPaXPT/S7YcKJRkghiK6/2LeqsPFIfoE=; b=K6eTUCGMKDdt8kGNazWtsXPx/4aC/gcOum25CS11nyUVIinzKWJOESlgrpSIgHcHY5podR 2/PhyBO3EAqldMk8SpV0s0rnQXVOe3c1qF019jygCYOmtYxgigp0TX2U2+j4NSq11NpX7g HVrNeAhVFFe8yS1ekHaw8PoxpqUioG0kp7NmjE2K7ID8ucVhcUjKiyuXBsqJyiZE0OEK3e Rm0y4ZQAIfMyw3sUd2p4qXExDWbO+WCbm4uveZSe/iIL8Po2hmetyXdSCyZ6Lq9o5aveFb wilkP3hOgVMk5Is6Nb8Jd/qadh0c6PlygDn4Uyp16OZWmY4cX6jyCwRF2pEbkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756865140; 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=CPoqmJ62ZCBHPaXPT/S7YcKJRkghiK6/2LeqsPFIfoE=; b=Un7N3JJ4QHoN4PczCUHBBJ7OyBcB3QDxgvpjGcQuVAf9T0qVD9iMfbyoeuunu3czMIS35t 7sraklvMCV6Bnf8J0mEG1CObxOdeT1RTn7IEv+9UAfOvZC8zErdCdP/pktv0rThe2QkqIY wNEHv0HmnciosNyr7BD2zHWzeG2F+gygVjZVpkl5febllkEwLEO/wYyBQ2NqhFMBddF7AN bwHYw/PhqDfdtk21cnYGp8vcbIS638hbO/uRtiEcJWRrDvVuOmnmmFkJbmbw7NUeKCxFku pSfO7RF2j/og5yk0VQbywE3jSXXfmKkKMY4Ibmfp60eXCq4cEyCaSIdznb0vEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756865140; a=rsa-sha256; cv=none; b=ak4QYFIvbI6gteFd4YP+5yll43Ia0kfdDsu8PzWwxFrY7IITJ3hRqPNBrPxBaEeD7oOdhu 0WBrJWwhrctVFSUcqG3bQGs6J4j6VFaC/X1jKVn2CoKae4faxwWf0iRWmRd2Upp6YKU20O +LwWAEyT0hCsgfEYra+Qn6qVEf4ajdCpdra4pr75hZb6Esc0WidmDEKUSrJqQomWxZr5x+ McK3KcRU6R72HO4jVf6Ch2dOYZ5faulFOKSMVqkf1ND6HE/J5clSbRQBOXR4eYQ/NuluZQ 1jscPCItQp59hCVQJGj03bCIOVcg4cT5u7mTkVNsU+jBLdZ5mgEs1bHcOF6YPg== 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 4cGmD41VXLz1Bsn; Wed, 03 Sep 2025 02:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58325ew3089619; Wed, 3 Sep 2025 02:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58325euh089616; Wed, 3 Sep 2025 02:05:40 GMT (envelope-from git) Date: Wed, 3 Sep 2025 02:05:40 GMT Message-Id: <202509030205.58325euh089616@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: d10640804e74 - stable/14 - nfs client: switch nfs_advlock() to use exclusive vnode lock 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: d10640804e74b84ba06102a1a399a34117f4cf41 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d10640804e74b84ba06102a1a399a34117f4cf41 commit d10640804e74b84ba06102a1a399a34117f4cf41 Author: Konstantin Belousov AuthorDate: 2025-08-27 16:57:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-03 02:05:20 +0000 nfs client: switch nfs_advlock() to use exclusive vnode lock (cherry picked from commit fe53e046cd9ce9c95a118ac0374e94336f16a37f) --- sys/fs/nfsclient/nfs_clvnops.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 7f751d81d5e5..013ab2445a83 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3253,7 +3253,7 @@ nfs_advlock(struct vop_advlock_args *ap) u_quad_t size; struct nfsmount *nmp; - error = NFSVOPLOCK(vp, LK_SHARED); + error = NFSVOPLOCK(vp, LK_EXCLUSIVE); if (error != 0) return (EBADF); nmp = VFSTONFS(vp->v_mount); @@ -3290,11 +3290,6 @@ nfs_advlock(struct vop_advlock_args *ap) cred = p->p_ucred; else cred = td->td_ucred; - NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); - if (VN_IS_DOOMED(vp)) { - error = EBADF; - goto out; - } /* * If this is unlocking a write locked region, flush and From nobody Wed Sep 3 04:38: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 4cGqcj6LPfz66NYy; Wed, 03 Sep 2025 04:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGqcj5r0Fz3vvC; Wed, 03 Sep 2025 04:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756874325; 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=y3CZTIu9gz1On9431sYkp/4NY6J9k10D+0/hcsdYdoM=; b=dyoHy7+gFMSVgZH1zfJwZ8ysg/DDtlzT4bmNcs6Kol/gTwBW1491OYxxeXCp31a5UzzC69 /h1z+sQhb+eC0wQvFqCt7LfEg/AkIP3bWWvdFDk0/YMobquCp6UbtmusdNFnM4aAUyggdE eonb2kOkaSe8b8/aKu8Gs+aYyR6ryFSMGpg5WmOlgBJ+jKkTYAekcHeYFRXzduEDE9FAj5 f6Kpd7asQ9dCEpbtFyGNNMn5+/Np3Q32ZoQEYoKIQ2h4pKfH3cw1WzWTd3TQnHUgNugPoL PoaLfYFt7c0b6jc/RiaZw/eRA32HimjrncCeZ5UlLxiHxRwHzEtJX3sDW4IBGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756874325; 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=y3CZTIu9gz1On9431sYkp/4NY6J9k10D+0/hcsdYdoM=; b=uwKxafE3CxmQni1m0C89QXIBMj0IsWeRUsJ/4xMJj8WxckveH54LneXK0NnewpXbWkniBQ B2Sj4m4iwH/u0rWF2eKLfWXJCB7lsK4dKuOGwdcQrWtQvwmAI82RflvHekSul4DPP+vQMO odwjVvybJRVAPbCcJm+H4p+fsS/SuQMR8RFdUz6g/Ay6zXt/0+WzaFhPLEcOe84sPairkG 5NDRFUy4JSdZvO66sBEjSbr2KsQvWS9TCv+c/UkLtLE9UlYK+1SOg1qTPYoYuEQ3hRfmRT sDRTY31/28Z3wSFtXVD2UX2r0OyoacbUaSR+spinQWFnKkV4JLm5RSNLc2gLFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756874325; a=rsa-sha256; cv=none; b=Z4ssl21TEOyIJMFTiky0inmZZoSLTDpNr05OYZSIMfI3cq2I1wQLxnY5C9geOAcEmvmP/M BJHbh3XzPd903eEp0OSi9gLfvQUCl4++xnhbWsiSOklFWJLl2tRFyaLDIgDWKZov9pJ4KK B2jybQaSHfGNHmO+xWmrPLRn/q6qdCTUKhj0DQME+nasARUlO49oAzKM9z366JX0kRlz7F eJkWugXSvg7fNmgiY+5UT6vow6XSeqInJvN+ATWZbdNEgGVgPrb2//P6MUmvKKRIK5/BLg tX7oWKKAzPcsW8ZZDwbGhElu/UAkn13zN2pm1MdW7rZFr/CA4CeYURnKETDLhA== 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 4cGqcj55nNz1GqN; Wed, 03 Sep 2025 04:38: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 5834cjan073547; Wed, 3 Sep 2025 04:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5834cjfM073544; Wed, 3 Sep 2025 04:38:45 GMT (envelope-from git) Date: Wed, 3 Sep 2025 04:38:45 GMT Message-Id: <202509030438.5834cjfM073544@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: bceb9c2f2b19 - stable/14 - IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() 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: bceb9c2f2b1933d7172feb6597a31a6547960005 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bceb9c2f2b1933d7172feb6597a31a6547960005 commit bceb9c2f2b1933d7172feb6597a31a6547960005 Author: Justin Hibbits AuthorDate: 2023-07-21 18:16:25 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-03 04:36:30 +0000 IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() Summary: These came in the original DrvAPI commits in 2014, and are obsoleted by bpf_mtap_if() and ether_bpf_mtap_if(). The `_if` suffix, rather than prefix, conveys that it's operating on the bpf of the interface, instead than the interface itself. Reviewed by: glebius Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41146 (cherry picked from commit 2a3716432d209c5fef1eb1a719f4c1914e7c8b5a) --- sys/arm/allwinner/if_awg.c | 2 +- sys/arm64/broadcom/genet/if_genet.c | 2 +- sys/dev/bge/if_bge.c | 2 +- sys/dev/bxe/bxe.c | 4 ++-- sys/dev/dwc/if_dwc.c | 2 +- sys/dev/eqos/if_eqos.c | 2 +- sys/dev/fxp/if_fxp.c | 2 +- sys/dev/nfe/if_nfe.c | 2 +- sys/dev/ntb/if_ntb/if_ntb.c | 2 +- sys/net/if.c | 12 ------------ sys/net/if_var.h | 2 -- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 566ba329e956..f511dd2309bb 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -984,7 +984,7 @@ awg_start_locked(struct awg_softc *sc) if_sendq_prepend(ifp, m); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); } if (cnt != 0) { diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 7dab488501c3..9846861e7c67 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -1036,7 +1036,7 @@ gen_start_locked(struct gen_softc *sc) if_sendq_prepend(ifp, m); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); } } diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 7aa25939fcf0..6c3301b1473a 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -5355,7 +5355,7 @@ bge_start_locked(if_t ifp) * If there's a BPF listener, bounce a copy of this frame * to him. */ - if_bpfmtap(ifp, m_head); + bpf_mtap_if(ifp, m_head); } if (count > 0) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 45e8f654c36a..3e7120a42a90 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -5565,7 +5565,7 @@ bxe_tx_start_locked(struct bxe_softc *sc, tx_count++; /* send a copy of the frame to any BPF listeners. */ - if_etherbpfmtap(ifp, m); + ether_bpf_mtap_if(ifp, m); tx_bd_avail = bxe_tx_avail(sc, fp); @@ -5706,7 +5706,7 @@ bxe_tx_mq_start_locked(struct bxe_softc *sc, tx_count++; /* send a copy of the frame to any BPF listeners */ - if_etherbpfmtap(ifp, next); + ether_bpf_mtap_if(ifp, next); drbr_advance(ifp, tx_br); } diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index cec3ebfbf4bb..18e86ac025d4 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1132,7 +1132,7 @@ dwc_txstart_locked(struct dwc_softc *sc) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); sc->tx_map_head = next_txidx(sc, sc->tx_map_head); sc->tx_mapcount++; ++enqueued; diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index 7c0335079195..a52a8ca23efd 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -597,7 +597,7 @@ eqos_start_locked(if_t ifp) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); pending++; } diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index c8f35e80fb17..260fb141983e 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -1358,7 +1358,7 @@ fxp_start_body(if_t ifp) /* * Pass packet to bpf if there is a listener. */ - if_bpfmtap(ifp, mb_head); + bpf_mtap_if(ifp, mb_head); } /* diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index 27a2a3315db4..0ab1c45b600e 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -2616,7 +2616,7 @@ nfe_start_locked(if_t ifp) break; } enq++; - if_etherbpfmtap(ifp, m0); + ether_bpf_mtap_if(ifp, m0); } if (enq > 0) { diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index 59a2e76ee143..152ba23e06cd 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -322,7 +322,7 @@ ntb_transmit_locked(struct ntb_net_queue *q) CTR0(KTR_NTB, "TX: ntb_transmit_locked"); while ((m = drbr_peek(ifp, q->br)) != NULL) { CTR1(KTR_NTB, "TX: start mbuf %p", m); - if_etherbpfmtap(ifp, m); + ether_bpf_mtap_if(ifp, m); len = m->m_pkthdr.len; mflags = m->m_flags; rc = ntb_transport_tx_enqueue(q->qp, m, m, len); diff --git a/sys/net/if.c b/sys/net/if.c index 07369c4512cf..f308edd24734 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4866,18 +4866,6 @@ if_gethandle(u_char type) return (if_alloc(type)); } -void -if_bpfmtap(if_t ifp, struct mbuf *m) -{ - BPF_MTAP(ifp, m); -} - -void -if_etherbpfmtap(if_t ifp, struct mbuf *m) -{ - ETHER_BPF_MTAP(ifp, m); -} - void if_vlancap(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 74692e916558..b8a0b3d3fcd1 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -629,8 +629,6 @@ int if_vlantrunkinuse(if_t ifp); caddr_t if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); -void if_bpfmtap(if_t ifp, struct mbuf *m); -void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); void if_init(if_t ifp, void *ctx); From nobody Wed Sep 3 13:05: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 4cH2sy0hFDz66Njn; Wed, 03 Sep 2025 13:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH2sx75kJz3crS; Wed, 03 Sep 2025 13:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756904758; 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=c2yoNgJXyxbnU1fLcF5uxKqUUPc8hQiZdEZPhs7MlHs=; b=m91I+5Ij1myFbiWbBA074cUmsLNd04Jc5ZFABpYk9oLdu6lY1BwRN19jQlqR0HZhics2Gb vwfhMCtemtfu9jN3zhAg+iVHD7vpEOLXKiZY/OuIRXLmGBgwbH4fwZdk9ies+rCGsEZdmz xrXuNuCPQmWh1km1pVaHC0/Tjc0ieUWkxJIQYwH+XBMC65VTzAl3x/QRA/Obhhf7qvhfSM zy+/735IERSSsGEv5VtvFZBAF5p+vWEZshOFcNgzwKE2lf+o9l+9JV09nDz2fLTDbKU6hS rbfK1FiWZp5ho8D1V5fGpG7vbHGxCuiipmLu+WHeP/qG7XPhUXBmZ/V9cxiDmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756904758; 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=c2yoNgJXyxbnU1fLcF5uxKqUUPc8hQiZdEZPhs7MlHs=; b=r9YrvlohyryUL5YIcU69wW8nN2gf5WzrKVYNRSoWzvxfBdLi/M0gs06TX0UI9yKxp3jWYF DwvaloSWCkHleTInObKq7EgUrkTugs9Nsc2tl5r6juU47Q9cca9rck9mPT0SFoRqOm2O1T SG8LDCr6SW8jEaY/0vPT9Ne+fvfaSzuZWvbTuzfZTkG5oT5l4qEQN/Mu15v/kKqatxUZAX FHnXAO25eHkNfmh3JGo0B7sTADBBwm9j6UX3OaxXhtMcAYxapsBTEJ/T28DZVEZczD6Ryc 2wtLkMk1PBK+QNEu6MP53ONtTCLPK5Kq5mUk9MZ8Mr2GcC6lo/AZ6dEGG1cX2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756904758; a=rsa-sha256; cv=none; b=e3b2EfSC3AoR6WReKtSkR+jVFfQtLZL7w9qbBfFi/CHJtLVTksmkl6vbr0gbfb3PHJn9hm I2DzVhDqFE16nbHEyTol3cpAVe+xBbzJL8NYMwB6boAnIwDyu6cAEgmw+Aqu+MWBkHGeXA LF8sD1ep3TDqc41Ueh9BSn4s7CQOMSXCqGEsSolxYfjLJYkKux98+XKdYTw6dsHq4SGZs8 oSguwXpSJ9geZDasa6AeN7FjOqp35wFWWw4W6fuwjPDE97hdxA43vXjA1HA2NkjOuZx2O/ YWHg7PyB+VF5iP7hHVkNv8FR011Hl74FU/tpsbsQTYvEwYP5SFFBFr/LbIznFA== 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 4cH2sx6Pbmz2ZF; Wed, 03 Sep 2025 13:05: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 583D5vcf037662; Wed, 3 Sep 2025 13:05:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583D5vNA037659; Wed, 3 Sep 2025 13:05:57 GMT (envelope-from git) Date: Wed, 3 Sep 2025 13:05:57 GMT Message-Id: <202509031305.583D5vNA037659@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: 96743bfb9543 - stable/14 - boot_i386.8: Mention this is legacy 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: 96743bfb95431f396e71d35eb92258122233334f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=96743bfb95431f396e71d35eb92258122233334f commit 96743bfb95431f396e71d35eb92258122233334f Author: Ed Maste AuthorDate: 2025-02-28 15:40:43 +0000 Commit: Ed Maste CommitDate: 2025-09-03 13:05:38 +0000 boot_i386.8: Mention this is legacy Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49704 (cherry picked from commit b8437cbae173308180fbaddc6a74bfb6f8c4410b) --- sbin/reboot/boot_i386.8 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 index da8fc2e430ac..26dd588fb437 100644 --- a/sbin/reboot/boot_i386.8 +++ b/sbin/reboot/boot_i386.8 @@ -32,9 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 -.\" -.Dd July 11, 2020 +.Dd April 7, 2025 .Dt BOOT 8 i386 .Os .Sh NAME @@ -47,14 +45,14 @@ An automatic consistency check of the file systems will be performed, and unless this fails, the system will resume multi-user operations. .Pp .Sy Cold starts . -Most i386 PCs attempt to boot first from floppy disk drive 0 (sometimes +Legacy i386 PCs attempt to boot first from floppy disk drive 0 (sometimes known as drive A:) and, failing that, from hard disk drive 0 (sometimes known as drive C:, or as drive 0x80 to the BIOS). Some BIOSes allow you to change this default sequence, and may also include a CD-ROM drive as a boot device. .Pp -Some newer PCs boot using UEFI firmware, not BIOS. +Contemporary PCs boot using UEFI firmware, not BIOS. That process is described in .Xr uefi 8 . From nobody Wed Sep 3 13:06: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 4cH2v81pjNz66Npx; Wed, 03 Sep 2025 13:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH2v80ykYz3dHm; Wed, 03 Sep 2025 13:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756904820; 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=SMQBFaVmcGoNGM24iNLgIlkmJFsg97iRfAlSN/JOEH0=; b=Z1fqCWAy7DmBEQ+y405Ct4FZ91jIogazu7wj9oppRrwkY/kz+411gNVd4dK5tw49GR6DgV 5qs9W1exaWexjt1DuK6XPvvhv6rJNOvbo9xwl6PV/RkcJstT5wiNd501lf8bMduvMv4NtZ hjEpkBzVnU913wQZZQdw09oCo+jvhJZ78eqn4bNBVXyUYg6l8g3ZSKTKsYQrYGTDUvg+rR ug2etaTY5R3AgdVudgxNRsbaqdEQ+odyZcyssxEOO+QZBiJHG2HuR65q2HhpG2MQ4DrUfn Q2mZRlApOXwomefrFm0J4oZ9F8Ip6rJJFt0A2gF0AotBUf1gQtMqDSKu04CcoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756904820; 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=SMQBFaVmcGoNGM24iNLgIlkmJFsg97iRfAlSN/JOEH0=; b=hlKeTSKFtCbClsRHntP8WrDnpzqa3Ohg6e27lPRctFsDY39kkLVnEffwHHMRnldTTQiQpB e/7dh2OvTJLrxUitaI2vJpm13XwrfyFg21hTOa/+ZzsYniLpMlQFA8V9KXjJvIq5sOlgqp O7CQk33mNcCC1XVFzRP9h8Z7CU2eP2mSdre9MWqK8PLVX4mleRE5WGHNo6Szud3wJMvijp ivJNnZM9GjldOM8PtB1YaMyIy06+yzyme1bOP79S75y37e+gy6I62RjTJm6Dv81IQ5AHk6 X4thK9gRuCPxMGCB5zTxHM9spXmmyV38cIwlffKsBZE0GlVd+rgG8a9NdwNh+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756904820; a=rsa-sha256; cv=none; b=DSVqbsm3cHceCxtGzTZecu4sNQmI9SdpmRc9URLaRNuufmNWrhLsYwc8s4l8P32qW/NOHx 1EV5kmLqvgSgCBYcjgn3W/OEHoWKbHz5goJHpI60E5ZnJH8DkhoW4YAFzAT0aHt+wEvQPv ilijDRXZ7q2nhac4bGMuUzQo4OCY8AG3g/OVpt/WBCjJZyJc5kx8uvZWTpVQIGVlvPsZbo E3Ss+2fibuO2p+b7K5Gqn/UhNxXyjDgM4YSFcUPB6GZpfovwF5CzgxGZY9yqo0vsPHYW07 cWmfi/qvjNAxvJDfsIS8TJdDskT0l2KfNPCHL1tM9oilWIEBkuOHlqEKWXV2cA== 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 4cH2v80L5Qz312; Wed, 03 Sep 2025 13:07: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 583D6x2N038133; Wed, 3 Sep 2025 13:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583D6x1X038130; Wed, 3 Sep 2025 13:06:59 GMT (envelope-from git) Date: Wed, 3 Sep 2025 13:06:59 GMT Message-Id: <202509031306.583D6x1X038130@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: 1ff48c6810a1 - stable/14 - tests: Update for jemalloc's option parsing 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: 1ff48c6810a1c4e340e63eea166ad46631496c57 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff48c6810a1c4e340e63eea166ad46631496c57 commit 1ff48c6810a1c4e340e63eea166ad46631496c57 Author: Ed Maste AuthorDate: 2025-06-17 15:33:33 +0000 Commit: Ed Maste CommitDate: 2025-09-03 13:06:47 +0000 tests: Update for jemalloc's option parsing MALLOC_OPTIONS=J -> MALLOC_CONF=junk:true PR: 287357 Reviewed by: markj Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50910 (cherry picked from commit 4f33d073003ccd91390709e14e5c1bf1f0c1c85c) --- bin/sh/tests/execution/func1.0 | 4 ++-- tools/regression/bpf/bpf_filter/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/sh/tests/execution/func1.0 b/bin/sh/tests/execution/func1.0 index 0dfd341f9099..bfcdd67ceb4c 100644 --- a/bin/sh/tests/execution/func1.0 +++ b/bin/sh/tests/execution/func1.0 @@ -1,3 +1,3 @@ -MALLOC_OPTIONS=J ${SH} -c 'g() { g() { :; }; :; }; g' && -MALLOC_OPTIONS=J ${SH} -c 'g() { unset -f g; :; }; g' +MALLOC_CONF=junk:true ${SH} -c 'g() { g() { :; }; :; }; g' && +MALLOC_CONF=junk:true ${SH} -c 'g() { unset -f g; :; }; g' diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile index 0f88a27c4e8a..554eace656f1 100644 --- a/tools/regression/bpf/bpf_filter/Makefile +++ b/tools/regression/bpf/bpf_filter/Makefile @@ -64,7 +64,7 @@ all: ${TEST_CASES} .if defined(BPF_BENCHMARK) @-time ${.CURDIR}/${TEST} .else - @-env MALLOC_OPTIONS=J ${.CURDIR}/${TEST} + @-env MALLOC_CONF=junk:true ${.CURDIR}/${TEST} .endif @rm -f ${.CURDIR}/${TEST} .endfor From nobody Wed Sep 3 13:28: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 4cH3Mx5R7cz66QGd; Wed, 03 Sep 2025 13:28: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH3Mx47y3z3gsw; Wed, 03 Sep 2025 13:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756906109; 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=3BZ8VWsY3wrw4yyoMjylV20RyRLzEPtYhCzQsska1mI=; b=eBOeJAlnWOH7FZkJ2mIzyuAwJqDhjIqAwyQwCsFug/IVSc7aUoGVpVmjfoCJwyfM0ILe8q kOhYJ5wxx/i4ykZgk/zCFNPgponz2VFMerhImE4164B5SiQYilByf44A9FZ4Iws429JJn6 PTcUCzTIsCCz5eVyurro+BxxGL2BFgSoR3DJt3m7uacll811Vh4PyjZJg5WbDZGQxMx9l1 23ZNXPBESbF2MKMoJBkNMCMY91FVEfIOvWLaoRYDvvbXcm+V7ns39FzLTsSCthNiH3cYGb cbwPtW7DRrkQUB4c8H9OsXJ8aIe0ptkOq4wKZFzx7H9KGy2Ysnsrp5QXWu9KWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756906109; 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=3BZ8VWsY3wrw4yyoMjylV20RyRLzEPtYhCzQsska1mI=; b=Wy8nwZ9WKAVk0Eo01/I8/U1BiSIkQz6wBmWZ87UQ7ovCqbT+ppvlbp21MiLNd0waK+I2yB lKg8DZwWX4S+sb7K6RvRHYEi8ZNT/DbJvKR/1dr8SOV3fbORZUl70qZYF+cd5vudG5Ok/U I4h/fEIUl3gA3KKmYkGUJHDrIl2iJRFydRxInqYQuxfes1OEztF2zkjmT7pJKOTxe92MTY 8VPhLYJ3cB/W+cDO0iDMH9HKV4GRQBOHrPypwNFx4jcT/GqB7Za8snHBHV3/uM5b9go4nA xdBg0Yaa/k7OXwAeUrxpi7CcPfC1sURfd639KA0ls+E3MQAMpxPmMQmr2cx0rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756906109; a=rsa-sha256; cv=none; b=Lk68sUeSKWRgBuZlKrSQDZ3E8UHTtzYRBIwTXhOA+k64FhMecUtOwZppxIOkvZ9K535IJG kdnFkRbWryj5eNWZfQ0K4UnYKpN9VCQtL4b67jzYiljuqllU3OoAUYeyj/pfEz/uHQfHS2 9TA9dZthcF9ZUpqiRwYQnumUSOqqDyAR8jpXkVURWA7OJoVRs6ZOtJSfMjRD1Jxe5kaBWV tC+sTd2E95mjtfxVYF6o/eEXyprZlfJ4IMqxOqy6vVUxmf06eY0Fw5CLV4cLXQrcej8uBl ZfvtEWkxstADTn61x2AmX64N8OGK3SB7Ae6D1tgBoe0cXITDB7i9YROzr/xxGg== 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 4cH3Mx3dHjz3Py; Wed, 03 Sep 2025 13:28: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 583DSTpE075938; Wed, 3 Sep 2025 13:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583DSTBR075935; Wed, 3 Sep 2025 13:28:29 GMT (envelope-from git) Date: Wed, 3 Sep 2025 13:28:29 GMT Message-Id: <202509031328.583DSTBR075935@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: e425d433c5ad - stable/14 - Makefile.inc1: Avoid including cwd in path 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: e425d433c5adaa0f7a513ba836fa378137ed7be4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e425d433c5adaa0f7a513ba836fa378137ed7be4 commit e425d433c5adaa0f7a513ba836fa378137ed7be4 Author: Ed Maste AuthorDate: 2024-08-16 16:18:15 +0000 Commit: Ed Maste CommitDate: 2025-09-03 13:28:15 +0000 Makefile.inc1: Avoid including cwd in path Buildworld failed when objcopy tried to overwrite itself, with `objcopy: open objcopy failed: Text file busy`. The PATH ended up with `::`, effectively including the current directory, and we found the wrong objcopy. PR: 261215 Sponsored by: The FreeBSD Foundation (cherry picked from commit ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4) --- Makefile.inc1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cbc2a226e83b..57306e3b65e7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -615,7 +615,10 @@ XPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin # When building we want to find the cross tools before the host tools in ${BPATH}. # We also need to add UNIVERSE_TOOLCHAIN_PATH so that we can find the shared # toolchain files (clang, lld, etc.) during make universe/tinderbox -STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_PATH} +STRICTTMPPATH= ${XPATH}:${BPATH} +.if defined(UNIVERSE_TOOLCHAIN_PATH) +STRICTTMPPATH:=${STRICTTMPPATH}:${UNIVERSE_TOOLCHAIN_PATH} +.endif # We should not be using tools from /usr/bin accidentally since this could cause # the build to break on other systems that don't have that tool. For now we # still allow using the old behaviour (inheriting $PATH) if From nobody Wed Sep 3 13:56: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 4cH3zq3GVsz66SKh; Wed, 03 Sep 2025 13:56: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH3zq2PGMz3kWn; Wed, 03 Sep 2025 13:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756907767; 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=puwIlRK4rBZJl7pVMRYxUswX33/2Oq60RDHxSSAqAJU=; b=A4vDwhFtukD9k0V2YHGMlOFn6Yc3creNn3TMmgHZe+SxAEctb5GGjhl0clvdTurunq390h 9zu93bNQklGJwqMfHngPwTWhpgz7P3ka9gnmBTR9YikyXk+BH4zPZQR3+A2sHu4QRh54Oy KfNsjR0rUL/FEY8s7qryZNlbHpNwfeUtMULFNxEsePndWFKjsFi+x6IZskblIwe5dYq+Ft NVwt/FSf0IVyVU51JhEQFDIAAdHrJTVXg+uIYONkHNhpPjpEL1ZlTxPKBTzU3LooknHbY/ wpTv5mZigpaHn1rT+4MB4IyWnaq9JHKpGhdd7nOQEXttNJNDy8hHbu9mzVThAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756907767; 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=puwIlRK4rBZJl7pVMRYxUswX33/2Oq60RDHxSSAqAJU=; b=L+iWm51Aut4XxaIi+gK+sejJittJqlHZO91g2vkwe2t2a/F4axDfXx3X7QX5M7XZysR6n5 f43RJ4d0LbKt9z/q4IxRCKqYeRXGzlXTQ2cMXTky7FdMCnJBnJIMhXCef5XriLXNuTY/hI SzyEb6c/XIbGtLhx3bjN/4oDOCeF2+0lm27QJEVvrZG3potvaDg4cCst4hYbSCpHQ4gr8o fUp0ovdQt1ndSRurAoHfiRfP+b9GPtVL2Ak9U5LMJUxG/z+zT/3yyOExOnVibdHHqF7cyZ JoENEhrgoEh9Kyh9AdH2NvqnAndNLXGHq5wqr5nWtRLd9RD/D6aQawOndBNFLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756907767; a=rsa-sha256; cv=none; b=AENaS7bVMOCJ7ZX2GFZdmjXNO1m+34ztJ7iDPwoVA99PkXmWzEzGsf6nU4VKOTesW9OXh8 t412485ghqdhpyNRvelUbF5EM2igSNAx1DcpwP39Rd4VkKz+0ojjStHUb+oN5moIjsh1CY +CZnwaqyvsqumRRtYrAkvuN8/50eVcgRd0MdylKEOK0z20qt3sQ+ETmFs0+xjEGErFrPPN Luv5vZz6+msEZElpb/f+KV3hIYda13oYWpnB8AANn15P322mb5q9Wzn3Pjxmg/xZR1ZQkK MwjnNHoP3nkmStP70yiN1jL3stecBltIiAZbCywWx/khn123ha7gu9mwvRQquA== 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 4cH3zq1wL0z4Yw; Wed, 03 Sep 2025 13:56: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 583Du7PP031674; Wed, 3 Sep 2025 13:56:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583Du79g031671; Wed, 3 Sep 2025 13:56:07 GMT (envelope-from git) Date: Wed, 3 Sep 2025 13:56:07 GMT Message-Id: <202509031356.583Du79g031671@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: 938fbab6f52a - stable/14 - chroot.2: Update errors and unprivileged use 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: 938fbab6f52aae1872202411a976fcfb6797a2c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=938fbab6f52aae1872202411a976fcfb6797a2c9 commit 938fbab6f52aae1872202411a976fcfb6797a2c9 Author: Ed Maste AuthorDate: 2025-08-02 17:17:40 +0000 Commit: Ed Maste CommitDate: 2025-09-03 13:55:53 +0000 chroot.2: Update errors and unprivileged use Include errors common to chroot and fchroot in a single list, followed by errors unique to each. Unprivileged chroot is permitted if the security.bsd.unprivileged_chroot sysctl is set to 1. Make note of this and update the EPERM description. Reported by: kevans Reviewed by: kevans, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51703 (cherry picked from commit 95f8c3e1ed0c3075411444381a5a4baef4ed8fda) --- lib/libc/sys/chroot.2 | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2 index af37a58794b8..cf17b9ab577c 100644 --- a/lib/libc/sys/chroot.2 +++ b/lib/libc/sys/chroot.2 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)chroot.2 8.1 (Berkeley) 6/4/93 -.\" -.Dd September 29, 2020 +.Dd August 2, 2025 .Dt CHROOT 2 .Os .Sh NAME @@ -60,7 +58,12 @@ It should be noted that .Fn chroot has no effect on the process's current directory. .Pp -This call is restricted to the super-user. +This call is restricted to the super-user, unless the +.Ql security.bsd.unprivileged_chroot +sysctl variable is set to 1 +and the process has enabled the +.Dv PROC_NO_NEW_PRIVS_CTL +.Xr procctl 2 . .Pp Depending on the setting of the .Ql kern.chroot_allow_open_directories @@ -99,14 +102,37 @@ still present on other systems. .Sh ERRORS The .Fn chroot +and +.Fn fchroot +system calls +will fail and the root directory will be unchanged if: +.Bl -tag -width Er +.It Bq Er EPERM +The effective user ID is not the super-user and the +.Ql security.bsd.unprivileged_chroot +sysctl is 0. +.It Bq Er EPERM +The effective user ID is not the super-user and the +process has not enabled the +.Dv PROC_NO_NEW_PRIVS_CTL +.Xr procctl 2 . +.It Bq Er EPERM +One or more filedescriptors are open directories and the +.Ql kern.chroot_allow_open_directories +sysctl is not set to permit this. +.It Bq Er EIO +An I/O error occurred while reading from or writing to the file system. +.It Bq Er EINTEGRITY +Corrupted data was detected while reading from the file system. +.El +.Pp +The +.Fn chroot system call will fail and the root directory will be unchanged if: .Bl -tag -width Er .It Bq Er ENOTDIR A component of the path name is not a directory. -.It Bq Er EPERM -The effective user ID is not the super-user, or one or more -filedescriptors are open directories. .It Bq Er ENAMETOOLONG A component of a pathname exceeded 255 characters, or an entire path name exceeded 1023 characters. @@ -121,10 +147,6 @@ The .Fa dirname argument points outside the process's allocated address space. -.It Bq Er EIO -An I/O error occurred while reading from or writing to the file system. -.It Bq Er EINTEGRITY -Corrupted data was detected while reading from the file system. .El .Sh SEE ALSO .Xr chdir 2 , From nobody Wed Sep 3 18:05:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cH9Wm6fcTz66qqG; Wed, 03 Sep 2025 18:05:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH9Wm5ZjYz3L3X; Wed, 03 Sep 2025 18:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756922740; 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=+fpEaUBAOoKPbPB2fAMJa/datftLgtI12V5pZkmK4Co=; b=ufvzhH2CmMUtiXDtKs/EUaGvSVeFir34DaezrEGQRM/yzVxnPYlQCcFY7U71Li4eaSymKn 5OXNX23jdkTxM9g8kWi/ATtl8UQ0FJ6YzUYMxHNa01c6v01cKaLz+aZeJDRoZQGvbCKpdw VWiDVDidjY1BHpSgZg858a2OJqOCNzllQVkPpVGAtO8sGcPG9HlCZZ92vGgLduad3wOUZ+ 8Wup7Kr8OfK3MdUChe/B5iv2WJBp18Npq765Dp0s0ZfVrs+8ZMHwWrg3EZI3l5DQcdUnDe BnZFrEgyrhtiMlHfC5ERJ0BZhifcnQ62X2N9PXaGpRhCbJZyADbCG9fNMah8zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756922740; 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=+fpEaUBAOoKPbPB2fAMJa/datftLgtI12V5pZkmK4Co=; b=qktXuvpobAu6/bjnovIqveYXFBuOIiOHH3SRbUalhieBM5KZ1Icq4SvyayTnS0zkiI4/Cq l9hiDAESDpeyrfCzpKhqa28UofcQ2NO45wh3BSej5gR2kr8g9z/8WSyRLWxdHB+HW6dLLf 7/GBI6rXtEJ6FRmauhQQcLqqpCDNWd21PSldX64cqHINnezBG5ebs1IzvgkBS/yS5tKkJj 1cRdKZl8k/x0fdVeeUlZcJj0tyxjIR9rBV1HXkB2JNpjUFCudCugzhW95yJBz46EUh79lw cYneeFtorPq3xXSyU1THdyZ9VkMc9upVnLBRlhHgABl5gCTfdT9kT4nO6ho8Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756922740; a=rsa-sha256; cv=none; b=cYDR+vH4vZHMiYxt8szrs2uA0SyyzutpZANfedilX4cK0Oi2fbl/ZpD5m/iJ+7ErAyeG6P 8TdOaPWlk2JH1vgZwyFDQbS2UcK9EGLR7HSqJSYhSJ4vISeTdK3KSptPOy7ODM5AmtBxXO q3weLHD3+0ikqq+G5FVQJznDZnF2Eitw/edhNBnGTkGP/AnkLwRE4w5he62u9qGaGWXJU9 jGbAyuH7yOELAAfZnJe8dsqEG5D278XspH72QwqffWCjkiwkslg4KuZS+dEvjKBeInCr9K XNOqGJz+cFCtXDkJGI7epN5bKhg+TacpaCT8tZdtaiCxAB/ELmbqhfwnANWlGQ== 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 4cH9Wm4wcyzBmw; Wed, 03 Sep 2025 18:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 583I5edW005044; Wed, 3 Sep 2025 18:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583I5efL005041; Wed, 3 Sep 2025 18:05:40 GMT (envelope-from git) Date: Wed, 3 Sep 2025 18:05:40 GMT Message-Id: <202509031805.583I5efL005041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 7b3094df479f - stable/14 - IfAPI: restore KBI after bceb9c2f2b19 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b3094df479fd820eb7a2bd3948619a9eaf77665 Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=7b3094df479fd820eb7a2bd3948619a9eaf77665 commit 7b3094df479fd820eb7a2bd3948619a9eaf77665 Author: Ka Ho Ng AuthorDate: 2025-09-03 17:59:01 +0000 Commit: Ka Ho Ng CommitDate: 2025-09-03 18:04:07 +0000 IfAPI: restore KBI after bceb9c2f2b19 This commit restores if_bpfmtap and if_etherbpfmtap functions, and implement them as wrappers around bpf_mtap_if and ether_bpf_mtap_if funcitons. Fixes: bceb9c2f2b19 Sponsored by: Juniper Networks, Inc. --- sys/net/if.c | 12 ++++++++++++ sys/net/if_var.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index f308edd24734..a3fb237e3f96 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4866,6 +4866,18 @@ if_gethandle(u_char type) return (if_alloc(type)); } +void +if_bpfmtap(if_t ifp, struct mbuf *m) +{ + bpf_mtap_if(ifp, m); +} + +void +if_etherbpfmtap(if_t ifp, struct mbuf *m) +{ + ether_bpf_mtap_if(ifp, m); +} + void if_vlancap(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index b8a0b3d3fcd1..74692e916558 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -629,6 +629,8 @@ int if_vlantrunkinuse(if_t ifp); caddr_t if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); +void if_bpfmtap(if_t ifp, struct mbuf *m); +void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); void if_init(if_t ifp, void *ctx); From nobody Wed Sep 3 18:57: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 4cHBh04FPCz66x7Q; Wed, 03 Sep 2025 18:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHBh029gMz3QGs; Wed, 03 Sep 2025 18:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756925872; 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=/Bx0suy7kHwBJ3cmri5uiKnaF9CMURK588m6B1dCsAA=; b=IlWtrcVnN6oQFBkS1FRHYsC0juqKtqbW8TZljbiNw9ZgxZChswqSVMeDNqVUM1QaCJiNnc fZ39HEXnRFaTg57FFOzqldLUyJWsRdUwcpoeqGPiqodKs9x8Gn+2mY1oMbF0SIP5SjKUub mmA8mB+miMi71t6mLxUf253knvqKWSMeXNwQx8PFnrkp9Iuqk44yh4s8kEuXzskH2yIzus ZjZG8JdI1CsKjyl8iYfq4RXvfzSJtlPDz4wiIY3sfKypzogDQaN6yoaHAm+sGARsxHf8Ow pg8EK2K/l84ezV/jCxix/0qgNBW44M19S/sPLfHlIiHf7EoT89HE1hHszCTC6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756925872; 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=/Bx0suy7kHwBJ3cmri5uiKnaF9CMURK588m6B1dCsAA=; b=qokDfFHEwo3WJrgq/NQtn2MMAs+dooYSSnk4BZiOKaVgA0VVBJjqnLwpdxpFyapHxrxAvf s8Exl0CI+nwwiRqPyo3NIKysgwI5ivfFMMsR31Q+lIyXLMgj6vHdtvqJERXs7suheW9o5E Y6AVHjHmlypG13M1/VkGYFoIZZtuZMnmcCcunVMujzWsG4+4iGG5lE6h4yrMqF393qUVsN iPGCm1bkze1FB6WmUrbiTycr/tEofTFke/Xn/EQW3Pl91sjmrj+FdtOs3G70WnzHgdbwqw Ao7RKMl4wW5RhgntJHK/GNBJ23Rf5iRz6I+lpWmQIInrKt+NO5EVFTEiI5Cykw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756925872; a=rsa-sha256; cv=none; b=a8DdCLdk2n/7lFpD0coxunb/LfB1cBi1fSssFkgDdROzlcMwvPPyZsD4NyFgtSNmivFbvy 0beypMlkmY8tGYDnGwzRTB9h7PkoyUj2sujpl3z/iCzlp8Xp2C9/dgG8JNu1YFV3HXmwXW bPiCORYszUow+7lap+zTKBnLcKS9Fkq0G3AgoJrEpz7ryCv0ufzu5vDKMm0fE428GYYE3g O4DIabIyGTsyqFOswVDNMaEBSLDU0WlQGGnYo+suyLgXMA+ZYDDgT68Nd7y48Kbv5YgP7E kDxGTF6mAiMrSSXF3jXwjcsNw98Vf+AfVHAh8thMTyMw8/g6JzuDj1P0bLW1aw== 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 4cHBh01VpczDFX; Wed, 03 Sep 2025 18:57: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 583Ivq04099090; Wed, 3 Sep 2025 18:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583IvqfC099087; Wed, 3 Sep 2025 18:57:52 GMT (envelope-from git) Date: Wed, 3 Sep 2025 18:57:52 GMT Message-Id: <202509031857.583IvqfC099087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 4f41ff7ced8a - stable/14 - IfAPI: fix LINT-NOIP build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f41ff7ced8a2fa6fc7ba35023b161567323282b Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=4f41ff7ced8a2fa6fc7ba35023b161567323282b commit 4f41ff7ced8a2fa6fc7ba35023b161567323282b Author: Ka Ho Ng AuthorDate: 2025-09-03 18:47:27 +0000 Commit: Ka Ho Ng CommitDate: 2025-09-03 18:47:27 +0000 IfAPI: fix LINT-NOIP build Also, reimplement the wrappers with __strong_reference macro. Fixes: 7b3094df479f Reported by: zlei Sponsored by: Juniper Networks, Inc. Reviewed by: zlei, jhibbits Differential Revision: https://reviews.freebsd.org/D52362 --- sys/net/bpf.c | 2 ++ sys/net/if.c | 12 ------------ sys/net/if_ethersubr.c | 2 ++ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index de56f3db782f..a5222c3659c7 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -3223,6 +3223,8 @@ bpf_validate(const struct bpf_insn *f, int len) #endif /* !DEV_BPF && !NETGRAPH_BPF */ +__strong_reference(bpf_mtap_if, if_bpfmtap); + #ifdef DDB static void bpf_show_bpf_if(struct bpf_if *bpf_if) diff --git a/sys/net/if.c b/sys/net/if.c index a3fb237e3f96..f308edd24734 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4866,18 +4866,6 @@ if_gethandle(u_char type) return (if_alloc(type)); } -void -if_bpfmtap(if_t ifp, struct mbuf *m) -{ - bpf_mtap_if(ifp, m); -} - -void -if_etherbpfmtap(if_t ifp, struct mbuf *m) -{ - ether_bpf_mtap_if(ifp, m); -} - void if_vlancap(if_t ifp) { diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index baf3a27c2e7e..b0e459dd1bdf 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1545,5 +1545,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) ether_gen_addr_byname(if_name(ifp), hwaddr); } +__strong_reference(ether_bpf_mtap_if, if_etherbpfmtap); + DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); MODULE_VERSION(ether, 1); From nobody Wed Sep 3 18: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 4cHBh13ZF2z66xB3; Wed, 03 Sep 2025 18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHBh134qNz3Qgy; Wed, 03 Sep 2025 18: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=1756925873; 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=iz1VweB7AnqKOFp8QSr3H0HVl8ewR0P2D0xiX22urYo=; b=DNA1cmVwUWhYb6B73vP/LMfJOFhgPPPwQmi5AHEqgPnM1CuM7Mpej5ZEJSeJ7gD4u7VOiI NT4XFZEONv/tRwEWg84K6gWVqYbv9Z/n3IarjwnySae9xHv4jklhTWB2wIUnrFgNFGMAby 5ozIVTZfHxVV+c1KCGSjhaR7MkmXi+jKA2r17LcfJ5vGKdK6oXgXTPkf2rCKDqvjQnL1Ur O2e8OMjGgztFpgB8PGXdio2sHL2tu27BRyyKc+0LWaxCji4EDqblhQMeUi/xJDp/sNu9/i DLmZxjJb+VcrrqeQGnbyAcjqHAPm+6708Z6f8XkwYUhaXaYQ/X4WCSyMdJJMjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756925873; 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=iz1VweB7AnqKOFp8QSr3H0HVl8ewR0P2D0xiX22urYo=; b=tdWzWZHgHZCegNty37KdOb0Ko4NUqK1dop95BcK9HqS5uK3EpfP1MclArrAjrZx0JWqZXz K2YPCbEXchmcOCFyyLrHYF9npBBLyfPxSyuMcp+X0aqapjkzkPygoA3wPZJ0NgcwBpurH2 LecN7zfLuCTgpeTcx6l6yF7I1vAmz9h98O3Kaij6weY23/f20rpsMrMFP12LmHbwzLebAt nkM46FOmTqT7NBXTqvhOxN4660ZZMpJqQXpjlnasmbmOieMqQsMmLqfvjSmcNCM2yV34BA bSPk43UsnDboluY4N5o+5yyxPN4NoR084zxvdi8XwdGjl4t5imnR+p5CuNTf3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756925873; a=rsa-sha256; cv=none; b=muCfdNtBrF1ShgdvA9TWK4F1zijDs+hkFiiHgw9vu1IK1eKVd2zdDyu16l2eWmWpOrsgGW 94QIYp3N1MrgK1vwempz95D4eMxf/mdYOfyJQ08jfT0bw2WLCHzYyWErMN02rlk+++czbA 06ANNIpnHLoBjDgmlZEmDdaOWjG/V1tyB/XhTtm4CeGGcXxjHfm4YL8C6HHYSDpDLtAwgh PcRkzufEokCOAe72qg+3QTbo3AuOaXd19PHAB7zHfa6kcyQzZJDWhuibG8JdgKgKWxWBXL 6cT6FhQrnNXnwuY7axA4Yc1noSysYVumbEkPXvqhfQDXedZKN4XYdG6lL67mdg== 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 4cHBh11sw4zTHv; Wed, 03 Sep 2025 18: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 583Ivr03099137; Wed, 3 Sep 2025 18: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 583IvrPY099134; Wed, 3 Sep 2025 18:57:53 GMT (envelope-from git) Date: Wed, 3 Sep 2025 18:57:53 GMT Message-Id: <202509031857.583IvrPY099134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: e2a3408b612f - stable/14 - irdma: normalize .CURDIR-relative paths to SRCTOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e2a3408b612f717c79f0e16cfabfdeff4067c2af Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=e2a3408b612f717c79f0e16cfabfdeff4067c2af commit e2a3408b612f717c79f0e16cfabfdeff4067c2af Author: Ka Ho Ng AuthorDate: 2025-08-27 21:13:24 +0000 Commit: Ka Ho Ng CommitDate: 2025-09-03 18:54:26 +0000 irdma: normalize .CURDIR-relative paths to SRCTOP Sponsored by: Juniper Networks, Inc. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52192 (cherry picked from commit a93e46f15693b6962eefac2ffa962edb020f8b49) --- sys/modules/irdma/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/modules/irdma/Makefile b/sys/modules/irdma/Makefile index b2ffb67ca66f..a9ef6e63d3f2 100644 --- a/sys/modules/irdma/Makefile +++ b/sys/modules/irdma/Makefile @@ -1,8 +1,8 @@ .include -OFED_INC_DIR = ${.CURDIR}/../../ofed/include -ICE_DIR = ${.CURDIR}/../../dev/ice -.PATH: ${.CURDIR}/../../dev/irdma +OFED_INC_DIR = ${SRCTOP}/sys/ofed/include +ICE_DIR = ${SRCTOP}/sys/dev/ice +.PATH: ${SRCTOP}/sys/dev/irdma KMOD= irdma SRCS= icrdma.c From nobody Wed Sep 3 20:22: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 4cHDYs6Txhz665jp; Wed, 03 Sep 2025 20:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHDYs5h2Cz3bnn; Wed, 03 Sep 2025 20:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756930961; 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=53s22FHRaz1c90U0EzXWVxVm0aPK70xXmVp7CpNEf/0=; b=sDktbqRwImmqCmBhPCUyfbd0/cg6qnhhSaVp3G7qdfouoXA4X/PJFIHLqR6Y1fO6rXnLkQ BEicbv2zzb2Aglh0u3k6klUzjxjfWSdtldPSPeCyWDVcYErTdIRGMuV+i5/fk7jpbHnELr L+gTDNx6msgeNUGAC0O9VmykqgINhfkZVwDflC74NWhrXdCJkiOtzW3ZbxUjJat7lKbwOb EsdrNsbWTcKiwbhbbL/7JrJ+JxmYWtiT5DnuFBaCLfSWJ+6R65oMv77Rh9Ygi/INXBOjn1 paCvBtGuqs39FU5I7IfCSMwqz8O68jrrt8rTk9CwRDdx1Fla85Cmi7+ra/R8Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756930961; 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=53s22FHRaz1c90U0EzXWVxVm0aPK70xXmVp7CpNEf/0=; b=Lp+XRN7yaqIQXz5BOrht9hsvtbCDeIoHfEqB8ZmAHOkYPuQm755T1KMWkMDFDm78UBB0x/ kWrQAaE65OeydjAv72IHBfkGXF/rDMPOwqd9hBun+QXwdTAzFObWReNDcnIBf7sY2qh/sJ 9llDyi88b7LUhJ8pITVl6m1V4/7hNtCCU7ZuH0+AqFQ3T6Xpp0Cp13wGtYTR7u+7FRX5J4 VmcLYd78/mIUYmA3ZBwg7gdmuSNk+ei4gq8RBCGhKL6/00SAU+C8qXtXcX9STNCzUJT28i TC0TUUAsLW0uOP4uZ2L5xMnapheRMgiJeApxaOgNZvTJkHpPzDLMo6wwBWxjsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756930961; a=rsa-sha256; cv=none; b=VaZ5/3xtsZKtrItCncmZKk8Wi2Vhk5bN2SJ2sCRws53hn1QNJ8MZJU700j/GU12mda8pnH YCGfckIp/YvcwmMC0rNPAlUSWu2XTPEWa9hjspWBAUwyHJzO9pYvY5YaJgNXdVk8HTsPKy gBxBx2//Ph/9PPv1byL2+bVpXPqhQDLol/OBqcwwzDQ7rYbopJwrobb1eeNlBiuCxZJirI FURsRXf/801881HfAP5RBVxKbRPsGMnwtQJHfFQk0Quh74aSQo4yz2gFavmbTgclgOxCUv PSXMjNnf2I54SEDiPcYiGcUisIvwEDCbvyZt+v4mSVbNomUlORSFRw5HymCnXg== 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 4cHDYs4zz0zXqS; Wed, 03 Sep 2025 20:22: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 583KMf5t068185; Wed, 3 Sep 2025 20:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583KMfSb068182; Wed, 3 Sep 2025 20:22:41 GMT (envelope-from git) Date: Wed, 3 Sep 2025 20:22:41 GMT Message-Id: <202509032022.583KMfSb068182@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: c0e3a2d77bfe - stable/14 - netstat: fix reporting of delivered UDP packets 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: c0e3a2d77bfe2cd1992a10c760cae273924e8300 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c0e3a2d77bfe2cd1992a10c760cae273924e8300 commit c0e3a2d77bfe2cd1992a10c760cae273924e8300 Author: Michael Tuexen AuthorDate: 2025-08-12 17:40:58 +0000 Commit: Michael Tuexen CommitDate: 2025-09-03 09:59:04 +0000 netstat: fix reporting of delivered UDP packets The counter udps_noport includes udps_noportbcast, so don't subtract udps_noportbcast twice. PR: 288680 Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51870 (cherry picked from commit d3f2d49e01a867e19186a1db095a7dd66e6c77c0) --- usr.bin/netstat/inet.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 86354d680131..f154c4849dfe 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -950,7 +950,6 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) udpstat.udps_badlen - udpstat.udps_badsum - udpstat.udps_noport - - udpstat.udps_noportbcast - udpstat.udps_fullsock; if (delivered || sflag <= 1) xo_emit("\t{:delivered-packets/%ju} {N:/delivered}\n", From nobody Thu Sep 4 00:44: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 4cHLNV39wWz66Sy6; Thu, 04 Sep 2025 00:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHLNV2Ww9z44vF; Thu, 04 Sep 2025 00:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946698; 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=JREgnQlEE2jiFUIJDSwHf2Mx9Ktxn9HuyIqFAghTvtk=; b=eQoYnxxcOikYWolutXP5ODor1nl7uqPlyt2ItzMB3Q9j4vbd+2VJbdR3IQQyQQy0dhFQGu hj7kLNtxuFZaF1sFeiYsWndOKTyPXNf9JRTTJwum7X3tUA+4A+oFRiFJmulfGsnoE7JtXr YdHdW73BRVnxat1BtgkY7O/WwCdG/fnZHBVc6We8Wvb3ylP/ffJFtDC+g5cCi8j3CdXmIr scO5xxcaQ9XfbbyBrUvYuDxUt9LufFnIoeJe15J1rFXveiE5/Zpax1ZweKvG7WHKoFBHlW Z/OM6iyjgqT0HCc9X2sKuTj4Am3O0G4Py2dxx3ZBgcg2nS0uXCQBMMj3uQEuiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946698; 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=JREgnQlEE2jiFUIJDSwHf2Mx9Ktxn9HuyIqFAghTvtk=; b=Yn4RJ21gvaDI5a84s/9WdkqbYMWgTrQcQyTApP263g8eUFmmciKkKRm+CdJOitrK+xfwCe fzefansOYv62cUYCXOblw4854//KqMGTdkjStt2cmkjLiSoAPGcmVlwz5D6nim2ZQIpN1O AmdfvLvWdILj91BJNMjtqjq2azgDb7dIKNgO0/uyn8dBvyrG2JrrUP+/JbtYTuVyrz4RJn 6PIVXKfDU2M6jaUx2mUWc1DkQ89MU+K5pSCRWGyxFxXe1F3dFWsds83x0Le74a1LUoeLXl YaxFdXnSo0uAV3fjB9zHQOElbSiMA1/ffs3n6fr8hjzX4/Hg2zCrWOs6kMD+0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756946698; a=rsa-sha256; cv=none; b=pJvSddnI4hse7TumOvI831Kcv4rVA4Et5TpKmGUygDau70qioHxcyLndP596inSYtc6Ees Z7qMKBApXjTtCvlQTZzHT6sETvzVp7fvFlckFkF8C3mqIbSMlFW5YdBL5HMeebc9Uj25w8 oxDJFC2W9ggiVGJrISlYuK0u8okXN7WI7lsbqQ5WOd2lOUPis9AwnMGAUMRECW6f3mjYav 3KpVyrUPlWmTIDdeQQhnUfeQ7nBPIGVm+yVbyEHd96kly93kAy4nkQMra9aJaObFDQZDD8 w+xNfYwTpVSkOLraYMZBpVM8CqhTee+cH+IjOPkEoUx6Mt+dtsrV/Pj49WJ9Vw== 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 4cHLNV1p9kzggP; Thu, 04 Sep 2025 00:44: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 5840iwR3060577; Thu, 4 Sep 2025 00:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5840iw4t060574; Thu, 4 Sep 2025 00:44:58 GMT (envelope-from git) Date: Thu, 4 Sep 2025 00:44:58 GMT Message-Id: <202509040044.5840iw4t060574@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: 93006233f203 - stable/14 - vfs: make vfscount refcounting handle possible kld unload 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: 93006233f20317dfa18f65f879828910f95b10c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=93006233f20317dfa18f65f879828910f95b10c5 commit 93006233f20317dfa18f65f879828910f95b10c5 Author: Konstantin Belousov AuthorDate: 2025-08-27 22:24:01 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-04 00:43:14 +0000 vfs: make vfscount refcounting handle possible kld unload (cherry picked from commit be8bae67002503baff6bb9fb77fbe6b80f035c33) --- sys/kern/vfs_init.c | 16 ++++++++++++++-- sys/kern/vfs_mount.c | 7 +++++-- sys/sys/mount.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 64263caaef98..e516d929d9d0 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -108,6 +108,16 @@ struct vattr va_null; * Routines having to do with the management of the vnode table. */ +void +vfs_unref_vfsconf(struct vfsconf *vfsp) +{ + vfsconf_lock(); + KASSERT(vfsp->vfc_refcount > 0, + ("vfs %p refcount underflow %d", vfsp, vfsp->vfc_refcount)); + vfsp->vfc_refcount--; + vfsconf_unlock(); +} + static struct vfsconf * vfs_byname_locked(const char *name) { @@ -128,9 +138,11 @@ vfs_byname(const char *name) { struct vfsconf *vfsp; - vfsconf_slock(); + vfsconf_lock(); vfsp = vfs_byname_locked(name); - vfsconf_sunlock(); + if (vfsp != NULL) + vfsp->vfc_refcount++; + vfsconf_unlock(); return (vfsp); } diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 1990f3714ab6..85d14a943d01 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -683,7 +683,6 @@ vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp, const char *fspath, MPASSERT(mp->mnt_vfs_ops == 1, mp, ("vfs_ops should be 1 but %d found", mp->mnt_vfs_ops)); (void) vfs_busy(mp, MBF_NOWAIT); - atomic_add_acq_int(&vfsp->vfc_refcount, 1); mp->mnt_op = vfsp->vfc_vfsops; mp->mnt_vfc = vfsp; mp->mnt_stat.f_type = vfsp->vfc_typenum; @@ -731,7 +730,6 @@ vfs_mount_destroy(struct mount *mp) __FILE__, __LINE__)); MPPASS(mp->mnt_writeopcount == 0, mp); MPPASS(mp->mnt_secondary_writes == 0, mp); - atomic_subtract_rel_int(&mp->mnt_vfc->vfc_refcount, 1); if (!TAILQ_EMPTY(&mp->mnt_nvnodelist)) { struct vnode *vp; @@ -769,6 +767,9 @@ vfs_mount_destroy(struct mount *mp) vfs_free_addrlist(mp->mnt_export); free(mp->mnt_export, M_MOUNT); } + vfsconf_lock(); + mp->mnt_vfc->vfc_refcount--; + vfsconf_unlock(); crfree(mp->mnt_cred); uma_zfree(mount_zone, mp); } @@ -1133,6 +1134,7 @@ vfs_domount_first( if (jailed(td->td_ucred) && (!prison_allow(td->td_ucred, vfsp->vfc_prison_flag) || vp == td->td_ucred->cr_prison->pr_root)) { vput(vp); + vfs_unref_vfsconf(vfsp); return (EPERM); } @@ -1169,6 +1171,7 @@ vfs_domount_first( } if (error != 0) { vput(vp); + vfs_unref_vfsconf(vfsp); return (error); } vn_seqc_write_begin(vp); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index efe230f518f8..f7e756e03c84 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1002,6 +1002,7 @@ struct mntarg *mount_argsu(struct mntarg *ma, const char *name, const void *val, void statfs_scale_blocks(struct statfs *sf, long max_size); struct vfsconf *vfs_byname(const char *); struct vfsconf *vfs_byname_kld(const char *, struct thread *td, int *); +void vfs_unref_vfsconf(struct vfsconf *vfsp); void vfs_mount_destroy(struct mount *); void vfs_event_signal(fsid_t *, u_int32_t, intptr_t); void vfs_freeopts(struct vfsoptlist *opts); From nobody Thu Sep 4 00:44: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 4cHLNX0nsXz66Sh9; Thu, 04 Sep 2025 00:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHLNW5L62z44s0; Thu, 04 Sep 2025 00:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946699; 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=B12SovSFE3WHcixqjetCY2xecapzfcd/NxpxYdXbuAg=; b=p7FY+SoK8ZuKA8iknZp83admKZi2qeCmhbUW4joxRbkI/nN866366VFfaEPKPOJlveT0hn 93HIl/rqO37WIqYA64c190Rv0XQktemLdXn6WPsN3vHJielBMA+RntpFIySveOjEHsNETZ IYUI9M9VyZO/mI1RvWe05klLmnlY0jSLFwzbSToHTE5lGf4+aJsDoM3w5pUmqAQ4NLUlQr nCMNtflpzjB6mSA4Cm0xcrV5Pp3n5CvB7FP2cnxpRPhGmoenxSPL4BgPYqH6llbVMV5QAc zt2jK/ZIhzSjU5ErXZOW5GeVAuLaGsDwPJDv2RkXYiWAMDnldsXvkT9m6Q4GHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946699; 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=B12SovSFE3WHcixqjetCY2xecapzfcd/NxpxYdXbuAg=; b=Rzh3voD+8pJ+LKpT12THoLlKKGjH0QtevgxANfz0yjVtLlFBm2U/tWL7J+lj/VTcAfhXLX FFJ4K34ZhfVXw+WrxlaoB3p9A5HrFnajHEYVNSiLHFXVf0/cuirwVEbCzMr0bOXEt9CjQy hzdWndImApxXpYxfJwYPYu64QqwdwQublzv64JiYFyqMtdADyX8k56xPWORSruxqr9PgsH hJdK9UanRLD7MfnoiFTGt2EtoL52FyZHY7SADbFMgavTEcpIbSPVJeaAP9mq6WpMrQFTQx ppb5WtDSD3w9B0jBJgheJMOtRPcNLINUonciXM1yb5sHkkzOLZoBg07Fmne70Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756946699; a=rsa-sha256; cv=none; b=vjdD+zfLVJDBK+Pqcu4zYhneaL5OXKq51MsjMcN8h11YopAio3KrRpaKQJPNwWyDYZbEfl lW7Wtm/IFXeh+CN3refe4gb7Ti2f8XaAiUNuFOeXXRrw35KhCwAhfnEPOb6S4llf+gJnS2 YUo8NlmA+CIB6wukHYmbRCW1pm00PbFFmmKAXC5EhVhD/8u8jektJe3DWK1fhCjhcdt1ls Bn8XY1Ua/Ecdts9wVRBavlUD2FcNz2d+CtfoV2r8uG02PAhT/fdrKnQ+g2q7Sh3qBuDJ51 ZHprYzzPtBXHv8qTN79m8tE+BDF7iWxqgYnL4b/pBzvCkuM9Xj+yKpxn4cf+rA== 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 4cHLNW1dX3zh1V; Thu, 04 Sep 2025 00:44: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 5840ixN4060616; Thu, 4 Sep 2025 00:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5840ixuc060613; Thu, 4 Sep 2025 00:44:59 GMT (envelope-from git) Date: Thu, 4 Sep 2025 00:44:59 GMT Message-Id: <202509040044.5840ixuc060613@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: 56b5818f9aa7 - stable/14 - kern/kern_thread.c: improve assert in thread_single_end() 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: 56b5818f9aa78ec7ae881cd901eadd889c56e6a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56b5818f9aa78ec7ae881cd901eadd889c56e6a2 commit 56b5818f9aa78ec7ae881cd901eadd889c56e6a2 Author: Konstantin Belousov AuthorDate: 2025-08-29 20:14:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-04 00:43:14 +0000 kern/kern_thread.c: improve assert in thread_single_end() (cherry picked from commit 8321d0da2ce294d83acc564f2c71fc3a023eb621) --- sys/kern/kern_thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index ec9127939f31..a41e74e1533e 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1710,8 +1710,10 @@ thread_single_end(struct proc *p, int mode) thread_unlock(td); } } - KASSERT(mode != SINGLE_BOUNDARY || p->p_boundary_count == 0, - ("inconsistent boundary count %d", p->p_boundary_count)); + KASSERT(mode != SINGLE_BOUNDARY || P_SHOULDSTOP(p) || + p->p_boundary_count == 0, + ("pid %d proc %p flags %#x inconsistent boundary count %d", + p->p_pid, p, p->p_flag, p->p_boundary_count)); PROC_SUNLOCK(p); if (wakeup_swapper) kick_proc0(); From nobody Thu Sep 4 00:45: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 4cHLNX50F7z66TC4; Thu, 04 Sep 2025 00:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHLNX3L78z44vl; Thu, 04 Sep 2025 00:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946700; 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=Cmoxg2OxhhlL3WlTukY3aUVKx4mgouPZi0Nd1JNyVRg=; b=L/0t2RlzrXcWhYtMxiQhZOiCIfkX7N+t87esuxJpgbFznKc1IscY5hMkOJjIgLH6J3S5rH OOIQKCvV+5ou2M5Z4uCDTV2vOmKWX+BzOZ93jae1DPPArfmbDDHb3+C2RJJ7mnv19fNmBz s24VLqVPvkxtInMp583Cnvku0aijtFCpA6ZPBYsNbXRnFmVWAQRIvdbVA1a8sGtvxce2f2 8t3uNtTELgm0MT540hjMafXVPo4LJTd18bpd+5usWyz5BKrhYrGgfmh/GKHv66vrQ9EZ1N L+tv5twvfJzn7sSGUnA8T1MpMuvs3qXBSeLyiDK/TRQRtHGqqOJhkhqKDUzMlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946700; 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=Cmoxg2OxhhlL3WlTukY3aUVKx4mgouPZi0Nd1JNyVRg=; b=lPdx9IMVGAZ4fPuToF2H26mfzUjyOrrt9iu8J9JwwePuXnvL1ObeF+qRZA8Bsnfe5fPSiD NrdBwtwNukIfQKtap3YghaR4GOBvVibJ87T3ARzNDqtGmgeCFLAIBlveM2IZxpfapOa2mI VLtuVp5aThuvs7DBBcu/Ty8PjB3eUor1NJTxIG7j1MIb0YMf/MaLNr/SkUtGoQVMT3SWsH eRpkohQj7zEY46oRDRgMcyz1cCufBqCOD9ZSt7HOX8tJuSPhbqGpuxA6Wq+XLnRIb32ZhD N3/C6FPpYjE51skfMGfp+w6hCRUwtcrCyaqYjKSZq8KFwGcWksFREAm3krOWew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756946700; a=rsa-sha256; cv=none; b=l90mrjnFDnOttOpAQ6m3kzF93l63fF+h4/3I2BiWuX8e8nseQJnVlj8fTPzqEGKCykSj3D qXf41rX87hcQGqtoKLSHGdqQ0mHpCJhA87vI25zl3Ge423dALYu39qXvt77Y2nkuXLZ1IT dj1yZ1eBz/pfZ8fHfqtGlIWU3fBaeen5wdK/C1H8J3pYHOGUT3cHrWBknTVpFDXZBL0hNG PgjzF4YMK3GLONtqCkqWiuieCQy2g07P/0ry8dbEvOyhhhkXEwe3eDz7Tn3U0Pcgnz2tEU 7drJ5Fb/IV8ua0eHXTgQFjL9UnSD5EPxWgHoOe0ca2aR7CyB7xU1XmmUd428Qg== 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 4cHLNX2tZTzh1W; Thu, 04 Sep 2025 00:45: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 5840j0uG060666; Thu, 4 Sep 2025 00:45:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5840j08E060663; Thu, 4 Sep 2025 00:45:00 GMT (envelope-from git) Date: Thu, 4 Sep 2025 00:45:00 GMT Message-Id: <202509040045.5840j08E060663@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: 12b17b1cccd2 - stable/14 - vm_fault: improve interface for vm_fault_quick_hold_pages() 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: 12b17b1cccd2b43de455a9c1d53a371ce67e4efa Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=12b17b1cccd2b43de455a9c1d53a371ce67e4efa commit 12b17b1cccd2b43de455a9c1d53a371ce67e4efa Author: Konstantin Belousov AuthorDate: 2025-08-26 15:03:10 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-04 00:43:15 +0000 vm_fault: improve interface for vm_fault_quick_hold_pages() (cherry picked from commit 041efb55ec8ba4e379fd1d0a75bd0f637e3d9676) --- sys/vm/vm_extern.h | 2 ++ sys/vm/vm_fault.c | 81 ++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 20 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 566c837aab7e..6057131668e1 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -95,6 +95,8 @@ int vm_fault_disable_pagefaults(void); void vm_fault_enable_pagefaults(int save); int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count); +int vm_fault_quick_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, + vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count); int vm_fault_trap(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags, int *signo, int *ucode); int vm_forkproc(struct thread *, struct proc *, struct thread *, diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 9d7c5d452a0b..0d6850d9e602 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1971,32 +1971,43 @@ vm_fault_prefault(const struct faultstate *fs, vm_offset_t addra, } /* - * Hold each of the physical pages that are mapped by the specified range of - * virtual addresses, ["addr", "addr" + "len"), if those mappings are valid - * and allow the specified types of access, "prot". If all of the implied - * pages are successfully held, then the number of held pages is returned - * together with pointers to those pages in the array "ma". However, if any - * of the pages cannot be held, -1 is returned. + * Hold each of the physical pages that are mapped by the specified + * range of virtual addresses, ["addr", "addr" + "len"), if those + * mappings are valid and allow the specified types of access, "prot". + * If all of the implied pages are successfully held, then the number + * of held pages is assigned to *ppages_count, together with pointers + * to those pages in the array "ma". The returned value is zero. + * + * However, if any of the pages cannot be held, an error is returned, + * and no pages are held. + * Error values: + * ENOMEM - the range is not valid + * EINVAL - the provided vm_page array is too small to hold all pages + * EAGAIN - a page was not mapped, and the thread is in nofaulting mode + * EFAULT - a page with requested permissions cannot be mapped + * (more detailed result from vm_fault() is lost) */ int -vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, - vm_prot_t prot, vm_page_t *ma, int max_count) +vm_fault_quick_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, + vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count) { vm_offset_t end, va; vm_page_t *mp; - int count; + int count, error; boolean_t pmap_failed; - if (len == 0) + if (len == 0) { + *ppages_count = 0; return (0); + } end = round_page(addr + len); addr = trunc_page(addr); if (!vm_map_range_valid(map, addr, end)) - return (-1); + return (ENOMEM); if (atop(end - addr) > max_count) - panic("vm_fault_quick_hold_pages: count > max_count"); + return (EINVAL); count = atop(end - addr); /* @@ -2038,19 +2049,49 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, * the proper behaviour explicitly. */ if ((prot & VM_PROT_QUICK_NOFAULT) != 0 && - (curthread->td_pflags & TDP_NOFAULTING) != 0) - goto error; - for (mp = ma, va = addr; va < end; mp++, va += PAGE_SIZE) + (curthread->td_pflags & TDP_NOFAULTING) != 0) { + error = EAGAIN; + goto fail; + } + for (mp = ma, va = addr; va < end; mp++, va += PAGE_SIZE) { if (*mp == NULL && vm_fault(map, va, prot, - VM_FAULT_NORMAL, mp) != KERN_SUCCESS) - goto error; + VM_FAULT_NORMAL, mp) != KERN_SUCCESS) { + error = EFAULT; + goto fail; + } + } } - return (count); -error: + *ppages_count = count; + return (0); +fail: for (mp = ma; mp < ma + count; mp++) if (*mp != NULL) vm_page_unwire(*mp, PQ_INACTIVE); - return (-1); + return (error); +} + + /* + * Hold each of the physical pages that are mapped by the specified range of + * virtual addresses, ["addr", "addr" + "len"), if those mappings are valid + * and allow the specified types of access, "prot". If all of the implied + * pages are successfully held, then the number of held pages is returned + * together with pointers to those pages in the array "ma". However, if any + * of the pages cannot be held, -1 is returned. + */ +int +vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, + vm_prot_t prot, vm_page_t *ma, int max_count) +{ + int error, pages_count; + + error = vm_fault_quick_hold_pages_e(map, addr, len, prot, ma, + max_count, &pages_count); + if (error != 0) { + if (error == EINVAL) + panic("vm_fault_quick_hold_pages: count > max_count"); + return (-1); + } + return (pages_count); } /* From nobody Thu Sep 4 00:45: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 4cHLNY6YjVz66T40; Thu, 04 Sep 2025 00:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHLNY4sv2z4541; Thu, 04 Sep 2025 00:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946701; 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=vSPurRD/hUOWmYY9RLgqg2Xo1ZjC68ROJ5FKipMy9lY=; b=sEj3IOi8c4eXSNyI5TRgvYYnAbw5CjpP9lVM3br+MqZVlhb0FzsALUWUK3SwWsHAwa2fm4 CQuUUMM5cGlQt5M5K7Qe7JcfaQlv4xy10wSJZQIGMGB++zBIw04RMqZa78CTGQo9XxPgCD hk4UsDzLF3NXzZL+O22b+RmhHzDooMmkxs6osUcnlOIAj7vVLcgQUozkSv/RcHofRz2nmN SvUsKQ3W+pRpsFsTZCbu5ReU8xGnBP09VjouYOK0GUm2Kv5sQTWojgkKu7HNKrVVebKQlZ /IahdtQ4Z9wLMYYdXQ68LevsB6Fy7tfT88HlUmph+RcqFtucGtWU9TTvYficDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946701; 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=vSPurRD/hUOWmYY9RLgqg2Xo1ZjC68ROJ5FKipMy9lY=; b=HZ5+DUPNPoAPaxXorx4JMRYDE09/RKceT4ksPoWPG5EUJeCCMCOULA9qze89tqWtsmgLFq 6Lguxd7Rd/ApoJVCmWCIA0FXjzWOGlFUHPChlC1+ESnudr6kQK7kjygU3gnv+I8y4csJIx 7eZEZspMutajf04lxVKnibHb8FiWZx3Si1xhNBuh4l7ZeJ1Ug8c9c82k1lz/Z4uy5D/f1i AE3Tjn97lKMkzw5n1fGjjjzBltu6bf1jex66JmHWidwL+8wEmi3NUDuv7YnnlMV5emDHv1 DzDLk6DYIi5Z7+CE5IXUon/htggq1Vhb/whTaXJHmqF/4BUe5tlp+NOIsw4qUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756946701; a=rsa-sha256; cv=none; b=YLYt8FxSu6hUqmUDhWgceC8tUUSM16EK4Vuul4ADvvP5CBCojuSZ65+A6OCgZcJZFJkLYX 4ijhOrTVsxw3BjJJeoAxixYALo39oHFRFs13J7045iuNKTZk4oZa65cgyJi4AYKdaS3Mb0 8RRkh3Wxo2ikjiSIsNXw3aJoVH+M/UdzdT/WsbB+o8NXxsL2jXIoepxY9dB35VjsuNGSBA M1zpMvv6FoYNPlGiQSgtVExZq+p7xmhzGW0qIXQKHKmMENUugs9sMyBhnKWDICf7JFsc0x i+GFxTG9ygnoWd0mbNc/D6xO7OA7/A9sJTqUnN8jPLWbfLUAi84+pvLB2DJ9sg== 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 4cHLNY3Wdzzgvf; Thu, 04 Sep 2025 00:45: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 5840j1uW060706; Thu, 4 Sep 2025 00:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5840j1d6060703; Thu, 4 Sep 2025 00:45:01 GMT (envelope-from git) Date: Thu, 4 Sep 2025 00:45:01 GMT Message-Id: <202509040045.5840j1d6060703@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: 9ab8dc298e7a - stable/14 - vm_fault.c: rename vm_fault_quick_hold_pages_e() to vm_fault_hold_pages_e() 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: 9ab8dc298e7ab022120daa9f7b8980030fa8104d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ab8dc298e7ab022120daa9f7b8980030fa8104d commit 9ab8dc298e7ab022120daa9f7b8980030fa8104d Author: Konstantin Belousov AuthorDate: 2025-08-28 17:34:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-04 00:43:15 +0000 vm_fault.c: rename vm_fault_quick_hold_pages_e() to vm_fault_hold_pages_e() (cherry picked from commit c18e41de7436f5f3c2516f48fabe6577e082547f) --- sys/vm/vm_extern.h | 4 ++-- sys/vm/vm_fault.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 6057131668e1..c5d2b2e34271 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -93,10 +93,10 @@ void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t, vm_ooffset_t *); int vm_fault_disable_pagefaults(void); void vm_fault_enable_pagefaults(int save); +int vm_fault_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, + vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count); int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count); -int vm_fault_quick_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, - vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count); int vm_fault_trap(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags, int *signo, int *ucode); int vm_forkproc(struct thread *, struct proc *, struct thread *, diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 0d6850d9e602..ed4213afdb8f 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1988,7 +1988,7 @@ vm_fault_prefault(const struct faultstate *fs, vm_offset_t addra, * (more detailed result from vm_fault() is lost) */ int -vm_fault_quick_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, +vm_fault_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count) { vm_offset_t end, va; @@ -2084,7 +2084,7 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, { int error, pages_count; - error = vm_fault_quick_hold_pages_e(map, addr, len, prot, ma, + error = vm_fault_hold_pages_e(map, addr, len, prot, ma, max_count, &pages_count); if (error != 0) { if (error == EINVAL) From nobody Thu Sep 4 00:45:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cHLNb2Cyxz66T86; Thu, 04 Sep 2025 00:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHLNZ6QjJz454P; Thu, 04 Sep 2025 00:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946702; 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=5LOtIEfhqWP5hCHrfeN86V8rPmqHYC9aHrlob+4Tpwk=; b=qTfPBRIBblylsYc5fnnkZE+vUZf9iikLxjuNWfP2dSpZxqL/6dnfufgGYBaicl0+mIg7o+ Xov45CC2qTQCPEn4VOZWtuZp27OpvWY/+Zvpy52fw3Vu4btEge4Jkh/XJhRrwgNN3JVk6e TNEtAHOMdjIhj6Ky3HmFJuddHwnLSel5yWEqN10/RyImFZExYwgIk/Q7rvqJO3iF3ykt0A 6P+c56Uu47a4LIIeEy8bsV6kRvS75khsfyEEGNN+hVDRtbmRCvdraMAHF1ij9ZGI7D0TYg Ki3YPz2CeOMMpLx7rhE3ICcjtK6Luh1jVI3Ca9qqvRNCNDcodVacOFQ0maimIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946702; 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=5LOtIEfhqWP5hCHrfeN86V8rPmqHYC9aHrlob+4Tpwk=; b=TqLEZS/JGvsEDNJLGhVz+zdSbtcr+Z1BYGYnWZ61mKIwwsnjqDFHAfXYZF+hMmY+7kiEGk LNPs8u6UEXn8DUPyHc33hGcMJRhBNOgwpXALba4ipN7eklNGHR87V4SeNbgnVY/1J3fuRS rXN8D/8NqYDwnJUoXkeSJknCB7dgc7t8zDGSv7ZsaUrOlGWweqbKw9ZFRdilwfrSR6//+C Qkv2zyy5/g8vLl7+yULbsR5Pb1+Dac0akBjb2TGBUiDzPTJxsf3UHHSfkWvrc9FnZrxjUM 8N4NBuCTzcH5qg/6AqD3LXjMSiVgRGPr2puvojHyC4yVKiskQFzL/0UX6/y8jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756946702; a=rsa-sha256; cv=none; b=nlAjbs3LkmQZYroGrgGNX32W8oz64ZssL4+U8HIjcwBemvaUd8RcESl1duF8ZLZyjZKiw3 M3/Kp08Ae7X/Kl3fvvP4MOSCVwVkW3YJk4CO5cW4TAIToNHPvurIWD/cJeFgVfXqdP+EOU usvgc31cs8zapzQGXQIanl/cfOX2NOx1TsNgW7EXOsfc9rSFluf+86/jryPRiCI/gGBj7h Adb1JnpppwiJNcZnl64r4ztsSbSOGD4/VuQPQtM7Mjw5eiM01eJpTEPOC1o6b4m4MraTqo 9ZFFmtIvV4WtS3sahJyd59aQLWPkaI7r7XFVLaYBTkt6kL5u4JzBGCEhVektDg== 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 4cHLNZ4PDdzggQ; Thu, 04 Sep 2025 00:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5840j2A3060741; Thu, 4 Sep 2025 00:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5840j2gE060738; Thu, 4 Sep 2025 00:45:02 GMT (envelope-from git) Date: Thu, 4 Sep 2025 00:45:02 GMT Message-Id: <202509040045.5840j2gE060738@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: 6e934dc3a737 - stable/14 - vm/vm_fault.c: rename vm_fault_hold_pages_e() to vm_fault_hold_pages() 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: 6e934dc3a7375fe7cef5f5c4b24f6cac470fc84e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6e934dc3a7375fe7cef5f5c4b24f6cac470fc84e commit 6e934dc3a7375fe7cef5f5c4b24f6cac470fc84e Author: Konstantin Belousov AuthorDate: 2025-09-02 19:32:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-04 00:43:15 +0000 vm/vm_fault.c: rename vm_fault_hold_pages_e() to vm_fault_hold_pages() (cherry picked from commit 5a308afeaf3d12562c6a61e06f112f730f4d7270) --- sys/vm/vm_extern.h | 2 +- sys/vm/vm_fault.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index c5d2b2e34271..9690e8ae9cbe 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -93,7 +93,7 @@ void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t, vm_ooffset_t *); int vm_fault_disable_pagefaults(void); void vm_fault_enable_pagefaults(int save); -int vm_fault_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, +int vm_fault_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count); int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count); diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index ed4213afdb8f..c8ace2b41345 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1988,7 +1988,7 @@ vm_fault_prefault(const struct faultstate *fs, vm_offset_t addra, * (more detailed result from vm_fault() is lost) */ int -vm_fault_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, +vm_fault_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count) { vm_offset_t end, va; @@ -2084,7 +2084,7 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, { int error, pages_count; - error = vm_fault_hold_pages_e(map, addr, len, prot, ma, + error = vm_fault_hold_pages(map, addr, len, prot, ma, max_count, &pages_count); if (error != 0) { if (error == EINVAL) From nobody Thu Sep 4 13:01: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 4cHfk06760z65yqG; Thu, 04 Sep 2025 13:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHfk05S3Lz3MCl; Thu, 04 Sep 2025 13:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756990872; 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=oo4nmQ8GEEHwdMmUU0GF9jzDPhS7QEZLf1d+a8Okcrk=; b=tHt2ZF8D6hEo8JpcZ3UBEu1ggz4pctDi7Bs0DoAIYbhSm4FgdYwA4lmmi9MRmhS3Oa62Gt EQRNUQRVOgosQpBW8RgVmKEgHMM0txMOHajaCZ8S9BJFNiUH7kUO2SszglrAoRNJyvrRTs 43oNvux9SCKKDZ10k47/IkOQWnU8cxa6W3UsXf6HM20ZXAsvJJe18JoawNc9Y/1yAQq900 UHfvZtCIPqjZb+yXYCYz8GRm34XrFRMMUWW9m+g10e7faJNLwhjoGsRGb5WPkSZLnoIZPe vngZZyNWcMQ0gOL6dudvd9Auwzs1CkLnj4HUgEsSxkLGTRWt4bMircHteD7z7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756990872; 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=oo4nmQ8GEEHwdMmUU0GF9jzDPhS7QEZLf1d+a8Okcrk=; b=tmFar3qRy7Yr9D0VaO8JJMnlmd+JNHKZD6kyKVcQq1JT2gQdNNaRl0pOKdebDOLPAnAJhd gdhDA3TMIxRHLI9vUwQI+k4amWyCNZaZDqfq+bwidU6+Cr+QHWYTKbAhvuNorbz109d5Ly M73HrSCuoToPMCurdH9ZyR7qwU98l1EO5IE3ax9kOH6gpDrwUv0Jhm0nMw1G6s/9U4gShl 7ARWI56xeKMBVKcAyL+yzXbakyNmRx5ME8yjpCH/n4umdKyGxiKARyxhG4sep9MqbatxMg nEHqiLGOy0Pw72dKVPkmtWcPrgl4u5JqIkKvzWhapaI4vu+smzhpQkvv/8UOew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756990872; a=rsa-sha256; cv=none; b=K6xS509TCvqOeUH3+yMRA7jBh3rgzAfYkoPYcE+UuV2T7+SJUOopm2j4bdVS8aYpQE6CJW LEoE3IbWLsf78Z/2KKqOMHmFRfad53l1fwVgYIaTZ3OnQHaVgl8CC9ihkRIOBzc9Fn7hGa 4Mhjbpm1WnI9jOY9R10Iw7gJPvC2K+HALLjsN8nZkvXRxbcaRnqr6TedxsrbfnR/PhnwgK Tk6dI5ICCkltHotSKGJdvPweLfSMmCQYBHDGg1fhF0/FSzutvqsASIOnCtSNXg/43aGajV 8YaA/dIrlOmi80XxcJpiTUY2t6XNAF6G9FWWp3huPK+9xsj3F5r5E/DYa65oRA== 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 4cHfk04s9Hz13TF; Thu, 04 Sep 2025 13:01: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 584D1CIi052283; Thu, 4 Sep 2025 13:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584D1CPA052280; Thu, 4 Sep 2025 13:01:12 GMT (envelope-from git) Date: Thu, 4 Sep 2025 13:01:12 GMT Message-Id: <202509041301.584D1CPA052280@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: 4407e10fdc8b - stable/14 - ng_parse: Add upper bound to avoid possible 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4407e10fdc8b969775233d47c05559c2601b60f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4407e10fdc8b969775233d47c05559c2601b60f4 commit 4407e10fdc8b969775233d47c05559c2601b60f4 Author: Ed Maste AuthorDate: 2025-08-25 14:25:13 +0000 Commit: Ed Maste CommitDate: 2025-09-04 12:08:51 +0000 ng_parse: Add upper bound to avoid possible overflow Also move num initialization for clarity. We still need to check num in ng_unparse_composite (reported by des@ in D52151) but this is another incremental improvement in netgraph input validation. Reviewed by: des PR: 267334 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52151 (cherry picked from commit 375527545c85362f14070d35575f9bcd7092f4b9) --- sys/netgraph/ng_parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index 1a1d9d8b3064..1f322a31975f 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -1200,14 +1200,14 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int *off, const u_char *const start, u_char *const buf, int *buflen, const enum comptype ctype) { - const int num = ng_get_composite_len(type, start, buf, ctype); int nextIndex = 0; /* next implicit array index */ u_int index; /* field or element index */ int *foff; /* field value offsets in string */ int align, len, blen, error = 0; /* Initialize */ - if (num < 0) + const int num = ng_get_composite_len(type, start, buf, ctype); + if (num < 0 || num > INT_MAX / sizeof(*foff)) return (EINVAL); foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO); if (foff == NULL) { From nobody Thu Sep 4 13:05: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 4cHfqB0LW5z65yV2; Thu, 04 Sep 2025 13:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHfq96qh1z3N10; Thu, 04 Sep 2025 13:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756991142; 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=1XkpZrnkg+bNnGCkFQafbsH+A56AVOhMsoNSjRYG0oY=; b=vmIB6M3qVm5Mf/L53T8k7Grj+Drmdm87qaRXevcAQDZjhORNj4zJc9a5s8D/T9BhtpMVGF MoCjjLVzOKbNcvOcWq+IezKmzYIz1VneRfZRaZs/pAW+u9bWjqvYCiFKKP5T/IOU0dhjKG NJQEKILVvTM3gVakhCM21+U4pBMxyloh6DeqbqBLedSYQSQBa/AzdVli/Pz4Wt5m+Mhy1R eAw2CIes+yoQf8ipK/qrFQIJOdwYK3nWKlyPv3xfRbhn4i7oo0tGl1d1cj8oQRDLuL8UO7 hFFxQSliZqqPghcCGezSTimIs+3rLLBBrE7Q+/ZL7UrdaM9RJ2Ec6rFuqW8Wsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756991142; 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=1XkpZrnkg+bNnGCkFQafbsH+A56AVOhMsoNSjRYG0oY=; b=aV7rsK9pAZH5o74VvdxdotD4x9UGrt092rL1XDd47DecBccH4rjq7nUu/mcUNhxBguPUUh +FqVCI/kvqLj6c/bWESlkNx5sL5RGNMoLDvusUPmX36G84eU107YFaf82g/5f3tG+h022k RNxxGxOSPmv/8z+LB+IJvdZIH8f/iMWTkSEzJannayUPJp7ZXk0kj/lJIld87AzzvVumax 8oV+OxdIOcWVR3eVN6Q6ZnFJyD6OcY0as6NlusmDwlukrfyG7Nag9nfHQUwZmcLPNR7r+f 4FAC1EuHS5L1hPexoez5HB4HVX2elHR08LfYbfUnpVt0att+T1OOJZWt289iHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756991142; a=rsa-sha256; cv=none; b=DMJn6J+jn7JMar59vyx1fGg+D08tCL9L9YkM2t9lQFBEub/tl/+0LzdTQ2aM1+xapbGXCw 7APq5O/K2kYlKX5Onms0OEZTpOyHRqQX0pH2aOoct+/+uRkKbrE86PhyH6fjqYK3M0f9rv 6ZRqiMuWVpmx8b7mWe5h16PlHiBqupKn92SnRr/F9Iit3kcnDgjNUSZji8dsxoGbplcTvL psQieQ904oWrR4T2dyYsiSJBoLiFWkoNKKg+0WAOKg1Oi6BJDJ2eawp21fQwNF8ScSGCcb j4HZEEs73Bw8Hn23tgJ1RhkXTOHVm8wk2eTJFRskl/+RRSJYA5+M6v49dGcNjQ== 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 4cHfq96P1Vz13ZM; Thu, 04 Sep 2025 13:05: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 584D5faT055834; Thu, 4 Sep 2025 13:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584D5f5H055831; Thu, 4 Sep 2025 13:05:41 GMT (envelope-from git) Date: Thu, 4 Sep 2025 13:05:41 GMT Message-Id: <202509041305.584D5f5H055831@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: bc77917cd053 - stable/13 - ng_parse: disallow negative length for malloc 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: bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 commit bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 Author: Ed Maste AuthorDate: 2022-11-01 14:01:29 +0000 Commit: Ed Maste CommitDate: 2025-09-04 13:05:30 +0000 ng_parse: disallow negative length for malloc This is an interim robustness improvement; further improvements as described in the PR and/or Phabricator review are still needed. PR: 267334 Reported by: Robert Morris Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37229 (cherry picked from commit ae4f39464c61182c2bdfd3cc61594f8707b3daf0) (cherry picked from commit 0e0329c6dbabc12f5ab08bb63929a2ba6d506084) --- sys/netgraph/ng_parse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index e11070274484..1a1d9d8b3064 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -1207,6 +1207,8 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int align, len, blen, error = 0; /* Initialize */ + if (num < 0) + return (EINVAL); foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO); if (foff == NULL) { error = ENOMEM; From nobody Thu Sep 4 13:05: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 4cHfqC30vMz66000; Thu, 04 Sep 2025 13:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHfqC0gl3z3NJc; Thu, 04 Sep 2025 13:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756991143; 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=sXD+hjY4dvsov8OleZdFHKiZ+nqw4L1r/JmhgkRLmxM=; b=yAtAn+7GBH8qgV1BJQmmza7XMtpcC7bt4CLxXeHWZQ67TpBP5DKW4Mo1azKREPniI9RT/F qt3BoIXaCvBEMk7GUw8cpM8wp5Z0rWEZCeEEqJdok6EUHsYEF9WpQP6sirXxcGXao5zqqk ovgY14oNFy6ECVRlAaBp+IufZ1H0Q5/g7t24PBxxAXV7gMabBrr0w9knfNayv5nao3AS8x xwLPQnIxQZONq7uYsqPh9lMfkWHgduaDFa6/ORgrm0x2KDrsMaKTstKMgXdJaZApG+3gYB NwBdwAChTAGWIcpSdQjssy2xWvYsKvWtsYuNyGd5hWMQsljoarPqI+gPziPB8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756991143; 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=sXD+hjY4dvsov8OleZdFHKiZ+nqw4L1r/JmhgkRLmxM=; b=eCCMdzh8Kt+Rb2IBhuPb31hg6//NILF2YQqgBFW35t9Jlzm1EQ02grMztKxeZs43QoC/Vl VVXGE9mfYFm9bLTDa0cRtf/MY1jbIa8lrhbE3hP8C84USlNMaH0wF4ajQ++hX1azI2AH5G 5TedpD6M62gc/jr3KZ5T5rhX3UEZnEU0i7nfc7uXIWpaGNVK0xeI9atjeL14VpnL/ZhkxM Eedris0+A8+bLgRvJg4W32EjYG9ghQ2aFWYWTDcTHbWeuUVHyGWmxjuDV8EFWEC7mdOl6C hW7xwTb6SgNGW4GJ8PLggFbgrPFKhrN2xrCGMqo7O/p1H2zjfDKDY8M9HvPKbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756991143; a=rsa-sha256; cv=none; b=mSjmVvMHi4Rpb2cbzdgggprIbtD518I1soQMBQyET/ETYyWcmwlPTgtKjNnsc3LEOPmoUy R5vwb44cLAx2dowwzD3nFSHiuZFl8UjftHCLLUUbrrHZzf7M5UWljd+likiN/pegnQyskC 3Nno8+x4miBqlTpcacBXiS8oc6GXE8RRZZGJjXfq0GqmcsM5ZMJM3qTu3mXAZUBk2hqBR7 /BE7rXCp5sTmax1xhTNZMgpAfeuj9w2LMskX5JvKEAI/LbROIQEYgPumawRltlxqvP0SGM HjSmBwgcI4KOwN0YNif1/JEgwMOru99psA1EYJfZcIikq5ci+zy0y241d47y/g== 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 4cHfqC09NPz13cZ; Thu, 04 Sep 2025 13:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584D5gYe055867; Thu, 4 Sep 2025 13:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584D5gx2055864; Thu, 4 Sep 2025 13:05:42 GMT (envelope-from git) Date: Thu, 4 Sep 2025 13:05:42 GMT Message-Id: <202509041305.584D5gx2055864@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: e3af3a23c155 - stable/13 - ng_parse: Add upper bound to avoid possible 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e3af3a23c155d85275c6e32f2fe943468f252ba3 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e3af3a23c155d85275c6e32f2fe943468f252ba3 commit e3af3a23c155d85275c6e32f2fe943468f252ba3 Author: Ed Maste AuthorDate: 2025-08-25 14:25:13 +0000 Commit: Ed Maste CommitDate: 2025-09-04 13:05:30 +0000 ng_parse: Add upper bound to avoid possible overflow Also move num initialization for clarity. We still need to check num in ng_unparse_composite (reported by des@ in D52151) but this is another incremental improvement in netgraph input validation. Reviewed by: des PR: 267334 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52151 (cherry picked from commit 375527545c85362f14070d35575f9bcd7092f4b9) (cherry picked from commit 4407e10fdc8b969775233d47c05559c2601b60f4) --- sys/netgraph/ng_parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index 1a1d9d8b3064..1f322a31975f 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -1200,14 +1200,14 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int *off, const u_char *const start, u_char *const buf, int *buflen, const enum comptype ctype) { - const int num = ng_get_composite_len(type, start, buf, ctype); int nextIndex = 0; /* next implicit array index */ u_int index; /* field or element index */ int *foff; /* field value offsets in string */ int align, len, blen, error = 0; /* Initialize */ - if (num < 0) + const int num = ng_get_composite_len(type, start, buf, ctype); + if (num < 0 || num > INT_MAX / sizeof(*foff)) return (EINVAL); foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO); if (foff == NULL) { From nobody Thu Sep 4 14:09: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 4cHhDh6m96z665WZ; Thu, 04 Sep 2025 14:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHhDh5q41z3ZFZ; Thu, 04 Sep 2025 14:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756994964; 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=tzl4/kqhPrKfTUwidOf8VKaIrEOoqdJGb03Ki1lClgw=; b=IS4Oc/XEaKQN7n7ljXfRXxjvHx65Y81oyIupPvKX+WknvDcZkx166vYr6E4/6rBYfiO4Bu 8utnlUM/L3DX18lctfPyjRRQIr2sqZ82T6Snxq6L7EQyZJ6NRHJrY16MggCS6D/YYfj5yo FepnRuGCKhdKk6iIMR/bP8YeAI506/0awhLSrzDqBVve4iFC1P0ydNq7kX63viSH4r4U14 7vFC5scytYivVTTBVNwg7cYKNn+9Y3P1Btw90Z8hkWLTzXxy/NAsyFg1O+8QQe4maoWVQ/ TJ5lT0Xsutf3SOXO57wyHNWhB2HbxdvvCG4IiHrnDRlb2NMiP6z4WP2kr+njAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756994964; 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=tzl4/kqhPrKfTUwidOf8VKaIrEOoqdJGb03Ki1lClgw=; b=etv28BcWziVq4ivWrplim6dN4aF/swYUY2gVDwpBalgsPJbTUr2Z7iKrh5kXhszstQjsaJ XjfLYL4WnKDeiRRDWjHbQpVz/FwIuRpMTsP6kw/xclH5RvMXJakvZN6islT4MLTiQhs3x/ nk3li9xmQZL2cgmDG3uRvb7boMhw+x7ml5WmNhJNK6sqpCWO/Z5XVclYTzhF7CsxCsMv4q FitsroosDY2IgF57Yb6+qoLFF49QetYxwvQiWHAN0Tw5VAu5bqE9q8+/aVjqMIYJZ7gbTb 6hvnf4JY84zNwQOZiEdM9zkK2mEJJDbJTsbbuZLGIR1mguS2SL0KEnQ/oOfY/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756994964; a=rsa-sha256; cv=none; b=EStf8joMr9PcfRx3keGaijIo1FGIjWXgtaEsK9C1IfdnBvsaLY6qelGenaOyXGMDuucKaA ba/2ZsHFKqecwqM3U1juItrXB5pmh3bASLUgX2ft0jpAhzRDbdL6fUWunfw7Cx3diIskyW 5TdqaDyyNddFFrXrRKWAAfZxXcqxq+poYGSk+4swy9vDyaNW8CFozfjqCE1ijCi+JOKKle N0LATGQZBqMkhhjwISRQDDUejHe5hlrpz8kc1wh0u/4wl2NelZXLDxc0vh4+GRVQTRpI1D M41JudBnVLybGsTi/zfTk8/QfLMgWV0SMTvkvnm/snIl/Fg1sMZhqjnJtgeVzQ== 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 4cHhDh52BTz15JT; Thu, 04 Sep 2025 14:09: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 584E9OJ1071599; Thu, 4 Sep 2025 14:09:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584E9Of7071596; Thu, 4 Sep 2025 14:09:24 GMT (envelope-from git) Date: Thu, 4 Sep 2025 14:09:24 GMT Message-Id: <202509041409.584E9Of7071596@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: 6147dfa9aff7 - stable/14 - moused,syscons: Avoid warning if system has no /dev/ttyv* 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: 6147dfa9aff7ed7e6d2529e10f83d997a079f651 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6147dfa9aff7ed7e6d2529e10f83d997a079f651 commit 6147dfa9aff7ed7e6d2529e10f83d997a079f651 Author: Ed Maste AuthorDate: 2025-09-02 17:01:47 +0000 Commit: Ed Maste CommitDate: 2025-09-04 14:09:08 +0000 moused,syscons: Avoid warning if system has no /dev/ttyv* A VM had no virtual terminals and emitted a warning on boot `eval: cannot open /dev/ttyv*: No such file or directory`. Break the loop in this case to avoid the warning. PR: 289173 Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52344 (cherry picked from commit 5eb80bf1a6a435e88507c49111a28ed9e38b4b76) --- libexec/rc/rc.d/moused | 1 + libexec/rc/rc.d/syscons | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libexec/rc/rc.d/moused b/libexec/rc/rc.d/moused index 85a04c89447a..92890264193c 100755 --- a/libexec/rc/rc.d/moused +++ b/libexec/rc/rc.d/moused @@ -65,6 +65,7 @@ moused_start() esac for ttyv in /dev/ttyv* ; do + [ "$ttyv" = '/dev/ttyv*' ] && break vidcontrol < ${ttyv} ${mousechar_arg} -m on done } diff --git a/libexec/rc/rc.d/syscons b/libexec/rc/rc.d/syscons index beef467deaf8..e96fc25efc53 100755 --- a/libexec/rc/rc.d/syscons +++ b/libexec/rc/rc.d/syscons @@ -238,6 +238,7 @@ syscons_configure_keyboard() sc_init echo -n ' allscreens_kbd' for ttyv in /dev/ttyv*; do + [ "$ttyv" = '/dev/ttyv*' ] && break kbdcontrol ${allscreens_kbdflags} < ${ttyv} > ${ttyv} 2>&1 done fi @@ -382,6 +383,7 @@ syscons_start() sc_init echo -n ' allscreens' for ttyv in /dev/ttyv*; do + [ "$ttyv" = '/dev/ttyv*' ] && break vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1 done fi From nobody Thu Sep 4 14:53: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 4cHjCS5GJ2z6695t; Thu, 04 Sep 2025 14:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHjCS4jC7z3hlC; Thu, 04 Sep 2025 14:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756997604; 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=YJjEjVLB9UQNSnzW7HNqCTd7/qXP4K3ysTKeZwhkdlc=; b=WA47OXOOnZPmhsWwRwg/0PqH7a5f0M8Q7r9CZUqon8NMH/H6JluRghOMUwg8YpRF0KE/cN LeZiHVcJR7ZqMQfra/r0Wd64PhRSQwI3TX99Wy6zhWGAx6JMkxH2ZdDNfVZY1dtlET9boC l9z7TvmUU3N2BUDQoK1IpHJkYtyAb/bjEQOTX3wJynu5KDAp+uO0pHowYbhGv7U8303su9 3ydGr3ICJkGmI2fXFUQtL5OOyjX02evy8pwN3ZxqMUl/I/kA/XS2Eyop2A0IEhgm+vhUC4 T3fzWUnO8nOfxhPtNSSUiFL6UudFsMscwAWpbkp4lsGt2H8WWTCBxqlaDr/s8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756997604; 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=YJjEjVLB9UQNSnzW7HNqCTd7/qXP4K3ysTKeZwhkdlc=; b=BELlX7SJ5GlousOvI3GTPExvWphkBCT5VGlDRUgZLQSjpzubYrlqhS61qv0A+g7rUH8L9I bkqYuw0G7gqITc3xzFWyr0RL4GdQjv94VigjUT1zmcTHJexa2G/euEA11CvImllubAWLuG 41a7rTvQLNiqBM2VSkAW8eYxBP3zPA4gw/tVcyK9INnKLoq+byW9XRgjfy3rMNvrMaVYn6 cb0di9vQrwNLtuOLJPtwyYsfcndmasTu2EmjG/PHwmBlTo7TwBSmQZ7v1Ue9G0DDK1BqLd Q5ujXipmD3lyiLMFt+wtiFICjTaHTS7GHuQx2j4ORDAjUGnQpoR4M7BSlhwAAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756997604; a=rsa-sha256; cv=none; b=jOoDPOb3AK76MiDXHw92WDA0/0dUO4HfP8bUCgnznNwoaDzsgavrllE6/L8Azb2YXRNdg9 XTMzPp/C4dzF7kXNnh4dhfoCoYdZ8n5usDi1c59i9u6Vqg9OHZA/pKd3xbicZ8nS3O9Pm9 2QJt30mfEQqH9/UQRK/pWdCQcqDrPvUz1mhvol+DADP7p0NGwDwjX9ok0YU3Jets8H/vKB MvsKKM2QqrasQIOtOG6UcIsrsiTl2u5rA17j0NLbKBdQMXq6Jf1k2KwRc5KKQ4NQVdXkFS mFH4VC185jcGr26mqyZypIiuGAgSdZpR9VUJy2E215NqXMPCdgwZ8ZucBjFHjg== 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 4cHjCS40Bgz16nB; Thu, 04 Sep 2025 14:53: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 584ErOHq062225; Thu, 4 Sep 2025 14:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584ErOgR062222; Thu, 4 Sep 2025 14:53:24 GMT (envelope-from git) Date: Thu, 4 Sep 2025 14:53:24 GMT Message-Id: <202509041453.584ErOgR062222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: a39ca2c29995 - stable/14 - date(1): Improve manpage around '-I' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a39ca2c299954b0e077bdebc9a083546cf3e9d0f Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=a39ca2c299954b0e077bdebc9a083546cf3e9d0f commit a39ca2c299954b0e077bdebc9a083546cf3e9d0f Author: Michael Osipov AuthorDate: 2025-08-31 20:06:00 +0000 Commit: Michael Osipov CommitDate: 2025-09-04 14:52:37 +0000 date(1): Improve manpage around '-I' * ISO 8601 defines two formats: basic and extended, clarify that we output the extended format only. * Clarify that ISO 8601 is only aware of timezone /offsets/, not timezones, it has no relation to the Olson timezone database (TZ environment variable). Reviewed by: otis (mentor), des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52314 (cherry picked from commit 21628c79d541b55b5e60231cefec73ca31719b6d) --- bin/date/date.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 62d28a7df0a0..b86a660a924d 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 10, 2024 +.Dd September 1, 2025 .Dt DATE 1 .Os .Sh NAME @@ -129,7 +129,7 @@ format. Parsing is done using .Xr strptime 3 . .It Fl I Ns Op Ar FMT -Use +Use extended .St -iso8601 output format. .Ar FMT @@ -154,9 +154,9 @@ is .Cm seconds , or .Cm ns Pc , -the +the extended .St -iso8601 -format includes the timezone. +format includes the timezone offset. .It Fl j Do not try to set the date. This allows you to use the From nobody Thu Sep 4 14:59: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 4cHjL34Hd3z669M4; Thu, 04 Sep 2025 14:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHjL33Jn4z3jfP; Thu, 04 Sep 2025 14:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756997947; 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=FCeX2U/Kn5iZcGKY2rTfZIqoIFlP57NRCJGsSezez14=; b=QHbf2E0J3fX9v2/VJMJR0Gt0qyVp4ZTm9BJEsRqIytWOJKHnxnf6+zCW/HtFFVlXfmVTR8 8pua8952063kXpOuUW3FqwDcXmQZmffF+U/4Y185s9789nx2+tzQV/SgXDGKaTwvejI9Jg THzxHmpv5Nc5zzKvEwpcTdv+Iy68VAwBuId3/SWV8DUAO//Zl3qFkcvqrvB72CzcXcbOrR JqY9NQwr/9YqyRze6rmEkTB6zz1pAIZ6wTgAWLuDN9YowIBSXOM/3gobI3XRFxDL45pOJz CsEecF/747k1Di2q1sngKx+hFqDqzx0Eg/VAQfBp/gSmUgzuQo/DTSiSJ1O07A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756997947; 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=FCeX2U/Kn5iZcGKY2rTfZIqoIFlP57NRCJGsSezez14=; b=GjDnUIR/EA5TGoGMt50FxxiMgd8+ktganiKcShKJTCKtcF2eOMvNhW/t4tik+RKV2bibSS /w5iVEAEm3VIfwHzgTQf5CtzstHONO+fl4m19Pfq+gKbsEZ79j1KvvpVwCVE4ND4mPTCYu IRLBFAIZUoxrIL7BTU+1izoLP2FeXSTegMx9yqN78i1IA+c+Njx8MgrErpu5bcKZ8CaPaq WKxx6ZNxbC9TMEvjz9Hodm0evDRhlmzCmswh45wjexITkf11LiztXnkzcdSPXfJdNNkxz8 nKoCPAdTXo79FpiFHUWdBtXuyn4HjzwoMR4am2KBo88n1xjabd7s1Fk1DwvRSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756997947; a=rsa-sha256; cv=none; b=xblyvcLEdhDRkcWfCSbbyJkQZtjsrUOKptKbxtvq4vZHk/Py25us0wme+TpELEI2Ei4YXd AWNCc45yF/P9E7yDmX2zsFp7HfYPlzaxuixjvTG0Xp/lrdntWqJ9Muq0rkQACF113pABL1 xltASqtzHGiIe9mvgx31yNPAy3X2CwFbvx+IA91aD8tWvuoqcouxkmZullAeO5LNp3Mqb7 qo6ou3okxbG8EfIMzytY6Km6crc5O93zxhLwtoOqBScP5a5MM7TCSfTOjR+jR3/sCuhkGC 43GA+dR8IZ7z+UGgQlPJnOjGhsDnj3b/sDD1IPLbvxO8MVjwTBgTRsWbr3matg== 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 4cHjL32KlFz16Cc; Thu, 04 Sep 2025 14:59: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 584Ex7qi064022; Thu, 4 Sep 2025 14:59:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584Ex7kb064019; Thu, 4 Sep 2025 14:59:07 GMT (envelope-from git) Date: Thu, 4 Sep 2025 14:59:07 GMT Message-Id: <202509041459.584Ex7kb064019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 2e25db21976b - stable/13 - date(1): Improve manpage around '-I' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e25db21976b04a6c62ba927ed0a8bea583bc07f Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=2e25db21976b04a6c62ba927ed0a8bea583bc07f commit 2e25db21976b04a6c62ba927ed0a8bea583bc07f Author: Michael Osipov AuthorDate: 2025-08-31 20:06:00 +0000 Commit: Michael Osipov CommitDate: 2025-09-04 14:55:50 +0000 date(1): Improve manpage around '-I' * ISO 8601 defines two formats: basic and extended, clarify that we output the extended format only. * Clarify that ISO 8601 is only aware of timezone /offsets/, not timezones, it has no relation to the Olson timezone database (TZ environment variable). Reviewed by: otis (mentor), des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52314 (cherry picked from commit 21628c79d541b55b5e60231cefec73ca31719b6d) --- bin/date/date.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 39a314214da6..3f1f513fcee5 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -31,7 +31,7 @@ .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" -.Dd February 27, 2023 +.Dd September 1, 2025 .Dt DATE 1 .Os .Sh NAME @@ -128,7 +128,7 @@ format. Parsing is done using .Xr strptime 3 . .It Fl I Ns Op Ar FMT -Use +Use extended .St -iso8601 output format. .Ar FMT @@ -151,9 +151,9 @@ is .Cm minutes or .Cm seconds ) , -the +the extended .St -iso8601 -format includes the timezone. +format includes the timezone offset. .It Fl j Do not try to set the date. This allows you to use the From nobody Thu Sep 4 18:16: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 4cHnjd4jcrz66Wq3; Thu, 04 Sep 2025 18:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHnjd3sBQz3JBT; Thu, 04 Sep 2025 18:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009781; 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=S2Rib2cU/a2x7BVguqrZiAsr6N2m0yPD7YE/wmCRkBA=; b=SNTMF/3DTUVI7hpvs9jHGFnj35aqzvrQt2QN02dtBV44OfxFR31PdofRzoOkJ+xmqZAQzw As46/xF+Zag0aqNF/kH+WWxPWj4bMu+4Fd4HEujH3o9mic5H/0KfxHe8Z0x+nUoetKVKpM NlaxUdis5Pnvv2nThZCWeu51vGL2L/x3pUCB0MOA5+TcYQ1lqw5AomY/XrnMGV3q/TBmTp 4iEY1mP7Z9d1Yr+ecvhEzcGW0+OIzjzHe6d847dwidvEg31TN4eWyCPQmg6sg8bi7n4vdq COPkYxX3g+lRM7B34CniwOMzV+2r3BKedGI2I1OmSYcq6wtRvpYxMTfKBNlv4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009781; 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=S2Rib2cU/a2x7BVguqrZiAsr6N2m0yPD7YE/wmCRkBA=; b=goZ5tjqsFK+y8ZApbdB5NScci9Cn/zC28HsrNf3SCHP6JCNzljPf9WGCKkMuq5GmmQ+5pn qDsHZt+04lnMKBXRoOTXNmxiAjttwWPlClDUZcYZzcPWkUwWgfCN6/4lqRytPGs+xUPWBP ID/ud46BsfLktOHDnFNgskX5tQDhOfsypC0Az+i6gBoaKQiLEXbq4hOdswkiM9I54kSdev vWBblrn1LAHLr+rodSrwnmGfahHGeolHCp0NtI/jRUENka2jWQB5xkUq7aVT2lxrTXWMuC 9SF5pJMfn3ePSPYGVQY6kg8wHrNXwv+Cq3bLkHVPTchitwxmOoOvA7MswL3Sxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757009781; a=rsa-sha256; cv=none; b=MkNXcFZhHoi00BNxu9FYxI6RCsToGFxmGBVWjN2F4cQ2G7OdpKt4Psrz2htjerldgjDnUM PWPn/l0d9ak8HlRfgMGVmh67XiXHBvPGDmSlrvBbD0E+3R9GoV/Fy74nbRNUjm8hSSwbul bltfoTsZLbYjh/RbCAV61XfQxfkUX7qiFb+6KHJpXNfCNhVNSAVZXrZhSPOSw1WTci1aYW urSXZtcKAzMSQN17slFzBXB3GK/vI2Nwd08vUw2mT0y119zqhbhoWfok0RiGZlSTqK0fTS LQWjVk0mvI14uHlo4Num0W4jWSgvjHYaEhgiRiSkj/iznUATzYg61KITmxF4kg== 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 4cHnjd3RHGz1Chd; Thu, 04 Sep 2025 18:16: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 584IGLUh039748; Thu, 4 Sep 2025 18:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584IGLmf039745; Thu, 4 Sep 2025 18:16:21 GMT (envelope-from git) Date: Thu, 4 Sep 2025 18:16:21 GMT Message-Id: <202509041816.584IGLmf039745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 167991a1bfb4 - stable/14 - ipfw: Fix segfault in NPTv6 rule parser 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 167991a1bfb4bc2d8767b274c8dac2a96450b215 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=167991a1bfb4bc2d8767b274c8dac2a96450b215 commit 167991a1bfb4bc2d8767b274c8dac2a96450b215 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-08-21 17:40:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-04 18:15:43 +0000 ipfw: Fix segfault in NPTv6 rule parser If the user specified a prefix length with either the internal or external prefix, we'd jump to check_prefix where we'd dereference p which was most likely uninitialized. Instead, store the various prefix lengths separately and check them all after the loop. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50597 (cherry picked from commit 64bc9ac8cd9a42259aeb1715d4e14902aa83fcac) --- sbin/ipfw/nptv6.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index fc9ce638b8af..f8c3693125b8 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -154,10 +154,10 @@ static struct _s_x nptv6newcmds[] = { { NULL, 0 } }; - static void nptv6_parse_prefix(const char *arg, struct in6_addr *prefix, int *len) { + long plen; char *p, *l; p = strdup(arg); @@ -168,13 +168,15 @@ nptv6_parse_prefix(const char *arg, struct in6_addr *prefix, int *len) if (inet_pton(AF_INET6, p, prefix) != 1) errx(EX_USAGE, "Bad prefix: %s", p); if (l != NULL) { - *len = (int)strtol(l, &l, 10); - if (*l != '\0' || *len <= 0 || *len > 64) + plen = strtol(l, &l, 10); + if (*l != '\0' || plen < 8 || plen > 64) errx(EX_USAGE, "Bad prefix length: %s", arg); + *len = plen; } else *len = 0; free(p); } + /* * Creates new nptv6 instance * ipfw nptv6 create int_prefix ext_prefix @@ -190,10 +192,10 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) struct in6_addr mask; ipfw_nptv6_cfg *cfg; ipfw_obj_lheader *olh; - int tcmd, flags, plen; + int tcmd, flags, iplen, eplen, pplen; char *p; - plen = 0; + iplen = eplen = pplen = 0; memset(buf, 0, sizeof(buf)); olh = (ipfw_obj_lheader *)buf; cfg = (ipfw_nptv6_cfg *)(olh + 1); @@ -206,10 +208,8 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) switch (tcmd) { case TOK_INTPREFIX: NEED1("IPv6 prefix required"); - nptv6_parse_prefix(*av, &cfg->internal, &plen); + nptv6_parse_prefix(*av, &cfg->internal, &iplen); flags |= NPTV6_HAS_INTPREFIX; - if (plen > 0) - goto check_prefix; ac--; av++; break; case TOK_EXTPREFIX: @@ -217,10 +217,8 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) errx(EX_USAGE, "Only one ext_prefix or ext_if allowed"); NEED1("IPv6 prefix required"); - nptv6_parse_prefix(*av, &cfg->external, &plen); + nptv6_parse_prefix(*av, &cfg->external, &eplen); flags |= NPTV6_HAS_EXTPREFIX; - if (plen > 0) - goto check_prefix; ac--; av++; break; case TOK_EXTIF: @@ -237,24 +235,29 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) break; case TOK_PREFIXLEN: NEED1("IPv6 prefix length required"); - plen = strtol(*av, &p, 10); -check_prefix: - if (*p != '\0' || plen < 8 || plen > 64) + pplen = strtol(*av, &p, 10); + if (*p != '\0' || pplen < 8 || pplen > 64) errx(EX_USAGE, "wrong prefix length: %s", *av); - /* RFC 6296 Sec. 3.1 */ - if (cfg->plen > 0 && cfg->plen != plen) { - warnx("Prefix length mismatch (%d vs %d). " - "It was extended up to %d", - cfg->plen, plen, MAX(plen, cfg->plen)); - plen = MAX(plen, cfg->plen); - } - cfg->plen = plen; - flags |= NPTV6_HAS_PREFIXLEN; ac--; av++; break; } } + /* RFC 6296 Sec. 3.1 */ + if (pplen != 0) { + if ((eplen != 0 && eplen != pplen) || + (iplen != 0 && iplen != pplen)) + errx(EX_USAGE, "prefix length mismatch"); + cfg->plen = pplen; + flags |= NPTV6_HAS_PREFIXLEN; + } else if (eplen != 0 || iplen != 0) { + if (eplen != 0 && iplen != 0 && eplen != iplen) + errx(EX_USAGE, "prefix length mismatch"); + warnx("use prefixlen instead"); + cfg->plen = eplen ? eplen : iplen; + flags |= NPTV6_HAS_PREFIXLEN; + } + /* Check validness */ if ((flags & NPTV6_HAS_INTPREFIX) != NPTV6_HAS_INTPREFIX) errx(EX_USAGE, "int_prefix required"); From nobody Thu Sep 4 18:16: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 4cHnjf5f9Zz66X5d; Thu, 04 Sep 2025 18:16:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHnjf57X9z3J8C; Thu, 04 Sep 2025 18:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009782; 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=QCl1QtLOhQpqcpFw/pPyZqmsTPv44SYTohrjCnwczOw=; b=xSJZfnfaOuuqDElpSFQ29EOGWQIx+wEGCat9KSYmjbDr/P5iVyv7PtKuWjijOQPirm8CPE 0N1dKfzj6Tv+ihqScY0hVCZ2GtgSwQ6RxvfZxz2vdJsGOGNBEqfT7nLg5PHq4p/ST6CgaJ VVZ0YMQuOC99QElmnI1pSMf1PKT4YBIKdrwkJGBHJPlghEHOYKqszavXQkStOoeK4abgxu +jrs90YTgQingPayhs1xH77yePjWUBd+d/IvmGRsCQJlchSrlelBWzoPRO+8wHZctPcxRW v9EvtG32x4vGVt0YVsxen9vYiu2TzOv9Vp5v5zj37b/p3WwudWnJOn2PKAh+Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009782; 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=QCl1QtLOhQpqcpFw/pPyZqmsTPv44SYTohrjCnwczOw=; b=ttzvdwI9LKrzT9pHHBb5YY2sFDF0K4g5lfZyUquMtmgerTvz11xmZf4wBpEUiY2f2VSKNq qD4FsDobRgMllDm2EZhyaJJcanmxU5tTldglJ2psQ7Cg7HKSR688Ept8Fc43MJQKGYhnzZ x1woRm51L5zBW3Vd+kvmaArhVmStFgfDPGbtxGzdMDltBL73DpTFQcPSTNHUelX2E41pqR W+I73RKYSLmkzfEP0D2wMMWduqr73hx3hryOKujo1KdoefrAKafHfHmcmcon2aoHpfRcvx 1Nkpiw8QrwSjQ4xcgPZ2mCfGSOPnQt71GbWxmuDwuI63QpmTs6k5r/+L4awZCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757009782; a=rsa-sha256; cv=none; b=ibDlyb6jzTJL0xHQO7zf2kt16dke4ql9UK9aRftWfprcdLdX/ZbDMTIaH7XEfwpRv+jtzq TyVw6XU8wtdZLXMJjT4VcUBxBTGvk9dENY0PoMNxD74PDr29CCfrCIfJBn9j3jrrpWjAqT Pr2Ffa06LpCHmGCDZV6kFSInpaSIwkHxKrTuzKRL5JHLUSU+yANezjPqb2K2EStVHEUMCN XI2uLp8F5B0RicmKDZezIw9gWDam5M4tSGA1LvrvaVZquj+d4injbjscDmgt90qZpXuCer 38Jbw8m61X2d9eSjlhpsn155Tgd+KEoyQ59Zzc3JpkJD/AvU+1a1jDdLzyllAQ== 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 4cHnjf4cnfzx; Thu, 04 Sep 2025 18:16:22 +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 584IGM4A039790; Thu, 4 Sep 2025 18:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584IGMAl039787; Thu, 4 Sep 2025 18:16:22 GMT (envelope-from git) Date: Thu, 4 Sep 2025 18:16:22 GMT Message-Id: <202509041816.584IGMAl039787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c73ee7ff6469 - stable/14 - ipfw: Add tests for the NPTv6 rule parser 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c73ee7ff64695d75af5a7da21dbcd1032138b480 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c73ee7ff64695d75af5a7da21dbcd1032138b480 commit c73ee7ff64695d75af5a7da21dbcd1032138b480 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-21 17:47:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-04 18:15:43 +0000 ipfw: Add tests for the NPTv6 rule parser (cherry picked from commit d879f1c8961d99bdbe6727004bfc6c23924526f8) --- sbin/ipfw/Makefile | 3 ++ sbin/ipfw/tests/Makefile | 1 + sbin/ipfw/tests/ipfw_test.sh | 107 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile index a800ec86b0cf..39054790b1a1 100644 --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -18,6 +18,9 @@ CFLAGS+=-DPF LIBADD= jail util MAN= ipfw.8 +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include CWARNFLAGS+= -Wno-cast-align diff --git a/sbin/ipfw/tests/Makefile b/sbin/ipfw/tests/Makefile index 987410f5d710..e2d4dab2729a 100644 --- a/sbin/ipfw/tests/Makefile +++ b/sbin/ipfw/tests/Makefile @@ -1,5 +1,6 @@ PACKAGE= tests ATF_TESTS_PYTEST+= test_add_rule.py +ATF_TESTS_SH+= ipfw_test .include diff --git a/sbin/ipfw/tests/ipfw_test.sh b/sbin/ipfw/tests/ipfw_test.sh new file mode 100644 index 000000000000..c7993c430a3d --- /dev/null +++ b/sbin/ipfw/tests/ipfw_test.sh @@ -0,0 +1,107 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +atf_test_case nptv6 cleanup +nptv6_head() +{ + atf_set "descr" "Test creation of NPTv6 rules" + atf_set "require.user" "root" + atf_set "require.kmods" "ipfw_nptv6" +} +nptv6_body() +{ + vnet_init + local jail=ipfw_$(atf_get ident) + local epair=$(vnet_mkepair) + vnet_mkjail ${jail} ${epair}a + + local rule="xyzzy" + local int="2001:db8:1::" + local ext="2001:db8:2::" + + atf_check jexec ${jail} \ + ifconfig "${epair}"a inet6 ${ext}1/64 up + + # This is how it's supposed to be used + atf_check jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int} ext_prefix ${ext} prefixlen 64 + atf_check -o inline:\ +"nptv6 $rule int_prefix $int ext_prefix $ext prefixlen 64\n" \ + jexec ${jail} ipfw nptv6 all list + atf_check jexec ${jail} ipfw nptv6 all destroy + + # Specify external interface rather than network + atf_check jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int} ext_if ${epair}a prefixlen 64 + atf_check -o inline:\ +"nptv6 $rule int_prefix $int ext_if ${epair}a prefixlen 64\n" \ + jexec ${jail} ipfw nptv6 all list + atf_check jexec ${jail} ipfw nptv6 all destroy + + # This should also work + atf_check jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int}/64 ext_prefix ${ext}/64 prefixlen 64 + atf_check -o inline:\ +"nptv6 $rule int_prefix $int ext_prefix $ext prefixlen 64\n" \ + jexec ${jail} ipfw nptv6 all list + atf_check jexec ${jail} ipfw nptv6 all destroy + + # This should also work, although it's not encouraged + atf_check -e match:"use prefixlen instead" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int}/64 ext_prefix ${ext}/64 + atf_check -o inline:\ +"nptv6 $rule int_prefix $int ext_prefix $ext prefixlen 64\n" \ + jexec ${jail} ipfw nptv6 all list + atf_check jexec ${jail} ipfw nptv6 all destroy + + # These should all fail + atf_check -s not-exit:0 -e match:"one ext_prefix or ext_if" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int} ext_prefix ${ext} ext_if ${epair}a + atf_check -o empty jexec ${jail} ipfw nptv6 all list + + atf_check -s not-exit:0 -e match:"one ext_prefix or ext_if" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int} ext_if ${epair}a ext_prefix ${ext} + atf_check -o empty jexec ${jail} ipfw nptv6 all list + + atf_check -s not-exit:0 -e match:"prefix length mismatch" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int}/48 ext_prefix ${ext}/64 + atf_check -o empty jexec ${jail} ipfw nptv6 all list + + atf_check -s not-exit:0 -e match:"prefix length mismatch" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int}/64 ext_prefix ${ext}/64 prefixlen 48 + atf_check -o empty jexec ${jail} ipfw nptv6 all list + + atf_check -s not-exit:0 -e match:"prefix length mismatch" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int}/64 ext_prefix ${ext} prefixlen 48 + atf_check -o empty jexec ${jail} ipfw nptv6 all list + + atf_check -s not-exit:0 -e match:"prefix length mismatch" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int} ext_prefix ${ext}/64 prefixlen 48 + atf_check -o empty jexec ${jail} ipfw nptv6 all list + + atf_check -s not-exit:0 -e match:"prefix length mismatch" \ + jexec ${jail} ipfw nptv6 ${rule} create \ + int_prefix ${int}/64 ext_if ${epair}a prefixlen 48 + atf_check -o empty jexec ${jail} ipfw nptv6 all list +} +nptv6_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case nptv6 +} From nobody Thu Sep 4 18:16: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 4cHnjl13xnz66Wxp; Thu, 04 Sep 2025 18:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHnjl0Lx1z3J75; Thu, 04 Sep 2025 18:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009787; 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=6CgBn29GNEgIpFX+JbDWfZZTlpVbWo44JV6Fb6LQ8OE=; b=TWQsZHwEysW8RU/Cm/anlCMH9HZVgSqcPH+nQ8X6YnHAecnJV4OR+Hgmy8UrNLrXPhiXWR llJ2R9q/KuCPVCE3v5KRo3NaIdyW2UY9nw9IoPUSb8HmXMiAE6P6XboguFk40G8wNTS4Pu y/waPnm5ughEVCO2+XdBLV4EEwqJJNnPbPaKa4YZZVmZU2uZuBryudxbTYTpyMgjvXbEAY +QnrnCUUJwlSL17FS1y6V1TVe0sp1XDzyETeCpF11sFAxnkfw7w6+G9ULZoMWjgItrt8WF R8qsuC1p29lyE4XM3VJ3dghQ42I5iWEKwxlRXUn6lTs/kP+DalN2KvL1NmbFmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009787; 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=6CgBn29GNEgIpFX+JbDWfZZTlpVbWo44JV6Fb6LQ8OE=; b=SuyKY7vNei+t44Nw10i+iL+ZMLQDQeaxhNLJ3leOGY3p7xI5ZvLkjFNGDw/9PpB0ijqrWU x+TRjl3u7tXmF4m478bodmf/vASejlQE8WghNaxpIz4WcGyfQhYRpXUqfK8XxqFbop6/lZ o4lRoSgHyEdFjPzSEPmBsgTUbF60CPxEfNqdzMRWe6yYtp0rbNAoWYyMqCc6W0An7tvfWK iKgdP03wHeaLrBmPv1VzrjGriB59LtioSMkl/sE0jVlKzsJ3M0z1T75l6nJp8g+WyGx5cP j4eqHlsAxKvaRUCenHiKRkLzo8N7r1AokMyecd0/sELs+xVuGSHNMDJH9foi2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757009787; a=rsa-sha256; cv=none; b=JbHK1uhlKjBT8Prv9kwJxhEk4W+GLKtVjX9yakjF3589+ucBiITZFoc9KeJ/xwvrsWsDtc VRfItaMjdiAjQRZglFCKPRzS21fxxoFPhfMSKP+d3ZDiKJoSZcQnXg+x1/wxRxWB3Xs5oo b24lDJhStAOfW3QaH1itPZ34aBxiac47TaNys4IW4Sraj71XHFeDnO+W8HeKz0e/nSZuWC eUkK9octwTPHk7xzFlP1dMiXHwSwuxpCq6VkB6Nu5G32ntF8XCywetkOhbjCnnC1fvMxJd hnbO9Kakd9Zmbcf4Es9M+z+MHdz1nTG37BXDuIK6KJXxVHv0veujprgbF+A8rw== 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 4cHnjk6twSz1C7B; Thu, 04 Sep 2025 18:16: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 584IGQsp039933; Thu, 4 Sep 2025 18:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584IGQpK039930; Thu, 4 Sep 2025 18:16:26 GMT (envelope-from git) Date: Thu, 4 Sep 2025 18:16:26 GMT Message-Id: <202509041816.584IGQpK039930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bb5b0c1624fb - stable/13 - ipfw: Fix segfault in NPTv6 rule parser 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb5b0c1624fb6a7032367d3d0c460d407756cba3 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bb5b0c1624fb6a7032367d3d0c460d407756cba3 commit bb5b0c1624fb6a7032367d3d0c460d407756cba3 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-08-21 17:40:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-04 18:15:15 +0000 ipfw: Fix segfault in NPTv6 rule parser If the user specified a prefix length with either the internal or external prefix, we'd jump to check_prefix where we'd dereference p which was most likely uninitialized. Instead, store the various prefix lengths separately and check them all after the loop. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50597 (cherry picked from commit 64bc9ac8cd9a42259aeb1715d4e14902aa83fcac) --- sbin/ipfw/nptv6.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index 45cee5df8125..5f66cce5aacb 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -154,10 +154,10 @@ static struct _s_x nptv6newcmds[] = { { NULL, 0 } }; - static void nptv6_parse_prefix(const char *arg, struct in6_addr *prefix, int *len) { + long plen; char *p, *l; p = strdup(arg); @@ -168,13 +168,15 @@ nptv6_parse_prefix(const char *arg, struct in6_addr *prefix, int *len) if (inet_pton(AF_INET6, p, prefix) != 1) errx(EX_USAGE, "Bad prefix: %s", p); if (l != NULL) { - *len = (int)strtol(l, &l, 10); - if (*l != '\0' || *len <= 0 || *len > 64) + plen = strtol(l, &l, 10); + if (*l != '\0' || plen < 8 || plen > 64) errx(EX_USAGE, "Bad prefix length: %s", arg); + *len = plen; } else *len = 0; free(p); } + /* * Creates new nptv6 instance * ipfw nptv6 create int_prefix ext_prefix @@ -190,10 +192,10 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) struct in6_addr mask; ipfw_nptv6_cfg *cfg; ipfw_obj_lheader *olh; - int tcmd, flags, plen; + int tcmd, flags, iplen, eplen, pplen; char *p; - plen = 0; + iplen = eplen = pplen = 0; memset(buf, 0, sizeof(buf)); olh = (ipfw_obj_lheader *)buf; cfg = (ipfw_nptv6_cfg *)(olh + 1); @@ -206,10 +208,8 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) switch (tcmd) { case TOK_INTPREFIX: NEED1("IPv6 prefix required"); - nptv6_parse_prefix(*av, &cfg->internal, &plen); + nptv6_parse_prefix(*av, &cfg->internal, &iplen); flags |= NPTV6_HAS_INTPREFIX; - if (plen > 0) - goto check_prefix; ac--; av++; break; case TOK_EXTPREFIX: @@ -217,10 +217,8 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) errx(EX_USAGE, "Only one ext_prefix or ext_if allowed"); NEED1("IPv6 prefix required"); - nptv6_parse_prefix(*av, &cfg->external, &plen); + nptv6_parse_prefix(*av, &cfg->external, &eplen); flags |= NPTV6_HAS_EXTPREFIX; - if (plen > 0) - goto check_prefix; ac--; av++; break; case TOK_EXTIF: @@ -237,24 +235,29 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) break; case TOK_PREFIXLEN: NEED1("IPv6 prefix length required"); - plen = strtol(*av, &p, 10); -check_prefix: - if (*p != '\0' || plen < 8 || plen > 64) + pplen = strtol(*av, &p, 10); + if (*p != '\0' || pplen < 8 || pplen > 64) errx(EX_USAGE, "wrong prefix length: %s", *av); - /* RFC 6296 Sec. 3.1 */ - if (cfg->plen > 0 && cfg->plen != plen) { - warnx("Prefix length mismatch (%d vs %d). " - "It was extended up to %d", - cfg->plen, plen, MAX(plen, cfg->plen)); - plen = MAX(plen, cfg->plen); - } - cfg->plen = plen; - flags |= NPTV6_HAS_PREFIXLEN; ac--; av++; break; } } + /* RFC 6296 Sec. 3.1 */ + if (pplen != 0) { + if ((eplen != 0 && eplen != pplen) || + (iplen != 0 && iplen != pplen)) + errx(EX_USAGE, "prefix length mismatch"); + cfg->plen = pplen; + flags |= NPTV6_HAS_PREFIXLEN; + } else if (eplen != 0 || iplen != 0) { + if (eplen != 0 && iplen != 0 && eplen != iplen) + errx(EX_USAGE, "prefix length mismatch"); + warnx("use prefixlen instead"); + cfg->plen = eplen ? eplen : iplen; + flags |= NPTV6_HAS_PREFIXLEN; + } + /* Check validness */ if ((flags & NPTV6_HAS_INTPREFIX) != NPTV6_HAS_INTPREFIX) errx(EX_USAGE, "int_prefix required"); From nobody Thu Sep 4 19:59: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 4cHr0P0LSQz66g7K; Thu, 04 Sep 2025 19:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr0N6pcxz3X7H; Thu, 04 Sep 2025 19:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757015957; 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=z9lrmDU0NbS9FLRGQ8F0teAOWFe77nkO7/wd38xeM38=; b=S1d6i5+Yo0IuwoD3zx6/pop9gDwdNAOvmc09qbBA7F0NDUeYeTjk4sET5RpdHX+K43x1Eo wN6tFBMArYfQJDA2VCa+pHe7wW+iqZhTDjPkkzmOYOvqJii30GCunFsBlkCNynJkoZS+mt 572/TtL1IkjHRVl1UFFnlRIqbZ6T76fyBsb5h418GwfKQaJ4GjWGS1uhSR1RTYfANxi6MZ byZROIH7sxrzIRNk3rrFKUFz6FCXVoSM0ropi/a1//s26Fd9mlkpV0u2D8bV0uPztnJZRP tcakOTpa6v8p9AsieIo+JBZbroOjTe4EwFqWojES4LK+UwMxKq3/rjq2iF/fnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757015957; 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=z9lrmDU0NbS9FLRGQ8F0teAOWFe77nkO7/wd38xeM38=; b=PPF7b2MoIGWT7/6r7Kz1y9SUWZCrk3Ah3uMhnDFPnNdaDCu4boV//bKUwdBYXSYIE5VQpF 6bhOtpY1j/PGFcd3qnpsXe/Klrcu8WNDsaQ5F5bZlIMmxPLvq0IyLdNcqy6fLx33VhwKWK 7NV2kZZy9Bpyf8iwdVR1f751jOCmpKN0XdBWdW21NRfp1Dx6G+OQ941d4KDJr8bkg7ke+4 CZSJ03qaW6LIcQuRkpYPsVI3YQgkys1JTTZYQGdgywr0BvH1c9M1AvVkgXoEV212WAP/m6 lYZxYpc0EKtaWJvRj1i3GRzA8PAN06lqX9Cdinvz6QDnxFylnFJcbhMKryYNBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757015957; a=rsa-sha256; cv=none; b=nFsdOqjl5US4Uea/DjZk2r9nxO7DsSB+Mg/BzFrzQnn8YDNJXCBghH4eSARo72o1PVuw2B PhGLvqAUTH4Cz/zdhFLR6TA2wf3HccAUjCJVv2kxMj478/nqg2t8GZ+lw860tba7/rwy34 KOQ04NUO2gW4DakBGL/Pbggi77hjr5+s2l3w6MwEgSEMfrv8PvN1jKvAi6+JcVwhGgVN7i 9i2rEZ2/wmQZmoPbjnPD11ppab1FrvTJHO69yjhhQh5ihDDLM8xbOZT+IQSgZWHNgPcehz q4FCXNQcyTDPGydHvEplMela++pUsTfyaF/Rru9HTeGRJiF0XKsuCy6Adx9IEw== 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 4cHr0N60Tvz29Y; Thu, 04 Sep 2025 19:59: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 584JxG3E027654; Thu, 4 Sep 2025 19:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584JxGYS027651; Thu, 4 Sep 2025 19:59:16 GMT (envelope-from git) Date: Thu, 4 Sep 2025 19:59:16 GMT Message-Id: <202509041959.584JxGYS027651@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: 3973a0cc2565 - stable/14 - ddb4: improve formatting 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: 3973a0cc2565e33dd402adb4b487432b706f9e57 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3973a0cc2565e33dd402adb4b487432b706f9e57 commit 3973a0cc2565e33dd402adb4b487432b706f9e57 Author: Michael Tuexen AuthorDate: 2025-05-24 19:25:17 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 19:58:54 +0000 ddb4: improve formatting Improve the consistency of the formatting. Reviewed by: ziaee Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50514 (cherry picked from commit a8b9eea5c5b5ec507be7e5e78a4b7a9a1a945dc1) --- share/man/man4/ddb.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 3648c9ca58cb..0bab4dc3e61b 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -24,7 +24,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd November 10, 2022 +.Dd May 24, 2025 .Dt DDB 4 .Os .Sh NAME @@ -566,7 +566,7 @@ Prints the address of the thread whose kernel-mode stack contains if any. .Pp .It Ic show Cm active trace -.It acttrace +.It Ic acttrace Show a stack trace for every thread running on a CPU. .Pp .It Ic show Cm all procs Ns Op Li / Ns Cm a From nobody Thu Sep 4 19:59: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 4cHr190N2fz66gLJ; Thu, 04 Sep 2025 19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr1864pXz3XXv; Thu, 04 Sep 2025 19:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757015996; 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=egrn046EGgJqqtCE3RgVqH7zTgsCHFCnZKhLZIslrAI=; b=AOPYTeGAho4kFhnw65tihN7VCwFsl+JMSldIJwyDV26zleI1A7Ob/uRut6A8CoAXayh32B oNWkCpLsEUGXjNCbP4luOr4SJ0CaDzVnK6zXyrgW9cRmJFfqmvn33bwsi7qyiXnVG8yhtH +nbV8bUV2WS8UlkJae9EYspPSa476OddKw+85KAi8zx+qw+6riyUQZffg+e4zDdqWi0OWM fc7PRc42XxN0hWApW6HEy/3CAm6FTPg5X2BlRs+Qz/fZfve1MIWnLp/YTDsEOVpeze7W4+ VgCDGwPA2vWviAwGW34uZUqL3qpASA3yuOvovgl32DYwhEF2FY8VmwEQ28s1Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757015996; 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=egrn046EGgJqqtCE3RgVqH7zTgsCHFCnZKhLZIslrAI=; b=jl++ilmk2wvn+D6TDJOaV0l5UQEEcywU434APGriCeRmm1IjIzG0Dkjy7gWfup3oDwAUPC hB9JeLH1iB3yxrI4BSrHoRHgdMLw9vJDMsHpm24LRnv4ePTGJgt1qp9jtQKMibViLl/HqH eVfYF784QxxQuedX9Gs6BLUsuEr0/eUJIQbdq5/I3UjSnIWKVZFW5MVEMDlIHZL5F/vOJw x14rvrO74qcDM3qqKgvzS+S2OxrwnFQZ09t0hlhNXy+LB2p99eabKsLiIyl01yjQsqL0cQ Plvy2q0bC4ozt/KdXtsjzCHfzO8ODesrMD2oc1gvWaYZ3CbFNHMGDCeFDFfNhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757015996; a=rsa-sha256; cv=none; b=QLHq91HwaAvCU0RkxO9ldDMhNdVxmd/yF1buThFoCZIthhnDX8Fd3qqi4S9ZqOvFw4knu8 JkYkUS7MHkKci8WxQMkZr/iv8NO0ZJLdtIul2d2o/+xsucvVJv5x/irs0vKC0guwQrS81b p8S4x4BFe6TMsuVptKN1V7anoWZMt/C8jk5NiL3sZo9ybAwq6F5HZJogFYS1lkx8TxgPwX KeAGqROVdFDgj1GZBX1e94/cc1vryCuvpooLNtc+YU7pNfArssmARJ7eKYonLgoxyKSkLS AXCE4qvfkmEZEaRrA1P89CBHcOTJVT/ODYzZ0ZDPrd8vxsu2hqIeP8QOJWsz8w== 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 4cHr185hXmz2SL; Thu, 04 Sep 2025 19:59: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 584JxuXm027956; Thu, 4 Sep 2025 19:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584JxuTv027951; Thu, 4 Sep 2025 19:59:56 GMT (envelope-from git) Date: Thu, 4 Sep 2025 19:59:56 GMT Message-Id: <202509041959.584JxuTv027951@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: ca0fcea09cf4 - stable/14 - ddb: improve show tcpcb 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: ca0fcea09cf47ca8ebf37d0b90db5f66843e11cc Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0fcea09cf47ca8ebf37d0b90db5f66843e11cc commit ca0fcea09cf47ca8ebf37d0b90db5f66843e11cc Author: Michael Tuexen AuthorDate: 2025-05-28 10:10:51 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 19:59:42 +0000 ddb: improve show tcpcb Print the name of the TCP function block and the name of the congestion control algorithm. Furthermore, print some information related to Black Box Logging. Reviewed by: thj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50535 (cherry picked from commit 8d4f495df46567dcfcbec59794e9b9137b2f38fe) --- sys/netinet/tcp_usrreq.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 3bdbd968216f..7bad828c4821 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3078,6 +3078,43 @@ db_print_toobflags(char t_oobflags) } } +static void +db_print_bblog_state(int state) +{ + switch (state) { + case TCP_LOG_STATE_RATIO_OFF: + db_printf("TCP_LOG_STATE_RATIO_OFF"); + break; + case TCP_LOG_STATE_CLEAR: + db_printf("TCP_LOG_STATE_CLEAR"); + break; + case TCP_LOG_STATE_OFF: + db_printf("TCP_LOG_STATE_OFF"); + break; + case TCP_LOG_STATE_TAIL: + db_printf("TCP_LOG_STATE_TAIL"); + break; + case TCP_LOG_STATE_HEAD: + db_printf("TCP_LOG_STATE_HEAD"); + break; + case TCP_LOG_STATE_HEAD_AUTO: + db_printf("TCP_LOG_STATE_HEAD_AUTO"); + break; + case TCP_LOG_STATE_CONTINUAL: + db_printf("TCP_LOG_STATE_CONTINUAL"); + break; + case TCP_LOG_STATE_TAIL_AUTO: + db_printf("TCP_LOG_STATE_TAIL_AUTO"); + break; + case TCP_LOG_VIA_BBPOINTS: + db_printf("TCP_LOG_STATE_BBPOINTS"); + break; + default: + db_printf("UNKNOWN(%d)", state); + break; + } +} + static void db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) { @@ -3189,6 +3226,21 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) db_print_indent(indent); db_printf("t_rttlow: %d rfbuf_ts: %u rfbuf_cnt: %d\n", tp->t_rttlow, tp->rfbuf_ts, tp->rfbuf_cnt); + + db_print_indent(indent); + db_printf("t_fb.tfb_tcp_block_name: %s\n", tp->t_fb->tfb_tcp_block_name); + + db_print_indent(indent); + db_printf("t_cc.name: %s\n", tp->t_cc->name); + + db_print_indent(indent); + db_printf("_t_logstate: %d (", tp->_t_logstate); + db_print_bblog_state(tp->_t_logstate); + db_printf(")\n"); + + db_print_indent(indent); + db_printf("t_lognum: %d t_loglimit: %d t_logsn: %u\n", + tp->t_lognum, tp->t_loglimit, tp->t_logsn); } DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) From nobody Thu Sep 4 20:01:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cHr2Q2LVvz66gCT; Thu, 04 Sep 2025 20:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr2Q1Mw0z3Y25; Thu, 04 Sep 2025 20:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016062; 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=yUhc3aC9eQIMR8aRAzD+gqn77w1ltbkaxd63EjsSoNg=; b=rShcErWgpEiqftmzMshjPHhRSilkNvB3NVxhXjjkb3JksM5zjdxFzrbAni9258ffxF2ElZ h+Na/A8USaTV2t6A/gnS9VwKirkYxJK+Mmad5kpyZl1ZRgOzJfNl1s88JGunZppYNtgocN RQO0t7J1cow2HenAa95fHa2xNmYkPi4S5exy9D6dhAIbSNcgz+iQO30+SxfBcv7Z7GHs2o 7gqjaqSPL6xCfESG0+79E5nuvVZX+9eJbz3V/INkeBmw+s4pXdMuN248NauPC/LWTE3LzM NPkBCMvSr0hHkUHZpeLcSzwGeb7KiqNXlIDJ3e7W3289YRXpgzY9GYDFg05Wrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016062; 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=yUhc3aC9eQIMR8aRAzD+gqn77w1ltbkaxd63EjsSoNg=; b=CAV1ANIb89ynOFjYkF5YPsUaN/+L+hqvwEGsjZx6269xAfkEUv+jH3/8CgGYKevGDCksgY 6EquvKaUfdm6N7rx8WkXhMf96Hkjj2+A9MuKPjOjpvDieDf+z9dsEyCjdpp5grneb9TPx2 gtriOkTS/f86FsMIaUCx+dadQE7DobjPldn9u5TvOuJ+proYFDebXz5NnTZdnZhtHU0zKF yeS5j7dVSDzS6Xlh1dely2NqBilVpzUZeTBOExBnZMKqu8b64HkDAFL7vWzAtXsQ1Gi+Cn hizwJMGMYoSrTpG3p2YmHG3U7ax0qsZlURtU9idDhOQQn46+9ycJsQMIehhoMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016062; a=rsa-sha256; cv=none; b=ayT1qvAxdKwcMi2uZ5EZs4W+GSRint/zzBGo0liX2ldXsJeYX7NORI9IDpQKBHH8TpOemu 87BBCU3laInrY0vIeqIbDfr7FNX9Hq8owJHc5J2Sg4+UuACitwS8sW+ujApWA79C/HCifm GvKaasHDGwkEHE/u3uzSfqdf0ZWOIkGRKJLfBv5EODQKFVgyVV81NtCrjP8sExglo0rsdC zAxF23ygF8A3tp3ripgOtBMpMEpl3JizgZ4T0zQydBXfd4hNHuclEcaW11irGL7Egq4GBX Gs5ucPeStkMm82JtdxX63aKyzSQSlFNNCvZYtj3SxOjozkf5K/c56IS0MMkigw== 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 4cHr2Q0jxbz1x8; Thu, 04 Sep 2025 20:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584K12HS039107; Thu, 4 Sep 2025 20:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K12ab039104; Thu, 4 Sep 2025 20:01:02 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:01:02 GMT Message-Id: <202509042001.584K12ab039104@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: 6e95753ac517 - stable/14 - ddb: add show all tcpcbs 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: 6e95753ac51716aec45cef049e1493d3c96874b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6e95753ac51716aec45cef049e1493d3c96874b1 commit 6e95753ac51716aec45cef049e1493d3c96874b1 Author: Michael Tuexen AuthorDate: 2025-05-28 10:25:26 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:00:15 +0000 ddb: add show all tcpcbs Add a command to show all TCP control blocks. Also provide an option to limit the output to TCP control blocks, which are locked. The plan is to run show all tcpcbs/l when syzkaller triggers a panic. If a TCP control block is affected, it is most likely locked and therefore the command shows the information of the affected TCP control block. Reviewed by: markj, thj Tested by: thj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50516 (cherry picked from commit f1430567f26bc84db3818914fa91c74507d1602a) --- share/man/man4/ddb.4 | 10 +++++++++- sys/netinet/tcp_usrreq.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 0bab4dc3e61b..cb14f42da489 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -24,7 +24,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd May 24, 2025 +.Dd May 28, 2025 .Dt DDB 4 .Os .Sh NAME @@ -580,6 +580,14 @@ The modifier will print command line arguments for each process. .\" .Pp +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm l +Show the same output as "show tcpcb" does, but for all +TCP control blocks within the system. +Using the +.Cm l +modifier will limit the output to TCP control blocks, which are locked. +.\" +.Pp .It Ic show Cm all trace .It Ic alltrace Show a stack trace for every thread in the system. diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 7bad828c4821..e0e921ebc42e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3255,4 +3255,27 @@ DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) db_print_tcpcb(tp, "tcpcb", 0); } + +DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) +{ + VNET_ITERATOR_DECL(vnet_iter); + struct inpcb *inp; + bool only_locked; + + only_locked = strchr(modif, 'l') != NULL; + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + CK_LIST_FOREACH(inp, &V_tcbinfo.ipi_listhead, inp_list) { + if (only_locked && + inp->inp_lock.rw_lock == RW_UNLOCKED) + continue; + db_print_tcpcb(intotcpcb(inp), "tcpcb", 0); + if (db_pager_quit) + break; + } + CURVNET_RESTORE(); + if (db_pager_quit) + break; + } +} #endif From nobody Thu Sep 4 20:01:49 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 4cHr3K37hWz66gWr; Thu, 04 Sep 2025 20:01:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr3K2Blbz3Yp0; Thu, 04 Sep 2025 20:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016109; 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=TCsQ6H4CHncbijQjPQIPo2+buD+TAXYfRUqA1+JuEIk=; b=s1pbi9e0++C8V+TyZL6+/1SjfdcqNhHHFqOE+tRaBqbNCfZQKLgCZSDlaoP8i8/Qsouv4Q P+CDg3bGF4hMfVWCNxtH2OCbS3Wm8pilQnW1dq36shBxilsMmWKmpZv72LH7+cab6MePR8 PXpMlkcK53RoEzjmUypMwYCZ4b0CgL5juMqfuzCVe/ZN27IqQKlF8jZBuo5hgAObiKgRVC X+zLOSNOYSJb2evQVpP0fPBcZo4Uz+bdMfNl78c6d10zVJzypHC0W2KWZ1TZ7aDc3h8UkQ 5ywHuJl+L81gpobx7nPkk9IXgRYWN32Hw/2zmsmpJHVmEmp2jirBxaF+rKnxMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016109; 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=TCsQ6H4CHncbijQjPQIPo2+buD+TAXYfRUqA1+JuEIk=; b=p/6rffK6wpb5z5UunqbMTnqC5o5LhCdmLgpPK7LCUoKSz9Uk7F2UyyiPE622xenBcDRvL1 4X/2w5anbOYYGZKghbY7K8PJjA08ss6H9Kv1opyiWU1FAI2F8JILZrpJGP0NsC1Sk8/+TP 2dlhYpO44pSNB19MOeckTzq/37HeuMUxAmSHo95nQO2I+FCWmOsXp8/Mq3fiYaX/APsZNc p5Glu0OWgqMRToIVIb5b70tTtCkQ+6QHj8VaeRdYmjMP1F2nrjJwDmMj+jtyFscOuXNJgy SNtqwjACWsxBpY1nUfAW4j8R+TMnsx9vFZ4T4oDj/dNFniKtrwNFXQnSsGw56g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016109; a=rsa-sha256; cv=none; b=iTpbeBeN/mbHc5Q5irB8KIT9yHiGPLkCF2pO9audXwhmwkUoYVLcCW6Dut+rNKDhL7aPeB ZPsyWrwmwvDGN2kLGCOBxgwQ8C0PM+P4u+c3s8RFjStjeYuTj7EkolNw6Vfrdt2PrKsGAK YNebdq6zI6pZDFpcFGrIZY3onrtEtWfLB8fyeFFz7JRVRfMbAB6/sl7tx1H/DVxAAlyRGI z0XOr3Yk9kTaxdiZgDrzj1b849JwxBCH9bQ2k9CHoUzxjww1qcJ4Eh6N5pVLoXgwQLpqNR xhjNiYU+QQ992i5LfJpNNlNCV7HG6xHU7UWp41K4pwGOCrsZrD5mLJ1oCgG7rA== 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 4cHr3K1lv5z1kk; Thu, 04 Sep 2025 20:01:49 +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 584K1nNX042210; Thu, 4 Sep 2025 20:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K1nRN042207; Thu, 4 Sep 2025 20:01:49 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:01:49 GMT Message-Id: <202509042001.584K1nRN042207@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: aded5f4203ec - stable/14 - ddb: add optional printing of BBLog entries 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: aded5f4203ec7aa3bd86d6c05be6b20714a2136c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=aded5f4203ec7aa3bd86d6c05be6b20714a2136c commit aded5f4203ec7aa3bd86d6c05be6b20714a2136c Author: Michael Tuexen AuthorDate: 2025-06-10 13:29:26 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:01:26 +0000 ddb: add optional printing of BBLog entries Add a /b option to show tcpcb and show all tcpcbs to print BBLog entries. Right now this supports the entries generated by the FreeBSD default TCP stack. It should help in debugging issues reported by syzkaller. The syntax for printing sent and received packets is similar to the one used by packetdrill, since the output of ddb will be used to create packetdrill scripts for debugging. Reviewed by: thj Tested by: thj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50629 (cherry picked from commit a62c6b0de48a5b9b752976b2675ac807684b7fdb) --- share/man/man4/ddb.4 | 12 +- sys/netinet/tcp_log_buf.c | 381 ++++++++++++++++++++++++++++++++++++++++++++++ sys/netinet/tcp_log_buf.h | 4 + sys/netinet/tcp_usrreq.c | 15 +- 4 files changed, 405 insertions(+), 7 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index cb14f42da489..08e804c64ff8 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -24,7 +24,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd May 28, 2025 +.Dd June 10, 2025 .Dt DDB 4 .Os .Sh NAME @@ -580,9 +580,12 @@ The modifier will print command line arguments for each process. .\" .Pp -.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm l +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm l Show the same output as "show tcpcb" does, but for all TCP control blocks within the system. +The +.Cm b +modifier will request BBLog entries to be printed. Using the .Cm l modifier will limit the output to TCP control blocks, which are locked. @@ -1079,7 +1082,7 @@ on i386.) Not present on some platforms. .\" .Pp -.It Ic show Cm tcpcb Ar addr +.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Oc Ar addr Print TCP control block .Vt struct tcpcb lying at address @@ -1087,6 +1090,9 @@ lying at address For exact interpretation of output, visit .Pa netinet/tcp.h header file. +The +.Cm b +modifier will request BBLog entries to be printed. .\" .Pp .It Ic show Cm thread Op Ar addr | tid diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index f540c7d3e70e..3c62d3b07f99 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -29,6 +29,7 @@ #include #include "opt_inet.h" +#include "opt_ddb.h" #include #include #include @@ -43,11 +44,18 @@ #include #include #include +#ifdef DDB +#include +#endif #include #include /* Must come after qmath.h and tree.h */ #include #include +#ifdef DDB +#include +#endif + #include #include #include @@ -2972,3 +2980,376 @@ skip_closed_req: done: INP_WUNLOCK(inp); } + +#ifdef DDB +static void +db_print_indent(int indent) +{ + int i; + + for (i = 0; i < indent; i++) + db_printf(" "); +} + +static void +db_print_tcphdr(struct tcp_log_buffer *tlm_buf) +{ + struct sackblk sack; + struct tcphdr *th; + int cnt, i, j, opt, optlen, num_sacks; + uint32_t val, ecr; + uint16_t mss; + uint16_t flags; + + if ((tlm_buf->tlb_eventflags & TLB_FLAG_HDR) == 0) { + return; + } + th = &tlm_buf->tlb_th; + flags = tcp_get_flags(th); + if (flags & TH_FIN) { + db_printf("F"); + } + if (flags & TH_SYN) { + db_printf("S"); + } + if (flags & TH_RST) { + db_printf("R"); + } + if (flags & TH_PUSH) { + db_printf("P"); + } + if (flags & TH_ACK) { + db_printf("."); + } + if (flags & TH_URG) { + db_printf("U"); + } + if (flags & TH_ECE) { + db_printf("E"); + } + if (flags & TH_FIN) { + db_printf("F"); + } + if (flags & TH_CWR) { + db_printf("W"); + } + if (flags & TH_FIN) { + db_printf("F"); + } + if (flags & TH_AE) { + db_printf("A"); + } + db_printf(" %u:%u(%u)", ntohl(th->th_seq), + ntohl(th->th_seq) + tlm_buf->tlb_len, tlm_buf->tlb_len); + if (flags & TH_ACK) { + db_printf(" ack %u", ntohl(th->th_ack)); + } + db_printf(" win %u", ntohs(th->th_win)); + if (flags & TH_URG) { + db_printf(" urg %u", ntohs(th->th_urp)); + } + cnt = (th->th_off << 2) - sizeof(struct tcphdr); + if (cnt > 0) { + db_printf(" <"); + for (i = 0; i < cnt; i += optlen) { + opt = tlm_buf->tlb_opts[i]; + if (opt == TCPOPT_EOL || opt == TCPOPT_NOP) { + optlen = 1; + } else { + if (cnt - i < 2) { + break; + } + optlen = tlm_buf->tlb_opts[i + 1]; + if (optlen < 2 || optlen > cnt - i) { + break; + } + } + if (i > 0) { + db_printf(","); + } + switch (opt) { + case TCPOPT_EOL: + db_printf("eol"); + break; + case TCPOPT_NOP: + db_printf("nop"); + break; + case TCPOPT_MAXSEG: + if (optlen != TCPOLEN_MAXSEG) { + break; + } + bcopy(tlm_buf->tlb_opts + i + 2, &mss, + sizeof(uint16_t)); + db_printf("mss %u", ntohs(mss)); + break; + case TCPOPT_WINDOW: + if (optlen != TCPOLEN_WINDOW) { + break; + } + db_printf("wscale %u", + tlm_buf->tlb_opts[i + 2]); + break; + case TCPOPT_SACK_PERMITTED: + if (optlen != TCPOLEN_SACK_PERMITTED) { + break; + } + db_printf("sackOK"); + break; + case TCPOPT_SACK: + if (optlen == TCPOLEN_SACKHDR || + (optlen - 2) % TCPOLEN_SACK != 0) { + break; + } + num_sacks = (optlen - 2) / TCPOLEN_SACK; + db_printf("sack"); + for (j = 0; j < num_sacks; j++) { + bcopy(tlm_buf->tlb_opts + i + 2 + + j * TCPOLEN_SACK, &sack, + TCPOLEN_SACK); + db_printf(" %u:%u", ntohl(sack.start), + ntohl(sack.end)); + } + break; + case TCPOPT_TIMESTAMP: + if (optlen != TCPOLEN_TIMESTAMP) { + break; + } + bcopy(tlm_buf->tlb_opts + i + 2, &val, + sizeof(uint32_t)); + bcopy(tlm_buf->tlb_opts + i + 6, &ecr, + sizeof(uint32_t)); + db_printf("TS val %u ecr %u", ntohl(val), + ntohl(ecr)); + break; + case TCPOPT_SIGNATURE: + db_printf("md5"); + if (optlen > 2) { + db_printf(" "); + } + for (j = 0; j < optlen - 2; j++) { + db_printf("%02x", + tlm_buf->tlb_opts[i + 2 + j]); + } + break; + case TCPOPT_FAST_OPEN: + db_printf("FO"); + if (optlen > 2) { + db_printf(" "); + } + for (j = 0; j < optlen - 2; j++) { + db_printf("%02x", + tlm_buf->tlb_opts[i + 2 + j]); + } + break; + default: + db_printf("opt=%u len=%u", opt, optlen); + break; + } + } + db_printf(">"); + } +} +static void +db_print_pru(struct tcp_log_buffer *tlm_buf) +{ + switch (tlm_buf->tlb_flex1) { + case PRU_ATTACH: + db_printf("ATTACH"); + break; + case PRU_DETACH: + db_printf("DETACH"); + break; + case PRU_BIND: + db_printf("BIND"); + break; + case PRU_LISTEN: + db_printf("LISTEN"); + break; + case PRU_CONNECT: + db_printf("CONNECT"); + break; + case PRU_ACCEPT: + db_printf("ACCEPT"); + break; + case PRU_DISCONNECT: + db_printf("DISCONNECT"); + break; + case PRU_SHUTDOWN: + db_printf("SHUTDOWN"); + break; + case PRU_RCVD: + db_printf("RCVD"); + break; + case PRU_SEND: + db_printf("SEND"); + break; + case PRU_ABORT: + db_printf("ABORT"); + break; + case PRU_CONTROL: + db_printf("CONTROL"); + break; + case PRU_SENSE: + db_printf("SENSE"); + break; + case PRU_RCVOOB: + db_printf("RCVOOB"); + break; + case PRU_SENDOOB: + db_printf("SENDOOB"); + break; + case PRU_SOCKADDR: + db_printf("SOCKADDR"); + break; + case PRU_PEERADDR: + db_printf("PEERADDR"); + break; + case PRU_CONNECT2: + db_printf("CONNECT2"); + break; + case PRU_FASTTIMO: + db_printf("FASTTIMO"); + break; + case PRU_SLOWTIMO: + db_printf("SLOWTIMO"); + break; + case PRU_PROTORCV: + db_printf("PROTORCV"); + break; + case PRU_PROTOSEND: + db_printf("PROTOSEND"); + break; + case PRU_SEND_EOF: + db_printf("SEND_EOF"); + break; + case PRU_SOSETLABEL: + db_printf("SOSETLABEL"); + break; + case PRU_CLOSE: + db_printf("CLOSE"); + break; + case PRU_FLUSH: + db_printf("FLUSH"); + break; + default: + db_printf("Unknown PRU (%u)", tlm_buf->tlb_flex1); + break; + } + if (tlm_buf->tlb_errno >= 0) { + db_printf(", error: %d", tlm_buf->tlb_errno); + } +} + +static void +db_print_rto(struct tcp_log_buffer *tlm_buf) +{ + tt_what what; + tt_which which; + + what = (tlm_buf->tlb_flex1 & 0xffffff00) >> 8; + which = tlm_buf->tlb_flex1 & 0x000000ff; + switch (what) { + case TT_PROCESSING: + db_printf("Processing "); + break; + case TT_PROCESSED: + db_printf("Processed "); + break; + case TT_STARTING: + db_printf("Starting "); + break; + case TT_STOPPING: + db_printf("Stopping "); + break; + default: + db_printf("Unknown operation (%u) for ", what); + break; + } + switch (which) { + case TT_REXMT: + db_printf("Retransmission "); + break; + case TT_PERSIST: + db_printf("Persist "); + break; + case TT_KEEP: + db_printf("Keepalive "); + break; + case TT_2MSL: + db_printf("2 MSL "); + break; + case TT_DELACK: + db_printf("Delayed ACK "); + break; + default: + db_printf("Unknown (%u) ", which); + break; + } + db_printf("timer"); + if (what == TT_STARTING) { + db_printf(": %u ms", tlm_buf->tlb_flex2); + } +} + +static void +db_print_usersend(struct tcp_log_buffer *tlm_buf) +{ + if ((tlm_buf->tlb_eventflags & TLB_FLAG_RXBUF) == 0) { + return; + } + if ((tlm_buf->tlb_eventflags & TLB_FLAG_TXBUF) == 0) { + return; + } + db_printf("usersend: rcv.acc: %u rcv.ccc: %u snd.acc: %u snd.ccc: %u", + tlm_buf->tlb_rxbuf.tls_sb_acc, tlm_buf->tlb_rxbuf.tls_sb_ccc, + tlm_buf->tlb_txbuf.tls_sb_acc, tlm_buf->tlb_txbuf.tls_sb_ccc); +} + +void +db_print_bblog_entries(struct tcp_log_stailq *log_entries, int indent) +{ + struct tcp_log_mem *log_entry; + struct tcp_log_buffer *tlm_buf, *prev_tlm_buf; + int64_t delta_t; + + indent += 2; + prev_tlm_buf = NULL; + STAILQ_FOREACH(log_entry, log_entries, tlm_queue) { + db_print_indent(indent); + tlm_buf = &log_entry->tlm_buf; + if (prev_tlm_buf == NULL) { + db_printf(" 0.000 "); + } else { + delta_t = sbttoms(tvtosbt(tlm_buf->tlb_tv) - + tvtosbt(prev_tlm_buf->tlb_tv)); + db_printf("+%u.%03u ", (uint32_t)(delta_t / 1000), + (uint32_t)(delta_t % 1000)); + } + switch (tlm_buf->tlb_eventid) { + case TCP_LOG_IN: + db_printf("< "); + db_print_tcphdr(tlm_buf); + break; + case TCP_LOG_OUT: + db_printf("> "); + db_print_tcphdr(tlm_buf); + break; + case TCP_LOG_RTO: + db_print_rto(tlm_buf); + break; + case TCP_LOG_PRU: + db_print_pru(tlm_buf); + break; + case TCP_LOG_USERSEND: + db_print_usersend(tlm_buf); + break; + default: + break; + } + db_printf("\n"); + prev_tlm_buf = tlm_buf; + if (db_pager_quit) + break; + } +} +#endif diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 0b2a91aacedf..7755fbccdb45 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -582,5 +582,9 @@ tcp_log_event(struct tcpcb *tp, struct tcphdr *th, struct sockbuf *rxbuf, } #endif /* TCP_BLACKBOX */ +#ifdef DDB +void db_print_bblog_entries(struct tcp_log_stailq *log_entries, int indent); +#endif + #endif /* _KERNEL */ #endif /* __tcp_log_buf_h__ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index e0e921ebc42e..89bc019e8884 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3116,7 +3116,7 @@ db_print_bblog_state(int state) } static void -db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) +db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) { db_print_indent(indent); @@ -3241,35 +3241,42 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) db_print_indent(indent); db_printf("t_lognum: %d t_loglimit: %d t_logsn: %u\n", tp->t_lognum, tp->t_loglimit, tp->t_logsn); + + if (show_bblog) { + db_print_bblog_entries(&tp->t_logs, indent); + } } DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) { struct tcpcb *tp; + bool show_bblog; if (!have_addr) { db_printf("usage: show tcpcb \n"); return; } + show_bblog = strchr(modif, 'b') != NULL; tp = (struct tcpcb *)addr; - db_print_tcpcb(tp, "tcpcb", 0); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog); } DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) { VNET_ITERATOR_DECL(vnet_iter); struct inpcb *inp; - bool only_locked; + bool only_locked, show_bblog; only_locked = strchr(modif, 'l') != NULL; + show_bblog = strchr(modif, 'b') != NULL; VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); CK_LIST_FOREACH(inp, &V_tcbinfo.ipi_listhead, inp_list) { if (only_locked && inp->inp_lock.rw_lock == RW_UNLOCKED) continue; - db_print_tcpcb(intotcpcb(inp), "tcpcb", 0); + db_print_tcpcb(intotcpcb(inp), "tcpcb", 0, show_bblog); if (db_pager_quit) break; } From nobody Thu Sep 4 20:02: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 4cHr4G570Sz66gRy; Thu, 04 Sep 2025 20:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr4G4Q5Cz3ZHG; Thu, 04 Sep 2025 20:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016158; 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=OnmELtPV+9s6itFk0I5cKQ3hVzWhico6mxQAp98+f0s=; b=O2bgNxNXTlJyubvHO74jitcLfClVPmJOZyVn6Oqzu22tavwtmr67noMYKCSMAHSwX4wfxN uzbyJcMit6GjPJArmQ8HAQJ2Hn8wXSGJ7gRHYCh7SnV3oDpsVtVVkMF7augNmIHWlFUx5j hj5vIiOqs+3Ec2gekzGzfToeHOGhdY9oOvkycPk/sKsDco9ZndkrnggK48WZ2lmbUiw3r7 IltvOP8cj86UXtsaA/QcQPkdtVwXQ1MM/smrpJJXWEqb78tgStdSVq3v5UBE9XuvSsumgZ vKZX7HSbIy624V3eBOtno5zng60tZauwXK1skBWv+gdKIsWrKrUd8x7b0+Rt4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016158; 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=OnmELtPV+9s6itFk0I5cKQ3hVzWhico6mxQAp98+f0s=; b=ECoLJW1KggBQsHCmyfjC9R6324oGkS4OYykc21X8scCRBjoMP2e1UMLeD/5yZlAT9EKSjA Rif2b+h4E5UCJQo6FkeQmBA24NfH+v4R7zpv8ExgfZnelsUVRQHfMTtS7RLbE1mpXEPqKa PluDUSuCETbP733MlmumBCAZDD+4AEABYA775dKPebLmPeKn532PSGa8iJuCoZfXMPwRua 88sKj7rfBlkNuW0p5MAiaHI5pTwICNP9hsWlcIrdOhOMv+HBAcK1dFSZwTzccgMLkvW26G HSyto0W3oOx8BWDlTSoeX9AZgK89jVKy4qL8U9aQOmKfQVWvtE4DIwJHK5jp+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016158; a=rsa-sha256; cv=none; b=xkTJQIgtLu906iM8zaufzU647EU8N9CR46geQbAJQl3R8nhzI4BERZiGrkg45fxqBQ4Spe uaaE5KvQ7WIq7nWio+pdGAG37Zj5CQc07Gp468++lMQK9pbcQcBgkGnUTNELkNFfeKK/zv C9yU5BD6stOkY0QULRbiqApmqwRO5c/kvyu6iVtVUBJY35yyIFK3LYbwIhaALCHdbgNg0B ZT9Nt+n1wpOuvdL4n+g0gndbFdySLGEgBLJ2EALzpLl0FPoaABl/aOVP/daJKlutPzEPEn Zvma2SBrtq4J1H9TnbWN2O4fuciktdyBTRCeP7xrkmTcsnbOxKdBRIXtKmCFjA== 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 4cHr4G3wF1z2pj; Thu, 04 Sep 2025 20:02: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 584K2cc2046047; Thu, 4 Sep 2025 20:02:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K2c7w046044; Thu, 4 Sep 2025 20:02:38 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:02:38 GMT Message-Id: <202509042002.584K2c7w046044@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: 9506da19ca73 - stable/14 - ddb: fix handling of BBLog entries when BBLog is disabled 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: 9506da19ca73f54c277ffa9fd89a774a6117d2d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9506da19ca73f54c277ffa9fd89a774a6117d2d0 commit 9506da19ca73f54c277ffa9fd89a774a6117d2d0 Author: Michael Tuexen AuthorDate: 2025-06-10 16:32:39 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:02:16 +0000 ddb: fix handling of BBLog entries when BBLog is disabled Fixes: a62c6b0de48a ("ddb: add optional printing of BBLog entries") Sponsored by: Netflix, Inc. (cherry picked from commit 0dc78204a7dcbc51bfab4c701e1335084548bc05) --- sys/netinet/tcp_log_buf.h | 7 +++---- sys/netinet/tcp_usrreq.c | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 7755fbccdb45..363ea13b1743 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -567,6 +567,9 @@ void tcp_log_flowend(struct tcpcb *tp); void tcp_log_sendfile(struct socket *so, off_t offset, size_t nbytes, int flags); int tcp_log_apply_ratio(struct tcpcb *tp, int ratio); +#ifdef DDB +void db_print_bblog_entries(struct tcp_log_stailq *log_entries, int indent); +#endif #else /* !TCP_BLACKBOX */ #define tcp_log_verbose (false) @@ -582,9 +585,5 @@ tcp_log_event(struct tcpcb *tp, struct tcphdr *th, struct sockbuf *rxbuf, } #endif /* TCP_BLACKBOX */ -#ifdef DDB -void db_print_bblog_entries(struct tcp_log_stailq *log_entries, int indent); -#endif - #endif /* _KERNEL */ #endif /* __tcp_log_buf_h__ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 89bc019e8884..daa04845ab79 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3243,7 +3243,12 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) tp->t_lognum, tp->t_loglimit, tp->t_logsn); if (show_bblog) { +#ifdef TCP_BLACKBOX db_print_bblog_entries(&tp->t_logs, indent); +#else + db_print_indent(indent); + db_printf("BBLog not supported\n"); +#endif } } From nobody Thu Sep 4 20:03: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 4cHr581gKgz66gX7; Thu, 04 Sep 2025 20:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr5812vQz3ZYb; Thu, 04 Sep 2025 20:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016204; 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=JIDk/LjWMlCCtYrRvZVVsFcR/xOZXqx1n3YhmmU241A=; b=Ki42xxQWkSOZpdE9uNuZOR5MRii+xtGZuBTtGqD2Pf88vw1et6AA5Ri/6OCoFQmTSiujwS vXONdLeegRZhltFL7iMyWbGU1p6gL9wLNlQdZsIJzoHsZkVPjBOJSIG2UGcAEmSgCSSvl9 mJ+3AKHk8hnbzar6COeLYhjG93P+gI4wHYF0gVEW5O/36iZSou4T2jYVZeuCGV5XIUECeC 3oRrFZ9JlJpqsVy8Ie2X/ez/Su4rh4KfvVxyrDSKuvf3r9J5s9Ra4vKaBlpouKRzlyHavI rl1kmRkln85T61YnOi5W1MPTHXbGKZpEodqcg0ZH0aEFuJFPzeJFZM044YXb6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016204; 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=JIDk/LjWMlCCtYrRvZVVsFcR/xOZXqx1n3YhmmU241A=; b=qvu3KSmiDdwqDiT5H42MRvunZiXXqm6+ybpX2EBTe6vulY3Fp1hc9lOvVzeAnIu8YOdL/Z GLoO2+oBJU3/Jcier1qCrY2KMoIEmhfB3wCpAA3MPzMNqMElGgz4GRHXc+U0FLBnbFbV9m WtbH/IqtRGN9FGnL2jL+rX45I5rT+p+JPvuZ6CK86O3cFUbx7kyEu4OKKrt15O5Hw/jCO1 BqBJBNuDnvo3BKv9AcxT0j8YoJhEt8ohNKAvR1XGltDYRRaaQD3zttsITHYor7QiHG49Wl Lm7nlbXKhWR4DtOiKdB+qQfKI/lNUE9RYWyWz1cQP+Xx/l5zpH63ebRUc7iGMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016204; a=rsa-sha256; cv=none; b=YEQhxLf2Bj5/Yi1s7FAxeJE7mYo5PmHxMcfoumtaGIQ8efTFJiddOdd+yRF5+9bVpUSuIt L9ZuXONECngtqb2lxPCJo3a4cVdHHeDWVZu+X5/atvpiBSUOGE1IxjhT9VU9HFOky+LeuK yHI+T6TQ2UsTMr6+Na4rBI3cnTNfl3SqRf5w/HEPYZuUjzHzMFUwLSPJbemim4otQAeba5 M1F9qHS21fPVBOPQ0adkM1HytxXwCaUbK5vQZJwROaOb0kH5CjIMQ/Uc8Dfh/+lvmSBJ04 qIb2wlxKOFrabgbI4EqYkR+762XFffov6sjqr/sEk9rHRgRTxvTui9utWZecQw== 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 4cHr580KTsz2dV; Thu, 04 Sep 2025 20:03: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 584K3NnW046388; Thu, 4 Sep 2025 20:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K3Nf3046385; Thu, 4 Sep 2025 20:03:23 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:03:23 GMT Message-Id: <202509042003.584K3Nf3046385@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: c53a68283300 - stable/14 - tcp: fix local blackholing 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: c53a6828330043d9ca2e2b56315cee4accd11f30 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c53a6828330043d9ca2e2b56315cee4accd11f30 commit c53a6828330043d9ca2e2b56315cee4accd11f30 Author: Michael Tuexen AuthorDate: 2025-06-13 20:53:42 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:03:01 +0000 tcp: fix local blackholing The sysctl-variable net.inet.tcp.blackhole_local should affect TCP segments from an IPv6 address of the local host, not of a host on the local area network. Thanks to cc@ for pointing me to the issue. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50828 (cherry picked from commit de8fb1b3835758998a53d772deeebcdb71bbb823) --- sys/netinet/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b4c77c303df7..fb0c110d460d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1411,7 +1411,7 @@ dropwithreset: ((V_blackhole == 1 && (thflags & TH_SYN)) || V_blackhole > 1))) && (V_blackhole_local || ( #ifdef INET6 - isipv6 ? !in6_localaddr(&ip6->ip6_src) : + isipv6 ? !in6_localip(&ip6->ip6_src) : #endif #ifdef INET !in_localip(ip->ip_src) From nobody Thu Sep 4 20:04: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 4cHr5w55lMz66gVw; Thu, 04 Sep 2025 20:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr5w3hB6z3bWJ; Thu, 04 Sep 2025 20:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016244; 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=gE2tNlVLqteB/Kf3g7qKrYjw5x2T95Imf6Aof64jZwU=; b=OZ1Z72NEpQsGxxSRm+RwW0k6fDoUWMsjBDflffU7/s6sX5lgI05enPV4PeloDmlK5XYLRk ebY8RTpnWuA53UO2wjmkjoTCcjlT5gyNfwmcmzylSVtdsWhzbLvAKL7bJJLtgZ9F6wEKcq ej5P6kdThs8JyT5YajTOoVtJhMoWZy/zeCu7rg5vY9u4TGU08Xh0oKj5b/+2HjVLYPbcXe N1wDONAlQG2yuf+GN5Ie/KyU1jC1Oy5S5N7kuL2HREDTYDLKY+zwoB8Pz4Q5o0qjD7KO2H keaA6+N7p+y4PFGO/t26S0hClM2M2cwtYS3wM6ABggImkdA3UmNeLAyC1IO0CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016244; 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=gE2tNlVLqteB/Kf3g7qKrYjw5x2T95Imf6Aof64jZwU=; b=UqYP1JjIoISb+WsIZvZM8cAs2naUG50ymbRYOVH0S+Bg6SnSQcz06qwpq3s5bKehwQFo0O 2djrGbbTUxWqpCAsEFuN+G/L83+rxjV1zbPirQeJsbBL+E6CxQJOz4vtpQszlkW3GgJYB5 S3lGtOqQYwGrUpy9J0/MHh40HYGQD000CQ/NS03gS5+ECHGMg3gIu+1dKNPxjc+xeeh+QL mv0DXvGoOSLlP7uNl2vdLUoSY2Nim8A2CR4k0Oa5liCaEKwkK91Ko1L0w3h1UKboOFM75e 7TaFfqkldAjj9uXOW7nM3+SNzQx0PcsDUlf5WT79nTnTe3omDeOySSSUBiXosA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016244; a=rsa-sha256; cv=none; b=O+SBRq3zlpRg5QdUVCD/8OTyUsq4HiehbBuw/+myoQxWhaLorJgAWpeogizMNox6+sWdEc 3WgVmCs94B25ix/Go1UgqtbJ7FyTAdiSD3XPYOaCEKh2u+IddhGcDH8SHFKYJGT1X6PIqt 0+NUWc3GX4oBXrqihA0ukyQds46Aool2Cu9kaXBKAzy/T7yB2Nud7SG+0vcZ9WhvxfB8TA u1h+Xh20QNBa/b7XujLuuQZclo5WJXgZTsQr6Y6xRVuqTeuV/4JiVfbXYtl8H2gRFn7Mqm qlbehEu/DdcT1Y7WEV9CpLJcjR7uyazNwJRUhfehQffnAICegc3ioQOhOk9+fg== 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 4cHr5w326Xz2T6; Thu, 04 Sep 2025 20:04: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 584K444G046719; Thu, 4 Sep 2025 20:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K44s2046716; Thu, 4 Sep 2025 20:04:04 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:04:04 GMT Message-Id: <202509042004.584K44s2046716@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: 5bfaf4a161da - stable/14 - udp: fix local blackholing 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: 5bfaf4a161da1fe8bc296f1651f350c1d14518dd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5bfaf4a161da1fe8bc296f1651f350c1d14518dd commit 5bfaf4a161da1fe8bc296f1651f350c1d14518dd Author: Michael Tuexen AuthorDate: 2025-06-13 20:57:16 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:03:42 +0000 udp: fix local blackholing The sysctl-variable net.inet.udp.blackhole_local should affect UDP packets from an IPv6 address of the local host, not of a host on the local area network. Thanks to cc@ for pointing me to the issue. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50829 (cherry picked from commit 16587f60a69820f1a319644da4ec1a40efbcbdf0) --- sys/netinet6/udp6_usrreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 066cf79c3a07..736f2da5c0ad 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -514,7 +514,7 @@ skip_checksum: goto badunlocked; } if (V_udp_blackhole && (V_udp_blackhole_local || - !in6_localaddr(&ip6->ip6_src))) + !in6_localip(&ip6->ip6_src))) goto badunlocked; icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); *mp = NULL; From nobody Thu Sep 4 20:04: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 4cHr6t4XpRz66gQT; Thu, 04 Sep 2025 20:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr6t40QYz3c0P; Thu, 04 Sep 2025 20:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016294; 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=XcaoUdXxKWfMlq7u+hrUMYKsyqz6n7Ha+2+PdGsg1so=; b=L4fNVXjdNi6J7z+Wxe6NO4qv2mrGcor3Gy58bCqYtbRk5etQkqco9Svj8qqZd2h9+UdRcD CfDoNNaxTLYh2dVgvs5gTLbecKIEFPWUMMuUk/gPaCPVohdskWqB02p5nRJVthmbZ8ln0x qcy3hOGgTrcotTLv9YCpoRtJIJ3RFlZnpfzi3Dcsg0x4vAXKAkSfWgdFYyccRRTRnNJmDJ QP3Q8ZMsm2WNpTo7TJvPpiFePAs7xIqHw/gmG7ygxhiimA41jzoo5Pu5BJ6hlXLvyCtcdI FTj2we/i0jiCNYt09NZ75oOZIlif8G89VKRkaOlvRvnr0sNZbzTNf0AH0HLtEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016294; 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=XcaoUdXxKWfMlq7u+hrUMYKsyqz6n7Ha+2+PdGsg1so=; b=awuRcKsCPgm3SBiViNMzyot2viPFP19CE2FPWDwxG95KvowrUisSVgAgefotGrpgLCD0yO Rb0wSTqNehb95Ae+zL9J02PzWAFzJsz2g69PyIUUQIGTEsLxIXiL2Ni1KZB1z1LLVPScSj bK97YcoJb0YtCLCYw3saIaif5ZmIYVcgUeUlcL7PqyQNI6I6DQTehYW9Aevqtcy8XyTI89 pTxd7E9BHd3wpWthFOhRkiF0AYEPC4nTX4c/e13pFM2JkTx5GxbQvXRVhWL5mNpTkogsfn yplfYzZhsUAZfzXX7GoTRk3RHrKP9yFUP77F/5PDIU3FCCQWnDb5UNe9h6XShQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016294; a=rsa-sha256; cv=none; b=LW6LnwauvWK/UmCf7C5JHfXulyWQ03UYgLBAUaQIyOdwgLfrChIBnll12a0ZHPJe9vDoOZ bilayF3Mz7cu1jSOyKGylz6OLDN9HrWEysMpO9OWOt+aIGkXIegt7v8fBrVMd52fpYNYBW 1xCFLgt5pw9NHbtQUTLI4E7QIi/Xxio9+HobD0CFIO3jT1h3SPqkUmP1SCUXqBPdUnhAv2 BP2sOUEbNwbm0kOYdChSJhmKpODTBFgRXT/JM/znN4pMC+7bmaJKHWMKEblAUVAmfyzAYE dL7Jcy/56hzZ1NU2Q3Yaf2Lh8Yf1h7qela/LqmD8Y97NWWKCwd4Xu1YU3xTdPw== 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 4cHr6t3bLmz2Dq; Thu, 04 Sep 2025 20:04: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 584K4sgl047059; Thu, 4 Sep 2025 20:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K4sdx047056; Thu, 4 Sep 2025 20:04:54 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:04:54 GMT Message-Id: <202509042004.584K4sdx047056@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: 9514c46ae270 - stable/14 - tcp: fix handling of TIME WAIT for local TCP connections 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: 9514c46ae270530a6ca726bf60fd40d3ab44354a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9514c46ae270530a6ca726bf60fd40d3ab44354a commit 9514c46ae270530a6ca726bf60fd40d3ab44354a Author: Michael Tuexen AuthorDate: 2025-06-13 21:00:36 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:04:32 +0000 tcp: fix handling of TIME WAIT for local TCP connections The sysctl-variable net.inet.tcp.nolocaltimewait should affect TCP connections where the remote endpoint is on the local host and not on the local area network. Reported by: cc Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50830 (cherry picked from commit 49eabd405f661fa3a9f0a005c2e54dc4cad07e48) --- sys/netinet/tcp_timewait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 6fb12ce5380e..0a58bf506a26 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -128,7 +128,7 @@ tcp_twstart(struct tcpcb *tp) if (V_nolocaltimewait && ( #ifdef INET6 - isipv6 ? in6_localaddr(&inp->in6p_faddr) : + isipv6 ? in6_localip(&inp->in6p_faddr) : #endif #ifdef INET in_localip(inp->inp_faddr) From nobody Thu Sep 4 20:06: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 4cHr8z4P2Qz66gtN; Thu, 04 Sep 2025 20:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr8z3snPz3cP6; Thu, 04 Sep 2025 20:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016403; 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=F8Md0ntCXL/v/ilRh5RcWY57zdH9t7FKSAv7CiJINZk=; b=v65fRwcWF+cjBMFivAxkmSsJ0J2j8ndKIdPnUdFpOdaO2dtJyTRlJDmniFxcvRzp27hXdE qBJ8VC+dy0EN9jo6lOuYdwAccJMcfBUDvQz5IrcwO8ERR0OFIvD7HiLpQUN86CDuVi24tH IZv9V5o1EoFYgI77rc3UXwdJ9pOv9RitI2TQFS6xy3F5Sak/c3PQ8yVbBKAX/3xtykMKf9 lCqopxa/UKVj7tf7NL9vIsPM7FeqFM7Yolsi2e2F02r2UKOc7zdPmNMhJl+ruvtu/5FOO5 /jEgrEDQwxy8qO6vTfhAQt4mBkH4FjHh2/m/L4jULNVbuS5gQCO6gfcN9a/RfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016403; 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=F8Md0ntCXL/v/ilRh5RcWY57zdH9t7FKSAv7CiJINZk=; b=qEPSlVsKsOYPY01Py6COOVlyhtylNUtmSzejgGvAoqrpaGXqvBi5a+rxSY3jety+YH7p4r 2uaEsGn6h8JfU+CAyj+tWVz8MI6DjlOKiJlWCSWzdL9TerqKJ1xSh/OX3yBaVp5BpWzTx+ lLWkGfFrPFXm5WVIwFzRoLU6YJpNHP5R0jlkYQ/q5qe948KqPlCJyL192W8egdfoujbyms RwVo/u9h5VpGVkdMdB1XoAd98jKAF644KfP5WXcvBJFKEyAroGVktFq/OixnVgp04HdW1v LW22hDbsrHzVmDU+6T0nzdNHh+dHghK5gPJ1lCzBAuKSVt5yrdOsloEdDG88Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016403; a=rsa-sha256; cv=none; b=ebV6Ae2r7WeatdZSDh5z1xRz4gDacfO5oPQ/ZEnpEwz3c3FaoyWnWj3xslCm9ZpQVFqI8S J4VJR6qIZBwoRcV+zxNqBB/ntIqq7Nfcr6DH+vxNLoU2dhd5TTVd4vxybKkChkh5bV5na0 2NXS5rga2JHVaeNvEBxIribA+l+Fm2+Boirne9LZbHn7cjjCoFFyR1+ZMal1YPMUTwWCE8 heF3o4WyJwmkQnOE1Z/00R5FRahybzYXDh1aaOJa0Drzg1AZZLx87LCSKgV+iijvcmbX+W /jIE10UBA3mQmw7ZAXc8t1N6PyVuE+j0T0xsyfJ2YeI6ZcP09IZhk3pEeZ4zKA== 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 4cHr8z3SSBz2Dr; Thu, 04 Sep 2025 20:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584K6hY0047698; Thu, 4 Sep 2025 20:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K6hGK047695; Thu, 4 Sep 2025 20:06:43 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:06:43 GMT Message-Id: <202509042006.584K6hGK047695@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: a8f6e2b5e46a - stable/14 - tcp: remove TCPTV_TWTRUNC 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: a8f6e2b5e46a71cc6d3deb07baac4707a5ecd81e Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a8f6e2b5e46a71cc6d3deb07baac4707a5ecd81e commit a8f6e2b5e46a71cc6d3deb07baac4707a5ecd81e Author: Michael Tuexen AuthorDate: 2025-06-17 13:46:40 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:06:18 +0000 tcp: remove TCPTV_TWTRUNC It is not used anymore... Reviewed by: rscheff, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50900 (cherry picked from commit 124120d44ba23ccc44144f9fc48d35818c660dc1) --- sys/netinet/tcp_timer.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index f3aa03e611a2..a45e41317ad5 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -113,8 +113,6 @@ #define TCPTV_CPU_VAR ( hz/5 ) /* cpu variance allowed (200ms) */ #define TCPTV_REXMTMAX ( 64*hz) /* max allowable REXMT value */ -#define TCPTV_TWTRUNC 8 /* RTO factor to truncate TW */ - #define TCP_MAXRXTSHIFT 12 /* maximum retransmits */ #define TCPTV_DELACK ( hz/25 ) /* 40ms timeout */ From nobody Thu Sep 4 21:54: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 4cHtYJ4kyPz66ZcG; Thu, 04 Sep 2025 21:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHtYJ3p0Qz3rwp; Thu, 04 Sep 2025 21:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757022868; 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=CQv7evidkGoDIu4XAo7cutDz/RbryMZtGNGAlplmC3c=; b=ZNKbBX6jFNXqiYI1OMHW8phz52ShU8iq0JtTVMCwYAtFNKBLRr8j4w7x2pi+NVuKM5j28Q Mldp3J9iJPPs2icl4xFLAXrZjZUOE6pNPqtuGySGurlSDRIHXe1wtI8kK+zmEgrjNg22T5 xeX+R9WODB5nPIZRPOLh3pslypY+rbndZCWWxVTPaJmKGAgflZvcEwZEMhN26OGAinFQuV lti4gZaOjN16U13kFCJveIqt6DRf9+FE7Ov/6FFnuyVKyyQpK6jfkIF3slQ7twC1E6N8LU QuchaFC9tIp+LPXDq0WzRPz3DGSoYkz99Y6uc+TpYkRwQRKoeQpueh4Yr1x1ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757022868; 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=CQv7evidkGoDIu4XAo7cutDz/RbryMZtGNGAlplmC3c=; b=fiRXy4RD5J7scmuGtc/jAnHHAOHIJf+oPCglaKUqKfsiD51OEIMJWlBbe4eLoLag0cK2N9 s5yGECK6RM6BTfXalhbqw3UsY3ir1ki81RUm7ayhA0Av2yZ1lHdlCliyTvsA1QSwMG89CY 1tIp1MDB5CNKnRGw5pVHJF3beU5JDHJRUie7osYAkGJAfX0FdMafCFWzPxBJ/4AEDojhsY umdvFROn/DYLyE9lcargKWPljo8hiEAPgE5bl6jnZHnyWOWByb8KlXjiZ8b9Ek2SJC4/wZ Rjr2yPEnwUgk8GSkdNBZAYWBL3NV/lC0Epiqt+fPT+UAH1QxW5L5l1hUyXGa5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757022868; a=rsa-sha256; cv=none; b=sM24YYBr9Qn3ECitHZD879Kqwf+V6ib/qQN4he0zE/J1huT93Nxab0XvPZmMg6rMJGXxS1 bXSspS9gDvRaSMrQrMeiskC0TQAqhgFbqhv0iVrGgA5bLXhQaaJjvxKsXQwOH844KFjUlR u89m8PunHmBAOOIqykZob2w5rdVBu3m9EY9W6onzvlC8NXmCWZtziDoCnCsia1XIKsdL8t JFj5nHxJzH7uyO8g3/fODz2ZGttN7QF6o7ZnU7MWALxN3klpyaWbDktJjwW8kMJ/xlQ/Jr NhZAtQUGLLnWTZVuPpUpD14C2xZKhaCAJd1pSXD0fpBmPhKSVZG6o/4Wt16pYA== 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 4cHtYJ3NKgz5WD; Thu, 04 Sep 2025 21:54: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 584LsSqF052193; Thu, 4 Sep 2025 21:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584LsSGm052190; Thu, 4 Sep 2025 21:54:28 GMT (envelope-from git) Date: Thu, 4 Sep 2025 21:54:28 GMT Message-Id: <202509042154.584LsSGm052190@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: 45d3204dec88 - stable/14 - Remove cached FreeBSD-kmods repo from cloudware 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: 45d3204dec88baee5d6da2890f90fe2c491e9e2a Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=45d3204dec88baee5d6da2890f90fe2c491e9e2a commit 45d3204dec88baee5d6da2890f90fe2c491e9e2a Author: Colin Percival AuthorDate: 2025-09-04 21:49:46 +0000 Commit: Colin Percival CommitDate: 2025-09-04 21:49:46 +0000 Remove cached FreeBSD-kmods repo from cloudware This is a direct commit to stable/14 but corresponds to part of 778bfd4e1033, which both chased the renaming of repositories in /etc/pkg/FreeBSD.conf and added cleanup of the FreeBSD-ports-kmods repository database (which is just "FreeBSD-kmods" on stable/14). Fixes: 8a2ce9f9dd67 ("pkg.conf: Use kmod repositories") --- release/tools/azure.conf | 1 + release/tools/ec2.conf | 1 + release/tools/vagrant.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 519ab13fe432..9e698b93fa91 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -28,6 +28,7 @@ vm_extra_pre_umount() { chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg delete -f -y pkg rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-kmods chroot ${DESTDIR} ${EMULATOR} pw usermod root -h - diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index bac8bb0d0e67..c0561227f72c 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -28,6 +28,7 @@ ec2_common() { /usr/sbin/pkg delete -f -y pkg umount ${DESTDIR}/dev rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-kmods # Turn off IPv6 Duplicate Address Detection; the EC2 networking # configuration makes it unnecessary. diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 2735ad2974cb..2fc21911ce17 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -21,6 +21,7 @@ vagrant_common () { env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-kmods # Vagrant instances use DHCP to get their network configuration. echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf From nobody Fri Sep 5 01:24: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 4cHzC42xgxz66ql7; Fri, 05 Sep 2025 01:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHzC41zPYz3HtL; Fri, 05 Sep 2025 01:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035440; 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=DtVGxU5IXvM3Apz1eANvHIZ5VtgcMRkLmx/TtcX42hc=; b=GCgLBo+P9vN3C/qfP6ek6fRIy1dkkn9L4u/VhRSBbtnVYXpopYv1aGNMy2NvbpDMmLatjK A1Tff6HqEcaVvxqF+6NwRSQCjgRgybZQJ3z58K3hthQ8Vl1J1xyJ7s0VDFDNP8PmaUIrAU BxD2Upq2JNrE9gkkHHeyCWFSpF2ZXYZ73T4lMc0m7qA6T3hZ7G0bZWEw+OuxNtmupOOW+v 6RrFn3sj4D1uFcXXBgDooQoISjQHJ6n7lQYT7ZlJ4QgP+Sj3lbC0trMk2lTUAwBqVGCF/l QfUy0dwerXFqe0xaW7olqQgq4ExfHQewpntOuZjBDQ0IKcI0ffRYk+9N+juCYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035440; 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=DtVGxU5IXvM3Apz1eANvHIZ5VtgcMRkLmx/TtcX42hc=; b=JwDHA4Q0FmFEThU95gclAv6Ejv+9m0BwTba7PTJAAaQi67ailcqKSqbLHJXgovJNejdSf0 LZ46j4bEorNWYcUBdKEkg5gwXyUM2LLehUGxNUek/F8NXEUj5BTNPAb4gNsBm5j/gppd6o mmBo5okjJEC48BNZG37IZMjd1n17ZNOFHugnDhAEfzzSGossXG0Qa0eRDWxXTcYozqTAfH A30SxUPgSyixduKPRdO9zG5bo9Bn+FT36zA896J5RquL4otDr1FBRwlfZCkO6y/JZRH2Lt c7WUv56jGvRZmzmww1ZYIwQq3y39bXYF/HaDbnbCnuwnwD4nueF5iBpIY5jrvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757035440; a=rsa-sha256; cv=none; b=T9j9lF8uqAraBdNeU0Ppt/DHEdQmz7ncWLgx3CE/HrsTVwJTAiFc2uKvFq6DiBIGB+P8eJ MxQWJju3s1y5X05EIRwCewpEp8FFTRHQPmZS+6sbURSWTbN80erjZNKN2wYw0Hs2aLbP/4 GItESsIl0AhKn1/fzx9P5AfAPScN5EuJWgrY7UjNqDZL/gPMX8bwo8lcBB3ROjbu4SqOvZ qRcFLm20vHcJCAuQ58+coBjoYKub3UZ6ExuI1rgs+Y6NjtwR8bx/hZr0V1q36MOjyDVpaO /Q5P5nR7wlp6J1JYcD5CSKfQOjcr8jYBRQe9+TH6ycgJRByqHzHPhidP/PSKuQ== 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 4cHzC41X34zC9L; Fri, 05 Sep 2025 01:24: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 5851O0YS043612; Fri, 5 Sep 2025 01:24:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5851O0iv043609; Fri, 5 Sep 2025 01:24:00 GMT (envelope-from git) Date: Fri, 5 Sep 2025 01:24:00 GMT Message-Id: <202509050124.5851O0iv043609@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: 6e7cc49f94cf - stable/15 - Make stable/15 a stable branch 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/15 X-Git-Reftype: branch X-Git-Commit: 6e7cc49f94cf9760125ab1699b6eb9b8311394a5 Auto-Submitted: auto-generated The branch stable/15 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6e7cc49f94cf9760125ab1699b6eb9b8311394a5 commit 6e7cc49f94cf9760125ab1699b6eb9b8311394a5 Author: Colin Percival AuthorDate: 2025-09-04 23:48:10 +0000 Commit: Colin Percival CommitDate: 2025-09-05 00:06:39 +0000 Make stable/15 a stable branch * Turn off LLVM assertions * Turn on production malloc and reproductible builds * Set dumpdev="NO" in /etc/defaults/rc.conf * Remove witness sysctl setting from install images * Adjust branch to stable/15 in release.conf.sample * Bump __FreeBSD_version * Update UPDATING Adjustments to kernel configurations will come in later commits. Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- UPDATING | 18 +++--------------- libexec/rc/rc.conf | 2 +- release/Makefile | 3 --- release/release.conf.sample | 2 +- share/man/man5/src.conf.5 | 12 ++++++------ share/mk/src.opts.mk | 6 +++--- sys/sys/param.h | 2 +- 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/UPDATING b/UPDATING index 21c6e92d6454..2837b5aec0a8 100644 --- a/UPDATING +++ b/UPDATING @@ -1,4 +1,4 @@ -Updating Information for users of FreeBSD-CURRENT. +Updating Information for users of FreeBSD stable/15. This file is maintained and copyrighted by M. Warner Losh . See end of file for further details. For commonly done items, please see the @@ -12,20 +12,8 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: - FreeBSD 15.x has many debugging features turned on, in both the kernel - and userland. These features attempt to detect incorrect use of - system primitives, and encourage loud failure through extra sanity - checking and fail stop semantics. They also substantially impact - system performance. If you want to do performance measurement, - benchmarking, and optimization, you'll want to turn them off. This - includes various WITNESS- related kernel options, INVARIANTS, malloc - debugging flags in userland, and various verbose features in the - kernel. Many developers choose to disable these features on build - machines to maximize performance. (To completely disable malloc - debugging, define WITH_MALLOC_PRODUCTION in /etc/src.conf and rebuild - world, or to merely disable the most expensive debugging functionality - at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250905: + __FreeBSD_version 1500064 after branching stable/15 from main. 20250903: The BLOAT_KERNEL_WITH_EXTERR kernel config option has been renamed to diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 0ef3012892dd..82b6efa6ca62 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -648,7 +648,7 @@ lpd_flags="" # Flags to lpd (if enabled). nscd_enable="NO" # Run the nsswitch caching daemon. chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd. chkprintcap_flags="-d" # Create missing directories by default. -dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO); +dumpdev="NO" # Device to crashdump to (device name, AUTO, or NO); # this should be commented out here # for stable branches to respect kenv. dumpon_flags="" # Options to pass to dumpon(8), followed by dumpdev. diff --git a/release/Makefile b/release/Makefile index b6a9aa42c2e2..6fd3b2f61325 100644 --- a/release/Makefile +++ b/release/Makefile @@ -244,7 +244,6 @@ disc1: ${PKGBASE_REPO} ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf - echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf @@ -285,7 +284,6 @@ bootonly: ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf - echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf @@ -341,7 +339,6 @@ dvd: ${PKGBASE_REPO} ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf - echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf diff --git a/release/release.conf.sample b/release/release.conf.sample index e583e49828d4..337019db6fa6 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -18,7 +18,7 @@ GITSRC="src.git" GITPORTS="ports.git" ## Set the src/, ports/, and doc/ branches or tags. -SRCBRANCH="main" +SRCBRANCH="stable/15" PORTBRANCH="main" ## Sample configuration for using git from ports. diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2895c0cf4746..fa3ab3bc63b0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd August 20, 2025 +.Dd September 4, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -935,8 +935,8 @@ amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le Do not build the LLD linker during the bootstrap phase of the build. To be able to build the system an alternate linker must be provided via XLD. -.It Va WITHOUT_LLVM_ASSERTIONS -Disable debugging assertions in LLVM. +.It Va WITH_LLVM_ASSERTIONS +Enable debugging assertions in LLVM. .It Va WITHOUT_LLVM_BINUTILS Install ELF Tool Chain's binary utilities instead of LLVM's. This includes @@ -1190,15 +1190,15 @@ if executed as an unprivileged user. See .Xr tests 7 for more details. -.It Va WITH_MALLOC_PRODUCTION -Disable assertions and statistics gathering in +.It Va WITHOUT_MALLOC_PRODUCTION +Enable assertions and statistics gathering in .Xr malloc 3 . The run-time options .Dv opt.abort , .Dv opt.abort_conf , and .Dv opt.junk -also default to false. +also default to true. .It Va WITHOUT_MAN Do not build manual pages. When set, these options are also in effect: diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 85a003eb4eaf..60fe42372faa 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -123,7 +123,6 @@ __DEFAULT_YES_OPTIONS = \ LEGACY_CONSOLE \ LLD \ LLD_BOOTSTRAP \ - LLVM_ASSERTIONS \ LLVM_BINUTILS \ LLVM_COV \ LLVM_CXXFILT \ @@ -143,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \ MAIL \ MAILWRAPPER \ MAKE \ + MALLOC_PRODUCTION \ MITKRB5 \ MLX5TOOL \ NETCAT \ @@ -164,6 +164,7 @@ __DEFAULT_YES_OPTIONS = \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ + REPRODUCIBLE_BUILD \ RESCUE \ ROUTED \ SENDMAIL \ @@ -210,11 +211,10 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ + LLVM_ASSERTIONS \ LLVM_FULL_DEBUGINFO \ - MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ - REPRODUCIBLE_BUILD \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ diff --git a/sys/sys/param.h b/sys/sys/param.h index fc2a78883f1e..c21c086e15ad 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500063 +#define __FreeBSD_version 1500064 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Fri Sep 5 01:24: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 4cHzC536gHz66qK2; Fri, 05 Sep 2025 01:24: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHzC52YLbz3HtN; Fri, 05 Sep 2025 01:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035441; 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=wrDUuwsMAi9QgmMstnviK5aoKX13z1RSvgppBHu92AA=; b=Tna+D6O3VeKv77fug2VDhMvVI6cKtf4CwxoUkaRN/GkJ+awGjdwNtCshmQ7c+80DNg/tEb U1TRAw6jLtZ+ymag6LDXGMZWY5cLn6iB4onXOdqbXX8Mq/NPzU4JoABIjDLmFJ796UBxTO PmTnhxMBjhLiRV1eL2EkhvhE7kVaz67JqbZfMHJwsVYVcHV0Vm/FdB6xSGwkyyzWXSlWfC daLb96cmPeT7rcX+ns6+bO1rnzw5zh5FshNLHvoTyN0KMCmW1oix8RiRlM/ZSsRqpVhe21 88DwFVuV5oQ7kAn3tq3pmILg8LxrlMjK3jA73rMGl/V5SlaPEF4F//KpBwWOxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035441; 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=wrDUuwsMAi9QgmMstnviK5aoKX13z1RSvgppBHu92AA=; b=pAzi0tde+nM+V9RuDUv5i+juaadeO113eT47iNIukEFWgxLmZbaec1xRKKBF7IAqZGEnwR D7p3IqMzVfFjkDbSmAmqhg5K1Ui+9sYH9tyFKfRETlscNfTtI4bBiyntDoLKCxMgYKgvi4 yOPIwvMKG2n5dIEej0mumvtEfP4QA2ui4A7X94ocV1j/k0M1UBVt8Kf2Xe+Ix60CJQ+PcO gQNK+YkYM+WETTXMuX8iyQnmCUUBVFXaihXjlkpRUklPGWJSz+PI+IfDyT94hrErugN9U9 PKI1hyoXYYFYWUyCc40nm3OWzvv86WGTVu236Yzlb7ja6hqk61VPXKL+8av6Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757035441; a=rsa-sha256; cv=none; b=gxOn5sHOGJapxQxAgHhS+px9Qd0wE8vwMoBeZX6efgqF/YHNHP39DUOqGDqy9+DovEHJE/ 3G7/zj21d/fXSEQVBbgfqiiTmjRSOv254Cme8xjbc6YrtWJ1wf1e2UIUmZZs0maa/EpJZM 3F1eB/vB6Es9ysQPVfHGdJ9K9JwN777G9dsl3CSQlOtsfHrlfYt0x2VI1aSGDt2/zHG7jl gkSwKSANzbRnxUw5uA6PkwE+kiuYHFZqC9tl2T0T6aAtBFVsM+yrDVo+RK/eLlPMtV3xhK HjbczsYzHssik5JL91K+ZmfIyVQsPTkrd5BfNrW2n8vywYvJX7b5K8VdhzVXGw== 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 4cHzC527H5zCPc; Fri, 05 Sep 2025 01:24: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 5851O1KS043646; Fri, 5 Sep 2025 01:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5851O1ts043643; Fri, 5 Sep 2025 01:24:01 GMT (envelope-from git) Date: Fri, 5 Sep 2025 01:24:01 GMT Message-Id: <202509050124.5851O1ts043643@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: c1d5c5a3efd9 - stable/15 - Remove NODEBUG kernels 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/15 X-Git-Reftype: branch X-Git-Commit: c1d5c5a3efd951f21b79500c41a795e4b20f479a Auto-Submitted: auto-generated The branch stable/15 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c1d5c5a3efd951f21b79500c41a795e4b20f479a commit c1d5c5a3efd951f21b79500c41a795e4b20f479a Author: Colin Percival AuthorDate: 2025-09-04 23:53:18 +0000 Commit: Colin Percival CommitDate: 2025-09-05 00:06:45 +0000 Remove NODEBUG kernels The default on stable branches is without debugging enabled. Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/amd64/conf/GENERIC-NODEBUG | 31 ------------------------------- sys/amd64/conf/MINIMAL-NODEBUG | 11 ----------- sys/arm/conf/GENERIC-NODEBUG | 31 ------------------------------- sys/arm64/conf/GENERIC-MMCCAM-NODEBUG | 14 -------------- sys/arm64/conf/GENERIC-NODEBUG | 31 ------------------------------- sys/i386/conf/GENERIC-NODEBUG | 33 --------------------------------- sys/i386/conf/MINIMAL-NODEBUG | 11 ----------- sys/powerpc/conf/GENERIC-NODEBUG | 31 ------------------------------- sys/powerpc/conf/GENERIC64-NODEBUG | 31 ------------------------------- sys/powerpc/conf/GENERIC64LE-NODEBUG | 31 ------------------------------- sys/riscv/conf/GENERIC-NODEBUG | 31 ------------------------------- 11 files changed, 286 deletions(-) diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG deleted file mode 100644 index 1939b0efd352..000000000000 --- a/sys/amd64/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/amd64 -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/amd64/conf/MINIMAL-NODEBUG b/sys/amd64/conf/MINIMAL-NODEBUG deleted file mode 100644 index 7b7c22bbcaf6..000000000000 --- a/sys/amd64/conf/MINIMAL-NODEBUG +++ /dev/null @@ -1,11 +0,0 @@ -# -# MINIMAL-NODEBUG -- Non-debug MINIMAL kernel. -# -# This is the MINIMAL equivalent to GENERIC-NODEBUG. - -#NO_UNIVERSE - -include MINIMAL -include "std.nodebug" - -ident MINIMAL-NODEBUG diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG deleted file mode 100644 index 0b3199245187..000000000000 --- a/sys/arm/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/arm -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG deleted file mode 100644 index b2e865129012..000000000000 --- a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG +++ /dev/null @@ -1,14 +0,0 @@ -# -# GENERIC-MMCCAM-NODEBUG -# -# Custom kernel for arm64 plus MMCCAM as opposed to the prior MMC stack. It is -# present to keep it building in tree since it wouldn't work in LINT. This -# version without debugging features. -# - -#NO_UNIVERSE - -include GENERIC-MMCCAM -include "std.nodebug" - -ident GENERIC-MMCCAM-NODEBUG diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG deleted file mode 100644 index 086942dfaab1..000000000000 --- a/sys/arm64/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/arm64 -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG deleted file mode 100644 index a93304481b5f..000000000000 --- a/sys/i386/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,33 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/i386 -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -#NO_UNIVERSE - -include GENERIC -include "std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/i386/conf/MINIMAL-NODEBUG b/sys/i386/conf/MINIMAL-NODEBUG deleted file mode 100644 index 7b7c22bbcaf6..000000000000 --- a/sys/i386/conf/MINIMAL-NODEBUG +++ /dev/null @@ -1,11 +0,0 @@ -# -# MINIMAL-NODEBUG -- Non-debug MINIMAL kernel. -# -# This is the MINIMAL equivalent to GENERIC-NODEBUG. - -#NO_UNIVERSE - -include MINIMAL -include "std.nodebug" - -ident MINIMAL-NODEBUG diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG deleted file mode 100644 index 0761376a8160..000000000000 --- a/sys/powerpc/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/powerpc -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/powerpc/conf/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG deleted file mode 100644 index a4c3dbd856e2..000000000000 --- a/sys/powerpc/conf/GENERIC64-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC64-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/powerpc -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC64. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC64 -include "std.nodebug" - -ident GENERIC64-NODEBUG diff --git a/sys/powerpc/conf/GENERIC64LE-NODEBUG b/sys/powerpc/conf/GENERIC64LE-NODEBUG deleted file mode 100644 index fd2d3ca84a19..000000000000 --- a/sys/powerpc/conf/GENERIC64LE-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC64LE-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/powerpc -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC64LE. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC64LE -include "std.nodebug" - -ident GENERIC64LE-NODEBUG diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG deleted file mode 100644 index e4f4b41f2c41..000000000000 --- a/sys/riscv/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/riscv -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "std.nodebug" - -ident GENERIC-NODEBUG From nobody Fri Sep 5 01:24:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cHzC65VSGz66qHp; Fri, 05 Sep 2025 01:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHzC63M5nz3HZY; Fri, 05 Sep 2025 01:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035442; 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=82PVG9ako1mLcIKEJ/rD2/8z8uObkc65VWjJ+qTQfWs=; b=jrejGgTBQyJtWO4GyuSWbwl/fcGcTCXBzPVNLDONeo5+RVJ3fmwEutoC0wNkzV5KhArJO/ 8J4f5xs+dtlPiR9/sjd/ucfdf+J+X/ZJSlS2RgmbnNCWYvgtF28mZufpiXmexARGiVvbzp jRK0gu2N50Rz40YvYGLBLwNDV5EXMIRs1PurNyXxDsAbc2wiP/+qRc7BJwzpUTDnfa2+SW 8i4TpzS/8AEXMBXGV2qv8R09gVM/qBqkcFPHNhLC+3ndEXoFywU2zwcM5upjXn529jVtnN PMHkjGN8MhL/aAstmrzIbG+uETGiSsgel0QYOYFuAZoWdWBep3v+gdAOqJ5zKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757035442; 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=82PVG9ako1mLcIKEJ/rD2/8z8uObkc65VWjJ+qTQfWs=; b=WN9gpReVgQ56E+Ho5VTqONQsKefxYaUVQwggOmDjSK5FITL3SZ2wYoKoSMeGDPN0f5W8sE EhSTRBmoR1Npwqvr3GwCI3A9v0f2HVgEU2V1/1lTvipeGR84LXajnyH22G09SwQNz6z55W CSdka/uCyHQjhgh2Ovsc9/JDPV5afd/A87VJqmhkXUJjKuuA5887sGtsRhvNuj8WtyQZal T1lBwQmWoL5nZaY60EJiegJByHj75Fh/CosZDRaDGFtNWeQgDtVY/T7VhPki5/m1PwHXFY hFKj12twGUEpkwwzvDhaZg1V3BBSBFu7msCihEkWH7PC+yrAjOTBnkKTlg8rig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757035442; a=rsa-sha256; cv=none; b=RODjfHkEiSPChgNKSlcbRjSy0OALI9+RpKFsTJIxu5mC/SGDFyAROjQAEywLTEjZJWGnZE Y9BdfoW5M4zO6tPFMiodSsPIqgTgUAuCrN4kffGYdPQ9XRbxulyKFYDyp9IjrFMciiUoaS IlAnUGjnJ3/KJzcU3Ehh2SwEtnB//fG+k4T2fSR04ceKpeHdUQhtxgfI3njkk6p8Zl1HCS ti6OasRuRcNl+GCRrE6G2MEnrGChTMoNxJ19gDjoYR0KPwhMJXTsXL+b3+hlUC+e5SR5b9 Ih5bUy/1mem/s7w3Z1b9z6ZkZiPTQXSv33VAjcz62wp9CmyKETKCCWI9GYl0FA== 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 4cHzC62rXhzBqR; Fri, 05 Sep 2025 01:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5851O2B5043686; Fri, 5 Sep 2025 01:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5851O2xJ043683; Fri, 5 Sep 2025 01:24:02 GMT (envelope-from git) Date: Fri, 5 Sep 2025 01:24:02 GMT Message-Id: <202509050124.5851O2xJ043683@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: 1aad58b919d3 - stable/15 - Remove std.debug from kernel configs 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/15 X-Git-Reftype: branch X-Git-Commit: 1aad58b919d3d22f86be01b8e26a203cd020eaae Auto-Submitted: auto-generated The branch stable/15 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1aad58b919d3d22f86be01b8e26a203cd020eaae commit 1aad58b919d3d22f86be01b8e26a203cd020eaae Author: Colin Percival AuthorDate: 2025-09-05 00:05:53 +0000 Commit: Colin Percival CommitDate: 2025-09-05 00:06:45 +0000 Remove std.debug from kernel configs The default on stable branches is without debugging enabled. Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/amd64/conf/GENERIC | 2 -- sys/amd64/conf/MINIMAL | 2 -- sys/arm/conf/std.armv7 | 3 --- sys/arm64/conf/std.arm64 | 2 -- sys/i386/conf/GENERIC | 2 -- sys/i386/conf/MINIMAL | 2 -- sys/powerpc/conf/GENERIC | 2 -- sys/powerpc/conf/GENERIC64 | 2 -- sys/powerpc/conf/GENERIC64LE | 2 -- sys/riscv/conf/GENERIC | 2 -- 10 files changed, 21 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 786edc4125c9..c98cfce8613a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -95,8 +95,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 0baf6d6431de..ec5ab2fcaee3 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -73,8 +73,6 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 4ef60c331212..15d8304ae5f1 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -65,9 +65,6 @@ options KDB_TRACE # Print a stack trace for a panic. options USB_DEBUG # Enable usb debug support code -# For full debugger support use (turn off in stable branch): -include "std.debug" - # Optional extras, never enabled by default: #options BOOTVERBOSE #options DEBUG # May result in extreme spewage diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index a0568466cfaf..58f3748e2700 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -74,8 +74,6 @@ options PERTHREAD_SSP # Per-thread SSP canary # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Kernel Sanitizers #options COVERAGE # Generic kernel coverage. Used by KCOV diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 88b8967cd693..f426c3d11874 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -89,8 +89,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index 8019617ca4d4..6b70c4e59825 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -83,8 +83,6 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 7c7d2809d784..1346fa8f9476 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -90,8 +90,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 630c88b97dd7..6675a4d299f4 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -100,8 +100,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index eb9a9441425d..f6f7d44c424b 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -96,8 +96,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 2ff711e80127..187e7396e884 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -167,8 +167,6 @@ device xilinx_spi # Xilinx AXI SPI Controller # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -include "std.debug" # options EARLY_PRINTF=sbi # Kernel dump features. From nobody Fri Sep 5 05:53: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 4cJ5B022lmz6781l; Fri, 05 Sep 2025 05:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ5B01SZ3z3pHr; Fri, 05 Sep 2025 05:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757051608; 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=Z1ZB0VhgYUYvJaqRY4gLvGifuHBt8cLhlp9KZxZausY=; b=Qdz/GTJWAGw1yR2hN5eNwGyDU9Znr6uiM6bE00QYoTFuQuOCV4C22bA65vGqeBuzmBmV26 t01OXOHct04R3wtWkr7GfHjEHYqRdh18SpJz02rTOgwUvZJqb82APyeq5DN4nnvRRFjjZB 64i/tEWCnIZAy6JDK+/c62vGAXtjdeQQYd8VXH8jpCoy1xc6hid5mSQ0vLjeiMLRg7jSHI UDHD6UItKRk7w0xdEOQ729i2JMzI3Rq9djZpVIdcr8AUIrAAxWzgO/+uRO4661SgkCnxCB xJBmK0DPeruQC29pInfKag6PjLkcUUHkQFx62ljFR4+zEflpNvrTLYOETyqLUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757051608; 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=Z1ZB0VhgYUYvJaqRY4gLvGifuHBt8cLhlp9KZxZausY=; b=l3bNTSH82sn53c/qWZFlPEeR5ePpTDJSCnyifLS338KkDD6vtOmD1yfwtZpAzL4uSm9P3R AveBsiLtZ8MhkCGse/S+fdQLyUNIzWJcMWn61z8njog/edLmjDmMA5daM8JvxNn8gFUIdD 0VJxjkkFLOOHFnuUs/y5SYzSoFWQvq+hlknbx43U8uqClEN+B/UL0KXhLIoo85NRCEm7fl 0yw6ZCkglAt8bj5odr2kG4thD6gXuO7gsIxoolkqP4tB04g3j7ECObGav3jCuWn3dk5c0Z HmBM9/sPHsPd8MukM4XbA2E/Dy2Xthua+fBgj30/oIorvUTR0bKuYHDk5pdiNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757051608; a=rsa-sha256; cv=none; b=asMmlLzX9ATRBtdQ34ztyCWypMc25e+A5wMlNe6vChp1haiRedyalUSK6yerp4k2ZG+Luh p6wusbYu/JjqLs0KQ0P4LzKJSItzjILDMfwJmJ/K01G6af72MWSsdx0cc3OwnPnqVFmb1J vujUJxuQB7pGD1t0AX9/LGzpxAFoaqzk6iBt9dvsWZdadrt37tt2q9Emt1QBqzoB9yYDmN d99+Q2CZyT11zdO8lfH24pYdhCTKZITeX03chBSiH9YcG+t0szAFXg212ZL3YyF7gUlbcC CHUnWfUmYBhPO9NLtIQjmgOhbhNGhci6//P7KwdOjzf9XR3TNrIHEWrtuhhQwA== 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 4cJ5B00x0Rzcvc; Fri, 05 Sep 2025 05:53: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 5855rS4d050223; Fri, 5 Sep 2025 05:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5855rSxG050220; Fri, 5 Sep 2025 05:53:28 GMT (envelope-from git) Date: Fri, 5 Sep 2025 05:53:28 GMT Message-Id: <202509050553.5855rSxG050220@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: bc7bb3966ad0 - stable/15 - moused: Fix movement of moused/moused to moused/moused/moused 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/15 X-Git-Reftype: branch X-Git-Commit: bc7bb3966ad07dd15651456767716d35aac472ea Auto-Submitted: auto-generated The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bc7bb3966ad07dd15651456767716d35aac472ea commit bc7bb3966ad07dd15651456767716d35aac472ea Author: Warner Losh AuthorDate: 2025-09-05 05:49:44 +0000 Commit: Warner Losh CommitDate: 2025-09-05 05:53:30 +0000 moused: Fix movement of moused/moused to moused/moused/moused So aef807876c30 moved moused down a level, so make depend broke. This fixes it. Sponsored by: Netflix (cherry picked from commit edd8c4c655925543e2d881811c544473da463147) --- tools/build/depend-cleanup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 22bf34439758..aa01db6ccc37 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -470,3 +470,9 @@ fi # 20250813 4f766afc1ca0 tcopy converted to C++ clean_dep usr.bin/tcopy tcopy c + +# 20250904 aef807876c30 moused binary to directory +if [ -f "$OBJTOP"/usr.sbin/moused/moused ]; then + echo "Removing old moused binary" + run rm -fv "$OBJTOP"/usr.sbin/moused/moused +fi From nobody Fri Sep 5 06:08: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 4cJ5Vv2r2Tz678fr; Fri, 05 Sep 2025 06:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ5Vv28jsz3rqq; Fri, 05 Sep 2025 06:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757052487; 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=D1MoZlo2pmN2wLgoSkzunaq7I+B7LJSsrG76/vQ+UQs=; b=pf0cjlg1OrqznAm0ByLSpZfd0lWcWyj0W8S71NSKqDEyBqDtx2W63z/AyLVeZDg84gqxl3 YvHkP62SuzjQ5lW1OZ1utxDWl+00K72Le9+0zvPXVuK80RNatVHQ2VdE/00otAExQTSEoL ioKC9v+3RdaExFJ5YuGreRfhqy5GTi+aShtaAH4qOGAoD1CSsv5VYP5d7UZ9yJlV/P5PZv cs1CWowoNAQsOebwcJr22XxJl0VZwSz8BlR1Au+OO3+enJrIgJtpTejEVQtc0VGfz+VlfP jFDTHFrCAqzNYR07ydYHrE96/vThvbnEAYpv+ZfUXN4sKyCEdBh6NfHWAu/aIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757052487; 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=D1MoZlo2pmN2wLgoSkzunaq7I+B7LJSsrG76/vQ+UQs=; b=eKYpfKfwInU1vz/3/p2KDZ/rqzVRKSleUncL7uAg5emwwAeHNaJ8C+TB9YcMnzbR8jDqIF uG/hO6aCoG8E9pPaKT5QZ+VYm2ATPTJgnC2SozDqvCj62KB61wTZBKKwgLua/b3p//txhz YhklJPiP8fhX4/CFD4RYqyFLgM2aYJrsLMNmscId7jQZiTuIR5xZBk1gejlNdd3U6iSdAF j3TEWSZGGlCIUBZ7NhDpgBRojOtyfufxJMhlMKk8C4dz8efuiju7MCP0GM2lkceEYrSWPZ ZpEoJoF7aS3PjdND2nWjJtq8CGNRVXM7bp6WlHZFnS7usnWlpriE2vmrS6XETA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757052487; a=rsa-sha256; cv=none; b=kkALTIjL1q20hH3WKr93R3hTyx76SoFmB76+K+49A4sLtAwdxzu8fddbGuVCdP30TZuUnB yx+3iiP1I2F8HxwFGv1W6m63c0G5A1mXZWXhdFlLTwThYwo2shBcwRunU9HDKNaHqpSXhW 53n9az+13aN/TKx2L7B3sBWKnBcyEOmgDo8+PJpKuE2xW8E6nWZFZbFZciKdVnVSSVKJCN m64hGY6WuxEMe34lTNVGHAkKPnoKmNBkIyDKcJrYBzWYaKMgDTQ8HyVq51B/bhp0tDYCsm 4UkYjSdqbXThOO62G2BTqYIVnffXlj2DYCnUwEgnseFo0HatSSnNHb7aCaQVZA== 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 4cJ5Vv1lyTzd6r; Fri, 05 Sep 2025 06:08: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 585687xS071922; Fri, 5 Sep 2025 06:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585687fT071919; Fri, 5 Sep 2025 06:08:07 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:08:07 GMT Message-Id: <202509050608.585687fT071919@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: 9866ce5d5c50 - stable/15 - tcp: improve compilability 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/15 X-Git-Reftype: branch X-Git-Commit: 9866ce5d5c500cea1ecf3cb6d575b6f5e655c657 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9866ce5d5c500cea1ecf3cb6d575b6f5e655c657 commit 9866ce5d5c500cea1ecf3cb6d575b6f5e655c657 Author: Michael Tuexen AuthorDate: 2025-09-05 06:00:52 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:07:52 +0000 tcp: improve compilability When building with DDB support, the inclusion of in_kdtrace.h is needed. Make this explicit and don't rely on tcp_var.h to do this. This is required for stable/14. Fixes: a62c6b0de48a ("ddb: add optional printing of BBLog entries") Sponsored by: Netflix, Inc. (cherry picked from commit 4cb50d74c19c014e8099272777eb20aaf834d61c) --- sys/netinet/tcp_log_buf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index e24790ece43d..473c534ef83d 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -61,6 +61,9 @@ #include #include +#ifdef DDB +#include +#endif #include #include #include From nobody Fri Sep 5 06:08: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 4cJ5Wg3kBPz678j7; Fri, 05 Sep 2025 06:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ5Wg36Vzz3s6g; Fri, 05 Sep 2025 06:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757052527; 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=wpa7CWiso/5aIA/T0EG/SoUafYM7BhZQEKjB4FUvJN8=; b=FkmS+i/9Nbo3knZibXjn4KgkTxS19GlSre9wC5qvd672yV7DVFICVsS+C+hNAAqweTV4Qf WYqH9N/+rGdmDPVlnpCYAUnWr6f7gghOmR8dxqXNWpgmLTaCA8eI3V76zfLp3UfxyJ2Erb cPZLLyOgjNXVJw5ul6gn7b/jQCZB4qVuC5A5QXnr0ZlRrsBf5Jv4W86nfRUmMwkTEQEkYN iGqEcLTFlkSpa/iBuCLQ4AGcCdVdYegQ/zIPpdWYl8P5WVXk6xWYhxJ3dcHOghLmNU2Iy7 TlBtMXjaGXhgj9tX36kD0RywuIXg+uPOzHm8jgcpHIX2HupD9DDF2+gHW05+3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757052527; 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=wpa7CWiso/5aIA/T0EG/SoUafYM7BhZQEKjB4FUvJN8=; b=g/BnYitCfRYKw5jtfQJHbGq1QTBOer7kXT3VKJ3CEBr6kjqOTGDM8Rm/c5kJqoyTNhZLdy 6ziHF8qwvQJXbf39eRIKNvltndwJf3prsZ3QAwZWa5jXhQvEtzGQfymdNLrEeWkCmCikkB nhffYmCiVAgc256CAYqhGKVsd74bg2l0RN0icxDfNQAZhuJo84e+p+eAIDMxrbnMWwRgyC lhwcD7Y7hOKYsLLLcZ/sDV/Em4GcSoN2LFLKvkpgqXOcw05zpUpm6BN7ztWFleBElo/xo3 63jhUFKIJOtqunl8UwSQ1gMMqAR1K3hx2uAH8sVzs90Uu8ii2TiXulCJk5IJtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757052527; a=rsa-sha256; cv=none; b=YqEPY2A+G8/6gphjvxUDcDNcTLNi6DuW/JbSeYKsIyWViGoMaULxM1EyBcjDGD2XyNwJJm Gs/jI+5iIE42mdP8gNf0u2yrgo209lBI2x2bIW9OHFBaV9p5lagLIxxbRXlRFP/L8+NEzo eIX3fMnSwbN64Xms1akSqBP6rXC+nTQrwNPbSfiVkWLQuYpjDoNIIR7UaAWDMs2gMAVR3e tjXv4dyYNc4oaN5WsdIaAin+hN5MYPBR7baBbTAFtEU4WOMhWcd2HWB+9nyVmmO5H14M0r okqlOpxA2ZWrqBfn7mCNn83nzRkKVfX9fWb5R/UXsR0zqca51CZ654suzzEk9g== 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 4cJ5Wg2hKRzckX; Fri, 05 Sep 2025 06:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58568lD0072177; Fri, 5 Sep 2025 06:08:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58568lvk072174; Fri, 5 Sep 2025 06:08:47 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:08:47 GMT Message-Id: <202509050608.58568lvk072174@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: d862ce89be67 - stable/14 - tcp: improve compilability 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: d862ce89be67c21f25aede1a32c2d70a409ab4df Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d862ce89be67c21f25aede1a32c2d70a409ab4df commit d862ce89be67c21f25aede1a32c2d70a409ab4df Author: Michael Tuexen AuthorDate: 2025-09-05 06:00:52 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:08:33 +0000 tcp: improve compilability When building with DDB support, the inclusion of in_kdtrace.h is needed. Make this explicit and don't rely on tcp_var.h to do this. This is required for stable/14. Fixes: a62c6b0de48a ("ddb: add optional printing of BBLog entries") Sponsored by: Netflix, Inc. (cherry picked from commit 4cb50d74c19c014e8099272777eb20aaf834d61c) --- sys/netinet/tcp_log_buf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index 3c62d3b07f99..5219f0be3f7e 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -61,6 +61,9 @@ #include #include +#ifdef DDB +#include +#endif #include #include #include From nobody Fri Sep 5 06:18: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 4cJ5lG5k6Bz679Kt; Fri, 05 Sep 2025 06:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ5lG5Cvfz3sjM; Fri, 05 Sep 2025 06:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757053130; 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=BIFTRpjEZiuRgWy17fXbXUQzgVYAZpChXupvmeB1HPo=; b=ezkKFlnucvLHGlIhcXFZXkWtVWQHazTACthnTfuYW6ci1fiZaal9jQ+mSGUv3rC8TDo/5p 0LC0aW2eaZs0ZHqW3yKR+PGCC0ZGPjZpqwV8rpH3ifXjOlB2JlIE9PZXJ2Yiv1ewtZyrOs jAzwEWgHVe92m0yy832CIp15VV63Oz/xdXV+WZMP6aDarh2Uai6hlP3vs+mA2lu3IzEwFI 2frCxWMGeTbYQU8aVtD4r8asRETdMPPebeZejP6RaqXFeGUZZhJrYBkHEZyf4bhEHCftvA KK8zX6CBR2UrbP84e3TLs70O6woOhRkMRi3As0Fkeqz30qQd8LBDIGBktrjiLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757053130; 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=BIFTRpjEZiuRgWy17fXbXUQzgVYAZpChXupvmeB1HPo=; b=XNO+bWGvUfVx+7v4in/mTi60U9+JPAo/MH5qRd8OSvyrWRWVf9LmOsECcqEu6++OzAHkUq BJZT2kN8+DHCU87tDjfJQ5WGpPcSUpMnHun+KxxUknvg0yjfKrA6/zBvADVX2412VjjUJA jnXsNqn8dA7C0BEkf3zEg9VtnomzWyhMGOwCsrx98geTjNSkxUCz7Vf0ImRgQMCZxsOlHi ZDoQg+vAhcTjbQUecfHnL1lRhulEhSJMmtK9FWOZoem4xWDGeS+t4e/rUy/L/U38RUXf7I IQ09QO6vh4vn/rHVurLl/e0Yi5ZyPG1N2Myn1g4C6e+4ZgU4nvzejvVjt5Vw9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757053130; a=rsa-sha256; cv=none; b=JBnWWWzyUOk3kVeO3VrG7oIoH8A5hh/ekDup/Try5sJDc2lQ83ijmMlN8WxN/sv73aKQY2 1PbTJa7Ot6A/jrPvrw72AHZBZ5quel+Huhj01m1rhjuidIuPPBHlQcbYH/HvCg2/5Q9QFd NSn8iObpWQ9NrR6lwA6b1qDZclxpynvsZkAiRWRUSl40iFOmENCzMl1S0Qq2cNQnsrduCs 7+GH0RBSgRBWDIBnW/oqMf69mE2xBb+9ApRw5uZt4oQF4qZ+4Cm2biK6HrKaJGoabtT0VF S46bFxXYidTnMOYSBA261fB1s+vt0WDCm6yFteq2CIMqkthQDLH7ngV3DAGP4Q== 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 4cJ5lG4WlxzcS7; Fri, 05 Sep 2025 06:18: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 5856IoTm090370; Fri, 5 Sep 2025 06:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5856IocA090367; Fri, 5 Sep 2025 06:18:50 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:18:50 GMT Message-Id: <202509050618.5856IocA090367@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: 39291cea53ad - stable/14 - Don't include netinet/tcp_timer.h when 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: 39291cea53ad06e0dacc98d7c81658b7d75c28c1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=39291cea53ad06e0dacc98d7c81658b7d75c28c1 commit 39291cea53ad06e0dacc98d7c81658b7d75c28c1 Author: Michael Tuexen AuthorDate: 2025-06-17 04:07:13 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:18:15 +0000 Don't include netinet/tcp_timer.h when not needed Reviewed by: glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50889 (cherry picked from commit 6039cd1b45eb847ef5bbe6c58341b8b92fff8a74) --- sbin/ipf/ipsend/iptests.c | 1 - sbin/ipf/ipsend/sock.c | 1 - usr.bin/netstat/inet.c | 1 - usr.bin/systat/netstat.c | 1 - usr.bin/systat/tcp.c | 1 - 5 files changed, 5 deletions(-) diff --git a/sbin/ipf/ipsend/iptests.c b/sbin/ipf/ipsend/iptests.c index 3fccf1389f6c..37f83a62e7ef 100644 --- a/sbin/ipf/ipsend/iptests.c +++ b/sbin/ipf/ipsend/iptests.c @@ -78,7 +78,6 @@ typedef int boolean_t; # include # endif #include "ipsend.h" -# include # include #if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000000) # define USE_NANOSLEEP diff --git a/sbin/ipf/ipsend/sock.c b/sbin/ipf/ipsend/sock.c index 6159864364bb..0fa867112aad 100644 --- a/sbin/ipf/ipsend/sock.c +++ b/sbin/ipf/ipsend/sock.c @@ -62,7 +62,6 @@ typedef int boolean_t; #include #define _WANT_INPCB #include -#include #define _WANT_TCPCB #include #include diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index f154c4849dfe..857d19038901 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -64,7 +64,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95"; #include #define TCPSTATES #include -#include #include #include #include diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 45b21bfbfd2c..66a32d4f8912 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -63,7 +63,6 @@ static const char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93"; #include #define TCPSTATES #include -#include #define _WANT_TCPCB #include #include diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c index 935a138be8e7..559e356d5011 100644 --- a/usr.bin/systat/tcp.c +++ b/usr.bin/systat/tcp.c @@ -51,7 +51,6 @@ static const char rcsid[] = #include #include #include -#include #include #include From nobody Fri Sep 5 06: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 4cJ60v0lpTz679n8; Fri, 05 Sep 2025 06:30: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ60t72bBz3t9L; Fri, 05 Sep 2025 06: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=1757053839; 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=o4fi2nFc84Yits6pIzAagORrPznuPlmqMsSN3MAfRI0=; b=wVeNfzkjzcgyMXOF0iPuUC/PPC1UfXi+ZBE3RN1c9CiX2njwG6bsfD6fFuLinQnOV0k6aN CmFzLUUhCjF4Ps/Nlh7wb/22fbNo0BcG4zrYh9n3rG5d8qKnL3yChgAZjggMe16H4IyC1V UWxS0kdP/nAIefTVuLjeFHUEPrfEwAv3a1SomX88kE0pk4t0aKkgEzk1yHBPm0di49R8w0 4PsRcRllW0pV43b292F89joJP4zwllh5zKoDNU1tgeQUWwgxlos5auRbjD1X93Rm8sbqM7 pLaG0kDAWQl6ao9F0TSgm0oFo/kpd0ucOuT3ox5PJb3t43s/BkXM8bkFVd3vGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757053839; 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=o4fi2nFc84Yits6pIzAagORrPznuPlmqMsSN3MAfRI0=; b=YtWxeSDNyZG7PWfIlUwE8NTkOGq2UPiQyxtEKITdKamSt7UpOaO9fG9oLQfEdKLT83BrUG aS+Df5C14LI69lEMB2hWABWrRtV6AKyAbK95UUfHXeNSUHnyWxdCmZAT8XKKc+TFAeLZgn 0vbToVt+G1Dcx6jVObJSjwuOMQ5w/O70zW1MxTHAfZtXqO33DJ/ZScpQL7N2wP/vMh+UGi VZ1knzLlq63/Cum88EInUP4fXJ5nk/L9YgSfrxdWK9k7qpl9rYPCYM9q1Pod8mjeo4tyLF hhsTh7QTAxr5LbPbOP7l7+nas6wWQF3pEtVOLSnGB7nVxg8cNE1ANVFBI7au0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757053839; a=rsa-sha256; cv=none; b=tWQA89mWY7pRMhTp/nICuGAC5nNFc4CeZqEpN8yeKAuhsMKh1qL/M2ckdeF0/gh1iRhC7O UpatlVVsUGKKeXnA43Zsrze2+zgkIQAkxYhfOTFYp3ro7k1P+mdgFQI6/JqdqAl7z+fSjN y3CEvzAFIkfIlDfYbF6mOETZbx3YVwPdUH7peThnCdWyU+Mkt5sxqiyPdEj0ASbE65KIWr HqPPawKvCmyGyziqZ2a6+jlh693Djcq+s6SGuMOUyuXrMTNCOBca532JBArsCvzEb0lWfY dU/2VJI872tWjVK/ndmRlrkuWuKzX9cC2+PDQ/znpjjPRsY4w9AjuxRBU+9G7A== 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 4cJ60t6dvQzdBm; Fri, 05 Sep 2025 06: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 5856UccO017674; Fri, 5 Sep 2025 06: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 5856UcHo017672; Fri, 5 Sep 2025 06:30:38 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:30:38 GMT Message-Id: <202509050630.5856UcHo017672@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: 66950b4f13b3 - stable/14 - tcp.4: fix typo for newcwv sysctl 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: 66950b4f13b3c36864db693243f1edc7b09084ca Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=66950b4f13b3c36864db693243f1edc7b09084ca commit 66950b4f13b3c36864db693243f1edc7b09084ca Author: Peter Lei AuthorDate: 2025-06-26 13:14:27 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:30:00 +0000 tcp.4: fix typo for newcwv sysctl Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 8b4f237c561686a9d9188724adb03f660ae79480) --- share/man/man4/tcp.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index bf86a8d35feb..edb969be5270 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -33,7 +33,7 @@ .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" -.Dd January 10, 2025 +.Dd June 26, 2025 .Dt TCP 4 .Os .Sh NAME @@ -798,7 +798,7 @@ The Maximum Segment Lifetime, in milliseconds, for a packet. The default value used for the TCP Maximum Segment Size .Pq Dq MSS for IPv4 when no advice to the contrary is received from MSS negotiation. -.It Va newcwd +.It Va newcwv Enable the New Congestion Window Validation mechanism as described in RFC 7661. This gently reduces the congestion window during periods, where TCP is application limited and the network bandwidth is not utilized completely. From nobody Fri Sep 5 06:40: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 4cJ6D33GQGz67BSK; Fri, 05 Sep 2025 06:40: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6D32XJKz3vNb; Fri, 05 Sep 2025 06:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054419; 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=pUGf/QmXjNn6lLaLRT937qpUYgaLcn8rhmiE13/ek6g=; b=dOcMMYUobpv1yX/pPgJhbZtQ8TGKvKjk1YEJvgughOnW9B2EAoKWvf/60rhLft0yVYPAco z9Rj0cTl4ahFKnJhdmnFSUlFTikcRQ+v8rnjeqvNXLNjrk899hPfr3OFLeJ3MRP7gtjfHZ tPhkGnVC8DWuRnVz3YvCruyP3kx37V9JFg/cZkjMNJD5yNeBc9kYxfGc6YF0sVI2bRnLOU YNZnL7r+e7wwMztVEHdzNgIGSvcS+6M2m5HF+sNSD1z9jzElGEtungAh9Qm59KVcg7wTGw vWNFaqLe8JI9pIg3N7sPkwL7A5yrkUGGMJVgbKmtF1Ii7htn566D8ww9RnHD1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054419; 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=pUGf/QmXjNn6lLaLRT937qpUYgaLcn8rhmiE13/ek6g=; b=iLw3u927bmoR5BZqqYs60e0GYJwRc84CyLJb1RP4P7+NhIuJB9fPoGlHXO764J2RTo2J6i evehaBSxGyPneegUaivNg9AAXcWFnsa+ybWoVaxEmvD5OqovlZMKXqfGs/NTNpQ3x6Ggqc u76src/u+W2ZN/9gWp06KbDUP3jhazGQ+WzOLrGX9KeWBnIIthcTw1BpFMSa2o5cfd0Xhg Vq0yHyYSvR3JafbpTAGjnT1aZcUIWuVj2BUDB/8d5fv8qZeLvusmS3nA14tPDc7ziN6XbJ PrV+zmHscLPiaV16HQw5HGll4kHdmyKZW/MMfnntUtXod1uX0pRLWNn3kRCCOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757054419; a=rsa-sha256; cv=none; b=KXPOtAvsYR3a2AfEImiHIkZw1ncglGxkcLBA0OrZZ2kjbJ/5lMZYbUp9pmKu8Y7vv+muhW itPbTQLB6aeRXOg7mBI5wMNh1Ta2njaHinE1XoEa2x2RH5mfrrZRuqj3ijfU8IiGEi57Yx ivDNTT1iS4yvlS/2d7olDDWhqXO2XIMdsaPnlFeYadlkjZOR6NfI3MfeCxyIhnxsbxU1wL ilqr2v0PGMW4XXzmee3OvVQO/ziqAK8rco9qcoxP3cQgYY8D5cK+elCXgjSFyIbz38qG7A sqF3pFS9tKp6m8W17Bfjdmz8gBOrIMaWc+UhzuFElpK7hegnigwqkrzVO/UU2Q== 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 4cJ6D31qvrzdfP; Fri, 05 Sep 2025 06:40: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 5856eJwK037366; Fri, 5 Sep 2025 06:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5856eJte037363; Fri, 5 Sep 2025 06:40:19 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:40:19 GMT Message-Id: <202509050640.5856eJte037363@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: 5e5087a127b1 - stable/14 - tcp: remove references to Lock(b) 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: 5e5087a127b1eec83dc663f687dd3b1cd051740c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5087a127b1eec83dc663f687dd3b1cd051740c commit 5e5087a127b1eec83dc663f687dd3b1cd051740c Author: Peter Lei AuthorDate: 2025-06-26 14:05:05 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:39:35 +0000 tcp: remove references to Lock(b) Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 41c1db8a4daae24dff545ee2d20ba6ffe8abd625) --- sys/netinet/tcp_stacks/tcp_bbr.h | 2 -- sys/netinet/tcp_stacks/tcp_rack.h | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/netinet/tcp_stacks/tcp_bbr.h b/sys/netinet/tcp_stacks/tcp_bbr.h index f88efe3c9ef9..10ddd12bda75 100644 --- a/sys/netinet/tcp_stacks/tcp_bbr.h +++ b/sys/netinet/tcp_stacks/tcp_bbr.h @@ -347,8 +347,6 @@ struct bbr_log_sysctl_out { /* * Locking for the rack control block. * a) Locked by INP_WLOCK - * b) Locked by the hpts-mutex - * */ #define BBR_STATE_STARTUP 0x01 #define BBR_STATE_DRAIN 0x02 diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index 1251dabbed37..aa232c183dd5 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -315,8 +315,6 @@ extern counter_u64_t rack_opts_arry[RACK_OPTS_SIZE]; /* * Locking for the rack control block. * a) Locked by INP_WLOCK - * b) Locked by the hpts-mutex - * */ #define RACK_GP_HIST 4 /* How much goodput history do we maintain? */ @@ -596,7 +594,7 @@ struct rack_control { struct tcp_rack { /* First cache line 0x00 */ - TAILQ_ENTRY(tcp_rack) r_hpts; /* hptsi queue next Lock(b) */ + TAILQ_ENTRY(tcp_rack) r_hpts; /* unused */ int32_t(*r_substate) (struct mbuf *, struct tcphdr *, struct socket *, struct tcpcb *, struct tcpopt *, int32_t, int32_t, uint32_t, int, int, uint8_t); /* Lock(a) */ From nobody Fri Sep 5 06:43:33 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 4cJ6Hn2BP6z67B90; Fri, 05 Sep 2025 06:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6Hn1ZqGz3vfZ; Fri, 05 Sep 2025 06:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054613; 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=9UXgP/mSs/kOT595Ov35z+CERM+W8Gr6JYwaR9xJbZg=; b=K3jie5YwFuFl84AjDFZs6jQDKKSH4wy0rSn77KCO5L/8LErGTVqsRaK+P7J4pElDRTjutF F6eVZ+Hn7nlnYCwFMJvhyJcZWUTZCiBion6IrsqKRuIReltOPq5Q2+/thD6LqEFjs2mnn1 NMGtmx2qrNyjkIGBheoB0I+Qf9VWJ+CHn50GHG0wPBLUOeO9VyuqSzL2XHKxONxENhPLgF al3UgfII97P6hFlvs1FlHHq0sQSpzkAx0GoJy51ayOuAjD3o8rwxXp/I8METP5iYrZFOa9 SUKR7xt/uzg5c/OzfX38GSnn9KfY75P6vrfT/VL0Ft96QwyTcja3uEAasB3DVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054613; 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=9UXgP/mSs/kOT595Ov35z+CERM+W8Gr6JYwaR9xJbZg=; b=lBT012tlM2Zbc0AiPcKJreuCrOVsxhXVX6Dfr9kTdWZfQmazCLYFk5PTh6NQkGhYpMZNJM uMnvwyX8xoMj+e/PDT4I2OQ2n1u7Qkpg+alToch+eTCIzqfuvXsjx7kXIqHeHnmPS7VORX uTugnRbEAEa1zxxzmoAqtfgOm7klesmNys70t/wqWlGRyoghpnbxMeGhaeUAXJe/ghWcc3 9B7xS40ar3+XmbnCFwANtlSuHCCAXAfrjbHItOg6XqWjSlxPdJcADlhPfrdjRI4fDw2AJz SVsKUYkmrZ2JTFey9jqkXUugH0KZqcyush2hRMsVQIdn1DN6IkBJj2KjOhg7eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757054613; a=rsa-sha256; cv=none; b=WfpCr6hXq0pkyz6DHgYqo4EMAvSjQ+J8alxey07YAfamW8LoGqpqFyUJX4nUbSAUgRdFaz lCEjJkZDiy8RA0jxriQ/zr690kATShFL6HMT1Yv+8MfOQkQ2gC/yrVl/Ui4okCAUN3uDCl uCZ9YN2NxTpzNU3iM7ls/1SMCevIrGFkUdTrtPCR5TorE93FuNKCviOh6M6cnU5+wzMM9/ YT4xhA0FtW3tB5AcfueH1okwMSeAnup0bH+7HYA5GZTiXTKFa48NigCee9Ydib9UJEKb+m Mjutjbqi22zDhlht0ZE4zBLoJ505+k4viYZc8N3dL8+XoNq1R/6KzMyqVY3zag== 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 4cJ6Hn10DHzdRK; Fri, 05 Sep 2025 06:43:33 +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 5856hXhU044694; Fri, 5 Sep 2025 06:43:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5856hXYu044691; Fri, 5 Sep 2025 06:43:33 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:43:33 GMT Message-Id: <202509050643.5856hXYu044691@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: a388086b44ec - stable/14 - tcp: use 0 as the value being ignored 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: a388086b44ec5289d65e5050629a8a0b0a31422f Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a388086b44ec5289d65e5050629a8a0b0a31422f commit a388086b44ec5289d65e5050629a8a0b0a31422f Author: Michael Tuexen AuthorDate: 2025-06-26 17:23:56 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:42:56 +0000 tcp: use 0 as the value being ignored No functional change intended. Sponsored by: Netflix, Inc. (cherry picked from commit 36ba7339d4df0803f8e0655e2ba8d174d4ccec38) --- sys/netinet/tcp_timewait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 0a58bf506a26..006f325d6d0e 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -92,7 +92,7 @@ VNET_DEFINE_STATIC(bool, nolocaltimewait) = true; #define V_nolocaltimewait VNET(nolocaltimewait) SYSCTL_BOOL(_net_inet_tcp, OID_AUTO, nolocaltimewait, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nolocaltimewait), true, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nolocaltimewait), 0, "Do not create TCP TIME_WAIT state for local connections"); /* From nobody Fri Sep 5 06:46: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 4cJ6Lz4mHSz67Bnx; Fri, 05 Sep 2025 06:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6Lz43PHz3w5r; Fri, 05 Sep 2025 06:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054779; 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=PttojVrc/M4EGqfBue7ibbU6WyfaRe/h8SqWGpNhXis=; b=ByPO8tASHeaUIEMA4CP8OY+MGAQT7ea6mhKj90fVQVyOB+53rapAixHPPgBHfkqpUaVRAd qS/qn8vcGSwpwDK3wcRT9aQ18BeriNhGoHEH7NB6S1IXBKWe5I1wQbXMDd3H/OzpNAG+jm r3HrJiRXFiQTIrA4bog6wFJOviqVjHAWSC6IK16fLy/zORwv1L1vOBkHXfep4Vjl7kVz3y U9tmhOOIQWOvj7y4/anj6w9lfEY2nhtCYrGN+5K23cp6dJRwg4BfYm62zi9Fx0rX1nTh2A /ABwfj59f1AFGndemN9pcv8fx4p/3QtaIeRzGpdgC7tV7MyudNNrO97HEo/12w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054779; 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=PttojVrc/M4EGqfBue7ibbU6WyfaRe/h8SqWGpNhXis=; b=VA/9nVSsqvhV0aHTcAZANXg8ml+0Aqqwc/ELcom9Wd2vd7tvhuO+68SSPlnccKsy/oBUbr ge9s7vav95x2C2kMuz9I9ZVzM+n/Ib5qa0RsF0cuKzgVB+Pn6y4xIMEQUFUtyLEMdFCToV kZ4IqNntl4OgNgJHsL+paFZHCoA74gE080hUllZgPo2U1NkodIblNATaNFo9gyvfQIHgaO 3KhUkCJg1cDnxvsw3LIxhrKGvgJE0H7210BuIGvUAr53gbETH8wPHi1guKtiLouJ+kHSzf Ax9p511Mjm2BcpGbSh6NvL7bzh60qINk4XtTP6SLl4XIralrP9BIfqFZ4+KoIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757054779; a=rsa-sha256; cv=none; b=W/HMOnMTqulxIHs6bWs7gqVRicuJctzsTljO3w600qKLZbN6BdROfHA2CerxhhPOroJ+jc l54/7U/1cn1BAnE25WY6aqZrCwKCq+J0vOmlXgc6JUl00aHbaJNZdzHG7FzQKF1i1ptXTJ t2vWZyP5K4jcS9GV7kKfczyxZnuZMaGBA5UyXqm/i77aMi99H3/6WOljqwSBuLTmco06jn 4wURG4Uf/F9xObKiC5b5G+bH2ni0Uci7prcfl4fR1bYj52ykdKAhViqfbFi9Chr5pMlZr2 Z/UEcLw+9ImZwdzVgBYefSe0drKCcSRnuMkvft9D51af/Pdrw393yKsKCU0ZsA== 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 4cJ6Lz3ZvpzdxM; Fri, 05 Sep 2025 06:46: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 5856kJ6p045606; Fri, 5 Sep 2025 06:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5856kJ0Z045603; Fri, 5 Sep 2025 06:46:19 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:46:19 GMT Message-Id: <202509050646.5856kJ0Z045603@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: 1c7813811d2b - stable/14 - ddb: print FIN flag only one when printing BBLog entries 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: 1c7813811d2bf6d15403b755ac7c717194ce1509 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1c7813811d2bf6d15403b755ac7c717194ce1509 commit 1c7813811d2bf6d15403b755ac7c717194ce1509 Author: Michael Tuexen AuthorDate: 2025-06-29 19:47:42 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:44:19 +0000 ddb: print FIN flag only one when printing BBLog entries Fixes: a62c6b0de48a ("ddb: add optional printing of BBLog entries") Sponsored by: Netflix, Inc. (cherry picked from commit ce929c4769c9fa73eff2f723dd266203b7816657) --- sys/netinet/tcp_log_buf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index 5219f0be3f7e..fa6394065da6 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -3030,15 +3030,9 @@ db_print_tcphdr(struct tcp_log_buffer *tlm_buf) if (flags & TH_ECE) { db_printf("E"); } - if (flags & TH_FIN) { - db_printf("F"); - } if (flags & TH_CWR) { db_printf("W"); } - if (flags & TH_FIN) { - db_printf("F"); - } if (flags & TH_AE) { db_printf("A"); } From nobody Fri Sep 5 06:49: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 4cJ6R404fkz67Bls; Fri, 05 Sep 2025 06:49: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6R36SK6z3wbv; Fri, 05 Sep 2025 06:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054991; 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=NfNnWHOfDb+hR37iUSENVf7Cx/7THujYD+3xUk2MaTE=; b=I+THb9oOE2QLKgwt8206af/LtLb/JpU13V9g6JmH2iEVJ3wv/V6OeJ//KQdvgb6JQoZw+7 wJ/1ikBhbZ2Cc5sBhF4pvZivIR5FkV8vUJ2bSIW+qGkjgeR/gphJDE2t0kKYS/Sni/DdgT Xn6+hWj2zwC3+4Qk5Y2f+9Ml/kKKL0+c1kXnB5tcbyMNMqpcfjBuB8Cp4kbgDnonR0jsgb wa6ifwvApr6gdCmfsra/M97NDL3KTWg6HxEqbqzJw3Z3rlqmChSTViqF8Cs0fYgIbJ3XJS i1DlDd9DFlMlG15AORDgWV6PLsifKjXBrRnZDyYZHwItjleBWfmvwowkYTCwYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054991; 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=NfNnWHOfDb+hR37iUSENVf7Cx/7THujYD+3xUk2MaTE=; b=YXErmt8bUCG7fBm4nxsveZsCmZ9h/lWcxLiWFulkPIOhfqLzK+7tfpg7j3Hc2NvnjfbrW9 6gOd6ECs8X3c1iwGKnHt1yHIwwSRtKCgcxNfEGZ4KTvmKbUvitkKI5upnpRyTmibu9KnhD SYzgDb+QM5Hln5Uqe9eCm+vqq9kvvdVLxl8q33kFDinpVgCk+goPKwmnDcfx1nbV+kCEey edD/GFrz51o33Sstqg17HeOfBma1UD6hlsH3IDtxVUO8w7zlIuhV+1QwKv45aH+93TjO6y 6Y9qRW1C67UFx/RcaHNplpJF7N6fwLg/paSMCfqlLVpGMKFCxP91XQWcS39rcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757054991; a=rsa-sha256; cv=none; b=aw4UhGe51zV/AON0gt42AeJ8IzvYhIUimQ3RhnDRaYoLMw/k+dOd8VTXHctKbmzq+wqWRQ DTNUsyYtMe/UoVuSdKiPhE4fTwo1BQrEnxwHsFITUWsfGt6tTUA3trD1uN8qf0m+sQcHmV pLEjZdAilPpcjAAtYfYSbk3t1LP5zh2Vz2nUdqZIkQPrbnO4FhzYVZLGdwZQYrRIqAc2hm tXRy3M3aFStwzfRPvD7oHwrsAeJxXhm5ynsD0ME4rog1JCPMtoxTpBI6IHkPEGzIfPA6Vc bMZf7kI6o1t35O9zY2+FylOH30sZxFWdYek23HxuKqMB4w6WU+M+26XfPQcnVQ== 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 4cJ6R35klQzdvW; Fri, 05 Sep 2025 06:49: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 5856npRj046709; Fri, 5 Sep 2025 06:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5856npxE046706; Fri, 5 Sep 2025 06:49:51 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:49:51 GMT Message-Id: <202509050649.5856npxE046706@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: 2a38a33b221e - stable/14 - tcp: fix the test that a duplicate ACK has no data 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: 2a38a33b221ea96389e95eb7fa5d8ac4c6664a9e Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2a38a33b221ea96389e95eb7fa5d8ac4c6664a9e commit 2a38a33b221ea96389e95eb7fa5d8ac4c6664a9e Author: Michael Tuexen AuthorDate: 2025-07-19 13:03:22 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:49:07 +0000 tcp: fix the test that a duplicate ACK has no data When processing a TCP segment, data is removed from the head or the tail. The test whether a segment has no data on it should depend on the TCP segment before the removal. Without this, received segments might trigger a fast retransmit even when they should not. Reported by: syzbot+fc97a2b5a0f7ea161161@syzkaller.appspotmail.com Reviewed by: Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51425 (cherry picked from commit e46c15a0f848174f58bb08fed8e173a76b4c473a) --- sys/netinet/tcp_input.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index fb0c110d460d..f4d061557e88 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1541,7 +1541,9 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, struct tcpopt to; int tfo_syn; u_int maxseg; + bool no_data; + no_data = (tlen == 0); thflags = tcp_get_flags(th); tp->sackhint.last_sack_ack = 0; sack_changed = SACK_NOCHANGE; @@ -1769,7 +1771,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tp->ts_recent = to.to_tsval; } - if (tlen == 0) { + if (no_data) { if (SEQ_GT(th->th_ack, tp->snd_una) && SEQ_LEQ(th->th_ack, tp->snd_max) && !IN_RECOVERY(tp->t_flags) && @@ -2570,7 +2572,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if (SEQ_LEQ(th->th_ack, tp->snd_una)) { maxseg = tcp_maxseg(tp); - if (tlen == 0 && + if (no_data && (tiwin == tp->snd_wnd || (tp->t_flags & TF_SACK_PERMIT))) { /* @@ -3104,8 +3106,7 @@ step6: (tp->snd_wl1 == th->th_seq && (SEQ_LT(tp->snd_wl2, th->th_ack) || (tp->snd_wl2 == th->th_ack && tiwin > tp->snd_wnd))))) { /* keep track of pure window updates */ - if (tlen == 0 && - tp->snd_wl2 == th->th_ack && tiwin > tp->snd_wnd) + if (no_data && tp->snd_wl2 == th->th_ack && tiwin > tp->snd_wnd) TCPSTAT_INC(tcps_rcvwinupd); tp->snd_wnd = tiwin; tp->snd_wl1 = th->th_seq; From nobody Fri Sep 5 07:02:15 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 4cJ6jN1ZqWz67CVK; Fri, 05 Sep 2025 07:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6jM6S1nz3xgh; Fri, 05 Sep 2025 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055735; 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=yCB1F4m/Ax6c4POq1OWLUvqKTvjtzmEgZ1MGUuWLivk=; b=OuTg3sAKypg6CvSOYbOfW5VeezoKzFhGEH9LyThasPifzW97P6Fa368Gj8+e6AUNBfjYUv 6YOgOOQb2gMzq7B7Dj+Bt/1IxbU2yj615Moh7bnaWq0J6ohlGWY9QahPfzftACh4b3J4qQ 9F3RQNzfD+lYm3qWBUd30/FADr7TtoJsPpK7Uni6PrbC9M3CcZxsSlpkEVe9EDe2THgrKk y5YKUqNHj3zi3RNiHmMI+DdizxllXN2gs2xfsRbCXF9W/9TVSlpvoYVf3E3oGtmMlNrqfF 0YQ3nWiOk8bXaj1Z4osYuuFkUMZV6FuRtUWfl5rW8uToiOkle37AhCdY3DtsNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055735; 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=yCB1F4m/Ax6c4POq1OWLUvqKTvjtzmEgZ1MGUuWLivk=; b=BbCPG50B+RlkuD7hPPWf+Ksg3JFDjQUq8tWOa/DlzuXjrT75QMrx1lxbzXmEYul97Nue+S mgZI9yxtES7FfJzt9DRr/vO9ykrrI+YZ8VDJsqtqFFp65WftcXDBwA6BbXdb5MYx4dvAjy N1LxEdH3vDCkH87ElSn7upoGYfiAb95CvuI+nKzVnAnBIhZg6descym0+5Mibj5I8tytZd Tfbr2xTEMyhRyIhM+/bKTdJj1iJuXw5noQpQy6PljFGelDe3Xmpkz95A3IoxYq8FbzDAsO 34ktDlhLm5xKVB3QFqnC2V+vFjaweaUCuzrmaNuPJvIakuE9ujHukTrX5VhBlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757055735; a=rsa-sha256; cv=none; b=K0oucKVflOewt1L9zyNSGZgMdTYYXyICkL7uoTb0PCqwOHzwh6o166Vcuzbj2scN1bpOlD DHKHShK0FAOw2klsHTzjm1QseQWM9Qe5qYDFeoWRq6Xv9z6uOuIDekFiZcC3oE5VXFMvwF s9kmS40oSgo3uDEl/uHvokNLfNuzfIjiL1wR4fWeW0Zh8RaUVuA4WEZSSNozWDXGNXTf6c DrZBQxFI48VC3eXgByN4Z1ekDawhSVEThquhPxX0XiFR4ATLQJzHDT4n35eRatwq6eNVZj 6Ib+xIVhUSGs049WgRf9WgZOK4V/XNbykFkWWifKsc29bmQnZEOuxV07kGbxKg== 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 4cJ6jM6241zdwZ; Fri, 05 Sep 2025 07:02: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 58572FFf082836; Fri, 5 Sep 2025 07:02:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58572FSv082833; Fri, 5 Sep 2025 07:02:15 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:02:15 GMT Message-Id: <202509050702.58572FSv082833@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: ff3299366f21 - stable/14 - tcp: remove duplicate tcp_bblogging_on checks 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: ff3299366f214c589dcb82f02c4f0db2495dd38e Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ff3299366f214c589dcb82f02c4f0db2495dd38e commit ff3299366f214c589dcb82f02c4f0db2495dd38e Author: Nick Banks AuthorDate: 2025-07-20 11:28:35 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:57:54 +0000 tcp: remove duplicate tcp_bblogging_on checks Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit a1fa30cea6e3bc66ba7243c69f2e5248ea3f79d5) --- sys/netinet/tcp_hpts.c | 70 +++++++++++++++++++++++------------------------ sys/netinet/tcp_log_buf.c | 2 +- sys/netinet/tcp_log_buf.h | 8 +++--- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 068728f254cb..da5fde91a132 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -432,38 +432,40 @@ static void tcp_hpts_log(struct tcp_hpts_entry *hpts, struct tcpcb *tp, struct timeval *tv, int slots_to_run, int idx, int from_callout) { - union tcp_log_stackspecific log; - /* - * Unused logs are - * 64 bit - delRate, rttProp, bw_inuse - * 16 bit - cwnd_gain - * 8 bit - bbr_state, bbr_substate, inhpts; - */ - memset(&log, 0, sizeof(log)); - log.u_bbr.flex1 = hpts->p_nxt_slot; - log.u_bbr.flex2 = hpts->p_cur_slot; - log.u_bbr.flex3 = hpts->p_prev_slot; - log.u_bbr.flex4 = idx; - log.u_bbr.flex5 = hpts->p_curtick; - log.u_bbr.flex6 = hpts->p_on_queue_cnt; - log.u_bbr.flex7 = hpts->p_cpu; - log.u_bbr.flex8 = (uint8_t)from_callout; - log.u_bbr.inflight = slots_to_run; - log.u_bbr.applimited = hpts->overidden_sleep; - log.u_bbr.delivered = hpts->saved_curtick; - log.u_bbr.timeStamp = tcp_tv_to_usectick(tv); - log.u_bbr.epoch = hpts->saved_curslot; - log.u_bbr.lt_epoch = hpts->saved_prev_slot; - log.u_bbr.pkts_out = hpts->p_delayed_by; - log.u_bbr.lost = hpts->p_hpts_sleep_time; - log.u_bbr.pacing_gain = hpts->p_cpu; - log.u_bbr.pkt_epoch = hpts->p_runningslot; - log.u_bbr.use_lt_bw = 1; - TCP_LOG_EVENTP(tp, NULL, - &tptosocket(tp)->so_rcv, - &tptosocket(tp)->so_snd, - BBR_LOG_HPTSDIAG, 0, - 0, &log, false, tv); + if (hpts_does_tp_logging && tcp_bblogging_on(tp)) { + union tcp_log_stackspecific log; + /* + * Unused logs are + * 64 bit - delRate, rttProp, bw_inuse + * 16 bit - cwnd_gain + * 8 bit - bbr_state, bbr_substate, inhpts; + */ + memset(&log, 0, sizeof(log)); + log.u_bbr.flex1 = hpts->p_nxt_slot; + log.u_bbr.flex2 = hpts->p_cur_slot; + log.u_bbr.flex3 = hpts->p_prev_slot; + log.u_bbr.flex4 = idx; + log.u_bbr.flex5 = hpts->p_curtick; + log.u_bbr.flex6 = hpts->p_on_queue_cnt; + log.u_bbr.flex7 = hpts->p_cpu; + log.u_bbr.flex8 = (uint8_t)from_callout; + log.u_bbr.inflight = slots_to_run; + log.u_bbr.applimited = hpts->overidden_sleep; + log.u_bbr.delivered = hpts->saved_curtick; + log.u_bbr.timeStamp = tcp_tv_to_usectick(tv); + log.u_bbr.epoch = hpts->saved_curslot; + log.u_bbr.lt_epoch = hpts->saved_prev_slot; + log.u_bbr.pkts_out = hpts->p_delayed_by; + log.u_bbr.lost = hpts->p_hpts_sleep_time; + log.u_bbr.pacing_gain = hpts->p_cpu; + log.u_bbr.pkt_epoch = hpts->p_runningslot; + log.u_bbr.use_lt_bw = 1; + TCP_LOG_EVENTP(tp, NULL, + &tptosocket(tp)->so_rcv, + &tptosocket(tp)->so_snd, + BBR_LOG_HPTSDIAG, 0, + 0, &log, false, tv); + } } static void @@ -1349,9 +1351,7 @@ again: } CURVNET_SET(inp->inp_vnet); /* Lets do any logging that we might want to */ - if (hpts_does_tp_logging && tcp_bblogging_on(tp)) { - tcp_hpts_log(hpts, tp, &tv, slots_to_run, i, from_callout); - } + tcp_hpts_log(hpts, tp, &tv, slots_to_run, i, from_callout); if (tp->t_fb_ptr != NULL) { kern_prefetch(tp->t_fb_ptr, &did_prefetch); diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index fa6394065da6..473c534ef83d 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -2881,7 +2881,7 @@ tcp_log_sendfile(struct socket *so, off_t offset, size_t nbytes, int flags) /* double check log state now that we have the lock */ if (inp->inp_flags & INP_DROPPED) goto done; - if (tp->_t_logstate != TCP_LOG_STATE_OFF) { + if (tcp_bblogging_on(tp)) { struct timeval tv; tcp_log_eventspecific_t log; diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 363ea13b1743..20b128a6ac70 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -536,12 +536,12 @@ struct tcpcb; NULL, NULL, 0, NULL); \ } while (0) #endif /* TCP_LOG_FORCEVERBOSE */ +/* Assumes/requires the caller has already checked tcp_bblogging_on(tp). */ #define TCP_LOG_EVENTP(tp, th, rxbuf, txbuf, eventid, errornum, len, stackinfo, th_hostorder, tv) \ do { \ - if (tcp_bblogging_on(tp)) \ - tcp_log_event(tp, th, rxbuf, txbuf, eventid, \ - errornum, len, stackinfo, th_hostorder, \ - NULL, NULL, 0, tv); \ + KASSERT(tcp_bblogging_on(tp), ("bblogging is off")); \ + tcp_log_event(tp, th, rxbuf, txbuf, eventid, errornum, len, \ + stackinfo, th_hostorder, NULL, NULL, 0, tv); \ } while (0) #ifdef TCP_BLACKBOX From nobody Fri Sep 5 07:06: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 4cJ6p65vJdz67Cn6; Fri, 05 Sep 2025 07:06:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6p64ylrz40XW; Fri, 05 Sep 2025 07:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055982; 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=flkHhCVgPgKNflWfIgUt1ZMarJodeB55+WAvY4UXRHo=; b=dTw0wkn8eT18ecBpq66Lgmoh3JsR5GR9DB7DnrxDA75GFBkoWjAjJ1a3ur8RDsgAwTbquG 58ICT3le8l8bldgxqd6M/JGu4ce9I/vjTbnkFiIeyO5qxeoVBi26P0mb5+dtIjW6se1rHq cNkRwOuyl+SKfkCruTGRbEoH8fgDi8Ch//6HtdsWZZE/haWhQfi2o+mtyIf/646V8Fk6gJ qhsE3TH4ODEYTMgNXtOGGMzN9HNThjQN3NbsYJIXZMgOOuJM+vnoRjY4XmvfpOIMlz+qco ZqrPx3hDeL1YCPeZR7pXHb+LqFMeg9x17L+Cvs+Vt6Vslps9bUu9cakAdipELQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055982; 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=flkHhCVgPgKNflWfIgUt1ZMarJodeB55+WAvY4UXRHo=; b=oHZjhyTXKCS8erMJMz08K/aHWLc8+lEQ/cEDEEnBWzEKy/SY8lwMGXj1SqRwJmRIaptczA dN+fjmzvZ2QZnfe8vVz39qc5vZVZPP9dnY6zC0yt9kWTuKohtGLKgGYq1ucwyLOT25tvSO 7h5+ydWLXb8yymavFApHeTiHIBARTz978hq8FqUzy9U3PMQqxPntx94RhTBAebigt0poFj syH7G4ZTNJz482gBotQENanxfUD11F1d5Qd+sOulb7cDI/6XxPIqFxbeAu7FwMkKI2O/pz ILeedazppELRyIPvkWDGX6eO5GZ6/En8XnhoS+BlvoufgdCKLqs05p+il6G6rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757055982; a=rsa-sha256; cv=none; b=SOe0z7Zg8Jwek1CaqDJiwKo1/NHXVL82K4OgoO2RupfFqNn8e96EW1CnPKAG4tujmBcBQn a7nJc+zDUcY//3RTuTwEFO6luZnjCwhPlpfvDlRtT5bEYtBSGIMiUbcoRqa8Uk82bwnDr+ qMoadUqepPktv9zob0H6IHVikxiyFuNGm4KX6uHC5lCMJL6y8cibuVSTIOmwaNpSWoWXVb toyX16kILX4GtKDDL6qsXBIvUwye3/KUUt+pVfqUg3F+3pRAg6qyZv/ngoWiQydz9VQyXT xVzgnAmKPSXbjSMBC57MAUiNGgzJRaxmKNpggGfUjK3nDLwzFJK0YOfG8Zc8ow== 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 4cJ6p64Drdzdgp; Fri, 05 Sep 2025 07:06:22 +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 58576MK8083917; Fri, 5 Sep 2025 07:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58576McG083912; Fri, 5 Sep 2025 07:06:22 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:06:22 GMT Message-Id: <202509050706.58576McG083912@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: f33397e3092b - stable/14 - tcp hpts: use consistently inline instead of __inline 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: f33397e3092bb8dd36ba0458bff8e7f861345a91 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f33397e3092bb8dd36ba0458bff8e7f861345a91 commit f33397e3092bb8dd36ba0458bff8e7f861345a91 Author: Nick Banks AuthorDate: 2025-07-20 12:33:31 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 07:05:18 +0000 tcp hpts: use consistently inline instead of __inline Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 22bebbb211e304f09a29764f24ad9cfb82cee7f0) --- sys/netinet/tcp_hpts.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index b097a2b98db9..a623d959db9a 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -165,25 +165,25 @@ extern int32_t tcp_min_hptsi_time; * The following functions should also be available * to userspace as well. */ -static __inline uint32_t +static inline uint32_t tcp_tv_to_hptstick(const struct timeval *sv) { return ((sv->tv_sec * 100000) + (sv->tv_usec / HPTS_TICKS_PER_SLOT)); } -static __inline uint32_t +static inline uint32_t tcp_tv_to_usectick(const struct timeval *sv) { return ((uint32_t) ((sv->tv_sec * HPTS_USEC_IN_SEC) + sv->tv_usec)); } -static __inline uint32_t +static inline uint32_t tcp_tv_to_mssectick(const struct timeval *sv) { return ((uint32_t) ((sv->tv_sec * HPTS_MSEC_IN_SEC) + (sv->tv_usec/HPTS_USEC_IN_MSEC))); } -static __inline uint64_t +static inline uint64_t tcp_tv_to_lusectick(const struct timeval *sv) { return ((uint64_t)((sv->tv_sec * HPTS_USEC_IN_SEC) + sv->tv_usec)); @@ -199,7 +199,7 @@ get_hpts_min_sleep_time(void) return (tcp_min_hptsi_time + HPTS_TICKS_PER_SLOT); } -static __inline uint32_t +static inline uint32_t tcp_gethptstick(struct timeval *sv) { struct timeval tv; @@ -210,7 +210,7 @@ tcp_gethptstick(struct timeval *sv) return (tcp_tv_to_hptstick(sv)); } -static __inline uint64_t +static inline uint64_t tcp_get_u64_usecs(struct timeval *tv) { struct timeval tvd; @@ -221,7 +221,7 @@ tcp_get_u64_usecs(struct timeval *tv) return (tcp_tv_to_lusectick(tv)); } -static __inline uint32_t +static inline uint32_t tcp_get_usecs(struct timeval *tv) { struct timeval tvd; From nobody Fri Sep 5 07:08:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJ6rW5DqSz67Cp9; Fri, 05 Sep 2025 07:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6rW4frxz40xm; Fri, 05 Sep 2025 07:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757056107; 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=LAymeb/v9B6QyzYITdX/Q2IQPp3GN14HZeTOoUnU5ng=; b=GbBWKZExuLg456BokuQCmUmDyUlwDZTurWpLBGGtstijZxQllX5Z825WDG/Swkjuze3Ndd DGDKH/K3SSpVSmeghyi25PyL5CBg6LEdjyRnbadzAaWFOWEfGtuUzRDsk/0E7cS1j3O8RD pPoK8LaWeG2Ev7vcqQSgjb4vbUYyr2pb4QEYxPcbPlyLDbFZBVux50EZYF5VCRRZthpOFX 2mo7B39yhoIkhycPI44spbS59aSAR6C+8wKQn1CQ7EaDFtLKjXXQkxXfiyaP8gnzOty4m7 izRWlkaao3D6yD2kd/oM1yb+xkXuRGxyOmA+7fDhBbAg9oumc4l1Pg7BcvRpzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757056107; 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=LAymeb/v9B6QyzYITdX/Q2IQPp3GN14HZeTOoUnU5ng=; b=aI6pae3UXxTqK38YRvluMKxUytH2isIxTuyrw3XFUVePcjGO2EyCbnmoilqCJgEj53SzT8 TQ7w8glD8FO2wfHCdZK4+kh2qjvBcn1hQ/21w+C/XDzSFAk+EmXeM1Dpu09cSiRHnBqIc0 B7uqBAZOC5KRt0VlxpZXX6ueh6+SYO0cI7lbNiEWG1uLnPWDXE/m80U7oUE5KGJ68GyN60 BO1ngLG9+I/90S/1emBkUrpD2RVm3qTRcoyQglpalILq9I9/gbIx2P7PCHn+yCEpf4AVfu toM6p4PuwxsiV0+p6L8Co6AtKK7ZAB/rnihFAezl0hpE/aGfX0wEkQAoWY/64w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757056107; a=rsa-sha256; cv=none; b=FreEPyhAc7QC65240oyFIcd5LU/Q9CxfgSuX3ryRxQBEdiTE+c38zM6vSDJa7sty6aUJlT jdttKyO3dm6GIVFwmfeAcTPIVoeBRp0ztAGUMI5acp/J7dGlcXnkfInm7p4uAct2C28TwK Z0xxRQdp2tZpDUrU/LDoBDDuku90Dz0HVXVfLiN6ztYwr0l1DDpIgozn51uufmOfTkNO0t Hi26TXH6msMyd13W4EzCpdlkC8Qv44NU+U2Vo/6vanmyiruCwGVFVUD/g/zxhwQEJyXbSh JtvwQ0yn3A3I8dTnCRjFrRjbVO20U/wNvG6tVOW6arMlr+i1IOAlwn0i/55X3A== 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 4cJ6rW48jJzdwf; Fri, 05 Sep 2025 07:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58578RmW084611; Fri, 5 Sep 2025 07:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58578RCL084608; Fri, 5 Sep 2025 07:08:27 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:08:27 GMT Message-Id: <202509050708.58578RCL084608@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: b5d0e1915a61 - stable/14 - tcp hpts: remove unused line argument from tcp_set_hpts 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: b5d0e1915a61076a921a4381dab96855ce5da098 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d0e1915a61076a921a4381dab96855ce5da098 commit b5d0e1915a61076a921a4381dab96855ce5da098 Author: Nick Banks AuthorDate: 2025-07-20 12:37:42 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 07:07:47 +0000 tcp hpts: remove unused line argument from tcp_set_hpts Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 3ad8fd6f30466789111e088c16fcab4d94f63232) --- sys/netinet/tcp_hpts.c | 2 +- sys/netinet/tcp_hpts.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index da5fde91a132..55bfea54c63a 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1486,7 +1486,7 @@ no_run: } void -__tcp_set_hpts(struct tcpcb *tp, int32_t line) +tcp_set_hpts(struct tcpcb *tp) { struct tcp_hpts_entry *hpts; int failed; diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index a623d959db9a..f5856ed8e688 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -149,8 +149,7 @@ uint32_t tcp_hpts_insert_diag(struct tcpcb *tp, uint32_t slot, int32_t line, #define tcp_hpts_insert(inp, slot) \ tcp_hpts_insert_diag((inp), (slot), __LINE__, NULL) -void __tcp_set_hpts(struct tcpcb *tp, int32_t line); -#define tcp_set_hpts(a) __tcp_set_hpts(a, __LINE__) +void tcp_set_hpts(struct tcpcb *tp); void tcp_set_inp_to_drop(struct inpcb *inp, uint16_t reason); From nobody Fri Sep 5 07:25: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 4cJ7DX0zdhz67Db2; Fri, 05 Sep 2025 07:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ7DX0BBqz41s4; Fri, 05 Sep 2025 07:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757057148; 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=8NPG5eKXu0CNN8GAieWN9ItJ5ZZo+iwy2ANjB2COJHw=; b=s5V4Ze2WIc9a0VbBDW78mK41bDgXk2w948iM2lRFqvOKAD4e+pxpqD57mmJQXcl9VlUh94 gGJ+wMr6R2CKrT8uR/vy4XkbNylTPMxRu7UpAtRqypkGpWQ2zs8Frps3gVpCOat2JPizJW wgeDB5ttFaJmhdlK84GeAxcwvESequNcgsz2vDqHFHRda860Ka3MtJGkPRN0CkDXvtuEZk paZ7Ky/LYppUF68eLW2ufE0f/46jGzHlSdzldMfZmi9tQ31bqQMtRto/febiOUGbdJmyU5 dLj+12cGt+v+wpGTiK6japv6z7ityiFRkFDLlpgZ/uY43IqanwbUa4VC38Rftg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757057148; 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=8NPG5eKXu0CNN8GAieWN9ItJ5ZZo+iwy2ANjB2COJHw=; b=HHWL/e4pgVvNohO6iLwPy3dGx9XsJzvbrIek7UfBetqdUafRJlHEC7+l9bPW0UMe4OhUeI mzQhwzvPfa5byEmkuWsUo/LY/Yc9DAehhMM22YGRzWwsiERtq0QAw7f/yTLuZK/Dn62k11 zef4RWtxGBErqrUf+gi8hTV4gz4CKHrwhutEZ8cQ6eTXp3yFEGUYlILBbBTvchun4Dw2lW 1bapuC2L+nq7tCS3wi/Zo1X4/BfZ0O2phaXVy0mOyF0whT/FTKANawTHljUSLaEiCQlY4z mC0fxt4kLk93+UbRHA3IcO5nw1BC7fz74prLHIjNnY2OP3sGL6osfbvbwyqyZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757057148; a=rsa-sha256; cv=none; b=DsEEYsWSvqCsa0Awj+w9CtWTc+9q5RG2gZo9tjXRQ6C/xiV3Aw46NusX9SW8EvntU0kCCI HAGmyWIe2LywkKnffFUKEnxHC0cRnmDueiEuCBhlEizrVOWAJvumEY2upIrASuIqDKfj5Z TI9+LPkbVov8+HU1ZbrZAR6gT6SdEfreJpMpcc2L+X3qwIpKK+iq7oooyQxKCox5eCWVCH GJ8APJlF75dQSNs/JnycQtQG/EZVSRJbLJLP0RZZV5VVlxE1xI6uHbbbKQGcBBz44+G4e1 RjprkZIY5/vLT0YsGn723oeOrE2gW7hrkHSGBcLkvBJgNuTpNKfmuCJ7lK2rUw== 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 4cJ7DW6cbqzfSW; Fri, 05 Sep 2025 07:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5857Pl4i020524; Fri, 5 Sep 2025 07:25:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5857Pllm020521; Fri, 5 Sep 2025 07:25:47 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:25:47 GMT Message-Id: <202509050725.5857Pllm020521@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: 560ae99e226f - stable/14 - tcp: cleanup 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: 560ae99e226f57bffe13d165f645ddcb914afa38 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=560ae99e226f57bffe13d165f645ddcb914afa38 commit 560ae99e226f57bffe13d165f645ddcb914afa38 Author: Michael Tuexen AuthorDate: 2025-07-20 13:01:00 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 07:25:02 +0000 tcp: cleanup Don't use the variable rstreason temporarily with a different semantic. No functional change intended. Reviewed by: Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51438 (cherry picked from commit 7dc73fa6693564cecc36cda6788cb21c0c922ced) --- sys/netinet/tcp_input.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index f4d061557e88..10b422c300b5 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1072,6 +1072,8 @@ findpcb: * socket appended to the listen queue in SYN_RECEIVED state. */ if ((thflags & (TH_RST|TH_ACK|TH_SYN)) == TH_ACK) { + int result; + /* * Parse the TCP options here because * syncookies need access to the reflected @@ -1081,8 +1083,8 @@ findpcb: /* * NB: syncache_expand() doesn't unlock inp. */ - rstreason = syncache_expand(&inc, &to, th, &so, m, port); - if (rstreason < 0) { + result = syncache_expand(&inc, &to, th, &so, m, port); + if (result < 0) { /* * A failing TCP MD5 signature comparison * must result in the segment being dropped @@ -1090,7 +1092,7 @@ findpcb: * to the sender. */ goto dropunlock; - } else if (rstreason == 0) { + } else if (result == 0) { /* * No syncache entry, or ACK was not for our * SYN/ACK. Do our protection against double From nobody Fri Sep 5 14:32: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 4cJJj02dnYz67f4D; Fri, 05 Sep 2025 14:32:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJJj022C1z3n0D; Fri, 05 Sep 2025 14:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757082756; 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=45l/NRb4L3cnLrJVSINgLQHjk7b5Efr7v0prfYeb1NY=; b=eOIuxScDJQ7GImE0+HdXoZg4z4MdofDrpezE+H0TwWy5UXeIvbO10EvMyjTVg0GhtbJlP9 jPBPFfizpcXFBU2t75D0QNLVpiPsVQTBPq672pHAjE4W3uIALJM2MOhdhKNGpe2l9TnYOL P7MHu1QTZGV4q+ZkLHoyb5mB/SJEQQB+fqAMyPlFlZbKZVDsRnpQZz79lza/4O7uMbCM2h caR1tgQJEfEXNoYk1/cWFFjGhngagJkHF1FjHepiT/Dbi6tZUi8vGgSKGIwZU3GhwXsUoL vlXPkLlPLzoP+Qd9OytCQoXh7bIdIsc4h8sP8jioLfR8viiT75z47pQsCeHrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757082756; 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=45l/NRb4L3cnLrJVSINgLQHjk7b5Efr7v0prfYeb1NY=; b=hI/M7ax0U1ppfGIcki/1ChQBB6uzANwhgQ9isrE+Qrj89G1ZLzBW5JXOWzOB3oCldoDqNf igHH9ISnwmXPIJpYWMRBNfMhOcBMF5BfTcnkHM1fGbcMefLwPLLzE1nuC7tmAUdyx0ql37 0oU6xO7xHPs9DwAAQXAtJ2y6VEAS5+YrqbGADS4iDEeMI8PXOqKmH6HqKh8VFqvviNnlXq +Oo/PzGA5p4UF+Kcp9piWmdcDhBX9Xvf8GTyAqLje7MG9jOGEQvq4rRwwC2sLFjC08iBp4 tGYJFPgHvg070R+9/HLh8lrEJO4IeucFGLZVCFdXjCf9mr31bce3xM7pv4IVyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757082756; a=rsa-sha256; cv=none; b=k6qYVYzJde3aqTDz2U3pin6zR1LYNGPG+mahirgI+XN37SMxZdxgVtuIz+mkQvsBMcdJCK 1A4W906evXeAU+qrWslpwpobukVZAHVJsvkzoSQpk1SHSc2RSjZ0bH27pq25ZUC/yEWLDj yWcMXl+nJO9TxGTlbn1hjTR6G8hEKZ2i5KHLcGsOCcLn1Eo04g3eWO3Px3rd+yat7GWSJT btdSAcArDAgNwNE8g3J+5YCEumGlRe5iHZCy3FOGrq/7rDRON2pRSyFVu6Iu8RZebk5CZT 4CGHi0Q9cKliZEGNqLDq3tfMqa4u1b5ge+3Vi275ELAIy6d58H+apXa+Ss46Ww== 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 4cJJj01cchzssn; Fri, 05 Sep 2025 14:32: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 585EWa0D024470; Fri, 5 Sep 2025 14:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585EWaFX024467; Fri, 5 Sep 2025 14:32:36 GMT (envelope-from git) Date: Fri, 5 Sep 2025 14:32:36 GMT Message-Id: <202509051432.585EWaFX024467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 69ed4a82afd7 - stable/14 - dtrace_lockstat.4: Fix 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 69ed4a82afd794c513b18d6941573c359cb83384 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=69ed4a82afd794c513b18d6941573c359cb83384 commit 69ed4a82afd794c513b18d6941573c359cb83384 Author: Christos Margiolis AuthorDate: 2025-09-03 17:49:50 +0000 Commit: Christos Margiolis CommitDate: 2025-09-05 14:32:22 +0000 dtrace_lockstat.4: Fix description MFC after: 1 day Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D52355 (cherry picked from commit e323aaaf397188e3d8e9cb2376af7a083896b441) --- share/man/man4/dtrace_lockstat.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/dtrace_lockstat.4 b/share/man/man4/dtrace_lockstat.4 index e308ca6c22ce..448de91a375f 100644 --- a/share/man/man4/dtrace_lockstat.4 +++ b/share/man/man4/dtrace_lockstat.4 @@ -22,12 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 20, 2019 +.Dd September 3, 2025 .Dt DTRACE_LOCKSTAT 4 .Os .Sh NAME .Nm dtrace_lockstat -.Nd a DTrace provider for tracing CPU scheduling events +.Nd a DTrace provider for tracing kernel locking events .Sh SYNOPSIS .Fn lockstat:::adaptive-acquire "struct mtx *" .Fn lockstat:::adaptive-release "struct mtx *" From nobody Fri Sep 5 17:34:44 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 4cJNl929GHz65tHN; Fri, 05 Sep 2025 17:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJNl91TZxz4GCh; Fri, 05 Sep 2025 17:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757093685; 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=LLSifpMO4Dmr4uQmV04QrQOH8j4aQAfenhEi4pEBX+w=; b=edQyIBLxZNrSV2TsleIn8CljWbWTTsLYUyTraYDdzH1QEPiNytX3gKLp3fogFOerZrDX3H CL5G1xeu+wLcIMjvrbWeiP2P6h39DEu9mcGpIN702seDiT9BwOl+HBG/5okDvQS61nh/fu lnYTDhrbMQiyxzv+RwN2GmJdFzUtkhVhDBmlbHQrBZMfojuv48wVj38thfeb8nDlNsaJRv 807mfiCObHWqHl+ypycewj5dPEFxRUoD6KqXHQBsyEd5EV7xxkiI/t/XDUQ3I/xiTJI9QR X5zywnx6Bg0KS0zpufAjA9y1709GGPPXUgsEQZ9kaAtAXqpqkUHnUnBxVkrvaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757093685; 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=LLSifpMO4Dmr4uQmV04QrQOH8j4aQAfenhEi4pEBX+w=; b=bycYfRP+DUkX+0N25aSfY8RzrOzGGsMQQA99DAih9aaTaeoJnq25SHYHdYBKLJEt2phj+L 9oS4FogludXKuHTlefcWWgTtVzc0st5GBflR5DpDMfJRyAnic4KvuGQOJWIMcRAr26Z4mW JfxHsPJtP3L6DUdjB45CRgxyIWEdilK6uIZprse20jz9XdpCVcyo41g2WSeYcqVlqHCCCv vIbJLXZpaa386Z6xJTa/Pzq95P97dJoYgn8+y0jZibQ98t/3mlATI8yajS3uacFGg66dzH rXbesqATquD0fdEv7rZF083khBjjAZtcb66SPaYYby6gyXrWOPS93WR3vBU9Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757093685; a=rsa-sha256; cv=none; b=t6cavY0scnR2lEHEkAuDj0Ksblrlo/gjqESgZyM1KHtWMbPfQTaTTMiXnZRSAWWCdzpagB Ca08d6wgor0PksMA2uWc7TW8+illRscf4JKzh5BqZRo8+Yhtwp36jn3MTQSKYRuRv6EFtT oZimM490zYnh5WkIUujkyHcVKdU0L51OZMBjZR1C409Fh1PMSP/4B0QCubWfqyWW3CGNmk iSquLgbYvm6tGQN8fXyybaDamVr9/o/xQNqsGy0gZ/kJR9zYVSxxd7X2PS33/F4p/N7HaY loBb0G3O0UaDC0of/V0T+6Kszt4EEyCckU1vCkYsXRMDnJw57JYMHz+WEg5Wsw== 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 4cJNl90vQMzyP4; Fri, 05 Sep 2025 17:34: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 585HYjIx065394; Fri, 5 Sep 2025 17:34:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585HYicT065391; Fri, 5 Sep 2025 17:34:44 GMT (envelope-from git) Date: Fri, 5 Sep 2025 17:34:44 GMT Message-Id: <202509051734.585HYicT065391@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: 9f6942484963 - stable/14 - tcp rack: fix sendmap app limited count tracking 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: 9f6942484963cb9f45b141eec89c5d9f1ed5db92 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9f6942484963cb9f45b141eec89c5d9f1ed5db92 commit 9f6942484963cb9f45b141eec89c5d9f1ed5db92 Author: Peter Lei AuthorDate: 2025-07-21 07:56:03 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 13:28:21 +0000 tcp rack: fix sendmap app limited count tracking rc_app_limited_cnt is an internal counter on the rack structure that tracks the number of sendmap entries that have the RACK_APP_LIMITED flag set. These entries gate goodput measurements. The counter is reported in a number of blackbox logging events. When a sendmap entry which has the RACK_APP_LIMITED flag set is cloned, the counter was not being maintained properly. While here, cleanup the counter check when a sendmap entry with the flag set is freed which previously hid this issue. Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit e0838f8a2e61e73e37c1ae08eab9473daacaacb8) --- sys/netinet/tcp_stacks/rack.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index f90b747cc2e4..e7226a5bcf87 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -3468,9 +3468,9 @@ static void rack_free(struct tcp_rack *rack, struct rack_sendmap *rsm) { if (rsm->r_flags & RACK_APP_LIMITED) { - if (rack->r_ctl.rc_app_limited_cnt > 0) { - rack->r_ctl.rc_app_limited_cnt--; - } + KASSERT((rack->r_ctl.rc_app_limited_cnt > 0), + ("app_cnt %u, rsm %p", rack->r_ctl.rc_app_limited_cnt, rsm)); + rack->r_ctl.rc_app_limited_cnt--; } if (rsm->r_limit_type) { /* currently there is only one limit type */ @@ -7208,6 +7208,9 @@ rack_clone_rsm(struct tcp_rack *rack, struct rack_sendmap *nrsm, /* Push bit must go to the right edge as well */ if (rsm->r_flags & RACK_HAD_PUSH) rsm->r_flags &= ~RACK_HAD_PUSH; + /* Update the count if app limited */ + if (nrsm->r_flags & RACK_APP_LIMITED) + rack->r_ctl.rc_app_limited_cnt++; /* Clone over the state of the hw_tls flag */ nrsm->r_hw_tls = rsm->r_hw_tls; /* From nobody Fri Sep 5 17:35: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 4cJNmF3K5Rz65tHZ; Fri, 05 Sep 2025 17:35: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJNmF2mftz4GRd; Fri, 05 Sep 2025 17:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757093741; 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=EyqC0rofsm8Tt0kIt7i6EjNf57yJu7QtJiuG7wk3cvU=; b=IvoW+lI7jNJ1KNiY+IRppHDElyyGLGh0gOHO94Jyrj/Z0tFjtHESAJ2NBKyLPlcWY/Fp0U STzINoKo9haxlsKsGt3aaqF2JPIeJd+Y8DQGxoaiQc01EHUa3OBzXj0wQm4ERi8o1tWKa8 sMAhYQaIE6GouGVGHFcVfQ6bRCDHeV1Gi3Dl4KWwvzfPubPEcXj0zs5DJ+/tQuUpukH4jK pH8yHtj8Dgzox2ynGDcEo98KytF84axViB0LXJL3yYsjuiamo5Ro63tweOBgriOYk36j4E DcwWvoTu1EC0uLEj2T0VCMCtbW/N08oo6kn3Ewa0ahC5dQPk+V5nOKx2pLZg2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757093741; 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=EyqC0rofsm8Tt0kIt7i6EjNf57yJu7QtJiuG7wk3cvU=; b=RYb7w3+vd0TPK1BgVEyjqNn1i46ymbDJEq+bQl9/12WSxx4iX08RH7f5Ru8UocXGhjmaUY UnrQnlQMy0G6sBNt3wumfjy/Q4/uOrbG9adwmfN/kzzVxdFBfg450oQHxXzCDpnSqXZVCE TiIBD+XdWpMm2vJzt5jgi8Le7LR6kjoKDRaK/QURcuxYLLRxGX8uj+1K+rN4matLPce07f KEH1mdh3i5XtDnnEOtlpsZkCnAR54u76h22Dluh0GNBgAOUJCkTcOkHn6C+5xtQi5H/2vs SKSaYjCunvmXicaI5POVar5l29nnztzL0xtvE8h/RItojUTa2C+svfTdmFMgnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757093741; a=rsa-sha256; cv=none; b=XKo63lXOLKfb42yU9sAOiq65VAcnD1FEwFc3EQTqgi2Wjplb0VAzt1ZI53VjGyCwulP6af uT/+01crmUmx1h/8P0RsgKVlcOcjZ58IM2vzUpNN4mNJWNYWeRrAiLxH2fmzBMX6td41Pl uRFWwUBNcsBSpd/3CAbC1mBJPQfBbBgWeRrQT19/l78SNmP7Zb66J/mfFKTvLkCny8koB/ AcxufDiS+Nwvj3O+3BSvdbcbylSQ0GUsyjqDJG2B/QAdQJ0+ekw4NzF5SILxZRnGy+8skL wdg0okx+0aGzVnc95yWyJEjRebDPLg7Lbu020LNEeIEfAgmbLqQ7FLHEYOV9OQ== 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 4cJNmF2BCKzybr; Fri, 05 Sep 2025 17:35: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 585HZfuF065804; Fri, 5 Sep 2025 17:35:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585HZfkt065801; Fri, 5 Sep 2025 17:35:41 GMT (envelope-from git) Date: Fri, 5 Sep 2025 17:35:41 GMT Message-Id: <202509051735.585HZfkt065801@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: ef163ce59d89 - stable/14 - tcp rack: remove duplicate header include 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: ef163ce59d89910111cf4951e7084bc8b5fdad66 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ef163ce59d89910111cf4951e7084bc8b5fdad66 commit ef163ce59d89910111cf4951e7084bc8b5fdad66 Author: Peter Lei AuthorDate: 2025-07-21 08:02:29 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 17:35:08 +0000 tcp rack: remove duplicate header include Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 2385565fac21554085a818975d3b7a97f7a4591e) --- 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 e7226a5bcf87..beb7428638db 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -40,7 +40,6 @@ #endif #include #include -#include #include #include #include /* for proc0 declaration */ From nobody Fri Sep 5 18:29:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJPyQ5RqJz65xgb; Fri, 05 Sep 2025 18:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJPyQ52XWz4MWJ; Fri, 05 Sep 2025 18:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757096974; 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=oUjBulooO4E7pzUqHBXm6Iw3z040so2dULzovC5Klag=; b=fkndJh+9Mo1zugGawLM9mV2bTHecbTOS/d/yTQ0kjfa1U8hZObGX1mrPlwcRZsPlF/aJ64 9iavjEgFuzxNCDye80Bjj69mAfM2R2anKwkgS+G5Al6L2xnKaf/AAlFsT8xEhJFs749x8D Uf0XQhNyZOMqSHuQ5YiyCQS4PUt1hbkWE34cqrhG/CQjvzROdWaMlqX8ns2NAT4OqQyc2I 18JNEvvEFAYBOM7KdrgYjIdu17phzQdPZm5RLxS1oclX8r1TURzPn90TcMvjhomWC0ryWL SG2MYmoiMztQ/Nb3cVV/sSjX9X6Zx7DVI1qdAtailZVjK3k9MxK2Mh609hbMmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757096974; 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=oUjBulooO4E7pzUqHBXm6Iw3z040so2dULzovC5Klag=; b=EAPVBvfyLvp5141bf4n/BTq2iSdoveVSO/Xx7fSPouCKl2x+Jimars+RSjKHzigHW37DsU 7cq98ca/U7YH3GF3DSl5EXMGo2hf8RFhUvl+/uahZ2UypdmcJLZ9yne89lWQBkppbKizDo bKQFQV/S6OAnzmybT4BJa63/EvdwHUyI5AIywQSbRYNPfpKMjqYBiq0H/HQtdq+SgSF0uj U/fNMtbLErPTTAJURjlspqkIn1Y4TCN9ufu/MOFoOdw6RaQ+Srtl115cow90rSQUlRWrNC fFdNeOvd9Bj62IFT5li5NdAz+3td8P7QdByTiRODhLI8WqZx3oViLFevdcoFvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757096974; a=rsa-sha256; cv=none; b=wv6JIs0yvIPZjCl+JdcpTr02c2UR/IJu27c/Db1Ajjs25ofEums5W33+VV6vgZFRPOBtXP as2M3AhssXLgCuXrQQwJrgqXszs9q30lQZb9s5Yi0VvGvBUzJKU9WCDUdsNwhDPFOPf2qN WyCiix1fUy2w9dMc3Tm4bsOH0bKevrFV4wuOZ25a9IDwdcwfHUcBAQTx/28UsvQL/pAJga Vrv2qyuiJF4Zwh/azxC5x3LTjoQc4T0xg6R1vcs0dP0/5CphigfD/PkC0EeYOVNGpNGQ4b KfgHOFZgQrA5izdCQcXELunuPvp9oOHs5EY3zG7uUQvuK+vjkuKmyJuViCTPWA== 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 4cJPyQ4d4gz10Dj; Fri, 05 Sep 2025 18:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585ITYQS060606; Fri, 5 Sep 2025 18:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585ITY2T060603; Fri, 5 Sep 2025 18:29:34 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:29:34 GMT Message-Id: <202509051829.585ITY2T060603@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: 7aa9563e20f9 - stable/14 - tcp: use a single counter for limiting the RST 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: 7aa9563e20f9f48fc29285140b23849b5b31d28a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7aa9563e20f9f48fc29285140b23849b5b31d28a commit 7aa9563e20f9f48fc29285140b23849b5b31d28a Author: Michael Tuexen AuthorDate: 2025-07-21 08:07:36 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:28:35 +0000 tcp: use a single counter for limiting the RST rate Using two counters does not provide any benefit, but it provides an externally observable signal whether there is a listening port. Reviewed by: Nick Banks, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51440 (cherry picked from commit d31bdbc3661f6535d5ce4bc98c3687e10aa56720) --- sys/netinet/icmp_var.h | 9 ++++----- sys/netinet/ip_icmp.c | 3 +-- sys/netinet/tcp_input.c | 31 ++++++++++++++++++------------- sys/netinet/tcp_stacks/bbr.c | 22 +++++++++++----------- sys/netinet/tcp_stacks/rack.c | 22 +++++++++++----------- sys/netinet/tcp_stacks/rack_bbr_common.c | 2 +- 6 files changed, 46 insertions(+), 43 deletions(-) diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index a53a9d7865c3..f0d832a37261 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -92,11 +92,10 @@ extern int badport_bandlim(int); #define BANDLIM_ICMP_UNREACH 0 #define BANDLIM_ICMP_ECHO 1 #define BANDLIM_ICMP_TSTAMP 2 -#define BANDLIM_RST_CLOSEDPORT 3 /* No connection, and no listeners */ -#define BANDLIM_RST_OPENPORT 4 /* No connection, listener */ -#define BANDLIM_ICMP6_UNREACH 5 -#define BANDLIM_SCTP_OOTB 6 -#define BANDLIM_MAX 7 +#define BANDLIM_TCP_RST 3 +#define BANDLIM_ICMP6_UNREACH 4 +#define BANDLIM_SCTP_OOTB 5 +#define BANDLIM_MAX 6 #endif #endif diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 122293a36a15..644b87858f17 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1104,8 +1104,7 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { [BANDLIM_ICMP_UNREACH] = "icmp unreach", [BANDLIM_ICMP_ECHO] = "icmp ping", [BANDLIM_ICMP_TSTAMP] = "icmp tstamp", - [BANDLIM_RST_CLOSEDPORT] = "closed port RST", - [BANDLIM_RST_OPENPORT] = "open port RST", + [BANDLIM_TCP_RST] = "tcp reset", [BANDLIM_ICMP6_UNREACH] = "icmp6 unreach", [BANDLIM_SCTP_OOTB] = "sctp ootb", }; diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 10b422c300b5..32050d02d268 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -638,6 +638,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) #endif /* INET6 */ struct tcpopt to; /* options in this segment */ char *s = NULL; /* address and port logging */ + bool closed_port = false; /* segment is hitting a closed port */ NET_EPOCH_ASSERT(); @@ -924,7 +925,8 @@ findpcb: log(LOG_INFO, "%s; %s: Connection attempt " "to closed port\n", s, __func__); } - rstreason = BANDLIM_RST_CLOSEDPORT; + rstreason = BANDLIM_TCP_RST; + closed_port = true; goto dropwithreset; } INP_LOCK_ASSERT(inp); @@ -1015,12 +1017,14 @@ findpcb: * down or it is in the CLOSED state. Either way we drop the * segment and send an appropriate response. */ - rstreason = BANDLIM_RST_CLOSEDPORT; + rstreason = BANDLIM_TCP_RST; + closed_port = true; goto dropwithreset; } if ((tp->t_port != port) && (tp->t_state > TCPS_LISTEN)) { - rstreason = BANDLIM_RST_CLOSEDPORT; + rstreason = BANDLIM_TCP_RST; + closed_port = true; goto dropwithreset; } @@ -1111,7 +1115,7 @@ findpcb: * of the failure cause. */ INP_WUNLOCK(inp); - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; lookupflag &= ~INPLOOKUP_WILDCARD; goto findpcb; } @@ -1202,7 +1206,7 @@ tfo_socket_result: s, __func__); syncache_badack(&inc, port); /* XXX: Not needed! */ TCPSTAT_INC(tcps_badsyn); - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; goto dropwithreset; } /* @@ -1278,7 +1282,7 @@ tfo_socket_result: "Connection attempt to deprecated " "IPv6 address rejected\n", s, __func__); - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; goto dropwithreset; } } @@ -1408,9 +1412,10 @@ dropwithreset: * When blackholing do not respond with a RST but * completely ignore the segment and drop it. */ - if (((rstreason == BANDLIM_RST_OPENPORT && V_blackhole == 3) || - (rstreason == BANDLIM_RST_CLOSEDPORT && - ((V_blackhole == 1 && (thflags & TH_SYN)) || V_blackhole > 1))) && + if (rstreason == BANDLIM_TCP_RST && + ((!closed_port && V_blackhole == 3) || + (closed_port && + ((V_blackhole == 1 && (thflags & TH_SYN)) || V_blackhole > 1))) && (V_blackhole_local || ( #ifdef INET6 isipv6 ? !in6_localip(&ip6->ip6_src) : @@ -1980,7 +1985,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -1993,7 +1998,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * FIN, or a RST. */ if ((thflags & (TH_SYN|TH_ACK)) == (TH_SYN|TH_ACK)) { - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } else if (thflags & TH_SYN) { @@ -2261,7 +2266,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * for the "LAND" DoS attack. */ if (tp->t_state == TCPS_SYN_RECEIVED && SEQ_LT(th->th_seq, tp->irs)) { - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -3418,7 +3423,7 @@ dropafterack: if (tp->t_state == TCPS_SYN_RECEIVED && (thflags & TH_ACK) && (SEQ_GT(tp->snd_una, th->th_ack) || SEQ_GT(th->th_ack, tp->snd_max)) ) { - rstreason = BANDLIM_RST_OPENPORT; + rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 66fab54bd010..af7bb8cb642f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -8752,7 +8752,7 @@ bbr_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if ((thflags & (TH_ACK | TH_RST)) == (TH_ACK | TH_RST)) { @@ -8954,7 +8954,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if (IS_FASTOPEN(tp->t_flags)) { @@ -8966,7 +8966,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if ((thflags & (TH_SYN | TH_ACK)) == (TH_SYN | TH_ACK)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } else if (thflags & TH_SYN) { /* non-initial SYN is ignored */ @@ -8999,7 +8999,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if (SEQ_LT(th->th_seq, tp->irs)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if (ctf_drop_checks(to, m, th, tp, &tlen, &thflags, &drop_hdrlen, &ret_val)) { @@ -9277,7 +9277,7 @@ bbr_do_established(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -9374,7 +9374,7 @@ bbr_do_close_wait(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -9524,7 +9524,7 @@ bbr_do_fin_wait_1(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -9626,7 +9626,7 @@ bbr_do_closing(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -9728,7 +9728,7 @@ bbr_do_lastack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -9837,7 +9837,7 @@ bbr_do_fin_wait_2(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -11492,7 +11492,7 @@ bbr_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((tp->t_state == TCPS_SYN_SENT) && (thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if (tiwin > bbr->r_ctl.rc_high_rwnd) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index beb7428638db..34dfdf9ce4f5 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -13265,7 +13265,7 @@ rack_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if ((thflags & (TH_ACK | TH_RST)) == (TH_ACK | TH_RST)) { @@ -13461,7 +13461,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if (IS_FASTOPEN(tp->t_flags)) { @@ -13474,7 +13474,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if ((thflags & (TH_SYN | TH_ACK)) == (TH_SYN | TH_ACK)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } else if (thflags & TH_SYN) { /* non-initial SYN is ignored */ @@ -13508,7 +13508,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if (SEQ_LT(th->th_seq, tp->irs)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } if (_ctf_drop_checks(to, m, th, tp, &tlen, &thflags, &drop_hdrlen, &ret_val, @@ -13776,7 +13776,7 @@ rack_do_established(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event(rack, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -13877,7 +13877,7 @@ rack_do_close_wait(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -14032,7 +14032,7 @@ rack_do_fin_wait_1(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -14138,7 +14138,7 @@ rack_do_closing(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -14244,7 +14244,7 @@ rack_do_lastack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -14353,7 +14353,7 @@ rack_do_fin_wait_2(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -16938,7 +16938,7 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((tp->t_state == TCPS_SYN_SENT) && (thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); #ifdef TCP_ACCOUNTING sched_unpin(); #endif diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index b78988b75c72..e5ccc7ebb236 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -682,7 +682,7 @@ __ctf_do_dropafterack(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, int32 (SEQ_GT(tp->snd_una, th->th_ack) || SEQ_GT(th->th_ack, tp->snd_max))) { *ret_val = 1; - ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return; } else *ret_val = 0; From nobody Fri Sep 5 18:36: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 4cJQ6l5QBsz65y3Y; Fri, 05 Sep 2025 18:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQ6l4Hp6z4N62; Fri, 05 Sep 2025 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097407; 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=gYx4jFV+uQ3RAwUITk/fcgKoaQLuJkm6apucuJ2+A54=; b=XK762NFwtjs3nTK5FQi3/g/UIfpV0GLLCF7GCfDm2STvzDhoEvpFfzASNWIJyNXzPBc+tA FU0GhHMFXruBe7nveI1woSo50Y1uBoFoWixVik1CQF/npY8IHTWOg73GK9lGa6JGv/YQc4 ajWBzufdEB4nV5Zcb8xc8wWc/llgpMOipTpZxpi7dSza10Oi1m+q6q6UMBMXAwPc+uIwYi HDA0LBLfxuPf6Zw+xnZFUjo9Z1RZpLkhOMank2MpFDkGi+4+fWkcrg75rJCSn8+/+tvA6J aPYODJVPH5iyTogfmzswMgbRruL+Q0Raq0F6hNReWGvN9n9RIJ1VX0FMHUFX0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097407; 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=gYx4jFV+uQ3RAwUITk/fcgKoaQLuJkm6apucuJ2+A54=; b=NwH2iHSTv8j8aion8GZwVmpnwMrem3vGOjCg3axth1rsvY4SwJzYnYIum49BBTOWB1FjlU epWzPYxeCvzAHHkK/r3gSPHA4Azn5kbH+MGAD0jXSGyz/Td2/7taJjw+Ke88t2LKzI5mBW dq9BjB8hwZkFTRVrjSY4uaHsZQibtdks6vJNszsI8nIWG9GnC59k57wO2IBQiwhO1Rz5I/ hIlKp9z/z6E6MsRjHi4HElzzbyfFgnjzqOFuocBeMF8A7jHOKlczhAGVD4HguKtqPMK6nA P/qMqz7hahsMqyG5gbYPI+niMJHgGo5YcXAup7AhfG8vWeyf8wGqh7egUGEixQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097407; a=rsa-sha256; cv=none; b=AKUNULASveNezUYthlRdAsPdwuZFttvkAj+vq21DFIR57bXwafD7m2plUt1HA8Rob+lkmi ipsoUaYHfV+Uj45wXnga1Xr3SEQM6P1I3EOvhr0LuakOJgHENB9zflG7VOj69MYaZzC8WL rgmhxhjBfXYhfU7NtZbYhXcpBs2BkLd23AF96lQ5iBIH2hhQk88n9ysHDJ8jDKe7bA3WwZ 8B3UwywHod7hlhrjUvIbZwmuXIDqsU2bb/Mf5Gox6SXPW0YFhPLEAAcNtjnsrbf69I6Jln FUpmj2a7jkLF23zZPY1xKMzyfaqd3NOLSNtnBwVKDHybrVrBvxJjhI4Qtadeww== 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 4cJQ6l3TmYz10tb; Fri, 05 Sep 2025 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585Ial0D078977; Fri, 5 Sep 2025 18:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585Ial6v078974; Fri, 5 Sep 2025 18:36:47 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:36:47 GMT Message-Id: <202509051836.585Ial6v078974@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: be83b57b6acc - stable/14 - mbuf.9: describe checksum offloading for SCTP 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: be83b57b6acc1087357994b844fc013ead53a409 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=be83b57b6acc1087357994b844fc013ead53a409 commit be83b57b6acc1087357994b844fc013ead53a409 Author: Michael Tuexen AuthorDate: 2025-07-29 06:52:06 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:36:14 +0000 mbuf.9: describe checksum offloading for SCTP This describes the current status of the implementation. While there, be a bit more precise on how long the checksum computation is delayed. Reviewed by: Timo Völker, bcr Differential Revision: https://reviews.freebsd.org/D51590 (cherry picked from commit fe35f275ab0240cb5ed05484c943293a71aadb5f) --- share/man/man9/mbuf.9 | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index 0262c598ed18..c05505716a30 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 28, 2023 +.Dd July 29, 2025 .Dt MBUF 9 .Os .\" @@ -1091,7 +1091,7 @@ network code, when data must be encrypted or otherwise altered prior to transmission. .El .Sh HARDWARE-ASSISTED CHECKSUM CALCULATION -This section currently applies to TCP/IP only. +This section currently applies to SCTP, TCP, and UDP over IP only. In order to save the host CPU resources, computing checksums is offloaded to the network interface hardware if possible. The @@ -1117,7 +1117,7 @@ in the .Vt mbuf chain containing the packet. .Pp -On output, checksum offloading is attempted after the outgoing +On output, the computation of the checksum is delayed until the outgoing interface has been determined for a packet. The interface-specific field .Va ifnet.if_data.ifi_hwassist @@ -1135,12 +1135,15 @@ such actions will never be requested through .Va csum_flags . .Pp The flags demanding a particular action from an interface are as follows: -.Bl -tag -width ".Dv CSUM_TCP" -offset indent +.Bl -tag -width ".Dv CSUM_SCTP" -offset indent .It Dv CSUM_IP The IP header checksum is to be computed and stored in the corresponding field of the packet. The hardware is expected to know the format of an IP header to determine the offset of the IP checksum field. +.It Dv CSUM_SCTP +The SCTP checksum is to be computed. +(See below.) .It Dv CSUM_TCP The TCP checksum is to be computed. (See below.) @@ -1149,14 +1152,16 @@ The UDP checksum is to be computed. (See below.) .El .Pp -Should a TCP or UDP checksum be offloaded to the hardware, +Should a SCTP, TCP, or UDP checksum be offloaded to the hardware, the field .Va csum_data will contain the byte offset of the checksum field relative to the end of the IP header. -In this case, the checksum field will be initially -set by the TCP/IP module to the checksum of the pseudo header +In the case of TCP or UDP, the checksum field will be initially +set by the TCP or UDP implementation to the checksum of the pseudo header defined by the TCP and UDP specifications. +In the case of SCTP, the checksum field will be initially +set by the SCTP implementation to 0. .Pp On input, an interface indicates the actions it has performed on a packet by setting one or more of the following flags in @@ -1187,13 +1192,13 @@ to obtain the final checksum to be used for TCP or UDP validation purposes. .El .Pp If a particular network interface just indicates success or -failure of TCP or UDP checksum validation without returning +failure of SCTP, TCP, or UDP checksum validation without returning the exact value of the checksum to the host CPU, its driver can mark .Dv CSUM_DATA_VALID -and -.Dv CSUM_PSEUDO_HDR in -.Va csum_flags , +.Va csum_flags +as well as, for TCP and UDP, +.Dv CSUM_PSEUDO_HDR and set .Va csum_data to @@ -1203,6 +1208,13 @@ It is a peculiarity of the algorithm used that the Internet checksum calculated over any valid packet will be .Li 0xFFFF as long as the original checksum field is included. +Note that for SCTP the value of +.Va csum_data +is not relevant and +.Dv CSUM_PSEUDO_HDR +in +.Va csum_flags +is not set, since SCTP does not use a pseudo header checksum. .Sh STRESS TESTING When running a kernel compiled with the option .Dv MBUF_STRESS_TEST , From nobody Fri Sep 5 18:45: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 4cJQJP2rJPz66DDB; Fri, 05 Sep 2025 18:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQJP0VlTz3GXm; Fri, 05 Sep 2025 18:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097909; 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=mdLFsx2ryJfDuyeMZYw+SFOXhIpJt7ehd5gvTev4PSY=; b=DQpTPzKp5o4pzaCeDiY71uYUjvBnkvJn/3K4JLiQX+byZdMF9kJtWrAgzdv4BwQy+htXcg XHrdWqQujCWI/bUqj9mt9hqfUm3K/A4ntBCSKK8ifYRhlY+egi5I1lF8FYsgfcZ9r1NT1B TG+/Q2+Q17rfiogwcZolREcIUXWbp6bDcOUAemspM1JluZwyWZq4StMKRAzBUfZgWpwZBt 7fpxZSH8qQ5dzip8+crBtXNXgwqZG1ylt0L8ixG/FfIoHc7u4zcCd55gEBbq0euKy91BrA y1sJv+hyyjf5clpm0Ocyvqe0sLMuel6E618YRA77DI9+X06IysJBmqNu3ncy5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097909; 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=mdLFsx2ryJfDuyeMZYw+SFOXhIpJt7ehd5gvTev4PSY=; b=ODYaIO5iy/0Z+MiLHEtU61Mk2EzXsxhIZm+wMySrCpQOUsbLIBI4Csb6zLP4g2ENCaxQKH PS6A3sIKKWXq5IHTDdz5rIL/1Kni7drWrJQEBAg6Up33u/k2YC6nmwMuXBsEn70af0a8l7 lK+tsHIoMCnI0iHYHL3yA8tstFGY/ooKu7tIzCLsvUx9WAnNTBp4hX4IojT7DEMsvy6sAe /N5SQaYrK8mVjm4mYF6znBe6exkE35Goy6gX2a1Bk7CcfR80arg/yKXw2jGphwO+13ZeRA JiN5d25RvbVxAUgIryBlX/3lXqOd8HMXeNbjSmue987JxGra7/yfAw1co0AAhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097909; a=rsa-sha256; cv=none; b=AkxcX/BAvce4K5BMu9b9gjGFhLOkuwRJNyhNwoWQk90Wcq5ffTgYpfPn271L/T/asB1sVo PpQxPkz3KAVRWgki5p3cSl0Nv0/vx847h/AP3kN+xN/lwsVlK9txG8bSZTbhOynLFUNlEi lwpn6m7wsi6a6P/3mQi16B0fqqr+2vWNldyftbXAVdgRQniYGB90s/y7GXvHf0JiPcUkDJ FQF8AcuM7pPWiIgpbD+8TjzYfSlIRQH+1B3uJdSkYdkOc5DOGrGOYtFWM7HqiPPdXnZ0xf 6LitijssFlbL7MjvWUfyBv7RKuodZiRV4Qn4IrSuR9P7Prk0Hu6B5W3bJcp58g== 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 4cJQJP066dz11BL; Fri, 05 Sep 2025 18:45: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 585Ij88Z097850; Fri, 5 Sep 2025 18:45:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585Ij8q7097847; Fri, 5 Sep 2025 18:45:08 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:45:08 GMT Message-Id: <202509051845.585Ij8q7097847@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: 226cfd057e20 - stable/14 - vtnet.4: update description of loader tunables 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: 226cfd057e205cb5e3ef23e97271e2189e6c40e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=226cfd057e205cb5e3ef23e97271e2189e6c40e0 commit 226cfd057e205cb5e3ef23e97271e2189e6c40e0 Author: Michael Tuexen AuthorDate: 2025-07-29 07:17:52 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:42:20 +0000 vtnet.4: update description of loader tunables This is based on the description of sysctl -d. Reviewed by: Timo Völker, bcr Differential Revision: https://reviews.freebsd.org/D51604 (cherry picked from commit 0ded4647215cffde9076ab4e82870b0f491bd0b2) --- share/man/man4/vtnet.4 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index e45a47ff6c87..7f5186ef4165 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 22, 2012 +.Dd July 29, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -70,6 +70,11 @@ prompt before booting the kernel or stored in .It Va hw.vtnet. Ns Ar X Ns Va .csum_disable This tunable disables receive and send checksum offload. The default value is 0. +.It Va hw.vtnet.fixup_needs_csum +.It Va hw.vtnet. Ns Ar X Ns Va .fixup_needs_csum +This tunable enforces the calculation of a valid checksum for NEEDS_CSUM +packets. +The default value is 0. .It Va hw.vtnet.tso_disable .It Va hw.vtnet. Ns Ar X Ns Va .tso_disable This tunable disables TSO. @@ -91,6 +96,22 @@ The number of queue pairs used is the lesser of the maximum supported by the driver and the hypervisor, the number of CPUs present in the guest, and this tunable if not zero. The default value is 0. +.It Va hw.vtnet.tso_maxlen +.It Va hw.vtnet. Ns Ar X Ns Va .tso_maxlen +This tunable sets the TSO burst limit. +The default value is 65535. +.It Va hw.vtnet.rx_process_limit +.It Va hw.vtnet. Ns Ar X Ns Va .rx_process_limit +This tunable sets the number of RX segments processed in one pass. +The default value is 1024. +.It Va hw.vtnet.lro_entry_count +.It Va hw.vtnet. Ns Ar X Ns Va .lro_entry_count +This tunable sets the software LRO entry count. +The default value is 128, the minimum value is 8. +.It Va hw.vtnet.lro_mbufq_depth +.It Va hw.vtnet. Ns Ar X Ns Va .lro_mbufq_depth +This tunable sets the depth of the software LRO mbuf queue. +The default value is 0. .El .Sh SEE ALSO .Xr arp 4 , From nobody Fri Sep 5 18:46: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 4cJQKt0QrRz66DYl; Fri, 05 Sep 2025 18:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQKs6hjvz3HB9; Fri, 05 Sep 2025 18:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097985; 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=4euOMZhBRM+6MD4SaizdbRE+cs0SFM4AwhTE89AG3Qo=; b=YOqEwSCVjIajRxbNUHgiuJKdpP87XknXlzQn+9llS5b146B7l6bhO4lopSWqVZVhYhUxi5 RBpgSuIyR5KQIsJcfSgJJ0d4B6ySk9eKp9vk64g58cb9rdPSAEhV0OK2GEL2gEbECrjMXb cWXIy7OPG3MMk896QRVfGyNrPk/Y6x7v3O2uRWUJ/0SDJR4nFSYi8ZnbRx00wK0S/0d9fH F7cDPip0zAOk6jdwBeatdIVHLlJ/zQoTGsM26lbik4uNuOZ1INctUrlB2/62CJyszpoOcz zXHWwLvDEziFCf6ndcxmYgF8sQ2OzZGs3KiQFPfy1yXYW51BGdhxmnBs1D4Dsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097985; 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=4euOMZhBRM+6MD4SaizdbRE+cs0SFM4AwhTE89AG3Qo=; b=TIJ9PEs+w1GyazKBk1P8rCed8aCfNXJuDzbcGuucO58SV7DCiNXi4LnaDQ75BZpnhfKA38 b6xGMvxtPfEHZ0cl+ygs7vfkSW9W75eroz/YHoT9dd6CfOdM/q5mGeJ0Ypky4RyfgJqQsx mQEnEkj2E/EbunniF67K6GqtCn1bocjIlbsEULnPTmRGKnk+GBS2aL0t0ojwE91DSLVlay ki8IqWU8B4ACAQh8sxsEbho+nUa21OiP+nHB/d9kF6K681Zzr2D8W2+Dw7K6JG5OlqT3Eg /D6PKetU+fqamtcJqK3qPHMVTM4kCXbqZKKIxr/3lM5sP2fYKLDhmhWLuSob+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097985; a=rsa-sha256; cv=none; b=WMizxVDdpsOUV4NJA3lwa2VqPu41mpVurRGwhXFv8byrMYcQN1lvXbCiWNeGinTW+3Pbzs q4R9afMNxY2zvD9Ijff13uqL9ceIyyB6PE0H7dSIVFuYsU9wwUiQm16SynmUSIXy6VkoBT 0WJfvfUpjZ6N9VYgcgw5j8gpjfJufi+Gz15FjuGV/K5ZujHW6q1EJWziCECOelb5es5D6L vyCsADJVYwUhT/teYjZjV8d/Au/SbyVgvFtqYXX8yrAPxTJQyTDBvwp/tuip6gqURTgfht OwSFT0c5mbyY5332dZHHP32bW/auZbrre2AfdPExOPuB028AtH0zY5FNL5C55g== 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 4cJQKs6GT4z11Gt; Fri, 05 Sep 2025 18:46: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 585IkPNI098303; Fri, 5 Sep 2025 18:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IkP3C098300; Fri, 5 Sep 2025 18:46:25 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:46:25 GMT Message-Id: <202509051846.585IkP3C098300@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: 5c00ab0924b2 - stable/14 - tcp: improve variable and constant names List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c00ab0924b20d256c93c40482a6e468e8a41ae9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5c00ab0924b20d256c93c40482a6e468e8a41ae9 commit 5c00ab0924b20d256c93c40482a6e468e8a41ae9 Author: Nick Banks AuthorDate: 2025-07-31 13:03:47 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:45:27 +0000 tcp: improve variable and constant names Don't use ticks in variable names or constant when they don't have a relation to ticks. Use slots or usecs. No functional change intended. Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit f197a24d11967b5780717d05e84a749f34b773c4) --- sys/netinet/tcp_hpts.c | 32 ++++++++++++++++---------------- sys/netinet/tcp_hpts.h | 20 ++++++++++---------- sys/netinet/tcp_stacks/bbr.c | 6 +++--- sys/netinet/tcp_stacks/rack.c | 26 +++++++++++++------------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 55bfea54c63a..2a8746167c6d 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -365,7 +365,7 @@ sysctl_net_inet_tcp_hpts_max_sleep(SYSCTL_HANDLER_ARGS) new = hpts_sleep_max; error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { - if ((new < (dynamic_min_sleep/HPTS_TICKS_PER_SLOT)) || + if ((new < (dynamic_min_sleep/HPTS_USECS_PER_SLOT)) || (new > HPTS_MAX_SLEEP_ALLOWED)) error = EINVAL; else @@ -403,15 +403,15 @@ SYSCTL_PROC(_net_inet_tcp_hpts, OID_AUTO, minsleep, &sysctl_net_inet_tcp_hpts_min_sleep, "IU", "The minimum time the hpts must sleep before processing more slots"); -static int ticks_indicate_more_sleep = TICKS_INDICATE_MORE_SLEEP; -static int ticks_indicate_less_sleep = TICKS_INDICATE_LESS_SLEEP; +static int slots_indicate_more_sleep = SLOTS_INDICATE_MORE_SLEEP; +static int slots_indicate_less_sleep = SLOTS_INDICATE_LESS_SLEEP; static int tcp_hpts_no_wake_over_thresh = 1; SYSCTL_INT(_net_inet_tcp_hpts, OID_AUTO, more_sleep, CTLFLAG_RW, - &ticks_indicate_more_sleep, 0, + &slots_indicate_more_sleep, 0, "If we only process this many or less on a timeout, we need longer sleep on the next callout"); SYSCTL_INT(_net_inet_tcp_hpts, OID_AUTO, less_sleep, CTLFLAG_RW, - &ticks_indicate_less_sleep, 0, + &slots_indicate_less_sleep, 0, "If we process this many or more on a timeout, we need less sleep on the next callout"); SYSCTL_INT(_net_inet_tcp_hpts, OID_AUTO, nowake_over_thresh, CTLFLAG_RW, &tcp_hpts_no_wake_over_thresh, 0, @@ -876,7 +876,7 @@ tcp_hpts_insert_diag(struct tcpcb *tp, uint32_t slot, int32_t line, struct hpts_ return (slot_on); } /* Get the current time relative to the wheel */ - wheel_cts = tcp_tv_to_hptstick(&tv); + wheel_cts = tcp_tv_to_hpts_slot(&tv); /* Map it onto the wheel */ wheel_slot = tick_to_wheel(wheel_cts); /* Now what's the max we can place it at? */ @@ -948,7 +948,7 @@ tcp_hpts_insert_diag(struct tcpcb *tp, uint32_t slot, int32_t line, struct hpts_ * We need to reschedule the hpts's time-out. */ hpts->p_hpts_sleep_time = slot; - need_new_to = slot * HPTS_TICKS_PER_SLOT; + need_new_to = slot * HPTS_USECS_PER_SLOT; } } /* @@ -1117,7 +1117,7 @@ again: HPTS_MTX_ASSERT(hpts); slots_to_run = hpts_slots_diff(hpts->p_prev_slot, hpts->p_cur_slot); if (((hpts->p_curtick - hpts->p_lasttick) > - ((NUM_OF_HPTSI_SLOTS-1) * HPTS_TICKS_PER_SLOT)) && + ((NUM_OF_HPTSI_SLOTS-1) * HPTS_USECS_PER_SLOT)) && (hpts->p_on_queue_cnt != 0)) { /* * Wheel wrap is occuring, basically we @@ -1198,7 +1198,7 @@ again: * was not any (i.e. if slots_to_run == 1, no delay). */ hpts->p_delayed_by = (slots_to_run - (i + 1)) * - HPTS_TICKS_PER_SLOT; + HPTS_USECS_PER_SLOT; runningslot = hpts->p_runningslot; hptsh = &hpts->p_hptss[runningslot]; @@ -1569,7 +1569,7 @@ __tcp_run_hpts(void) ticks_ran = tcp_hptsi(hpts, 0); /* We may want to adjust the sleep values here */ if (hpts->p_on_queue_cnt >= conn_cnt_thresh) { - if (ticks_ran > ticks_indicate_less_sleep) { + if (ticks_ran > slots_indicate_less_sleep) { struct timeval tv; sbintime_t sb; @@ -1579,7 +1579,7 @@ __tcp_run_hpts(void) /* Reschedule with new to value */ tcp_hpts_set_max_sleep(hpts, 0); tv.tv_sec = 0; - tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; + tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_USECS_PER_SLOT; /* Validate its in the right ranges */ if (tv.tv_usec < hpts->p_mysleep.tv_usec) { hpts->overidden_sleep = tv.tv_usec; @@ -1601,7 +1601,7 @@ __tcp_run_hpts(void) callout_reset_sbt_on(&hpts->co, sb, 0, hpts_timeout_swi, hpts, hpts->p_cpu, (C_DIRECT_EXEC | C_PREL(tcp_hpts_precision))); - } else if (ticks_ran < ticks_indicate_more_sleep) { + } else if (ticks_ran < slots_indicate_more_sleep) { /* For the further sleep, don't reschedule hpts */ hpts->p_mysleep.tv_usec *= 2; if (hpts->p_mysleep.tv_usec > dynamic_max_sleep) @@ -1684,7 +1684,7 @@ tcp_hpts_thread(void *ctx) hpts->p_hpts_active = 1; ticks_ran = tcp_hptsi(hpts, 1); tv.tv_sec = 0; - tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; + tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_USECS_PER_SLOT; if ((hpts->p_on_queue_cnt > conn_cnt_thresh) && (hpts->hit_callout_thresh == 0)) { hpts->hit_callout_thresh = 1; atomic_add_int(&hpts_that_need_softclock, 1); @@ -1698,11 +1698,11 @@ tcp_hpts_thread(void *ctx) * Only adjust sleep time if we were * called from the callout i.e. direct_wake == 0. */ - if (ticks_ran < ticks_indicate_more_sleep) { + if (ticks_ran < slots_indicate_more_sleep) { hpts->p_mysleep.tv_usec *= 2; if (hpts->p_mysleep.tv_usec > dynamic_max_sleep) hpts->p_mysleep.tv_usec = dynamic_max_sleep; - } else if (ticks_ran > ticks_indicate_less_sleep) { + } else if (ticks_ran > slots_indicate_less_sleep) { hpts->p_mysleep.tv_usec /= 2; if (hpts->p_mysleep.tv_usec < dynamic_min_sleep) hpts->p_mysleep.tv_usec = dynamic_min_sleep; @@ -1996,7 +1996,7 @@ tcp_hpts_mod_load(void) } } tv.tv_sec = 0; - tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; + tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_USECS_PER_SLOT; hpts->sleeping = tv.tv_usec; sb = tvtosbt(tv); callout_reset_sbt_on(&hpts->co, sb, 0, diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index f5856ed8e688..a13a8a4b5353 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -26,8 +26,8 @@ #ifndef __tcp_hpts_h__ #define __tcp_hpts_h__ -/* Number of useconds in a hpts tick */ -#define HPTS_TICKS_PER_SLOT 10 +/* Number of useconds represented by an hpts slot */ +#define HPTS_USECS_PER_SLOT 10 #define HPTS_MS_TO_SLOTS(x) ((x * 100) + 1) #define HPTS_USEC_TO_SLOTS(x) ((x+9) /10) #define HPTS_USEC_IN_SEC 1000000 @@ -91,8 +91,8 @@ struct hpts_diag { #define DYNAMIC_MAX_SLEEP 5000 /* 5ms */ /* Thresholds for raising/lowering sleep */ -#define TICKS_INDICATE_MORE_SLEEP 100 /* This would be 1ms */ -#define TICKS_INDICATE_LESS_SLEEP 1000 /* This would indicate 10ms */ +#define SLOTS_INDICATE_MORE_SLEEP 100 /* This would be 1ms */ +#define SLOTS_INDICATE_LESS_SLEEP 1000 /* This would indicate 10ms */ /** * * Dynamic adjustment of sleeping times is done in "new" mode @@ -102,10 +102,10 @@ struct hpts_diag { * When we are in the "new" mode i.e. conn_cnt > conn_cnt_thresh * then we do a dynamic adjustment on the time we sleep. * Our threshold is if the lateness of the first client served (in ticks) is - * greater than or equal too ticks_indicate_more_sleep (10ms + * greater than or equal too slots_indicate_more_sleep (10ms * or 10000 ticks). If we were that late, the actual sleep time * is adjusted down by 50%. If the ticks_ran is less than - * ticks_indicate_more_sleep (100 ticks or 1000usecs). + * slots_indicate_more_sleep (100 ticks or 1000usecs). * */ @@ -165,9 +165,9 @@ extern int32_t tcp_min_hptsi_time; * to userspace as well. */ static inline uint32_t -tcp_tv_to_hptstick(const struct timeval *sv) +tcp_tv_to_hpts_slot(const struct timeval *sv) { - return ((sv->tv_sec * 100000) + (sv->tv_usec / HPTS_TICKS_PER_SLOT)); + return ((sv->tv_sec * 100000) + (sv->tv_usec / HPTS_USECS_PER_SLOT)); } static inline uint32_t @@ -195,7 +195,7 @@ extern int32_t tcp_min_hptsi_time; static inline int32_t get_hpts_min_sleep_time(void) { - return (tcp_min_hptsi_time + HPTS_TICKS_PER_SLOT); + return (tcp_min_hptsi_time + HPTS_USECS_PER_SLOT); } static inline uint32_t @@ -206,7 +206,7 @@ tcp_gethptstick(struct timeval *sv) if (sv == NULL) sv = &tv; microuptime(sv); - return (tcp_tv_to_hptstick(sv)); + return (tcp_tv_to_hpts_slot(sv)); } static inline uint64_t diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index af7bb8cb642f..65230bbd953f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -14098,17 +14098,17 @@ bbr_switch_failed(struct tcpcb *tp) toval = bbr->rc_pacer_started - cts; } else { /* one slot please */ - toval = HPTS_TICKS_PER_SLOT; + toval = HPTS_USECS_PER_SLOT; } } else if (bbr->r_ctl.rc_hpts_flags & PACE_TMR_MASK) { if (TSTMP_GT(bbr->r_ctl.rc_timer_exp, cts)) { toval = bbr->r_ctl.rc_timer_exp - cts; } else { /* one slot please */ - toval = HPTS_TICKS_PER_SLOT; + toval = HPTS_USECS_PER_SLOT; } } else - toval = HPTS_TICKS_PER_SLOT; + toval = HPTS_USECS_PER_SLOT; (void)tcp_hpts_insert_diag(tp, HPTS_USEC_TO_SLOTS(toval), __LINE__, &diag); bbr_log_hpts_diag(bbr, cts, &diag); diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 34dfdf9ce4f5..10fc55bb2088 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -6790,22 +6790,22 @@ rack_start_hpts_timer(struct tcp_rack *rack, struct tcpcb *tp, uint32_t cts, * on the clock. We always have a min * 10 slots (10 x 10 i.e. 100 usecs). */ - if (slot <= HPTS_TICKS_PER_SLOT) { + if (slot <= HPTS_USECS_PER_SLOT) { /* We gain delay */ - rack->r_ctl.rc_agg_delayed += (HPTS_TICKS_PER_SLOT - slot); - slot = HPTS_TICKS_PER_SLOT; + rack->r_ctl.rc_agg_delayed += (HPTS_USECS_PER_SLOT - slot); + slot = HPTS_USECS_PER_SLOT; } else { /* We take off some */ - rack->r_ctl.rc_agg_delayed -= (slot - HPTS_TICKS_PER_SLOT); - slot = HPTS_TICKS_PER_SLOT; + rack->r_ctl.rc_agg_delayed -= (slot - HPTS_USECS_PER_SLOT); + slot = HPTS_USECS_PER_SLOT; } } else { slot -= rack->r_ctl.rc_agg_delayed; rack->r_ctl.rc_agg_delayed = 0; /* Make sure we have 100 useconds at minimum */ - if (slot < HPTS_TICKS_PER_SLOT) { - rack->r_ctl.rc_agg_delayed = HPTS_TICKS_PER_SLOT - slot; - slot = HPTS_TICKS_PER_SLOT; + if (slot < HPTS_USECS_PER_SLOT) { + rack->r_ctl.rc_agg_delayed = HPTS_USECS_PER_SLOT - slot; + slot = HPTS_USECS_PER_SLOT; } if (rack->r_ctl.rc_agg_delayed == 0) rack->r_late = 0; @@ -14768,17 +14768,17 @@ rack_switch_failed(struct tcpcb *tp) toval = rack->r_ctl.rc_last_output_to - cts; } else { /* one slot please */ - toval = HPTS_TICKS_PER_SLOT; + toval = HPTS_USECS_PER_SLOT; } } else if (rack->r_ctl.rc_hpts_flags & PACE_TMR_MASK) { if (TSTMP_GT(rack->r_ctl.rc_timer_exp, cts)) { toval = rack->r_ctl.rc_timer_exp - cts; } else { /* one slot please */ - toval = HPTS_TICKS_PER_SLOT; + toval = HPTS_USECS_PER_SLOT; } } else - toval = HPTS_TICKS_PER_SLOT; + toval = HPTS_USECS_PER_SLOT; (void)tcp_hpts_insert_diag(tp, HPTS_USEC_TO_SLOTS(toval), __LINE__, &diag); rack_log_hpts_diag(rack, cts, &diag, &tv); @@ -15368,7 +15368,7 @@ rack_init(struct tcpcb *tp, void **ptr) if (TSTMP_GT(qr.timer_pacing_to, us_cts)) tov = qr.timer_pacing_to - us_cts; else - tov = HPTS_TICKS_PER_SLOT; + tov = HPTS_USECS_PER_SLOT; } if (qr.timer_hpts_flags & PACE_TMR_MASK) { rack->r_ctl.rc_timer_exp = qr.timer_timer_exp; @@ -15376,7 +15376,7 @@ rack_init(struct tcpcb *tp, void **ptr) if (TSTMP_GT(qr.timer_timer_exp, us_cts)) tov = qr.timer_timer_exp - us_cts; else - tov = HPTS_TICKS_PER_SLOT; + tov = HPTS_USECS_PER_SLOT; } } rack_log_chg_info(tp, rack, 4, From nobody Fri Sep 5 18:50: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 4cJQQy1Xnjz66DlL; Fri, 05 Sep 2025 18:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQQy1LBRz3JN5; Fri, 05 Sep 2025 18:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098250; 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=LPIynVR+I7sETOdXb66hgC0kLnRikGasWwW9r7Nf8PM=; b=k2KTwtQATAJ0RmhKPybjEhI0UrYO7fKgHq55vU6Ahgz2kn6bo1nNwzBHgrnWFdS1blp813 M7y/2ZQsENK2ypU+77KIBCJoHTQa9MwvwXgQ6a3hebpPXzkeUXu4LWde8isEYNbyfIF9B+ dThVNDwte9VZG5q9s0vnHPldkluo4bPBCFrb0QQ0zV2g8SWSp5L+Yzgbcn4UIQwCcPcJ+4 YBkhByrc3GWUj8nBOXspXVdyuBRi1ETCT4aBZwRXJSzJPlAxQcPmz4GGESak4wGVPtuTiu 91WUx0NR0OtZYYekx94mRnPslsFN1p4DhN6hz2St54CKNG9X8VrSRHIIIv9yvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098250; 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=LPIynVR+I7sETOdXb66hgC0kLnRikGasWwW9r7Nf8PM=; b=DDwRR0C6PV6R4QsDfIJsr7KKQ/W2hX1Iz48lF8/Ywtn/i/VEjuiiNwJosgMOn6Cz2K8oT2 VJYtSnbbrSzXOFYBMqZfYxgEaa2opw263QXxsQ4TvqUNTF4bp9I3mciOiBwDNbU/n4Xhb4 9CFLUs+G9eG143hgNNX3BhgOXZzQZrOMphIFEMSCrQoFx+K5C7X+Vfc0TzewQaNuSOlnuO uO9Jb1cGGzKXFvoO9K35FDQa0tyuxfM9PRek+KD/F05G3ZF/c2ut2xOTUfKobNkTXii3aC Iz0mdykykQIs0mg9YjB0VF9dmF5gWw4eOTVhxrcErCKDywBeWWsUv6tbhFxkhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098250; a=rsa-sha256; cv=none; b=fWJ+nej0uH0hiMorPdB6jCOdSGZSjnZBR253dC0RM7sZ8xtypxrWOoV1Zs7uxALuPNVwgE Qk11CzIK/O61QSEu5iORrNEriU4541Hb1GZtb1rSGKBBgqPBClOp5i8LltZ4Ak0ueX0hX6 2WlwAKF9K72f3yAY/jyQqQqeca2+TTPAt7DGDBfZ20/on6tXYD8OWgpd9uq5meIPZcTu7l hjTP7velK5/U0G897NynMbpmuzuGKyqZmrPakq+iaqUsVzl0Y74pEmHs+96hsSXlY68FNH xAJnGXMHDJsygrjUIg9+cZXF1JDDO72RZg6wogKaRJO7WgWkH4GakUaIKK8ZPw== 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 4cJQQy0xZNz11Qq; Fri, 05 Sep 2025 18:50: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 585IooFS008546; Fri, 5 Sep 2025 18:50:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IooRD008543; Fri, 5 Sep 2025 18:50:50 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:50:50 GMT Message-Id: <202509051850.585IooRD008543@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: dd8b6e2ce3fd - stable/14 - sctp, tcp, udp: improve deferred computation of checksums 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: dd8b6e2ce3fd3f208a8199ae89143953d4e4800c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dd8b6e2ce3fd3f208a8199ae89143953d4e4800c commit dd8b6e2ce3fd3f208a8199ae89143953d4e4800c Author: Timo Völker AuthorDate: 2025-08-01 10:09:47 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:48:50 +0000 sctp, tcp, udp: improve deferred computation of checksums When the SCTP, TCP, or UDP implementation send a packet, it does not compute the corresponding checksum but defers that. The network layer will determine whether the network interface selected for the packet has the requested capability and computes the checksum in software, if the selected network interface doesn't have the requested capability. Do this not only for packets being sent by the local SCTP, TCP, and UDP stack, but also when forwarding packets. Furthermore, when such packets are delivered to a local SCTP, TCP, or UDP stack, do not compute or validate the checksum, since such packets never have been on the wire. This allows to support checksum offloading also in the case of local virtual machines or jails. Support for epair, vtnet, and tap interfaces will be added in separate commits. Reviewed by: kp, rgrimes, tuexen, manpages Differential Revision: https://reviews.freebsd.org/D51475 (cherry picked from commit bcb298fa9e23c1192c5707086a67d3b396186abc) --- share/man/man9/mbuf.9 | 32 +++++++++++++++++++++++--------- sys/netinet/ip_fastfwd.c | 22 ++++++++++++++++++++++ sys/netinet/sctp_input.c | 6 +++++- sys/netinet/tcp_input.c | 12 ++++++++++++ sys/netinet/udp_usrreq.c | 6 ++++++ sys/netinet6/ip6_fastfwd.c | 28 ++++++++++++++++++++++++++++ sys/netinet6/ip6_forward.c | 27 +++++++++++++++++++++++++++ sys/netinet6/sctp6_usrreq.c | 6 +++++- sys/netinet6/udp6_usrreq.c | 6 ++++++ sys/sys/mbuf.h | 17 ++++++++--------- 10 files changed, 142 insertions(+), 20 deletions(-) diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index c05505716a30..e4f30962ccab 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 29, 2025 +.Dd August 1, 2025 .Dt MBUF 9 .Os .\" @@ -1102,8 +1102,7 @@ of a packet contains two fields used for that purpose, .Vt int Va csum_flags and .Vt int Va csum_data . -The meaning of those fields depends on the direction a packet flows in, -and on whether the packet is fragmented. +The meaning of those fields depends on whether the packet is fragmented. Henceforth, .Va csum_flags or @@ -1117,14 +1116,14 @@ in the .Vt mbuf chain containing the packet. .Pp -On output, the computation of the checksum is delayed until the outgoing -interface has been determined for a packet. +When a packet is sent by SCTP, TCP, or UDP, the computation of the checksum +is delayed until the outgoing interface has been determined for a packet. The interface-specific field .Va ifnet.if_data.ifi_hwassist (see .Xr ifnet 9 ) -is consulted for the capabilities of the interface to assist in -computing checksums. +is consulted by IP for the capabilities of the network interface selected for +output to assist in computing checksums. The .Va csum_flags field of the packet header is set to indicate which actions the interface @@ -1163,8 +1162,8 @@ defined by the TCP and UDP specifications. In the case of SCTP, the checksum field will be initially set by the SCTP implementation to 0. .Pp -On input, an interface indicates the actions it has performed -on a packet by setting one or more of the following flags in +When a packet is received by an interface, it indicates the actions it has +performed on a packet by setting one or more of the following flags in .Va csum_flags associated with the packet: .Bl -tag -width ".Dv CSUM_IP_CHECKED" -offset indent @@ -1215,6 +1214,21 @@ is not relevant and in .Va csum_flags is not set, since SCTP does not use a pseudo header checksum. +.Pp +If IP delivers a packet with the flags +.Dv CSUM_SCTP , +.Dv CSUM_TCP , +or +.Dv CSUM_UDP +set in +.Va csum_flags +to a local SCTP, TCP, or UDP stack, the packet will be processed without +computing or validating the checksum, since the packet has not been on the +wire. +This can happen if the packet was handled by a virtual interface such as +.Xr tap 4 +or +.Xr epair 4 . .Sh STRESS TESTING When running a kernel compiled with the option .Dv MBUF_STRESS_TEST , diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 6d34ba4f5420..eb1dd5c3e17f 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -69,6 +69,7 @@ #include #include "opt_ipstealth.h" +#include "opt_sctp.h" #include #include @@ -102,6 +103,10 @@ #include +#if defined(SCTP) || defined(SCTP_SUPPORT) +#include +#endif + #define V_ipsendredirects VNET(ipsendredirects) static struct mbuf * @@ -462,6 +467,23 @@ passout: } else gw = (const struct sockaddr *)dst; + /* + * If TCP/UDP header still needs a valid checksum and interface will not + * calculate it for us, do it here. + */ + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & + ~nh->nh_ifp->if_hwassist)) { + in_delayed_cksum(m); + m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; + } +#if defined(SCTP) || defined(SCTP_SUPPORT) + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_IP_SCTP & + ~nh->nh_ifp->if_hwassist)) { + sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2)); + m->m_pkthdr.csum_flags &= ~CSUM_IP_SCTP; + } +#endif + /* Handle redirect case. */ redest.s_addr = 0; if (V_ipsendredirects && osrc.s_addr == ip->ip_src.s_addr && diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index dc31ffbc2161..5f637cc63df5 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -5780,7 +5780,11 @@ sctp_input_with_port(struct mbuf *i_pak, int off, uint16_t port) goto out; } ecn_bits = ip->ip_tos; - if (m->m_pkthdr.csum_flags & CSUM_SCTP_VALID) { + if (m->m_pkthdr.csum_flags & (CSUM_SCTP_VALID | CSUM_IP_SCTP)) { + /* + * Packet with CSUM_IP_SCTP were sent from local host using + * checksum offloading. Checksum not required. + */ SCTP_STAT_INCR(sctps_recvhwcrc); compute_crc = 0; } else { diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 32050d02d268..55164c1ac20f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -667,6 +667,12 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) th->th_sum = in6_cksum_pseudo(ip6, tlen, IPPROTO_TCP, m->m_pkthdr.csum_data); th->th_sum ^= 0xffff; + } else if (m->m_pkthdr.csum_flags & CSUM_IP6_TCP) { + /* + * Packet from local host (maybe from a VM). + * Checksum not required. + */ + th->th_sum = 0; } else th->th_sum = in6_cksum(m, IPPROTO_TCP, off0, tlen); if (th->th_sum) { @@ -727,6 +733,12 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) htonl(m->m_pkthdr.csum_data + tlen + IPPROTO_TCP)); th->th_sum ^= 0xffff; + } else if (m->m_pkthdr.csum_flags & CSUM_IP_TCP) { + /* + * Packet from local host (maybe from a VM). + * Checksum not required. + */ + th->th_sum = 0; } else { struct ipovly *ipov = (struct ipovly *)ip; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 653c42a84214..1ea44c45a390 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -562,6 +562,12 @@ udp_input(struct mbuf **mp, int *offp, int proto) ip->ip_dst.s_addr, htonl((u_short)len + m->m_pkthdr.csum_data + proto)); uh_sum ^= 0xffff; + } else if (m->m_pkthdr.csum_flags & CSUM_IP_UDP) { + /* + * Packet from local host (maybe from a VM). + * Checksum not required. + */ + uh_sum = 0; } else { char b[offsetof(struct ipovly, ih_src)]; struct ipovly *ipov = (struct ipovly *)ip; diff --git a/sys/netinet6/ip6_fastfwd.c b/sys/netinet6/ip6_fastfwd.c index 0ed313bd49a5..7139267722b7 100644 --- a/sys/netinet6/ip6_fastfwd.c +++ b/sys/netinet6/ip6_fastfwd.c @@ -27,6 +27,7 @@ #include #include "opt_inet6.h" #include "opt_ipstealth.h" +#include "opt_sctp.h" #include #include @@ -54,6 +55,10 @@ #include #include +#if defined(SCTP) || defined(SCTP_SUPPORT) +#include +#endif + static int ip6_findroute(struct nhop_object **pnh, const struct sockaddr_in6 *dst, struct mbuf *m) @@ -277,6 +282,29 @@ passout: ip6->ip6_hlim -= IPV6_HLIMDEC; } + /* + * If TCP/UDP header still needs a valid checksum and interface will not + * calculate it for us, do it here. + */ + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6 & + ~nh->nh_ifp->if_hwassist)) { + int offset = ip6_lasthdr(m, 0, IPPROTO_IPV6, NULL); + + if (offset < sizeof(struct ip6_hdr) || offset > m->m_pkthdr.len) + goto drop; + in6_delayed_cksum(m, m->m_pkthdr.len - offset, offset); + m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6; + } +#if defined(SCTP) || defined(SCTP_SUPPORT) + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_IP6_SCTP & + ~nh->nh_ifp->if_hwassist)) { + int offset = ip6_lasthdr(m, 0, IPPROTO_IPV6, NULL); + + sctp_delayed_cksum(m, offset); + m->m_pkthdr.csum_flags &= ~CSUM_IP6_SCTP; + } +#endif + m_clrprotoflags(m); /* Avoid confusing lower layers. */ IP_PROBE(send, NULL, NULL, ip6, nh->nh_ifp, NULL, ip6); diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index ad8c95c9363c..f6c09b0ac7bc 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -75,6 +75,10 @@ #include +#if defined(SCTP) || defined(SCTP_SUPPORT) +#include +#endif + /* * Forward a packet. If some error occurs return the sender * an icmp packet. Note we can't always generate a meaningful @@ -389,6 +393,29 @@ pass: goto bad; } + /* + * If TCP/UDP header still needs a valid checksum and interface will not + * calculate it for us, do it here. + */ + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6 & + ~nh->nh_ifp->if_hwassist)) { + int offset = ip6_lasthdr(m, 0, IPPROTO_IPV6, NULL); + + if (offset < sizeof(struct ip6_hdr) || offset > m->m_pkthdr.len) + goto bad; + in6_delayed_cksum(m, m->m_pkthdr.len - offset, offset); + m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6; + } +#if defined(SCTP) || defined(SCTP_SUPPORT) + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_IP6_SCTP & + ~nh->nh_ifp->if_hwassist)) { + int offset = ip6_lasthdr(m, 0, IPPROTO_IPV6, NULL); + + sctp_delayed_cksum(m, offset); + m->m_pkthdr.csum_flags &= ~CSUM_IP6_SCTP; + } +#endif + /* Currently LLE layer stores embedded IPv6 addresses */ if (IN6_IS_SCOPE_LINKLOCAL(&dst.sin6_addr)) { in6_set_unicast_scopeid(&dst.sin6_addr, dst.sin6_scope_id); diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 0d59209ceedd..c27ad59b0480 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -139,7 +139,11 @@ sctp6_input_with_port(struct mbuf **i_pak, int *offp, uint16_t port) goto out; } ecn_bits = IPV6_TRAFFIC_CLASS(ip6); - if (m->m_pkthdr.csum_flags & CSUM_SCTP_VALID) { + if (m->m_pkthdr.csum_flags & (CSUM_SCTP_VALID | CSUM_IP6_SCTP)) { + /* + * Packet with CSUM_IP6_SCTP were sent from local host using + * checksum offloading. Checksum not required. + */ SCTP_STAT_INCR(sctps_recvhwcrc); compute_crc = 0; } else { diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 736f2da5c0ad..4622556adcfa 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -426,6 +426,12 @@ udp6_input(struct mbuf **mp, int *offp, int proto) uh_sum = in6_cksum_pseudo(ip6, ulen, nxt, m->m_pkthdr.csum_data); uh_sum ^= 0xffff; + } else if (m->m_pkthdr.csum_flags & CSUM_IP6_UDP) { + /* + * Packet from local host (maybe from a VM). + * Checksum not required. + */ + uh_sum = 0; } else uh_sum = in6_cksum_partial(m, nxt, off, plen, ulen); diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 41da07fa77f9..6966e03cc319 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -642,16 +642,15 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) /* * Flags indicating checksum, segmentation and other offload work to be - * done, or already done, by hardware or lower layers. It is split into - * separate inbound and outbound flags. + * done, or already done, by hardware or lower layers. * - * Outbound flags that are set by upper protocol layers requesting lower + * Flags that are set by upper protocol layers requesting lower * layers, or ideally the hardware, to perform these offloading tasks. - * For outbound packets this field and its flags can be directly tested - * against ifnet if_hwassist. Note that the outbound and the inbound flags do - * not collide right now but they could be allowed to (as long as the flags are - * scrubbed appropriately when the direction of an mbuf changes). CSUM_BITS - * would also have to split into CSUM_BITS_TX and CSUM_BITS_RX. + * Before passing packets to a network interface this field and its flags can + * be directly tested against ifnet if_hwassist. Note that the flags + * CSUM_IP_SCTP, CSUM_IP_TCP, and CSUM_IP_UDP can appear on input processing + * of SCTP, TCP, and UDP. In such a case the checksum will not be computed or + * validated by SCTP, TCP, or TCP, since the packet has not been on the wire. * * CSUM_INNER_ is the same as CSUM_ but it applies to the inner frame. * The CSUM_ENCAP_ bits identify the outer encapsulation. @@ -680,7 +679,7 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) #define CSUM_ENCAP_VXLAN 0x00040000 /* VXLAN outer encapsulation */ #define CSUM_ENCAP_RSVD1 0x00080000 -/* Inbound checksum support where the checksum was verified by hardware. */ +/* Flags used to indicate that the checksum was verified by hardware. */ #define CSUM_INNER_L3_CALC 0x00100000 #define CSUM_INNER_L3_VALID 0x00200000 #define CSUM_INNER_L4_CALC 0x00400000 From nobody Fri Sep 5 18:51: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 4cJQRt2P8Bz66Dty; Fri, 05 Sep 2025 18:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQRt1wN3z3Jmy; Fri, 05 Sep 2025 18:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098298; 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=zpg5YyZNsSGHjMCLA82UWxKvfExCqVrIxsPTj+mcces=; b=N24acqmvD/n2VQFJzVERHYnbayD+XfUtV2JhpVcgIjcNiiK+XxZmC+RxDvz0YmiLqqDQfJ qhFJkAmH8FlR+VL8ZFnXDqMneZV0MeSYMpGyA7QXrte2D/hx4xAO2mQJGNOSVT/2Q5Rt3P bmglVnsaJg8hXGR+lCf9CUTXocmTvJJ37ETxjVEQpJimAEtEf8YKZjMjnDx51h/98E6Rmv mvYNGQ8JGdDekd0dhlEzMq2R7iQCCe6jyHQfUA8NCf8qWG6l6VPChyLEtRx3B6isHY81Q2 Nx7bq9Zoz6U1HzoQxWnHQqtYWE6FkMN1Gop8zZf0rM2WRBO8LSk/rbUf8oVNwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098298; 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=zpg5YyZNsSGHjMCLA82UWxKvfExCqVrIxsPTj+mcces=; b=ytTqTH4Oz9gv6VYN/rUPalTz3EcV9OgI9DrU5MwJeRNgkomDCPf/fotc4EVvRY5N4oULJg G69v5hka/E5urLDeAsyEIkRwnCwimiK5t+eFYU72hPvPwxPG0hfG35huUw7R9xUK9VLgx9 789wiq3nv7wP+HWXco5HpqbiMow35p+GYj7RBS/1/U8l2jGRJM3hSzf2eT8ZlfMLqmEs3/ bBunS9D2qLegcP15olqUqGQCQBS7qTV4Sr1lJbz+i3R/iRWROPlleDIfWEG3isc5tG8zaB xkn6CLUJH3Qf4xTtA6szl25aWZgIjEMy2G6kBrD0HbSZ4lVoyQohokbHqTzKug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098298; a=rsa-sha256; cv=none; b=BAdoHuObz+YGGjfS04slnI5MBMojbqZsYRAEnAmtvnGm5yamZRPvXEeF15q/3wQsfXzIMp sspPO2FucnQlMf1E1CV3LKzhz19n/DnrKdRBWAX7a3KjC5G+uttWgiVLyDzb0Q+ztzlxxu kHky2GjaAj/mB18fvyfgVp53zMyuILRydCOk774hEOCnPcVyZgUrVXFbs4RH+T6HniUojy LWLoAm8GN9jfowB4mh9sEMwh84wC9ndWTr9Ph6Eo3LVMv+qMEZ8vIxoIyq3DVK18y/8p2u 0+ChCnU22eIFm3LWWw18tVHLkzeefebrTx0HXocqCR8TgA/HTSVkX5N8+vUgkQ== 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 4cJQRt1Ts1z11RG; Fri, 05 Sep 2025 18:51: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 585Ipc3Y014555; Fri, 5 Sep 2025 18:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IpcFq014552; Fri, 5 Sep 2025 18:51:38 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:51:38 GMT Message-Id: <202509051851.585IpcFq014552@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: 163e06ec64ea - stable/14 - tcp: Fix wrap around comparison bug 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: 163e06ec64eacedacacbbd99fa6088a9968ed337 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=163e06ec64eacedacacbbd99fa6088a9968ed337 commit 163e06ec64eacedacacbbd99fa6088a9968ed337 Author: Nick Banks AuthorDate: 2025-08-01 21:21:42 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:51:10 +0000 tcp: Fix wrap around comparison bug The variables p_curtick and p_lasttick are not in usecs. Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 79059e0ec9b1d3273ce32fdd028802fcad4b85ab) --- sys/netinet/tcp_hpts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 2a8746167c6d..f91fe0a640f6 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1116,8 +1116,7 @@ again: hpts->p_wheel_complete = 0; HPTS_MTX_ASSERT(hpts); slots_to_run = hpts_slots_diff(hpts->p_prev_slot, hpts->p_cur_slot); - if (((hpts->p_curtick - hpts->p_lasttick) > - ((NUM_OF_HPTSI_SLOTS-1) * HPTS_USECS_PER_SLOT)) && + if (((hpts->p_curtick - hpts->p_lasttick) > (NUM_OF_HPTSI_SLOTS - 1)) && (hpts->p_on_queue_cnt != 0)) { /* * Wheel wrap is occuring, basically we From nobody Fri Sep 5 18:52: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 4cJQSp5ZMkz66FFj; Fri, 05 Sep 2025 18:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQSn0mvXz3K0t; Fri, 05 Sep 2025 18:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098345; 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=I3+7qn0aQhs73nxnPylh2FBy324+Lz19b3tKySrwET4=; b=VPIKUIInmEV/NhWOEALdFl4R+poBbsBmHQtWa8Bxv35dpWVvgcYBr2fSII5irMJ5VTN6w4 7i9Ptsj3d/nE8dkQd2O8RXSrYA+CsUI68/rG1sRG1YomfJir+HBdwI9yckupyRGiW+mg8r mYjj+bqGVqpZ4eS87yz5vyc3m8ONUMvjNtoTi/JXiXGc8Q1pDuUvcTlNLPP06rG4MOfBbf vDRLAIpNbDStZilPhuHPj8nOF6BBpJAJm4Cse51PC0yq2//CqM/0UrnbqVqIzh2Yv+l5sM BZBo7KWEt9VytjKtYUUWiAcJCEX6apl78aehlee9HbvZS2hVHr3RNA4UlQVlhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098345; 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=I3+7qn0aQhs73nxnPylh2FBy324+Lz19b3tKySrwET4=; b=l55X0tk+/TkviWvWi8viswUudnGWtVkEu9vxvgIv+ofAHjUhcCFD2bLErQdzWWXuH+HiR1 ViUeVSmaOstNN0x5zF8lwPmIFVqxinc3ONE8ASn5tmLdjm5C1l/0YxW4VBGFmxUhmt/bi+ Rc2AqdKJJ1t4SWWN2u69wJNX5QErVRIW8FFbFzC7xBd0+9bDkseyYnSmmD5zLAMu9eDwFI OLx/gRJ4fERwuXy2EpE30F7spU+Li4MjTJlB67OtOihkWWsO2UDRjeg9cGNimY9YbqLifr yFr0gmaKM5SejgxdiH37VSJPgIFOXnr33KFK9bGNqIfjCw9xHU4LMU9gHcWXqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098345; a=rsa-sha256; cv=none; b=m4s8mOtdxJqPRa6tvUWKdjhyy0OZhL2W0FBkBKWgwxRAYdq/zBkLR4XnsGWpqiJMQ2GTiQ /od04rqxmyzp5NgmjtSLmgTb+MQgvX/tBZdbeOcA1ccx3aX2hJZ4Uj6Q+jSdUJw+skLMQC sLp1n9IzRVXLnJGnsf051PnP5a4547BGFJ21EGSg3+7Cz+9dhiqJF1WbM4EAtXrQSSEJxu /mgi6ZkEBANrbVJvNdDZQ4sjZUm8cqqDQ7m/vAvu2YEHnbaFoi5vXe/ZoEafG3YDDP7Asl 8ddvOuLsYSaleGdp3u/98O1kJFq0MZHLHWEEgJCO6xtP3ryyPUVd4WfiUZ9faw== 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 4cJQSn0KxMz118B; Fri, 05 Sep 2025 18:52: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 585IqOfv016208; Fri, 5 Sep 2025 18:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IqOfL016205; Fri, 5 Sep 2025 18:52:24 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:52:24 GMT Message-Id: <202509051852.585IqOfL016205@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: 2871bc271ec1 - stable/14 - rack, bbr: minor cleanup 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: 2871bc271ec17125dce0d35b8bf76f679d99d18d Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2871bc271ec17125dce0d35b8bf76f679d99d18d commit 2871bc271ec17125dce0d35b8bf76f679d99d18d Author: Michael Tuexen AuthorDate: 2025-08-06 10:24:54 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:52:00 +0000 rack, bbr: minor cleanup No functional change intended. Reviewed by: Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51734 (cherry picked from commit 717bbade24857fd52724e9bb5ffdcfa0310f0a48) --- sys/netinet/tcp_stacks/rack_bbr_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index e5ccc7ebb236..d39ededc99d1 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -509,11 +509,9 @@ void ctf_do_dropwithreset(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, int32_t rstreason, int32_t tlen) { - if (tp != NULL) { - tcp_dropwithreset(m, th, tp, tlen, rstreason); + tcp_dropwithreset(m, th, tp, tlen, rstreason); + if (tp != NULL) INP_WUNLOCK(tptoinpcb(tp)); - } else - tcp_dropwithreset(m, th, NULL, tlen, rstreason); } void From nobody Fri Sep 5 18:55: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 4cJQXh5wSkz66F1s; Fri, 05 Sep 2025 18:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQXh5K1Fz3Kbm; Fri, 05 Sep 2025 18:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098548; 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=PfkZrh9IiSd/RJH+FEL6PVsan7mT7ffW925e3mPZTII=; b=oopbI6IZyKMVXvPe/N63JMEZa3zrdAlpL0kfxFva59VCTGCWchbjGSRxqptOIG3lqaPQrE 2EMx1Nth1l9qr4SoFsHLl2kGexKajkcuzFz161i/QYLAq9U4a4G9f1DvZ1QptTBmbTZu5k ZqAC4XajVe2pQBkr/dQGVECi5EyuKcPKowww1/aQuVoTsmG6hOpZ0C1jUFiwFhWmPWwh+N STIx62PQ8X2nJ4HR8STc9Gd3KrajCpDkTh4AoovRgSIWaCa7nzyM4owXzJXZcHcfBFPbhp AOUpDLLjahniprVkC3KMQKbu4yLOxeSq6rKKBQyaOCr/KxBA1+9mwyOgnOlu4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098548; 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=PfkZrh9IiSd/RJH+FEL6PVsan7mT7ffW925e3mPZTII=; b=fAcK/yo/YGEdRd9Ad4NzLHbD5ix1BG3AppxQZ3u/BHQPAvxnkjkzzUrhGlBXBk/LhfcMvV S7i/SX7OFmC46Ucsyru/wu8LDG4uBvczhhGTW+uQ9Z8J9Seb0T6NQHraKjhjQ6S37j9Lyf yit15rvNyJPZyJ2ZG9MpveoQlHSK9TlkZ/JvzlLlwev3GMKZ+ulxU0GffHzzbBnAT9BTPy d3tK6e0PBDLmHvTVjkCJ8irzhBG3lD9TspP4tnFlji3uOwdyfZvexRRzKaE32u2QfYS9bI 0GzuTS1YL5kGz5TAaLk14YGjp77BwrDJmy4HhN/ldQmp0wqShkgHCHLR71GOGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098548; a=rsa-sha256; cv=none; b=Wf4xTKwNRJHhv6tKlbEvmQTsHnd+aCI+IJB9jseBhwnJ9p8C+loEx0sZn4QbMNYb0Dzt3y 2umAl5KLGL0+OqMfzA/CKe/XxPtZPNhMU6PuWLtuXWR3iHgQV/z2/Df1jOnabfz21H5Y78 RQcE4Piw8L+VQ3dSZ4l/fImvnXAbnEqB9smGWgwBxeqF/0ZBQegLzW0IOQTU8g/1tBf3Ly sp8FAlWV+Nyw3sp0MrcLfW/p1ps9Y9MTWmiq5ensaYok3C/ZrGFgbXBf74GMf5GMdVTJ1Y Mh+PaeO5YejLuSIvdmAzcpJTw2IDyfVsNgjw07u3JRw/NWny+1lFYG9UChoXBQ== 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 4cJQXh4Xccz118C; Fri, 05 Sep 2025 18:55: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 585ItmAs017317; Fri, 5 Sep 2025 18:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585ItmcG017314; Fri, 5 Sep 2025 18:55:48 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:55:48 GMT Message-Id: <202509051855.585ItmcG017314@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: 63803f20f90d - stable/14 - tcp sack: improve computation of delivered_data 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: 63803f20f90df2afe84932e2a8e6e7556e246004 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=63803f20f90df2afe84932e2a8e6e7556e246004 commit 63803f20f90df2afe84932e2a8e6e7556e246004 Author: Michael Tuexen AuthorDate: 2025-08-06 10:33:17 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:54:21 +0000 tcp sack: improve computation of delivered_data delivered_data is the number of bytes, which have newly been delivered to the peer. This includes the number of bytes cumulatively acknowledged and selectively acknowledged. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51718 (cherry picked from commit 0950ab7d76951ea8e65f25a68511dc809339e802) --- sys/netinet/tcp_sack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index cc02263512da..2672a868ba98 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -570,6 +570,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) */ if (SEQ_LT(tp->snd_una, th_ack) && !TAILQ_EMPTY(&tp->snd_holes)) { left_edge_delta = th_ack - tp->snd_una; + delivered_data += left_edge_delta; sack_blocks[num_sack_blks].start = tp->snd_una; sack_blocks[num_sack_blks++].end = th_ack; /* @@ -577,7 +578,6 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) * due to DSACK blocks */ if (SEQ_LT(tp->snd_fack, th_ack)) { - delivered_data += th_ack - tp->snd_una; tp->snd_fack = th_ack; sack_changed = SACK_CHANGE; } From nobody Fri Sep 5 18: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 4cJQZ23KTGz66FNG; Fri, 05 Sep 2025 18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQZ22fQlz3Kyy; Fri, 05 Sep 2025 18: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=1757098618; 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=oZM+gVWtL2TJVEwjPqVhV86QjFKS+jLFEugZ/14BUyY=; b=jyWJRgVOcB2vOgo1xc43nNRiWGsrvn4a1HLPdGiI310C1KOez0ZGGdwaQ2yiR1dsK9bgpR JvIGrT0Kg+IwpDPuE3sFj7pTeJYrsAkPV+J5A30sfeSan/SpJnSdb5eQvwgxSp5iw19iab SXY3SbfqmxyWaFhwd4LKy0LUYf9VekWdEhD+iJAErvjcUzTAjkrsBrTIPHaNLYhx7ec0Wq hzVr2WfsAnpxnHtb/OwXbbjDSg5BUDAlySXCPzWw1iEFtzwsaCZr+BWPd200EpVUhCUdkf mOrcGs2/xT/Wzg3n1GZNNRTDJfe0hKIVpFhkaC/3QZjQMeLOv2ImLpTaMsNMXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098618; 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=oZM+gVWtL2TJVEwjPqVhV86QjFKS+jLFEugZ/14BUyY=; b=ifxHxt9wIdUF5l/+P7ISK591QJzJrgJxlfdkuG9/0ISwLO3qrG9pIa9jiaY0Y2mEXhXgEl 1qzy5utzMM5nNPxu6a4HKLytChYb52lNUZVn4GFGBmULjJPQQa+axTkUVnjZgwHRwjg2Md gHBkjfuMwM43UfUDp6oGSdxvipw0q95qfULqmh9ZQvHv9fPi3f4PXcClgHJrHBB4bPBk7H LdsC+eoD7e1CbWRFi5ThIV4aR9PNj78FbAG55tNrn0Cjd6l8iIkL+Z0dGdFxiDbNzI2XNq vwcC7yf/uIbT80m3HnN4jyMKqaEh1vLJzV2ywNPinhPkS5SqN7SXqHSj0PCCLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098618; a=rsa-sha256; cv=none; b=hOC/oSqDBtjHs6kCLCoUhd5bvp+aMJJ573sEHaUwvKaAzeRfk1Krp8WgLd61XpLeHYSVHa gJ/OeEkf3/bBG32ug8IKG4gHAQXVbJY4p7aLB8bI/gx7CrP9bRa44UbpsvhiKVc0XUAx+f +h32V365hgG/pLbuLK5hBUy257RmDY+HndC1BEyaYM/83bI5cUSGolyYq0PMo30VyZ5oB0 Su69TO1iKB1WoYVo1Hb4YRMSaoxNubzjQHlZ/KjB55FwUbPJjI36IZhfJGhCreNBflTrol HCEsN43we1vU4+4fbcNyGJ15/ECgHfADGfobU/EKHGBOSRCIaheMwowS5EARgQ== 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 4cJQZ22F4Fz11dQ; Fri, 05 Sep 2025 18: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 585IuwGc017778; Fri, 5 Sep 2025 18: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 585IuwPU017775; Fri, 5 Sep 2025 18:56:58 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:56:58 GMT Message-Id: <202509051856.585IuwPU017775@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: 125056694075 - stable/14 - tcp : remove assignment 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: 125056694075a6b7c34e70c7a1ef89bf7255d6c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=125056694075a6b7c34e70c7a1ef89bf7255d6c9 commit 125056694075a6b7c34e70c7a1ef89bf7255d6c9 Author: Michael Tuexen AuthorDate: 2025-08-07 20:14:08 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:56:10 +0000 tcp : remove assignment without effect rstreason is only relevant in the code paths with the label 'dropwithreset', but not in the one with the label 'drop'. No functional change intended. Reviewed by: Nick Banks, rrs, Peter Lei, imp Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51814 (cherry picked from commit b6521ceaf2771fe6b3f4ae7e7eb390312e3a678a) --- sys/netinet/tcp_input.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 55164c1ac20f..18b489f2e605 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2231,7 +2231,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, SEQ_LT(th->th_seq, tp->last_ack_sent + tp->rcv_wnd)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); tp = tcp_drop(tp, ECONNRESET); - rstreason = BANDLIM_UNLIMITED; } else { tcp_ecn_input_syn_sent(tp, thflags, iptos); tcp_send_challenge_ack(tp, th, m); From nobody Fri Sep 5 18:57: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 4cJQZh0lBmz66Dmk; Fri, 05 Sep 2025 18:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQZg6yl3z3LPR; Fri, 05 Sep 2025 18:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098652; 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=cPwwM1Bjqp9Y/wxj0j0tfG73TBmOtvzHJxk6WzeqXzw=; b=X6Ask9YbBRQv1OdPxQIYo/+SGc2unEfIjtX8Et3GNeZbtiUSEn/9fLYMtKN9R5frleze8P 13gjSkAdL1pu/PSXUzR89UNz1lLeS0DIy9u67Ch8yNj42Hcq1DmhSZiQ07WHSBMgOA0g+G OaW/c5azuoq3sXDzqe1NjD4+rI8h9+231xcHP3+enw4M/mnfj/mu5iO5d91h4rVPatB+Y5 mrs1NgnOoZFJjGIyQLk5CSgtUGsfbhrO0D/m/pYZ7imVQAWQSpN0qMsj9nGmyaW1cBrLva vEMzt2s0Wt2NO5ScgtBgmceZX3ZeggYjDaKAAgtBAzvgM60H0XgpBfYvdpZfPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098652; 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=cPwwM1Bjqp9Y/wxj0j0tfG73TBmOtvzHJxk6WzeqXzw=; b=BrR1nKMZXKyIktBs1v4FIPrLdz3kpmEmuLZsisy+wXfh/oVeFAaas11y5Gn6dU75NMZpYA GVnrk2f8aT7BmEpjhH8D2GUQuswJ/5+bQ0a6eJumb92RtfDO86ukw+E9liPrqZNPj/YjHi hDuxxyFDxWeVNtBP7VwxZ/ifyWk2ORPBoiHMy/ixu3zjoqlJDY4wZtEP2diWSNbD3oqhGW nhPNjX41qAQjY16zfovBwKSMzWr4DMQxyUN2/0cLmFXImoNvytgcsGPDvy4YemrHponpVE cHjQGFdReKenaPOOFvsPlJkzOjngq464YHBl+oWnOd3WgWwTYB4bJ/2yQ5BIEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098652; a=rsa-sha256; cv=none; b=txt9FaCYh2bAc77b3pdVBpoKBZDWgDIQNnHKCr7KEbv1p9KX7/MAIb79kekRkhEX5RV8tx 84tWGBkFPwg/C26WXx3uMNd9jWmbr+w+3fezMQ2wcq0wxYiWd14q1eXi4ChrxPTiVHSWNh mWC3M9Sy1YKgvVxrOUeRgKAenUlBNlbqeMBax3uKjBdXCWv5cCveZhaB1jnV3OaKMoTwym u+UaOg8Lf1LYi3ooYUNdeJb55svbSrNjkI7Y+fDD8WYjJ8e4UQLzEnWgx98qB5nKw1tWOZ vbQ+uEv8GsvX3NaRj1X4bMBCwKRm1Joi5x6mJrLy38eP5kmof2HW4wAkrWPVmQ== 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 4cJQZg6MMxz11Jp; Fri, 05 Sep 2025 18:57: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 585IvVgA018042; Fri, 5 Sep 2025 18:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IvVeV018038; Fri, 5 Sep 2025 18:57:31 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:57:31 GMT Message-Id: <202509051857.585IvVeV018038@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: e7331da314b5 - stable/14 - tcp: rate limit the sending of all RST segments 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: e7331da314b57c39cf5c3fb5f20a2963b2485ce6 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e7331da314b57c39cf5c3fb5f20a2963b2485ce6 commit e7331da314b57c39cf5c3fb5f20a2963b2485ce6 Author: Michael Tuexen AuthorDate: 2025-08-07 20:23:54 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:57:10 +0000 tcp: rate limit the sending of all RST segments Also rate limit the sending of RST segments in the following cases: * when receiving data on a closed socket. * when a socket can not be created at the end of the handshake and the sysctl-variable net.inet.tcp.syncache.rst_on_sock_fail is 1. * when an ACK segment is received in SYN SENT state and it does not acknowledge the SYN segment. After this change, there is no need anymore to provide a rstreason to tcp_dropwithreset(), since it is always BANDLIM_TCP_RST. This will be a follow-up commit, since it will change the code in a couple of places, but will not change the functionality. Reviewed by: rrs, Nick Banks, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51815 (cherry picked from commit 2eb786d96e97a953d0256d1d622c4853964be2dc) --- sys/netinet/tcp_input.c | 6 +++--- sys/netinet/tcp_stacks/bbr.c | 4 ++-- sys/netinet/tcp_stacks/rack.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 18b489f2e605..93d2e94bcff0 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1151,7 +1151,7 @@ tfo_socket_result: V_tcp_sc_rst_sock_fail ? "sending RST" : "try again"); if (V_tcp_sc_rst_sock_fail) { - rstreason = BANDLIM_UNLIMITED; + rstreason = BANDLIM_TCP_RST; goto dropwithreset; } else goto dropunlock; @@ -1598,7 +1598,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ if ((tp->t_state == TCPS_SYN_SENT) && (thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { - rstreason = BANDLIM_UNLIMITED; + rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -2359,7 +2359,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); TCPSTAT_INC(tcps_rcvafterclose); - rstreason = BANDLIM_UNLIMITED; + rstreason = BANDLIM_TCP_RST; goto dropwithreset; } diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 65230bbd953f..c1053e90d6da 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7852,7 +7852,7 @@ nothing_left: /* tcp_close will kill the inp pre-log the Reset */ tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); - ctf_do_dropwithreset(m, tp, th, BANDLIM_UNLIMITED, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); BBR_STAT_INC(bbr_dropped_af_data); return (1); } @@ -9394,7 +9394,7 @@ close_now: tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); KMOD_TCPSTAT_INC(tcps_rcvafterclose); - ctf_do_dropwithreset(m, tp, th, BANDLIM_UNLIMITED, (*tlen)); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, (*tlen)); return (1); } if (sbavail(&so->so_snd) == 0) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 10fc55bb2088..9a4ec0546b95 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -12428,7 +12428,7 @@ rack_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so, /* tcp_close will kill the inp pre-log the Reset */ tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); - ctf_do_dropwithreset(m, tp, th, BANDLIM_UNLIMITED, tlen); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); return (1); } } @@ -13899,7 +13899,7 @@ rack_check_data_after_close(struct mbuf *m, tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); KMOD_TCPSTAT_INC(tcps_rcvafterclose); - ctf_do_dropwithreset(m, tp, th, BANDLIM_UNLIMITED, (*tlen)); + ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, (*tlen)); return (1); } if (sbavail(&so->so_snd) == 0) From nobody Fri Sep 5 18:58: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 4cJQbZ4vT2z66FN2; Fri, 05 Sep 2025 18:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQbZ2YK5z3Lhj; Fri, 05 Sep 2025 18:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098698; 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=bfK/ACvrAFyFHj/MZaABogeJHOT58ZPoIQ2Wy2Vf2y4=; b=XkboO2RYmnu3tAbIyQ8ZU8vJE9Lzai0Yf4S343U4q2iEBCHlyXmSnWsbQ4cY8xa7XKnGQ/ nRS1mxRICUIT2o02FQDpdavNLcES/22XyVj5d6tabID4kvjwyJfzTYH7KZ89r1VGfQX0Ru VFxNbJ5H5GZQAT0nk519+xkrLLQxIKsFnqLpKGNEZ99v62zu9CRfEYNVM7Fad657kwT4S+ WfHRVDWNKkShwLT8v7lr04mt3jNVg+QpAJ+qi1mMrI3UHmUtuR5yX6gZel8obiwLUN2YIX 2I0v+uZdQKZhj+x+rS2kuvayPygbmeDs3fKX975LJaI0RFoRwhecKxWok+qBgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098698; 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=bfK/ACvrAFyFHj/MZaABogeJHOT58ZPoIQ2Wy2Vf2y4=; b=ymORzS22H5RwQYvaHX065tOaxrHVBtGMOD+MBbc9XK5lhGpd6cDBkmTuWbelro+G5qYRsu kotG/nGtRR0Kvnw7ckNDubZeScaNANP9JfFDy0rmN+jbZLw3DDsYayLMNSn5rCjCBqB5hu 0q1QeNpl3Sw86iY2w+5XWj+ohTqPPQvoFaMlb8Yze5+RdPXW/X4asIF6kTXQ6oi26OCGWd whux/bRrYRKsNDeK16sWB37qeAsIoeaAgtRbaI617kRkT4vXu+rrUqU30gSyRDONlDl/NV RegZSbs6BWXKAO4og18TuPypfbG6ArAIYJsCB0tov0IIT97UO5qQGTkGBUcyUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098698; a=rsa-sha256; cv=none; b=hoy7QpgVh/2KdReY46dmFN2HWwL/0llIA78v30F8uOutqgfhC9rCNlUkw0/HZG47nUiinS 0CNYPdiWNzQXPkpzb3+iXYpmAvTUv66qMtB1dK5YYmEDQ6CuamkEoyBg0g8aGc204R0HTy 93PZTlwjqMCTqEbI1wiGgygIrNoxomHZxQLrAIjsAG0DJYO9AmWjJHqmI4omrjpx2S6pYs 2vAKp0+ybb4EwAgZ53PYWwK0hN02SBjtKb/TUiCIa6kHB9hwhd70XT2xmtcqQdnlhuSRfW vOty3cHMkkZv6b1+R8gHQbQBS49BGeh97fCMnQ/yM9RtTmBUwt4KM+DisvxULw== 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 4cJQbZ27Prz11fS; Fri, 05 Sep 2025 18:58: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 585IwIQn018389; Fri, 5 Sep 2025 18:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IwIcv018384; Fri, 5 Sep 2025 18:58:18 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:58:18 GMT Message-Id: <202509051858.585IwIcv018384@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: d1ab6d36aeb2 - stable/14 - tcp: mitigate a side channel for detection of TCP connections 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: d1ab6d36aeb21091f7a442ca78aa2ca9a8941875 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ab6d36aeb21091f7a442ca78aa2ca9a8941875 commit d1ab6d36aeb21091f7a442ca78aa2ca9a8941875 Author: Michael Tuexen AuthorDate: 2025-08-09 12:17:38 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:57:52 +0000 tcp: mitigate a side channel for detection of TCP connections If a blind attacker wants to guess by sending ACK segments if there exists a TCP connection , this might trigger a challenge ACK on an existing TCP connection. To make this hit non-observable for the attacker, also increment the global counter, which would have been incremented if it would have been a non-hit. This issue was reported as issue number 11 in Keyu Man et al.: SCAD: Towards a Universal and Automated Network Side-Channel Vulnerability Detection Reviewed by: Nick Banks, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51724 (cherry picked from commit f0f6e50388963cae44bb92bb69ed7a1135dd2eec) --- sys/netinet/tcp_subr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index d17b46d13038..6a9a4635cee7 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -85,6 +85,7 @@ #include #include #include +#include #ifdef INET6 #include #include @@ -2230,6 +2231,13 @@ tcp_send_challenge_ack(struct tcpcb *tp, struct tcphdr *th, struct mbuf *m) sbintime_t now; bool send_challenge_ack; + /* + * The sending of a challenge ACK could be triggered by a blind attacker + * to detect an existing TCP connection. To mitigate that, increment + * also the global counter which would be incremented if the attacker + * would have guessed wrongly. + */ + (void)badport_bandlim(BANDLIM_TCP_RST); if (V_tcp_ack_war_time_window == 0 || V_tcp_ack_war_cnt == 0) { /* ACK war protection is disabled. */ send_challenge_ack = true; From nobody Fri Sep 5 18:58: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 4cJQcM279fz66FKP; Fri, 05 Sep 2025 18:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQcM1ZN3z3Lp0; Fri, 05 Sep 2025 18:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098739; 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=2ee43QeMncXvMD69EzMlHpzMZ4scyT/WqJY6Ec1hP48=; b=ftSWdGc8EKNera3Y6cr9T36KlaiIF4EoFKuNCifkeaLJxxKvV67edB5lLStz4tuVs/95e9 i+96g9QOXjJpjNPbokqv5xbYyGmjCgezOvskk1Xb/Id5mbxzme70C0Z41ARnUV5jgXUH+Y W5KR12MT6k2851qc4Idg3aBweYkY/9fd+Re3NTYjBdy+M0GhwG75jjdNfnixAvHUunaEWt CF2nK8bXrT5xOdbEj5vSzdXBew3jCj2y8tbe7m+XFZnresDhZvGYUsS2iian+22+gycbaG 1sjqQGXylSNQ/p50D68iI6dhzHjyUZgWecOq0D/I6buLoEYQ6Z7BFnJZZyDjTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098739; 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=2ee43QeMncXvMD69EzMlHpzMZ4scyT/WqJY6Ec1hP48=; b=Ks24zgDMMyB6af5RWevnII2zTWnTXM7gDG5WyuSfD0B0HX9BZ2TJnaMWtN50rv7Ai+i5tC GWNEydWkPwwWezVN0CXMJ95sWvw4Im93LYCWfwIoN+dgkHU2zX6Fsvoc4C5wQsirMqmHG5 lye3dK4PsNXTk1VllUilGCP3mX5uLTcS2RZDJPpqbajBaS2VfsL3YrUDvar22C7Nq/Ppkc 7srMkBK6H5ZouG22v5fWJs2+vUvMNOlS1vNpbll7fW5FvcR2l62M9kdR7x7xGl9ddmXn8S c+JISTfUOwUg9ZP8YWrtADVVlu30H+zkqZCDbMTGs1IaKRxyDW4Ww97+TKl1wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098739; a=rsa-sha256; cv=none; b=m/kB/f4SrI67t2HCvGpklV3OgaFhf1beUMRDHX6Xfdr1thsnwomUeGQmE+06p9K56wpD8b KR+jBoeExGgceqmzRjZR+zFPLnbpFAx92K+c2F67qxpEHwgs0w72JSYL4FZJusswL/ILST incOfZ3aiDn7bb63JHvrH0/xjnqjyLGS36f2JlhuTJymtQ/EqApmnMcJehsvoHlsRLqSGf Rn7mIL8AKwMp/YLBZ8BmD9FaJcSdXW41YddVE4VmxV5pBZVokzeMlnAsLsc7qjtmUsRDhW famSJaXN5h/sRQ52UUeJYxg5B4sC1CKEtLuOfhdV1cdCKm4PGWwlxgt08+s+1Q== 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 4cJQcM16f9z11dR; Fri, 05 Sep 2025 18:58: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 585IwxB9018705; Fri, 5 Sep 2025 18:58:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IwxBQ018702; Fri, 5 Sep 2025 18:58:59 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:58:59 GMT Message-Id: <202509051858.585IwxBQ018702@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: 86c4e2d071ca - stable/14 - icmp: remove unused BANDLIM_UNLIMITED 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: 86c4e2d071ca335ad4460a3643b4ece9799cfc82 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=86c4e2d071ca335ad4460a3643b4ece9799cfc82 commit 86c4e2d071ca335ad4460a3643b4ece9799cfc82 Author: Michael Tuexen AuthorDate: 2025-08-11 16:46:08 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:58:34 +0000 icmp: remove unused BANDLIM_UNLIMITED Reviewed by: Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51849 (cherry picked from commit 52a94237615c6d3b6c928e41d9c7168ff6979996) --- sys/netinet/icmp_var.h | 1 - sys/netinet/ip_icmp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index f0d832a37261..02cd8c85f1b4 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -88,7 +88,6 @@ void kmod_icmpstat_inc(int statnum); SYSCTL_DECL(_net_inet_icmp); extern int badport_bandlim(int); -#define BANDLIM_UNLIMITED -1 #define BANDLIM_ICMP_UNREACH 0 #define BANDLIM_ICMP_ECHO 1 #define BANDLIM_ICMP_TSTAMP 2 diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 644b87858f17..fffe7e280a8e 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1189,7 +1189,7 @@ badport_bandlim(int which) { int64_t pps; - if (V_icmplim == 0 || which == BANDLIM_UNLIMITED) + if (V_icmplim == 0) return (0); KASSERT(which >= 0 && which < BANDLIM_MAX, From nobody Fri Sep 5 18: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 4cJQdV0lbKz66Fcs; Fri, 05 Sep 2025 18:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQdV0H5vz3M6J; Fri, 05 Sep 2025 18:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098798; 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=Ele53WFlX5guePb/HsH9ILpvAUoy076GVz+FZyDatCw=; b=WEN0XDjiYn6sd7eKoc4c/9K4EDRda0FkB96ZYo0MQN0xqjENFTZU0DIiLMTB1M9+GVlMYs teV2+GcYf/EYMvG7Y9EWFW3CR0LHQSSjNpJ+vcoHQQ82bFUCP6NVCOQEcTgQICi9yyqvsB ya2w8FmVjrAiGLIwSggVDUCiCIan9+GIfkrP3iwlj9P6oNcIjAQNg9yL1Ce34hXxUh+5Cz xUhymjyouuWFBfEiL6WynvLsY4dCIFYk+jg3IakvrwVRxNiXH+k/HZERhMJfGm35JUds8F pBfMqwYtQW/kA/6NFM9sU4ukNJAyJk50RqnqD+q59BHVpQGNz84mKKFO7L9aiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098798; 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=Ele53WFlX5guePb/HsH9ILpvAUoy076GVz+FZyDatCw=; b=dKI2o6jL7i7TSd5H5TKbubOn0gP2gtlRiBTn2Q6s3BAkbr6GGWHsOw2QjsHaA7n0Qvr5RI UeMVZ/DCLrmGNaePvLkzQA2uH2rHQIE3x/YGXYIcKwChQT/Vsa0Dq6f421dbm6QJ+GEZ/9 qlz3QbbGsyM5JpRXHxRe8OoomQ/ddQdx9XlaMVywQV1JOZQRU4VVcpRcNszGTTUq2vDu87 rMDx7GSw7ZtKS38hTCqe8TfaUnTPEOWFSNfqL3W5q4CIJakF+8FJieq+qGZaQlhzFnsA2c Mss+hzcTZnjQYTR/TdtrVkRNzjwvn3X5vBnN2slM8R+yoJ2E8U1+/9pF7/mcGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098798; a=rsa-sha256; cv=none; b=u8GjILRhDAB00g1s7SWpQ7ZwfrU8lH3WkNBcgn7UtvOCLRmgZK39Uo9ZntA6Xi6TUtIqMx TQHaaX9yuTTe2JuUNbHrAXLY0eYVu8ezKLNUynNuHaCn+7mbyL/l5SEmWYSqSlOrAnNSkB Owesms1FKK3WzHNXAoQXkjmOYe77aEeR0HDcI9Fs/84+H9uruiadC0X4feyvC/PozTaN3b /AeSHo4n95AagvTNAITavPWxSqUcKDSclvcNPJJw0Sm/4gvNe5mYUioRe78iU2z2wG6KGl 9m5uaPjuh5SfciWznZZLJOfmBiJeERu084fUUQx6lbNVbtNQdhCe93BnCkW3gg== 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 4cJQdT6zzlz11dS; Fri, 05 Sep 2025 18: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 585IxvTr019116; Fri, 5 Sep 2025 18: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 585IxvXf019113; Fri, 5 Sep 2025 18:59:57 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:59:57 GMT Message-Id: <202509051859.585IxvXf019113@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: 9eb5c85c70fc - stable/14 - udp: use appropriate error counters 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: 9eb5c85c70fcfeeaab9d2d5410a566e16309ced1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9eb5c85c70fcfeeaab9d2d5410a566e16309ced1 commit 9eb5c85c70fcfeeaab9d2d5410a566e16309ced1 Author: Michael Tuexen AuthorDate: 2025-08-12 12:24:20 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:59:32 +0000 udp: use appropriate error counters Since there are multicast and broadcast specific error counters, use them. Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51869 (cherry picked from commit 0312f80349eedfc2b0d2f24b4fd073795148d3d5) --- sys/netinet/udp_usrreq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 1ea44c45a390..f44bd1838d07 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -656,7 +656,11 @@ udp_input(struct mbuf **mp, int *offp, int proto) else UDP_PROBE(receive, NULL, NULL, ip, NULL, uh); UDPSTAT_INC(udps_noport); - if (m->m_flags & (M_BCAST | M_MCAST)) { + if (m->m_flags & M_MCAST) { + UDPSTAT_INC(udps_noportmcast); + goto badunlocked; + } + if (m->m_flags & M_BCAST) { UDPSTAT_INC(udps_noportbcast); goto badunlocked; } From nobody Fri Sep 5 19:01:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJQfk6TwBz66FgF; Fri, 05 Sep 2025 19:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQfk5ptDz3MCy; Fri, 05 Sep 2025 19:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098862; 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=Jsv2e1MBwYKCnmW2AHLZBQWzTP0CcgKI9RfgNdisJbs=; b=Vlui42BAP4PEAHo97eF9u7C4d8er46rJ8YVOmyX3tvVKSvBlUOlSGC18cTURjG706nNATf sU5oUIN9nmQQ/PdPlzAGfpvx9I73AgxEAsZC4sIeCMlilCBWJgsLSD/i1JPeCxdRE098BL J9LwbAqqDgTFgY51Fi40A5/BqCnsuTmksc0RNSratmLZSMR2Rc64Ci4XZ7fq73e7ef24V0 lZ9xWXLL1vubCnaRHgY/Osvp3taYXGUN8rJ/45zEzaGloltYUG9SZMhFHSZHpS3Lw5JItA NPWErrN8fuZxfqWW2+50IGMkwlgDDX2KmM/wZgKwiGp05ztNFSGGD5xMfsHAXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098862; 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=Jsv2e1MBwYKCnmW2AHLZBQWzTP0CcgKI9RfgNdisJbs=; b=YiijtVcnIAkMewCo31HYnM3QW1HIVPRRPl/Ze+vw7bR1XjbXn1MB8AHCFqWt6SbIpOSyAO /0Uroj957tHSwWKycV4Dl1/44ooEodTUxGuT3K3IeGdR3/V8hVstXMA2hmzTb/JfZg16bj xC8HJalk4gMIUaotlzxIAB0NuGGN6JuXMSBaxhO26VZJQoC25DlxBzhCmFCl+Koof07vhk NwvnXHgR1mRUIFYR7IECOpLml2+z3Tsl/qA68VndHTcHGTfLAMqemhXrJvsaOsYNWEoyiu 5xzSftcPTP/B+JvBouPpFMtmCrt0gyJMV+CjSNV+mTdOGaLf59zJTV196HzlLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098862; a=rsa-sha256; cv=none; b=NwsJ2Aym3Lj2kljAlaUBRmP7kuWgqxT91VAY64UWaqm68z7lZrEx9Ut85ng3GzcrEBxH/p +aN3w1BdZJypUParVMqA3AU2q3Li4Iavfy8692OvPqidpNG6Q+5/HNrs2NMQtg5jH0JT67 xI9HHefITifDctw4WKlzM6+8aB3DfyVOuIH6CUPcDvibCeZzEfUDz0vZMoHgbpEttA15wr UGAyLc5QXxpLKInUJUxMRwyccCSJ0aTJKVmwl7S6yRRu4BG+JpYx1xP7mUBJvlmBLuIIJ4 /UMVKTe8L5QiatlI6V8yMlAsGrmTkaiisJq/jDrBACQUuJWlSElhNW99RWyLjg== 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 4cJQfk52mBz11Df; Fri, 05 Sep 2025 19:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585J12qY031324; Fri, 5 Sep 2025 19:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J12p9031320; Fri, 5 Sep 2025 19:01:02 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:01:02 GMT Message-Id: <202509051901.585J12p9031320@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: 95fbcd9cada8 - stable/14 - tcp: minor cleanup 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: 95fbcd9cada82ca2e9be6a385f2225670c7d509f Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=95fbcd9cada82ca2e9be6a385f2225670c7d509f commit 95fbcd9cada82ca2e9be6a385f2225670c7d509f Author: Michael Tuexen AuthorDate: 2025-08-12 12:48:27 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:00:40 +0000 tcp: minor cleanup Don't use the rstreason variable as a hint that a second lookup is performed, since the rstreason variable will be removed. Use the INPLOOKUP_WILDCARD flag in the lookupflag variable instead. No functional change intended. Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51847 (cherry picked from commit 6e07231667e639bd825e6cdb67609a39e3098e9d) --- sys/netinet/tcp_input.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 93d2e94bcff0..c72c315271fb 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -922,23 +922,23 @@ findpcb: * XXX MRT Send RST using which routing table? */ if (inp == NULL) { - if (rstreason != 0) { + if ((lookupflag & INPLOOKUP_WILDCARD) == 0) { /* We came here after second (safety) lookup. */ - MPASS((lookupflag & INPLOOKUP_WILDCARD) == 0); - goto dropwithreset; - } - /* - * Log communication attempts to ports that are not - * in use. - */ - if ((V_tcp_log_in_vain == 1 && (thflags & TH_SYN)) || - V_tcp_log_in_vain == 2) { - if ((s = tcp_log_vain(NULL, th, (void *)ip, ip6))) + MPASS(!closed_port); + } else { + /* + * Log communication attempts to ports that are not + * in use. + */ + if (((V_tcp_log_in_vain == 1 && (thflags & TH_SYN)) || + V_tcp_log_in_vain == 2) && + (s = tcp_log_vain(NULL, th, (void *)ip, ip6))) { log(LOG_INFO, "%s; %s: Connection attempt " "to closed port\n", s, __func__); + } + closed_port = true; } rstreason = BANDLIM_TCP_RST; - closed_port = true; goto dropwithreset; } INP_LOCK_ASSERT(inp); @@ -1119,7 +1119,8 @@ findpcb: * don't want to sent RST for the second ACK, * so we perform second lookup without wildcard * match, hoping to find the new socket. If - * the ACK is stray indeed, rstreason would + * the ACK is stray indeed, the missing + * INPLOOKUP_WILDCARD flag in lookupflag would * hint the above code that the lookup was a * second attempt. * @@ -1127,7 +1128,6 @@ findpcb: * of the failure cause. */ INP_WUNLOCK(inp); - rstreason = BANDLIM_TCP_RST; lookupflag &= ~INPLOOKUP_WILDCARD; goto findpcb; } From nobody Fri Sep 5 19:01: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 4cJQgn3q9wz66FPj; Fri, 05 Sep 2025 19:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQgn2xd2z3NWj; Fri, 05 Sep 2025 19:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098917; 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=umhgpAC70qNTYqzhnlGWqam0oCuxz1EKoHQRJgteowk=; b=Ziv5ihM+mfe1Ijv1qxxGBo/MS2JPbNSB+6lpvstk/LxLFt47G+GrsReuYiDF7gQd52dOcQ +gv1uslx2b8g9x1+A69YeBsplWV9T0dXRe5IaME2mC+FOJIxZvuKvUKPQRrAnEkXZeROPY BlHIvPdwgsHuyzp29jIfO67ltUAU+aOJ5j9VmhxTOzfFlU3v/Hw03V80KGagfSX8pt3KgR Z0B7IzTAhEQzfqMy8jsu4VnP1q0ihy7Q54oNmRdgSIf1UPbbBTzsqwd8WIcUKHuZnM/NGD p2EDPcrnXvaEoyzmCLFH2Q0hmDNaPifx3zRVqIio9RMhRlnqnYH0aT0YhB+MSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098917; 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=umhgpAC70qNTYqzhnlGWqam0oCuxz1EKoHQRJgteowk=; b=jSJcdTsWZtBIwcGdO+HQYm6bGBBvSHNpl1LUgDY9WJBNkyITrSWymWAVAM8NFqaG+5mvNi 3g0vB3/HlVrjeF1rsDm66o+OUzUVhCV2GhnZrRQvAEu8pxWzou23mKdOhx/cH61ZHMC5ip R705AdakpdcLW8up+g4Rx47m0aDiyM/ap1LsaP7Tua90iHd43A4AQV7XlqwXg8TScEx9JP dnKH9biusTtZ5NAPYYGcGiku+VetFc9ugT+n3iB/quXHFuenhL5VrJhvJ8W6Ihk5nQOLnf gSFtKHt5TTG+Qwz7eaa2BuSZ4MTZJH7BZrQQ9+w3a5jc5jsewfzsfpa+F+GPPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098917; a=rsa-sha256; cv=none; b=rSAXGWwhw5ztgcI+G2vc2x3ioXSMY8HbOKpPlEAXhtZ7z6/SjYWqKwgAPopqOhG0TwRGb9 1Y1k7XwhMYk9a8w5UcDU/PVEBks7YH07ySxDuCOHvDRpn2/L0/bjloxsS0qUgf4NuDdugW xFLNho1/09jeQM3A5Pn6hp1wTd8OcreXhu/fjY1c0yi1+kuCFrKTNxOKKp4G9ycbpkkoOz QCGaCsRhaszEDk+DDWcZiAsIsZSW/s+uJPZOCWHUDjmbnWPnHtYfasL2gfA4+H+4oaUBkr i/7NaqjV6fheLPBX2aOXe2zzG/CXbyhWsPQtfa80lQx9vSAZYdF4nNo8BmgkNQ== 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 4cJQgn2C9nz11g2; Fri, 05 Sep 2025 19:01: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 585J1vPS036142; Fri, 5 Sep 2025 19:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J1vDB036139; Fri, 5 Sep 2025 19:01:57 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:01:57 GMT Message-Id: <202509051901.585J1vDB036139@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: 5cdd4a1bf2cc - stable/14 - tcp: retire rstreason 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: 5cdd4a1bf2cc94553f397b590c743f94e7bd589a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5cdd4a1bf2cc94553f397b590c743f94e7bd589a commit 5cdd4a1bf2cc94553f397b590c743f94e7bd589a Author: Michael Tuexen AuthorDate: 2025-08-12 14:08:26 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:01:26 +0000 tcp: retire rstreason With the latest changes, this variable and parameter for tcp_dropwithreset() is not needed anymore. It also makes it harder to introduce the usage of multiple counters for TCP again, which might open side channel attacks. No funtional changes intended. Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51872 (cherry picked from commit 463b5aed0d62f094addb700604725767a8904901) --- sys/netinet/tcp_input.c | 30 +++++++----------------------- sys/netinet/tcp_stacks/bbr.c | 26 +++++++++++++------------- sys/netinet/tcp_stacks/rack.c | 26 +++++++++++++------------- sys/netinet/tcp_stacks/rack_bbr_common.c | 10 +++++----- sys/netinet/tcp_stacks/rack_bbr_common.h | 4 ++-- sys/netinet/tcp_var.h | 3 +-- 6 files changed, 41 insertions(+), 58 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index c72c315271fb..d1d0cc7d70e8 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -626,7 +626,6 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) int tlen = 0, off; int drop_hdrlen; int thflags; - int rstreason = 0; /* For badport_bandlim accounting purposes */ int lookupflag; uint8_t iptos; struct m_tag *fwd_tag = NULL; @@ -938,7 +937,6 @@ findpcb: } closed_port = true; } - rstreason = BANDLIM_TCP_RST; goto dropwithreset; } INP_LOCK_ASSERT(inp); @@ -1029,13 +1027,11 @@ findpcb: * down or it is in the CLOSED state. Either way we drop the * segment and send an appropriate response. */ - rstreason = BANDLIM_TCP_RST; closed_port = true; goto dropwithreset; } if ((tp->t_port != port) && (tp->t_state > TCPS_LISTEN)) { - rstreason = BANDLIM_TCP_RST; closed_port = true; goto dropwithreset; } @@ -1151,7 +1147,6 @@ tfo_socket_result: V_tcp_sc_rst_sock_fail ? "sending RST" : "try again"); if (V_tcp_sc_rst_sock_fail) { - rstreason = BANDLIM_TCP_RST; goto dropwithreset; } else goto dropunlock; @@ -1218,7 +1213,6 @@ tfo_socket_result: s, __func__); syncache_badack(&inc, port); /* XXX: Not needed! */ TCPSTAT_INC(tcps_badsyn); - rstreason = BANDLIM_TCP_RST; goto dropwithreset; } /* @@ -1294,7 +1288,6 @@ tfo_socket_result: "Connection attempt to deprecated " "IPv6 address rejected\n", s, __func__); - rstreason = BANDLIM_TCP_RST; goto dropwithreset; } } @@ -1424,8 +1417,7 @@ dropwithreset: * When blackholing do not respond with a RST but * completely ignore the segment and drop it. */ - if (rstreason == BANDLIM_TCP_RST && - ((!closed_port && V_blackhole == 3) || + if (((!closed_port && V_blackhole == 3) || (closed_port && ((V_blackhole == 1 && (thflags & TH_SYN)) || V_blackhole > 1))) && (V_blackhole_local || ( @@ -1440,7 +1432,7 @@ dropwithreset: ))) goto dropunlock; TCP_PROBE5(receive, NULL, tp, m, tp, th); - tcp_dropwithreset(m, th, tp, tlen, rstreason); + tcp_dropwithreset(m, th, tp, tlen); m = NULL; /* mbuf chain got consumed. */ dropunlock: @@ -1549,7 +1541,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, uint16_t thflags; int acked, ourfinisacked, needoutput = 0; sackstatus_t sack_changed; - int rstreason, todrop, win, incforsyn = 0; + int todrop, win, incforsyn = 0; uint32_t tiwin; uint16_t nsegs; char *s; @@ -1598,7 +1590,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ if ((tp->t_state == TCPS_SYN_SENT) && (thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { - rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -1997,7 +1988,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { - rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -2010,7 +2000,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * FIN, or a RST. */ if ((thflags & (TH_SYN|TH_ACK)) == (TH_SYN|TH_ACK)) { - rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } else if (thflags & TH_SYN) { @@ -2277,7 +2266,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * for the "LAND" DoS attack. */ if (tp->t_state == TCPS_SYN_RECEIVED && SEQ_LT(th->th_seq, tp->irs)) { - rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -2359,7 +2347,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); TCPSTAT_INC(tcps_rcvafterclose); - rstreason = BANDLIM_TCP_RST; goto dropwithreset; } @@ -3434,7 +3421,6 @@ dropafterack: if (tp->t_state == TCPS_SYN_RECEIVED && (thflags & TH_ACK) && (SEQ_GT(tp->snd_una, th->th_ack) || SEQ_GT(th->th_ack, tp->snd_max)) ) { - rstreason = BANDLIM_TCP_RST; tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } @@ -3446,11 +3432,10 @@ dropafterack: return; dropwithreset: + tcp_dropwithreset(m, th, NULL, tlen); if (tp != NULL) { - tcp_dropwithreset(m, th, tp, tlen, rstreason); INP_WUNLOCK(inp); - } else - tcp_dropwithreset(m, th, NULL, tlen, rstreason); + } return; drop: @@ -3470,8 +3455,7 @@ drop: * tp may be NULL. */ void -tcp_dropwithreset(struct mbuf *m, struct tcphdr *th, struct tcpcb *tp, - int tlen, int rstreason) +tcp_dropwithreset(struct mbuf *m, struct tcphdr *th, struct tcpcb *tp, int tlen) { #ifdef INET struct ip *ip; @@ -3511,7 +3495,7 @@ tcp_dropwithreset(struct mbuf *m, struct tcphdr *th, struct tcpcb *tp, #endif /* Perform bandwidth limiting. */ - if (badport_bandlim(rstreason) < 0) + if (badport_bandlim(BANDLIM_TCP_RST) < 0) goto drop; /* tcp_respond consumes the mbuf chain. */ diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index c1053e90d6da..996a12229ac7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7852,7 +7852,7 @@ nothing_left: /* tcp_close will kill the inp pre-log the Reset */ tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); BBR_STAT_INC(bbr_dropped_af_data); return (1); } @@ -8752,7 +8752,7 @@ bbr_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } if ((thflags & (TH_ACK | TH_RST)) == (TH_ACK | TH_RST)) { @@ -8954,7 +8954,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } if (IS_FASTOPEN(tp->t_flags)) { @@ -8966,7 +8966,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if ((thflags & (TH_SYN | TH_ACK)) == (TH_SYN | TH_ACK)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } else if (thflags & TH_SYN) { /* non-initial SYN is ignored */ @@ -8999,7 +8999,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if (SEQ_LT(th->th_seq, tp->irs)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } if (ctf_drop_checks(to, m, th, tp, &tlen, &thflags, &drop_hdrlen, &ret_val)) { @@ -9277,7 +9277,7 @@ bbr_do_established(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -9374,7 +9374,7 @@ bbr_do_close_wait(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -9394,7 +9394,7 @@ close_now: tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); KMOD_TCPSTAT_INC(tcps_rcvafterclose); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, (*tlen)); + ctf_do_dropwithreset(m, tp, th, *tlen); return (1); } if (sbavail(&so->so_snd) == 0) @@ -9524,7 +9524,7 @@ bbr_do_fin_wait_1(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -9626,7 +9626,7 @@ bbr_do_closing(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -9728,7 +9728,7 @@ bbr_do_lastack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -9837,7 +9837,7 @@ bbr_do_fin_wait_2(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { bbr_log_progress_event(bbr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -11492,7 +11492,7 @@ bbr_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((tp->t_state == TCPS_SYN_SENT) && (thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } if (tiwin > bbr->r_ctl.rc_high_rwnd) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 9a4ec0546b95..9b35fbb7797b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -12428,7 +12428,7 @@ rack_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so, /* tcp_close will kill the inp pre-log the Reset */ tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } } @@ -13265,7 +13265,7 @@ rack_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } if ((thflags & (TH_ACK | TH_RST)) == (TH_ACK | TH_RST)) { @@ -13461,7 +13461,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } if (IS_FASTOPEN(tp->t_flags)) { @@ -13474,7 +13474,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if ((thflags & (TH_SYN | TH_ACK)) == (TH_SYN | TH_ACK)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } else if (thflags & TH_SYN) { /* non-initial SYN is ignored */ @@ -13508,7 +13508,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, */ if (SEQ_LT(th->th_seq, tp->irs)) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return (1); } if (_ctf_drop_checks(to, m, th, tp, &tlen, &thflags, &drop_hdrlen, &ret_val, @@ -13776,7 +13776,7 @@ rack_do_established(struct mbuf *m, struct tcphdr *th, struct socket *so, if (sbavail(&so->so_snd)) { if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event(rack, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -13877,7 +13877,7 @@ rack_do_close_wait(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -13899,7 +13899,7 @@ rack_check_data_after_close(struct mbuf *m, tcp_log_end_status(tp, TCP_EI_STATUS_SERVER_RST); tp = tcp_close(tp); KMOD_TCPSTAT_INC(tcps_rcvafterclose); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, (*tlen)); + ctf_do_dropwithreset(m, tp, th, *tlen); return (1); } if (sbavail(&so->so_snd) == 0) @@ -14032,7 +14032,7 @@ rack_do_fin_wait_1(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -14138,7 +14138,7 @@ rack_do_closing(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -14244,7 +14244,7 @@ rack_do_lastack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -14353,7 +14353,7 @@ rack_do_fin_wait_2(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - ctf_do_dropwithreset_conn(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset_conn(m, tp, th, tlen); return (1); } } @@ -16938,7 +16938,7 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((tp->t_state == TCPS_SYN_SENT) && (thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->iss) || SEQ_GT(th->th_ack, tp->snd_max))) { tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); #ifdef TCP_ACCOUNTING sched_unpin(); #endif diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index d39ededc99d1..57dd242b9480 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -507,9 +507,9 @@ ctf_flight_size(struct tcpcb *tp, uint32_t rc_sacked) void ctf_do_dropwithreset(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, - int32_t rstreason, int32_t tlen) + int32_t tlen) { - tcp_dropwithreset(m, th, tp, tlen, rstreason); + tcp_dropwithreset(m, th, tp, tlen); if (tp != NULL) INP_WUNLOCK(tptoinpcb(tp)); } @@ -680,7 +680,7 @@ __ctf_do_dropafterack(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, int32 (SEQ_GT(tp->snd_una, th->th_ack) || SEQ_GT(th->th_ack, tp->snd_max))) { *ret_val = 1; - ctf_do_dropwithreset(m, tp, th, BANDLIM_TCP_RST, tlen); + ctf_do_dropwithreset(m, tp, th, tlen); return; } else *ret_val = 0; @@ -906,10 +906,10 @@ ctf_calc_rwin(struct socket *so, struct tcpcb *tp) void ctf_do_dropwithreset_conn(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, - int32_t rstreason, int32_t tlen) + int32_t tlen) { - tcp_dropwithreset(m, th, tp, tlen, rstreason); + tcp_dropwithreset(m, th, tp, tlen); tp = tcp_drop(tp, ETIMEDOUT); if (tp) INP_WUNLOCK(tptoinpcb(tp)); diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.h b/sys/netinet/tcp_stacks/rack_bbr_common.h index 9e5fbe675a3a..6cc22021dea5 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.h +++ b/sys/netinet/tcp_stacks/rack_bbr_common.h @@ -105,7 +105,7 @@ __ctf_do_dropafterack(struct mbuf *m, struct tcpcb *tp, void ctf_do_dropwithreset(struct mbuf *m, struct tcpcb *tp, - struct tcphdr *th, int32_t rstreason, int32_t tlen); + struct tcphdr *th, int32_t tlen); void ctf_do_drop(struct mbuf *m, struct tcpcb *tp); @@ -130,7 +130,7 @@ ctf_calc_rwin(struct socket *so, struct tcpcb *tp); void ctf_do_dropwithreset_conn(struct mbuf *m, struct tcpcb *tp, struct tcphdr *th, - int32_t rstreason, int32_t tlen); + int32_t tlen); uint32_t ctf_fixed_maxseg(struct tcpcb *tp); diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index d5f7f0d4dc19..2aa300ef043a 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1395,8 +1395,7 @@ int tcp_reass(struct tcpcb *, struct tcphdr *, tcp_seq *, int *, void tcp_reass_global_init(void); void tcp_reass_flush(struct tcpcb *); void tcp_dooptions(struct tcpopt *, u_char *, int, int); -void tcp_dropwithreset(struct mbuf *, struct tcphdr *, - struct tcpcb *, int, int); +void tcp_dropwithreset(struct mbuf *, struct tcphdr *, struct tcpcb *, int); void tcp_pulloutofband(struct socket *, struct tcphdr *, struct mbuf *, int); void tcp_xmit_timer(struct tcpcb *, int); From nobody Fri Sep 5 19:02:33 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 4cJQhT647Mz66FdY; Fri, 05 Sep 2025 19:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQhT547Hz3Nyq; Fri, 05 Sep 2025 19:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098953; 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=PIFbGtKXt359u2VUQM1EGOeVRh7ScxOtavKP0YTHU3Y=; b=PeGtySxzhNOoGTRVzxPkxMWEPiWuobii9frekpeqdp+WkzCIaSQfC66yeG552M57IESKjJ f2zB3BxsXyU2q38ekv67qXBpoNfYeUEYtf2WeK8++l9NAfOrdIV2wgWS48K/jzV0zTI1Ac sHU3MEWgtjQzQW2YMzoiQigr4lCVxpnw+Apyga06ebTTCivNL1Qr3QTmFWBRDKbzgrMBrD Vx9KLDBtnVc5sU1y7dhiia3E1UIMPcrarU0p6Oc+C1S/mHYUgn1gdbWcj0bnm+0sFN8gDr EQJtoDrn3M+CmE81FMkRCpRbqdokWJWEoB+HQ54YXY921IYUpDJg4ItDz1MjLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098953; 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=PIFbGtKXt359u2VUQM1EGOeVRh7ScxOtavKP0YTHU3Y=; b=E6phpbWg65OxwUs37gPDmItQ+O8FqMJGIPzmpEVBCnaFY4f+QU/7mSnUN9NTZ+sEhVIpIH ShheWHLntDDUu5aBZjPFl6EOtbaEbdD2aAEMjIHkw3ahwbcLQ1DBIYExaZzeA88WlUJUqQ VpsTFEevPyC08g6Wvc+AAa6BCeDL3TmFUFXneoMpOiyOpFTYsclB8l+kllQoy+7J7fjZ6N 1nhYceJnp8esm+3lQoYA56rg+evvWjeCNkVxAB315A7Dxb0i7DQQXfQXgbVFpU1NVFXX8G WntW0QHiLMSXwbWykIOM0i39c/KTFc6MHqdYvAOA4NVHBKo4RmEgVKqps1oQnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098953; a=rsa-sha256; cv=none; b=bo5mVzT9djoZRigg2N0iBE+nau2NgQ9CmeSmDk88Mjpq/hWYhNaABIrwipFqWX5/A6jin4 Ehf3OXtH+urnjAw2TYOwTl8eM9splMch+8os6Vw6JmuiadF0nELIXgw07RRmvJF5A9pBRv CoYwXQJW+bu7FDI/9RBZzkvNpPzw3v0aCAss6oo/+/jX6QCNHU7Q+T9W7hGKq6ueq3Bw6c gF+0SNOze/eAIrXLVlTYb4jdMGrhC2tyuzQwTjwd2KmUlRIzngrzh+paBl2c0a9EeEOYZv NMMqabSSe71sDR9G6dJlHT2N1tbpKDHaY4vIGdCMSJPm1Dm0mD2cDDHzyekRkw== 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 4cJQhT4T2hz11KH; Fri, 05 Sep 2025 19:02:33 +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 585J2XCq036408; Fri, 5 Sep 2025 19:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J2XF7036405; Fri, 5 Sep 2025 19:02:33 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:02:33 GMT Message-Id: <202509051902.585J2XF7036405@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: 4eb741473379 - stable/14 - netstat: remove unneeded cast 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: 4eb741473379cec354a5f478a6cc94a31d505dfd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4eb741473379cec354a5f478a6cc94a31d505dfd commit 4eb741473379cec354a5f478a6cc94a31d505dfd Author: Michael Tuexen AuthorDate: 2025-08-12 17:45:54 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:02:22 +0000 netstat: remove unneeded cast delivered is already an uint64_t, so no need to cast it to that type. Sponsored by: Netflix, Inc. (cherry picked from commit 6bca82843e5605fc242211093b56d1129eb4307c) --- usr.bin/netstat/inet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 857d19038901..93ce8fd59cb7 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -952,7 +952,7 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) udpstat.udps_fullsock; if (delivered || sflag <= 1) xo_emit("\t{:delivered-packets/%ju} {N:/delivered}\n", - (uint64_t)delivered); + delivered); p(udps_opackets, "{:output-packets/%ju} {N:/datagram%s output}\n"); /* the next statistic is cumulative in udps_noportbcast */ p(udps_filtermcast, "{:multicast-source-filter-matches/%ju} " From nobody Fri Sep 5 19:03: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 4cJQjj46nwz66G08; Fri, 05 Sep 2025 19:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQjj3LwMz3PY3; Fri, 05 Sep 2025 19:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099017; 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=xScRZs1JUT263FgPo/mqK4ctW+eF1eGwDfaqUu/QSmg=; b=ct1x+KGUslII/aPljBkQVJHVPOTUAYZJ9yhY7aV6H7w8H+3C5EvP+NApgLDEyUCnt5CA75 4QFtE7q51BxXcf6HIqHYLz0U+nKnghL1ivaWwGEGBfR3DeU7N6KmN37QQPb7fEKzpoemRF kq7rvzlvXgyH93h+3I83t9G8jCt3iIavFEjC4tqyYBux3S3VFPDNhFfQhPeP5yQbd7hs4R c+cxMae9HmAI/rnAa6plyObSY9oLIiXgTAOrzjZ9FS2skvvjPRy29iDXUm/QEzBUAODIUw SttOJdoLVD2qGFU/xB6NPP2VDt4vFmmpiDmo1SrXSsMQma7K2Ql+eOXGkvc4+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099017; 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=xScRZs1JUT263FgPo/mqK4ctW+eF1eGwDfaqUu/QSmg=; b=VCgvXKO8v9C5CvbakDfZKGevEbGxvl1qMMsfND5Ym1KP4JpsMbBMduqJZFxCLsinGPEZxb NpoI6JSKpe1tfGesop0FzS3UL2FxRMd4v0G3JBLl6X7CqOySRqu003HMJGOjqCZ+Fi3Phw 4cFGLAYADIX0IjNCLOyWBMUceOSmJYTWS6JzcAuGaMCxd0tybAsXFE6S2eVB0I3S8OCuD4 21X5XDGB/OLC2140oTmFBzLEBrw+9pEbE6aeWU11KdAgpZp/Uk3wAwDNFSnxUtF2enR7um OSIOL7Kae1VIIkrQvib24p9Cu8gLo9gzlnf+tlSWriv4n6VjhcbSmc2mlnxYPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099017; a=rsa-sha256; cv=none; b=vgvvHckgGmOmYrcCOs+8Eis0FheoX31L3ueNZydsZ1bIFtB/lgH//uIbJ6vpW913ZU7eLR qzNothfGZXRC2cBQ+6KCZxSCyYaMZAE7+/LrBfqv2ka/V3omi2D853eOnNuEOpsINyQBCd Yy12NE3inAInOGvlUkX8CWNhOkBAxHe9hQOpa4S+Y8gnSboPR/rhicyLM4ws6cjybtVfmQ dYGZR2vaGSPqMX0t4HusKmMu+bcasqgNpsI6x3g2gs0a/lIeV8hBBZW29u5wSDpALNZ3vX cPITV112zGga5qxqdpHPXEvD4SO2N6wGc99HQchNVY+1m+MXRmzbA+r05+9Ppg== 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 4cJQjj2qQWz11lN; Fri, 05 Sep 2025 19:03: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 585J3beg036784; Fri, 5 Sep 2025 19:03:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J3bRS036781; Fri, 5 Sep 2025 19:03:37 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:03:37 GMT Message-Id: <202509051903.585J3bRS036781@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: fd86cd7a7f49 - stable/14 - netstat: report undelivered multi and broadcast UDP packets correctly 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: fd86cd7a7f499358f4402e9963529e3637b508ed Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fd86cd7a7f499358f4402e9963529e3637b508ed commit fd86cd7a7f499358f4402e9963529e3637b508ed Author: Michael Tuexen AuthorDate: 2025-08-13 06:57:04 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:02:52 +0000 netstat: report undelivered multi and broadcast UDP packets correctly When reporting undelivered broadcast/multicast datagrams, don't just report the undelivered broadcast ones. Actually report the sum of both. Alternatively, one could also report broadcast and multicast datagrams separately, but that would change the output format of netstat. While there, use the correct type for casting a variable printed with %ju. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51881 (cherry picked from commit 2b068d35de84975ea4b04a19413786663a51dc70) --- usr.bin/netstat/inet.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 93ce8fd59cb7..363224d5f913 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -905,7 +905,7 @@ void udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) { struct udpstat udpstat; - uint64_t delivered; + uint64_t delivered, noportbmcast; #ifdef INET6 if (udp_done != 0) @@ -938,8 +938,11 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) "{N:/with no checksum}\n"); p1a(udps_noport, "{:dropped-no-socket/%ju} " "{N:/dropped due to no socket}\n"); - p(udps_noportbcast, "{:dropped-broadcast-multicast/%ju} " - "{N:/broadcast\\/multicast datagram%s undelivered}\n"); + noportbmcast = udpstat.udps_noportmcast + udpstat.udps_noportbcast; + if (noportbmcast || sflag <= 1) + xo_emit("\t{:dropped-broadcast-multicast/%ju} " + "{N:/broadcast\\/multicast datagram%s undelivered}\n", + (uintmax_t)noportbmcast, plural(noportbmcast)); p1a(udps_fullsock, "{:dropped-full-socket-buffer/%ju} " "{N:/dropped due to full socket buffers}\n"); p1a(udpps_pcbhashmiss, "{:not-for-hashed-pcb/%ju} " @@ -952,7 +955,7 @@ udp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) udpstat.udps_fullsock; if (delivered || sflag <= 1) xo_emit("\t{:delivered-packets/%ju} {N:/delivered}\n", - delivered); + (uintmax_t)delivered); p(udps_opackets, "{:output-packets/%ju} {N:/datagram%s output}\n"); /* the next statistic is cumulative in udps_noportbcast */ p(udps_filtermcast, "{:multicast-source-filter-matches/%ju} " From nobody Fri Sep 5 19:04: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 4cJQl659Bvz66G1s; Fri, 05 Sep 2025 19:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQl64YFcz3PXB; Fri, 05 Sep 2025 19:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099090; 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=SrCh7RFamfCc84yw1ghvFep9BBgWDGqSwZ8HZfCE2xU=; b=thl7MOUryalQYS1O6qgI8bzVvp2IIsmYRRQ2gFQS268AcQkgsKT4nMZqHbMNMHoa3ZcURU p4IqqOxdnHIpLEc4g/Z+SL/i6Wz2SIZg2rDcuLzi3Zo22iKXQUSA8UyI58IBrF45hSC60J So31k+bl8LQ8PSCePt7zCtOHVsLSmJdvUIZdsuQQ0NN4Mvecv0SxwTLLg6UtsNDeNIXFFA 1aHS7N0GBYMr0xpWx4RcLQlkZjOGl/l5CPI9e8ruExGJFEXIcsAr3KEGDdSnpu8JxHSDHi 6R5j7xsGf6HYj4OrrEHmn4JFWJp0RRkcrqW0p8xQUaySfWUM1gnCmH/TQY6sag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099090; 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=SrCh7RFamfCc84yw1ghvFep9BBgWDGqSwZ8HZfCE2xU=; b=QNdy7ipRJ5DbDS4ProvjbYHY6N5oTCs0ppwL8Kb8JujX7MaJp3vDeFqH+gLrgK6q0YqD1+ OtKauy4VzVP6G7rcWlWuZ1kwDK/7Jn7QXn9CcgaV+1NVT+Iu9ytmD1QLliwOPFTFBYfTRH bCdSaoKXrACIgE/ZBpakrENrGO+4vkuPj+J1trWN/j0SOXpgPQ4X4slzOAM7OyhEZCs0O9 f1Wq4/SnChEhLv59PTonDl3tdXdh1lSaiMk+HMUmmqF0ZbPmWj9DjhoM6rbclBxDrztZhh nJul1elwRFfN+VbBcBre5E3AJjg2hCW5X9AegjQ21dclgn/ck4IlgTLHOPlL7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099090; a=rsa-sha256; cv=none; b=sZj9IEqm7Dx6+aqFRNUhNFBNL6lqTd3qeZ9lmQ1QYa+JKmZDQ7Co6+yRMSO5nVr94tybJP I7SuOCPq1vT46RgVbsHEWUaDujS5+v1wYDgLq4z2O95lzQ47IEGfqUg7bKX/tAX5VernQX l8tfNLBUFNYfkVVoeUa6rMAwGgmIjfNQsMN1AHbZAE1IrefbMOQfe7KjWRq7Y2cfWyPgzS zwNyEN3yVUPU+5jhm6RQ4ZswnJ1RXQz03OmMxepNSLwqRKtFHGeP81PLOAkx0Swe8vYoTG fvfn7Zr7pY51TemwMEmauTkG7WFwli27/NtrjUBvsgKVrdcWCVAWwgkSRpaa4A== 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 4cJQl641c0z11lP; Fri, 05 Sep 2025 19:04: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 585J4oWt037233; Fri, 5 Sep 2025 19:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J4oLH037230; Fri, 5 Sep 2025 19:04:50 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:04:50 GMT Message-Id: <202509051904.585J4oLH037230@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: 19bb9fecba8e - stable/14 - systat: improve reporting of UDP statistics 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: 19bb9fecba8ea76bf320b6732c3900c554b4a347 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=19bb9fecba8ea76bf320b6732c3900c554b4a347 commit 19bb9fecba8ea76bf320b6732c3900c554b4a347 Author: Michael Tuexen AuthorDate: 2025-08-13 18:21:34 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:04:02 +0000 systat: improve reporting of UDP statistics Report the undelivered multi and broadcast UDP packets separately. Reviewed by: rrs, cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51884 (cherry picked from commit b9de52a0ec07088006dc373c2d882f410aa51f1e) --- usr.bin/systat/ip.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c index bc90ff557e20..67019f78bc45 100644 --- a/usr.bin/systat/ip.c +++ b/usr.bin/systat/ip.c @@ -85,9 +85,10 @@ static struct stat curstat, initstat, oldstat; 13999999999 packets forwarded 999999999 - no checksum 14999999999 - unreachable dests 999999999 - invalid length 15999999999 - redirects generated 999999999 - no socket for dest port -16999999999 option errors 999999999 - no socket for broadcast -17999999999 unwanted multicasts 999999999 - socket buffer full -18999999999 delivered to upper layer 999999999 total output packets +16999999999 option errors 999999999 - no socket for broadcast +17999999999 unwanted multicasts 999999999 - no socket for multicast +18999999999 delivered to upper layer 999999999 - socket buffer full +19999999999 999999999 total output packets --0123456789012345678901234567890123456789012345678901234567890123456789012345 --0 1 2 3 4 5 6 7 */ @@ -130,9 +131,10 @@ labelip(void) L(13, "packets forwarded"); R(13, "- no checksum"); L(14, "- unreachable dests"); R(14, "- invalid length"); L(15, "- redirects generated"); R(15, "- no socket for dest port"); - L(16, "option errors"); R(16, "- no socket for broadcast"); - L(17, "unwanted multicasts"); R(17, "- socket buffer full"); - L(18, "delivered to upper layer"); R(18, "total output packets"); + L(16, "option errors"); R(16, " - no socket for broadcast"); + L(17, "unwanted multicasts"); R(17, " - no socket for multicast"); + L(18, "delivered to upper layer"); R(18, "- socket buffer full"); + R(19, "total output packets"); #undef L #undef R } @@ -192,6 +194,7 @@ domode(struct stat *ret) DO(u.udps_badlen); DO(u.udps_noport); DO(u.udps_noportbcast); + DO(u.udps_noportmcast); DO(u.udps_fullsock); DO(u.udps_opackets); #undef DO @@ -240,9 +243,10 @@ showip(void) DO(i.ips_badoptions, 16, 0); DO(u.udps_noportbcast, 16, 35); DO(i.ips_notmember, 17, 0); - DO(u.udps_fullsock, 17, 35); + DO(u.udps_noportmcast, 17, 35); DO(i.ips_delivered, 18, 0); - DO(u.udps_opackets, 18, 35); + DO(u.udps_fullsock, 18, 35); + DO(u.udps_opackets, 19, 35); #undef DO } From nobody Fri Sep 5 19:05: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 4cJQmD6DvZz66G21; Fri, 05 Sep 2025 19:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQmD5cy7z3Q4v; Fri, 05 Sep 2025 19:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099148; 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=TEdlgPyWaMjk5WDjgeFbN1tMXNSF5yRVlcVdvZ4ebLQ=; b=cvoW1P7Twug7pUEF3cSTeHu8EL0PSqIF6Po1TR2zcfoShoof5iZEhnhfJH3W3tevXBdHcI yoB3jvOWkYbUjQyfYgY9oaVguQvI6HfAcOt39rv6OMUkwdr+EJIQ0zRNJYuqBpqpMM/8rI Jo4NYStqxQByIks5RNXRQO/HWVDoARdWFJYX0WQcFavAnugCv7ElW2AdYyCLKsunvLX+7Q NmaVRPF590MqLS3fG9eq/pvWJsEQQDieEtXEmql7YwoXGVe4RfU8igjuL/omMh1jVPvGGu rkEcy8Kax+YyPD2D3/01XnJu9AiNM10bo/FJCmyQJ3bNgM4XXFwe3hjF8Ng/ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099148; 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=TEdlgPyWaMjk5WDjgeFbN1tMXNSF5yRVlcVdvZ4ebLQ=; b=wcKSRCHta1xm6RpBqsG5e7CejsVCV0cfBZXQCMPH9E/4hMOq+p8SyVvDjRle7EnFwfk8y2 8F8rx/lzKENwh3kcmcqMP4Cifi9koU5dz87at40xbxdIV1+X/EV6xqtaSKLdxwDvbzrlcQ UiG0dJGAKRLVTpDMEPPjaezPA6fn/+ai4ULaLJ0TR6JtzRl7FhLv0nYkaI6w63V5TG+QMf nBp2TNdildszK1QHK2uTVq/woxYAtkajtjKOb0epMeYI447jaBl/BxkFNrh/M01NvyCjw+ l9QQxlIwQ7ntpQWrZT+fdMKN/APIbRqaDAFxtCEWft09+x1pe0SxWe3VjPuzZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099148; a=rsa-sha256; cv=none; b=j2oPrYC0KfrrS9r171Uj0mOHGLG87L4dIi05rRuswa/sfZtX14UNjTRkWebdfj42MmtcQt 30STpj4EQI7LDpa667g+NW0FvFKnMhS3A70njd8UpHn21utWUtlj+3iEZZ/FAbOK8hR5Ny bQcPhENgeceAd/5R+hpwS8nhr47nNQBZCNrBJnqHYDk6nrc13KIQEH77U047jkEhZJsP4X 7DLWYoKlWiRCSRoDTV8/vCW/27YbFvRVxHv7NvpmM62DMcpxTvKUFKrPpp52Cmlh684a12 okszkqj2DoWMzH5BLgBCyrmXmQDWnHIY1NhxRzIZ5UYhht+pRgh+Dc9N8yp4jw== 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 4cJQmD55wSz11gB; Fri, 05 Sep 2025 19:05: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 585J5mDl037624; Fri, 5 Sep 2025 19:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J5mCi037621; Fri, 5 Sep 2025 19:05:48 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:05:48 GMT Message-Id: <202509051905.585J5mCi037621@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: 9feb2ac05b77 - stable/14 - icmp: clear offset and flags when reflecting a packet 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: 9feb2ac05b77a10f992107f2fbc1ab61c058f200 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9feb2ac05b77a10f992107f2fbc1ab61c058f200 commit 9feb2ac05b77a10f992107f2fbc1ab61c058f200 Author: Michael Tuexen AuthorDate: 2025-08-18 17:15:39 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:05:15 +0000 icmp: clear offset and flags when reflecting a packet When reflecting a packet, use an offset of 0 and clear all three bits, in particular the DF bit. PR: 288558 Reviewed by: markj, zlei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51991 (cherry picked from commit b9a2d84b1bf7f9cf556e2f0b68023d5af8362797) --- sys/netinet/ip_icmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index fffe7e280a8e..29ce294fefd2 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -393,7 +393,6 @@ stdreply: icmpelen = max(8, min(V_icmp_quotelen, ntohs(oip->ip_len) - nip->ip_hl = 5; nip->ip_p = IPPROTO_ICMP; nip->ip_tos = 0; - nip->ip_off = 0; if (V_error_keeptags) m_tag_copy_chain(m, n, M_NOWAIT); @@ -879,6 +878,8 @@ match: mac_netinet_icmp_replyinplace(m); #endif ip->ip_src = t; + /* ip->ip_tos will be reflected. */ + ip->ip_off = htons(0); ip->ip_ttl = V_ip_defttl; if (optlen > 0) { From nobody Fri Sep 5 19:06: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 4cJQms5k6Pz66Fy7; Fri, 05 Sep 2025 19:06: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQms576Xz3QF8; Fri, 05 Sep 2025 19:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099181; 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=cFgExbxRpSh0s/80FISW4Y8AmeoGOWXwUclh/peBLPE=; b=pxzErlIehGtpUeaBhR/odobtdVsFKRYZi0imcnoLnmKWEva+owmNScI4Hue6Xu7S71tplF BzwSDQ9DSPrstuUlIUwEJ5TXwITAZ/7c3qowSALmBaEHtldMRhrurp2gI2nYSrbnZcbJ6D f5E4ZzMd79oAodu+nJ2uVw47khhmNXBN6kkNcDa3F+RdAzdt7SV4UjQmofUwxOtNlEAdgK lk1OlMiIj+Kvwp3jR7q9h2aDIk8zPzLdI8C6bvu6uY4iOdAdSlN3sT/l8n1hk8usbEk77K UDjT6FL4ffr+QB0fBZl21tYGeyBQawtkt1inf94j1V2kwrVNj8vZaJOSjdZXtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099181; 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=cFgExbxRpSh0s/80FISW4Y8AmeoGOWXwUclh/peBLPE=; b=XcHnrMVxyGI09fwASTLAxG0Sui//405S+wE/itlw0360pQ13Oc3TvT6wfwRt4DQNvJPZAD 3lKah33gQrYH7z33wb27MTEB6fB8bLo1hcRJzydhlDIOAnJkm+L9tRzvmvooCNATGLOsru QW2ktCEcfKnQ72w9JIQwU6bTXBhZNsfmZYDeKOilPFUCECK6NImaR+obIYNg/TxlZchUG5 mA/jGH19VTYKcGrbX8GFGdhRkL1npmpsHe6l77kbEEpmSThgJA5LFljm+7ALxlr4ZQE/od aIHuGXm/v4S5EqwIZk5v6V7p8+E5BiIGJr2ocL8Nxl1JDCAoB24mIS7MGHWhfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099181; a=rsa-sha256; cv=none; b=O+6EsC4v8Au4cgAZ8+JIyVLmZzp73XTRd2l21M2GCmauCRDVPPkW+071ujqEZJQbcTWB3v Aubs0vsZUFCiF0Y8nvFIwLR2aRxtlyFYKZh46HF1M5Rqy9ymswWmoCKS4svSk9z6VLdvCt M0cejrPvmesxr1YiM/y8cVG5qrXkJ2wzeQKEDNCRauZX6TG/iNWoEKQ/LI6LItQn47t7EN A9mY2ow5SZS7X/W+lHae2u/ef/WjnzOhvx6oHQMZywXbd53vZyHz8HIBkpEE+pj8c5/VAS FokiytG90gVxYp8REwASiqpN/1u7N2pb6q6sMFggD0vrIdKNXFeFtVcpbzvbcA== 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 4cJQms3xfbz1204; Fri, 05 Sep 2025 19:06: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 585J6LCa037878; Fri, 5 Sep 2025 19:06:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J6Lae037875; Fri, 5 Sep 2025 19:06:21 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:06:21 GMT Message-Id: <202509051906.585J6Lae037875@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: c2fe29000d17 - stable/14 - vtnet.4: improve existing descriptions and add missing ones 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: c2fe29000d17861ca6e16ceb112adb20880f1341 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c2fe29000d17861ca6e16ceb112adb20880f1341 commit c2fe29000d17861ca6e16ceb112adb20880f1341 Author: Michael Tuexen AuthorDate: 2025-08-21 15:11:06 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:06:08 +0000 vtnet.4: improve existing descriptions and add missing ones Improve several descriptions for loader tunables and add descriptions of the statistics provided by read only sysctl-variables. Reviewed by: bcr Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51985 (cherry picked from commit ac87d70563f85d53575956c6fe40615b2e501c13) --- share/man/man4/vtnet.4 | 142 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 6 deletions(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 7f5186ef4165..3760612536df 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 29, 2025 +.Dd August 21, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -68,20 +68,29 @@ prompt before booting the kernel or stored in .Bl -tag -width "xxxxxx" .It Va hw.vtnet.csum_disable .It Va hw.vtnet. Ns Ar X Ns Va .csum_disable -This tunable disables receive and send checksum offload. +This tunable disables receive and transmission checksum offloading for TCP and +UDP. +This also implies that TCP segmentation offloading and large receive offload +are disabled. The default value is 0. .It Va hw.vtnet.fixup_needs_csum .It Va hw.vtnet. Ns Ar X Ns Va .fixup_needs_csum -This tunable enforces the calculation of a valid checksum for NEEDS_CSUM -packets. +This tunable enforces the calculation of a valid TCP or UDP checksum for +packets received with +.Dv VIRTIO_NET_HDR_F_NEEDS_CSUM +being set in the +.Va flags +field of the structure +.Vt struct virtio_net_hdr . +It also marks the checksum as being correct in the mbuf packet header. The default value is 0. .It Va hw.vtnet.tso_disable .It Va hw.vtnet. Ns Ar X Ns Va .tso_disable -This tunable disables TSO. +This tunable disables TCP segmentation offloading. The default value is 0. .It Va hw.vtnet.lro_disable .It Va hw.vtnet. Ns Ar X Ns Va .lro_disable -This tunable disables LRO. +This tunable disables large receive offload. The default value is 0. .It Va hw.vtnet.mq_disable .It Va hw.vtnet. Ns Ar X Ns Va .mq_disable @@ -113,6 +122,127 @@ The default value is 128, the minimum value is 8. This tunable sets the depth of the software LRO mbuf queue. The default value is 0. .El +.Sh TRANSMIT QUEUE STATISTICS +.Bl -tag -width "xxxxxx" +For each transmit queue of each interface the following read-only statistics +are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .rescheduled +The number of times the transmit interrupt handler was rescheduled. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .tso +The number of times TCP segment offloading was performed. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .csum +The number of times transmission checksum offloading for UDP or TCP was +performed. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .omcasts +The number of multicast packets that were transmitted. +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .obytes +The number of bytes that were transmitted (based on Ethernet frames). +.It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .opackets +The number of packets that were transmitted (Ethernet frames). +.El +.Sh RECEIVE QUEUE STATISTICS +For each receive queue of each interface the following read-only statistics +are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .rescheduled +The number of times the receive interrupt handler was rescheduled. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .host_lro +The number of times TCP large receive offload was performed. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum_failed +Currently not used. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum +The number of times receive checksum offloading for UDP or TCP was performed. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .ierrors +The number of times an error occurred during input processing. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .iqdrops +The number of times a packet was dropped during input processing. +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .ibytes +The number of bytes that were received (based on Ethernet frames). +.It Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .ipackets +The number of packets that were received (Ethernet frames). +.El +.Sh INTERFACE TRANSMIT STATISTICS +For each interface the following read-only transmit statistics are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .tx_task_rescheduled +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .rescheduled +over all transmit queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_offloaded +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .tso +over all transmit queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_offloaded +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .csum +over all transmit queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_defrag_failed +The number of times an attempt to defragment an mbuf chain failed during a +transmit operation. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_defragged +The number of times an mbuf chain was defragmented during a transmit operation. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_without_csum +The number of times TCP segment offloading was attempted without transmission +checksum offloading. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_not_tcp +The number of times TCP segment offloading was attempted for a non-TCP packet. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_proto_mismatch +The number of times the IP protocol version of the transmission checksum +offloading request did not match the IP protocol version of the packet. +.It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_unknown_ethtype +The number of times a transmission offload operation was requested for an +ethernet frame for which the EtherType was neither IPv4 nor IPv6 +(considering simple VLAN tagging). +.El +.Sh INTERFACE RECEIVE STATISTICS +For each interface the following read-only receive statistics are provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .rx_task_rescheduled +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .rescheduled +over all receive queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_offloaded +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum +over all receive queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_failed +The sum of +.Va dev.vtnet. Ns Ar X Ns Va .rxq Ns Ar Y Ns Va .csum_failed +over all receive queues of the interface. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_proto +Currently unused. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_offset +Currently unused. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_ipproto +Currently unused. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_csum_bad_ethtype +The number of times fixing the checksum required by +.Va hw.vtnet.fixup_needs_csum +or +.Va hw.vtnet. Ns Ar X Ns Va .fixup_needs_csum +was attempted for a packet with an EtherType other than IPv4 or IPv6. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_mergeable_failed +The number of times receiving a mergable buffer failed. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_enq_replacement_failed +The number of times the enqueuing the replacement receive mbuf chain failed. +.It Va dev.vtnet. Ns Ar X Ns Va .rx_frame_too_large +The number of times the frame was loger than the mbuf chain during large +receive offload without mergeable buffers. +.It Va dev.vtnet. Ns Ar X Ns Va .mbuf_alloc_failed +The number of times an mbuf cluster allocation for the receive buffer failed. +.El +.Sh INTERFACE CONFIGURATION PARAMETER +For each interface the following read-only configuration parameters are +provided: +.Bl -tag -width "xxxxxx" +.It Va dev.vtnet. Ns Ar X Ns Va .act_vq_pairs +The number of active virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .req_vq_pairs +The number of requested virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs +The maximum number of supported virtqueue pairs. +.El .Sh SEE ALSO .Xr arp 4 , .Xr netintro 4 , From nobody Fri Sep 5 19:09: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 4cJQrF4tHhz66G2t; Fri, 05 Sep 2025 19:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQrF3ylyz3Qnq; Fri, 05 Sep 2025 19:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099357; 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=yrDGIoeKJGrPSrwp/qWn9Y1QRa4LPmkMkWZNiL5iLUY=; b=Bk1AB7zJxKv02NXCH6lWue0I47wPSd/lZPfTzFeVKjoZpI4dGoQPT9EaSAhQZRCSKdL5ws qr5vldJDPx/R6mRZj5vgSFbJMiA0cNTYQjClZV5Eq19VzKZfStY6dfM1FsuNm5Ymeb3prq o5zzK8oYoY7dD8XGSvpRbW6eGPryLdDfIYDjXzWLb/HurDjsYTB+phliszHbI9nRAJG+k7 NUCB5SN7IA+CDGHhYoDZvCWQwTV+ZH4UPf5dlg1SkFyFZghsT1EIiVwuTrNRtxcVnARXjC gw0edCPtTqF2S++/fKvUku1tMxot3Yzluah/fY2p21BDo/lGtSyCVVHzhl+SSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099357; 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=yrDGIoeKJGrPSrwp/qWn9Y1QRa4LPmkMkWZNiL5iLUY=; b=d5H2iu/bbyXuCjaUu7He4ZpHhJPwq9rurcsr+zJh8a4T6D0HBbnoEtiua9EH7NsY0STmSd x8hbs8HI/k/DBCW06dWVLMAvXpP/NCSxDCJlFVwTyVKgCCg2aJSmhg8jytIKiwvdBCJ1+/ Kqm802+Zmi9v+gOU858+ucMurcMd/Yk46tNLsMJMT6yV8EZEsEphKkhwF1eJrbfTkIe282 F1rsh3nCFzYB5NIa8AxMQBxnBqI3mQV878IZGxcZnmmMRSjLsgvGUwEn9lzTSfF3mGBENX I8bqdBBVdRVM+S8GULJhKNIfljlb7c9n2MD/5x0Oa37glTz8CqEZ7Ul7qi6EnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099357; a=rsa-sha256; cv=none; b=JwuToiZo77cw4JpiocABcwzIrBevSayioSYH7YVhQe4jxZ4UE04P4Tk+v91Z47+o+6E8Kz hHSy0uwzeoU3HfQLYsewsLdBsTfnFZk2SBgFZ7plvrXTOoKmCNNVTl8mWk2mzEtJaR3BwH 9fL1HFnR54bFAwyM5mdDRyHCKCWtZoA9flxgmKP2tkfoP/5G8OGeWQlYutw9p8vhHbhK4M kPiChb20HRYp0uuVszonGpOOWEv6aGd7WCPh6JhAtA9JRQQF7WQ2kOsj3kuBe6+3ZQt7lR auND8H+lqGlt+H+puvmrKZT77n6IVJJyrWHEcivBtFzwwgYuPxTxi29hUZLq6w== 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 4cJQrF3Bzzz11gD; Fri, 05 Sep 2025 19:09: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 585J9HMk038823; Fri, 5 Sep 2025 19:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J9HR2038820; Fri, 5 Sep 2025 19:09:17 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:09:17 GMT Message-Id: <202509051909.585J9HR2038820@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: 25c0c8725fbb - stable/14 - vtnet, ptnet: include opt_*.h files early 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: 25c0c8725fbb1713543429709077cbb78bac0c51 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=25c0c8725fbb1713543429709077cbb78bac0c51 commit 25c0c8725fbb1713543429709077cbb78bac0c51 Author: Michael Tuexen AuthorDate: 2025-08-21 15:18:07 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:08:47 +0000 vtnet, ptnet: include opt_*.h files early Include opt_inet.h and opt_inet6.h early in the files including virtio_net.h, since they use INET and/or INET6. While there, remove redundant inclusion of sys/types.h, since it is included already by sys/param.h. There was a discussion to include opt_inet.h and opt_inet6.h also in virtio_net.h. glebius suggested to add a mechanism for files to check, if required opt_*.h files were included. virtio_net.h will be the first consumer of this mechanism. Reviewed by: glebius, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52046 (cherry picked from commit 3077532b1bb2911d3012ee90bae9d9499c960569) --- sys/dev/netmap/if_ptnet.c | 6 ++---- sys/dev/virtio/network/if_vtnet.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c index cea62517b2e6..d8995be7f1e9 100644 --- a/sys/dev/netmap/if_ptnet.c +++ b/sys/dev/netmap/if_ptnet.c @@ -27,8 +27,9 @@ /* Driver for ptnet paravirtualized network device. */ #include +#include "opt_inet.h" +#include "opt_inet6.h" -#include #include #include #include @@ -75,9 +76,6 @@ #include #include -#include "opt_inet.h" -#include "opt_inet6.h" - #include #include #include diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 479c34b4f2ee..bc31957d492c 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -29,6 +29,9 @@ /* Driver for VirtIO network devices. */ #include +#include "opt_inet.h" +#include "opt_inet6.h" + #include #include #include @@ -83,9 +86,6 @@ #include #include "virtio_if.h" -#include "opt_inet.h" -#include "opt_inet6.h" - #if defined(INET) || defined(INET6) #include #endif From nobody Fri Sep 5 19:09: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 4cJQs13tzTz66G30; Fri, 05 Sep 2025 19:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQs13CRgz3R6F; Fri, 05 Sep 2025 19:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099397; 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=U98DWzvxX+HlF0QK97c8qYFZ+vjx/mWg+CxlueKWXVY=; b=V9IEb9xrf78TcJshgqnC+4bE/6mpfQhdX5mMs9qX0R6l8BmHvJQ3sKpfKFz7hyOw0RF6uq PzFs8y+9925miElPYPYTKdebp2FfpC/XP59IR4x3eoG/gidX8w3Y/Jxx9OYCjMrk/sOgls LcTahhOQgXHVU+HjRDhx2eapnAZ+blRWZ1vbJvGaf0dJCOW4vy4yfZsiyvIsxN1VWFYdVB KrTNAjFlMICDYKZRG0nCfzQqhcT6Fxn+m5lUdM3u8B6jOzF81Ncrey59aWz8VQdhHXdpqq OmAOzAVIM+a94fQExbdYKF7CRoxtA/kC3SHW6MLJ5eSjJ6TsffLqhfOQeiVISA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099397; 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=U98DWzvxX+HlF0QK97c8qYFZ+vjx/mWg+CxlueKWXVY=; b=YPbq03WNtEyPL6n6LbrYdiuFhc8DF0HCUqHvf750eFbjbTetT/k0WJrAiOzd79G78EScrd e/EMA2ACM711EAbt9DGSUkx5qsfujzINrUuz1TK2P3wZT40xdQCVK0S+QMI7XMIdLHe5LT TebqD/y9gkdmR+DMf/zw6boymwuZpasSWZwThclZ+vV8nbPFNlLRZ6+bEa3sTvy45GFXKn yzPwLPny9Olco9UnkB5bJ7MhE+fGWgI5vnerxs+0IbRG6cCvEN4us5xqK2+akeuGAu4v1C qYLoOi1lR63fbELGcdX80nghSD39MEb/RvmY8E5xTJ7gfiqho4kPFkAYHLK4IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099397; a=rsa-sha256; cv=none; b=sOE0j0wcoNl4hA5fj+NXtIlc5cTRJAobCP6LFEne4Q8FQcFzxvF0BMLBULgAan3XTTtd5J 5I1vKZCnjXgOrn0emn+UmIN1Lra0AWL2ImSbYO50DuQpV7/xJVmVnaNNXIQAoubAr6lvVl tYDJcdGqIayzAxJZBTLOfaLSptF3utRcH48cAOeKMAbaf9F7WctRIUMh5rbTmHrrx6kFDJ uX+aV59sCkENn9bFs74w6I5/jPyRcawbRQI4I71TDO0eFGhOa6pMm6SbmwqOpUwXMXdy9U UmbOket0dCO3xTqvDQ9dnwhW94/9LeG8V3O6cPBWsLyleQTi3O9hJsRq+u+5Wg== 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 4cJQs12PCSz11lQ; Fri, 05 Sep 2025 19:09: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 585J9v1F039119; Fri, 5 Sep 2025 19:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J9vcG039116; Fri, 5 Sep 2025 19:09:57 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:09:57 GMT Message-Id: <202509051909.585J9vcG039116@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: 68ff713966ed - stable/14 - vtnet.4: use transmit checksum offloading 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: 68ff713966ed2f5e9e78ca6c782bbef2e657623a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=68ff713966ed2f5e9e78ca6c782bbef2e657623a commit 68ff713966ed2f5e9e78ca6c782bbef2e657623a Author: Michael Tuexen AuthorDate: 2025-08-21 15:33:09 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:09:42 +0000 vtnet.4: use transmit checksum offloading Use transmit checksum offloading instead transmission checksum offloading to be consistent with other man pages. Reported by: Peter Lei Sponsored by: Netflix, Inc. (cherry picked from commit c7263f873ee9abb772f67b5536e2380a046e1b94) --- share/man/man4/vtnet.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 3760612536df..6dce8a2889de 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -68,7 +68,7 @@ prompt before booting the kernel or stored in .Bl -tag -width "xxxxxx" .It Va hw.vtnet.csum_disable .It Va hw.vtnet. Ns Ar X Ns Va .csum_disable -This tunable disables receive and transmission checksum offloading for TCP and +This tunable disables receive and transmit checksum offloading for TCP and UDP. This also implies that TCP segmentation offloading and large receive offload are disabled. @@ -132,7 +132,7 @@ The number of times the transmit interrupt handler was rescheduled. .It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .tso The number of times TCP segment offloading was performed. .It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .csum -The number of times transmission checksum offloading for UDP or TCP was +The number of times transmit checksum offloading for UDP or TCP was performed. .It Va dev.vtnet. Ns Ar X Ns Va .txq Ns Ar Y Ns Va .omcasts The number of multicast packets that were transmitted. @@ -183,15 +183,15 @@ transmit operation. .It Va dev.vtnet. Ns Ar X Ns Va .tx_defragged The number of times an mbuf chain was defragmented during a transmit operation. .It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_without_csum -The number of times TCP segment offloading was attempted without transmission +The number of times TCP segment offloading was attempted without transmit checksum offloading. .It Va dev.vtnet. Ns Ar X Ns Va .tx_tso_not_tcp The number of times TCP segment offloading was attempted for a non-TCP packet. .It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_proto_mismatch -The number of times the IP protocol version of the transmission checksum +The number of times the IP protocol version of the transmit checksum offloading request did not match the IP protocol version of the packet. .It Va dev.vtnet. Ns Ar X Ns Va .tx_csum_unknown_ethtype -The number of times a transmission offload operation was requested for an +The number of times a transmit offload operation was requested for an ethernet frame for which the EtherType was neither IPv4 nor IPv6 (considering simple VLAN tagging). .El From nobody Fri Sep 5 21:36: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 4cJV6W2w7Dz66R6V; Fri, 05 Sep 2025 21:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJV6W2M8Qz3kYj; Fri, 05 Sep 2025 21:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757108211; 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=5Lg7/Zjyi3UFHI7PqWN2Ot7plKZ7efGUp1/n9vMBrac=; b=ccxecIYKvAUulkoGdPt18bULUmEeSiL0XPEUU1OzS4aiRnH30VLJ/D3zvE0prFGCbW0P0c O36+mLpIJEPs8aS4N5wuj5G1D0VAI+LnajSzWOUAywc6GTL2v4NIjhc8Ar1/4VA+9Or5k8 MXzIYbf34JWWS81A2Wm76sctwEpSNw/Ju6EoAgTBXJzc3LYgPZxgCaKbOZDulg2zErtpEL Hs/6K/gB18vNPZRjQxqYnEbN+8yzDdylkzkLQw/Fom/48hdnWuoPB4rlkuzOL2+mFcaUpl wtNhuAeC+urvSAnuJFXALHzXHmUWJ11SNI7QROAAfbhRsZXfEuBgXaYwOXv3mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757108211; 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=5Lg7/Zjyi3UFHI7PqWN2Ot7plKZ7efGUp1/n9vMBrac=; b=iaxC9ShNFLoDYgwg/71vWp/Ipq0Yy99pJT3VmhU+kJCWGW3Jis1oPO7u+1xXkMsfgJJjYj +jqxRFzKDNnG1IHQ3qIoGYXpsRa6p4OV2NeKMMGKmBrzPcNLvS52rvIjsi4v9rTxUr5bBe USQYGgJhEFPqznqnU2GsB3ivQ5puSVUaEvAibw1OD903jrp4dw3740j07fEOcE6JZWLJ0f +D9zyiv6eg+xr55NJJYkVkqiSSa6cIHVhk0qLctxq9uilJ28UCnrThFDv+k2CfIoJNJztv 9rwnBh0C8A0JVAzgJkdqb+Ba4jGhBg+gxMl+ytbNy2nCgfS04eyRt+VW2Zy3nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757108211; a=rsa-sha256; cv=none; b=PXQwto6bjYgcow1KGSJCgyVxh0Z4bb6H6GGOoo/ulvbMS+s4MfiIlU4+gDWjRZFfKz3CTp /YdK5tGnYzjq9hNaIoSUkzZSL/Tq96WR4tWwi2ZI77KFsbw6+4zqVwjddpyu0suqMW4VJA sr659avh1dNSTy5b33v9CKrerCexQB9h1XyPYqLEYvIx/NIQ7mJgmbaHF6L1DF7Zk7vRAY WS/sUs6nPfhNPhqZnJcl9+6cNyX1NKsyGqW3d+VmMbc4gGgUT/7exCJoDAq+BtziteLfQD xHW0O2LQeYaVDkOAhMJpq/PEyBXLuu9AU6evMnpWGlGhHqN7i4bPp+8bma58RA== 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 4cJV6W1vn8z15RC; Fri, 05 Sep 2025 21:36: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 585LapxX020546; Fri, 5 Sep 2025 21:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585Lapli020543; Fri, 5 Sep 2025 21:36:51 GMT (envelope-from git) Date: Fri, 5 Sep 2025 21:36:51 GMT Message-Id: <202509052136.585Lapli020543@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: c09d21f71329 - stable/15 - Add description for WITH_PTHREADS_ASSERTIONS 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/15 X-Git-Reftype: branch X-Git-Commit: c09d21f7132908737a20171d75b88925282da4c4 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c09d21f7132908737a20171d75b88925282da4c4 commit c09d21f7132908737a20171d75b88925282da4c4 Author: Colin Percival AuthorDate: 2025-09-05 21:29:51 +0000 Commit: Colin Percival CommitDate: 2025-09-05 21:36:19 +0000 Add description for WITH_PTHREADS_ASSERTIONS This option is turned on by default in -CURRENT but will be turned off in 15-STABLE; this description will land in the src.conf(5) man page in that branch. MFC after: 1 minute (cherry picked from commit af60084978a43632c5ab2d6e3aca41be7a658d8c) --- tools/build/options/WITH_PTHREADS_ASSERTIONS | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/options/WITH_PTHREADS_ASSERTIONS b/tools/build/options/WITH_PTHREADS_ASSERTIONS new file mode 100644 index 000000000000..03c15b76fb85 --- /dev/null +++ b/tools/build/options/WITH_PTHREADS_ASSERTIONS @@ -0,0 +1 @@ +Enable debugging assertions in pthreads library. From nobody Fri Sep 5 21:36: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 4cJV6X3yVsz66RWV; Fri, 05 Sep 2025 21:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJV6X3GXTz3kTf; Fri, 05 Sep 2025 21:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757108212; 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=mbQ3IooSbY98XayNmP0N7UvaTMsEcEADgw3jTdO8oxo=; b=lfyt5d9mmvvDD85xeDQlaxm0lAOBJ0G3BqKTXjSef+Co3Qt7QAjnEYk4scFTEDrKYFhT0K 725tLOY7JF1QGOTHWxoVq4aoT/4Ivk/YGeozAbEeJMooktWZO5dmPKpi1G85wOB9uYn0Wp wVp8/Ftqcvw9URUoiCYthnki6zZOWHMe2gK/Q+EFC3v7RmNdB9Othpe28fr0Q6Bxh4tufI jAsyfVKqFBUFjpxDUcXNZxu0PT776UqjlExs8GDqdTpkL9UW5LDn/Iq+u/TVIdGQvHF5yO xVrHnY3jnPzM/4Cktg29UwtVEmFl8k9D7u8bQqnAM4F2u1SVLx5sMETj3qlwxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757108212; 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=mbQ3IooSbY98XayNmP0N7UvaTMsEcEADgw3jTdO8oxo=; b=miY4oxsWqFAN59e04+LsODxYk1B7TrvNlty9tDcLCEZ2E7sKWIhjj5y2bk30vXMr5jdC6v fjerFmr8i3zZloU/FCK1iOzjEAzrYSWndrIoUsEOELL5rbP/GlWaxOVeT6KBckgbsz00l2 zIIkEjt8PrYRH5lAipeD0Sn5J+L3lvPXzO0kIg4pvtLSvJuJlTfWsH0cLVp2y0+wszg2jy 2Q5p/EsNT60ZzxzHbjBi61iOdI2nc6DKNjF6z/NVLzH6pBaj6XYjNpiNGUGN7qEFJvhZZS Evtk1yQ/dgUtBoNeaPt9niPKgiLqW3daB+z60v/RfRqLXMwr1jZq3DWD1Ej/Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757108212; a=rsa-sha256; cv=none; b=Qk5TY1STdTYAoqxFMuyUq5UQLQUhPCGvwZSnqono5VMZPq6UzhGqYtpJMUXan3m/1x5VpW lj1SqPEeSYnSNMD+UzQIhTKm9vM5u3eaJ4JKPHlRwxJjfXjz0bviVbrl/tVLavItrI3Ox7 GQ2zCQGlKSn2yIs4jpui17JV3K3MVpQYkX+zifmmL0tAeeRVVKlngA6PNmo+qb0jNZ/bIa uAZEN5IoMPYV/vPWKvdf0Jh0zQ2DGo9XSFOma7sLdVUl0NDHpQ3e6Q608zsG4ckMH4q7jI qpR4Jl8yAHCCjzg7un9CQl6+xVT8wmk+QuehWrG7f1omNDsAi7rs0fjdQYJB6A== 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 4cJV6X2rMVz14pv; Fri, 05 Sep 2025 21:36: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 585LaqLT020581; Fri, 5 Sep 2025 21:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585LaqpT020578; Fri, 5 Sep 2025 21:36:52 GMT (envelope-from git) Date: Fri, 5 Sep 2025 21:36:52 GMT Message-Id: <202509052136.585LaqpT020578@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: bc96364a4d60 - stable/15 - Turn off PTHREAD assertions in stable/15 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/15 X-Git-Reftype: branch X-Git-Commit: bc96364a4d604a5b37a00789ac16e8e32c75301c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bc96364a4d604a5b37a00789ac16e8e32c75301c commit bc96364a4d604a5b37a00789ac16e8e32c75301c Author: Colin Percival AuthorDate: 2025-09-05 21:33:47 +0000 Commit: Colin Percival CommitDate: 2025-09-05 21:36:25 +0000 Turn off PTHREAD assertions in stable/15 Direct commit to stable/15; the assertions stay on in -CURRENT. Reported by: Mark Millard Discussed with: kib Approved by: re (implicit) --- share/man/man5/src.conf.5 | 6 +++--- share/mk/src.opts.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index fa3ab3bc63b0..aa6a85754a8c 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd September 4, 2025 +.Dd September 5, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1514,8 +1514,8 @@ and related programs. Do not build .Xr ppp 8 and related programs. -.It Va WITHOUT_PTHREADS_ASSERTIONS -Disable debugging assertions in pthreads library. +.It Va WITH_PTHREADS_ASSERTIONS +Enable debugging assertions in pthreads library. .It Va WITHOUT_QUOTAS Do not build .Xr quota 1 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 60fe42372faa..fe71796d2270 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -160,7 +160,6 @@ __DEFAULT_YES_OPTIONS = \ PKGBOOTSTRAP \ PMC \ PPP \ - PTHREADS_ASSERTIONS \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ @@ -215,6 +214,7 @@ __DEFAULT_NO_OPTIONS = \ LLVM_FULL_DEBUGINFO \ OFED_EXTRA \ OPENLDAP \ + PTHREADS_ASSERTIONS \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ From nobody Fri Sep 5 22:05: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 4cJVlV3Cxjz66ThY; Fri, 05 Sep 2025 22:05: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJVlV2P8Fz3qY9; Fri, 05 Sep 2025 22:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757109926; 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=7LHVJzPc+sGB00WeEPOHucK8KUgTBwLbK4Xy9inQQIA=; b=a34rYJF251p4ArrQ9JSj7erUC3vixhh7d1BZl1UxRmcua3KY//ZZ4f9XZW8ftULdaGak0C 1uYHq9w0fJj8fgNNtZUiGyKC5pgS/rxKQoWrO+8EJaGSWlv2RurE/b4kQ7Y/N/i4vwXXUe 0Jrzs2Qh0WFBDQQmsvhBYtgT6MiuEU/5lPttWFEtG/fseQNIiLHPRBdt76fAv8L6PZq32Q QN4A1MgF3KpjxCDnFUhoJORdvtrD4x1If8u7wXzzwiTcSsLAO1PUW7YIvBoqD9GBxgmZti tmRSJTuVUUMXjPu9hJgvGzyWUW2zhl0pqTL150LLZDt2o5xe8WueRxjjIMPbZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757109926; 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=7LHVJzPc+sGB00WeEPOHucK8KUgTBwLbK4Xy9inQQIA=; b=uJcLXQQ3rWGb5w5GZ09HRJ1gHguxpqzVVX/amsYdjzrfJtgmPiqPbYHPqmlO+NfzwrCQnK khTZ/8elKy5EXawTd93dEM5Y5q7uo/IwsZHP1ybuugqvHbttNsqA+AnV6FRViZIezybS53 pdjesNfcgrzJtMt/Nc1AGhbav4YDRIXKgWuhl7EB6LZdZndql79IWXCK7a23smVbNzo5jx ArwM9I22PObUkxchr0F/MqDTbnAQ6S96zJunX6WbdmM5qY/16//qbT468olzg1oxcIby5f oym6tVxazFH29n9OqEaOS0v9rVH831XhY/KkGWz5SCDCIv9gZ5lytViA3JnJKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757109926; a=rsa-sha256; cv=none; b=m1+4fk6V8VNXaDuEhffXQ/jQklxyYU/ewAHGZgOwVUu1AnCE5Z7On35Wy+uZotDFx7EXYZ BR5cxB/w8R/nr9qcLmBCce2MwPWiUVubj6F1Cf05Ut/YaPQqJ5VkVkrI73FyB5AA7nvJPm ieVqPNzKdR65LubyRRwjFsa97KhJe6QiM34lYnR1Y4/AmZBz7W8YCU589sRZfaNQC/4wRh FyQ/yq7SwUCbNnzMrjVsE+52WuLgBWkZB6e9kkztAG6F+rcPQHu9c9DPJT0R6/F2QjjPiq +8fA0rBhXoFjDefHFxW+XcPZwAVkC0/Vty39f6XeIsJ3oeopfZjxEwTYQFQ7Vg== 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 4cJVlV1tmVz16Bs; Fri, 05 Sep 2025 22:05: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 585M5Qrn076921; Fri, 5 Sep 2025 22:05:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585M5QWF076918; Fri, 5 Sep 2025 22:05:26 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:05:26 GMT Message-Id: <202509052205.585M5QWF076918@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: 8ba76c6565f3 - stable/15 - Add -DEBUG kernel configurations 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/15 X-Git-Reftype: branch X-Git-Commit: 8ba76c6565f3d57160009d5ac8972fed9b00e59e Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8ba76c6565f3d57160009d5ac8972fed9b00e59e commit 8ba76c6565f3d57160009d5ac8972fed9b00e59e Author: Colin Percival AuthorDate: 2025-09-05 22:05:03 +0000 Commit: Colin Percival CommitDate: 2025-09-05 22:05:03 +0000 Add -DEBUG kernel configurations Also include these in GENERIC-K*SAN kernels (which previously depended on GENERIC configurations which debug-enabled until the branch point). Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/amd64/conf/GENERIC-DEBUG | 9 +++++++++ sys/amd64/conf/GENERIC-KASAN | 2 +- sys/amd64/conf/GENERIC-KCSAN | 2 +- sys/amd64/conf/GENERIC-KMSAN | 2 +- sys/amd64/conf/MINIMAL-DEBUG | 9 +++++++++ sys/arm/conf/GENERIC-DEBUG | 9 +++++++++ sys/arm64/conf/GENERIC-DEBUG | 9 +++++++++ sys/arm64/conf/GENERIC-KASAN | 2 +- sys/arm64/conf/GENERIC-KMSAN | 2 +- sys/i386/conf/GENERIC-DEBUG | 9 +++++++++ sys/powerpc/conf/GENERIC-DEBUG | 9 +++++++++ sys/powerpc/conf/GENERIC64-DEBUG | 9 +++++++++ sys/powerpc/conf/GENERIC64LE-DEBUG | 9 +++++++++ sys/riscv/conf/GENERIC-DEBUG | 9 +++++++++ 14 files changed, 86 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/GENERIC-DEBUG b/sys/amd64/conf/GENERIC-DEBUG new file mode 100644 index 000000000000..f7187677370b --- /dev/null +++ b/sys/amd64/conf/GENERIC-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/amd64 +# + +include GENERIC +include "std.debug" + +ident GENERIC-DEBUG diff --git a/sys/amd64/conf/GENERIC-KASAN b/sys/amd64/conf/GENERIC-KASAN index 5aa2d50d3cca..855f2e29f119 100644 --- a/sys/amd64/conf/GENERIC-KASAN +++ b/sys/amd64/conf/GENERIC-KASAN @@ -1,5 +1,5 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KASAN diff --git a/sys/amd64/conf/GENERIC-KCSAN b/sys/amd64/conf/GENERIC-KCSAN index a0970f2a46a4..135f705c0c93 100644 --- a/sys/amd64/conf/GENERIC-KCSAN +++ b/sys/amd64/conf/GENERIC-KCSAN @@ -25,7 +25,7 @@ # in NOTES. # -include GENERIC +include GENERIC-DEBUG ident GENERIC-KCSAN diff --git a/sys/amd64/conf/GENERIC-KMSAN b/sys/amd64/conf/GENERIC-KMSAN index e147d8b8168b..c84241e9d50b 100644 --- a/sys/amd64/conf/GENERIC-KMSAN +++ b/sys/amd64/conf/GENERIC-KMSAN @@ -1,5 +1,5 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KMSAN diff --git a/sys/amd64/conf/MINIMAL-DEBUG b/sys/amd64/conf/MINIMAL-DEBUG new file mode 100644 index 000000000000..a2533608f8af --- /dev/null +++ b/sys/amd64/conf/MINIMAL-DEBUG @@ -0,0 +1,9 @@ +# +# MINIMAL-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/amd64 +# + +include MINIMAL +include "std.debug" + +ident MINIMAL-DEBUG diff --git a/sys/arm/conf/GENERIC-DEBUG b/sys/arm/conf/GENERIC-DEBUG new file mode 100644 index 000000000000..f36fe21b1640 --- /dev/null +++ b/sys/arm/conf/GENERIC-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/ARMv6 +# + +include GENERIC +include "std.debug" + +ident GENERIC-DEBUG diff --git a/sys/arm64/conf/GENERIC-DEBUG b/sys/arm64/conf/GENERIC-DEBUG new file mode 100644 index 000000000000..d954106b58db --- /dev/null +++ b/sys/arm64/conf/GENERIC-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/arm64 +# + +include GENERIC +include "std.debug" + +ident GENERIC-DEBUG diff --git a/sys/arm64/conf/GENERIC-KASAN b/sys/arm64/conf/GENERIC-KASAN index 232e8cb27fcd..baaf62098e95 100644 --- a/sys/arm64/conf/GENERIC-KASAN +++ b/sys/arm64/conf/GENERIC-KASAN @@ -1,4 +1,4 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KASAN diff --git a/sys/arm64/conf/GENERIC-KMSAN b/sys/arm64/conf/GENERIC-KMSAN index a9ff46159f14..5304e3588a96 100644 --- a/sys/arm64/conf/GENERIC-KMSAN +++ b/sys/arm64/conf/GENERIC-KMSAN @@ -1,4 +1,4 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KMSAN diff --git a/sys/i386/conf/GENERIC-DEBUG b/sys/i386/conf/GENERIC-DEBUG new file mode 100644 index 000000000000..a988096e019e --- /dev/null +++ b/sys/i386/conf/GENERIC-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/i386 +# + +include GENERIC +include "std.debug" + +ident GENERIC-DEBUG diff --git a/sys/powerpc/conf/GENERIC-DEBUG b/sys/powerpc/conf/GENERIC-DEBUG new file mode 100644 index 000000000000..6388aaaffb55 --- /dev/null +++ b/sys/powerpc/conf/GENERIC-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/powerpc +# + +include GENERIC +include "std.debug" + +ident GENERIC-DEBUG diff --git a/sys/powerpc/conf/GENERIC64-DEBUG b/sys/powerpc/conf/GENERIC64-DEBUG new file mode 100644 index 000000000000..5e0d43941200 --- /dev/null +++ b/sys/powerpc/conf/GENERIC64-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/powerpc64 +# + +include GENERIC64 +include "std.debug" + +ident GENERIC64-DEBUG diff --git a/sys/powerpc/conf/GENERIC64LE-DEBUG b/sys/powerpc/conf/GENERIC64LE-DEBUG new file mode 100644 index 000000000000..97d308864313 --- /dev/null +++ b/sys/powerpc/conf/GENERIC64LE-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/powerpc64le +# + +include GENERIC64LE +include "std.debug" + +ident GENERIC64LE-DEBUG diff --git a/sys/riscv/conf/GENERIC-DEBUG b/sys/riscv/conf/GENERIC-DEBUG new file mode 100644 index 000000000000..ab16a6cc5cfa --- /dev/null +++ b/sys/riscv/conf/GENERIC-DEBUG @@ -0,0 +1,9 @@ +# +# GENERIC-DEBUG -- WITNESS and INVARIANTS enabled kernel configuration file +# for FreeBSD/RISC-V +# + +include GENERIC +include "std.debug" + +ident GENERIC-DEBUG From nobody Fri Sep 5 22:26: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 4cJWCj5y34z66VQ5; Fri, 05 Sep 2025 22:26: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWCj57kyz3rlb; Fri, 05 Sep 2025 22:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111185; 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=zIdX89GuD4T4ETsGKKrxe2m8ou5KcpZGsHxenLWjo/k=; b=NUlkgIfDnlE4fiNwEiTjxdstntMgS3S+R1VjSxzQrp0WsoEErFuvMjO6SyiKILAprHeiKZ zxktPo3i8ip3CGdls4tiou+/M2KTLZuEbEOimBdbeFs6A0N7g2VnHJcaB8Qhc0cvrQmHjx tCPOUKU/lld5HqdLDjlZDiaLux3W2+mUomTFhFhO2kTV1/QB9bxJYOwwA4IlkwAM3NaNpt xjj4SSrZYrKhH13SuBnZV8E0FNMOWoD6LZbI85dHUbGDu5Kk+tu4xbn+tyq2p5cPQRjzee ODPtdfibkPJdnOk/Cetna8ZV9y6FEJZ8IwHysFBc8tHtH8OWypeRKfo6rIkuMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111185; 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=zIdX89GuD4T4ETsGKKrxe2m8ou5KcpZGsHxenLWjo/k=; b=ZFNDUrZUKbvzS8SzlWhXf1h0cQXipRSy6a3RHyiMwdUDAvHc8gaE5B1pcSoyMQ4Uql4T/V 3ztF0EVvU7R1MrXDXzuexvN8HHPtlVnaMTC+aotNNuhJIRRXIB0ES1lKfzTO3iPVd+Jmzv 6v2jGLDVK0AfOQn0pONtFWNWcz1NMukJjxQPODMzz4Wc4xJaHfqZ54ioN/1ZJp1LlbpPbx Cpmjgya+peNnB6r/IRHxaWpCc5TpqALfCQQht3Tz5Z1Y2lNGYUAKilQOtnKY8KEd4S2tkZ L0wwNzb+hMYwSJb2omJmIMtcTtxv1we+H43HqK7PLeaIErxSgVHd1t3JGw06sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111185; a=rsa-sha256; cv=none; b=w6LLCj0eFtNH1qRWjr99nOvz3wB6MpMNsBJ5ZmjzMr9q7hQHd8AM9Tc4Wbdv8Kx6MqCF9t wzzalHPz0RqAvtGNHR5VSKQWLrZ2JwBhNH61nmoFBh3LGBq9VPz23bz7SKCmLnoOF+5bdj 40dbwcCgVONWB4Syu35UqeVLLKdNMEE/0sEkvogtGTEF1t+DAGzdXxyQtoSAJSOm88RoWV lDmIt0ZHM3OvM3qxHhdVcp9zxiCjARhPa1Zuqpz1YAHxGJCTBgObZHmI+TAxLM13VfLzbe XH1Sd5yqfVaXo4mlVNBWEwXhBw7BecDyeEvFUz+nqN2Gx61zQibeLN+wDBQUqA== 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 4cJWCj4Rt3z16PM; Fri, 05 Sep 2025 22:26: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 585MQPPd014331; Fri, 5 Sep 2025 22:26:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585MQPEJ014328; Fri, 5 Sep 2025 22:26:25 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:26:25 GMT Message-Id: <202509052226.585MQPEJ014328@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: 37c6c4daae15 - stable/14 - epair: don't include if_var.h twice 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: 37c6c4daae1538cd623971bdef1caea3cbb90d54 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=37c6c4daae1538cd623971bdef1caea3cbb90d54 commit 37c6c4daae1538cd623971bdef1caea3cbb90d54 Author: Michael Tuexen AuthorDate: 2025-08-26 12:19:37 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 22:26:10 +0000 epair: don't include if_var.h twice Sponsored by: Netflix, Inc. (cherry picked from commit f5dbf1b1c725da226fd45937decb5a5652ac1422) --- sys/net/if_epair.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 7051e31565d4..988930998dad 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include From nobody Fri Sep 5 22:26:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJWDJ000Pz66Vgp; Fri, 05 Sep 2025 22:26:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWDH6YrZz3sT8; Fri, 05 Sep 2025 22:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111215; 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=xxm9vXDS9ganZM8J5yP5LlJPV7l6X9+6Ok8BMN9FWyI=; b=ix7UteflqfVr3e2u6YOEWBqdqhZVzTVJdT2Uosk4BuNxFwVoW8bjkEpxQmIObiTUbCMrlw NHb9hzqdIn+7fFrBkJ8t+8M652r7wFSh551vazCCtaBp4oUbQ/Y1CIvp0bph4uSL9uI0/X reQ1rJzx2GJ7MEd/cHTJH3IvRUJ96VbsNWR1DxzLU8hutkumahtenT0ZvQtP8HeDRF3Yd9 PYqcahGm29CPFD8pGhfn4SGIIRytsJmkXlWlWcnxK91XF9oy6pCOiDpDmUBZ6/Wv0KNlh8 RmPrgjCNMJqVQN7rwm4cm4nXWAKoc0kRF3vd86O0S+jqrXpIvGrvlKcHomj16g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111215; 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=xxm9vXDS9ganZM8J5yP5LlJPV7l6X9+6Ok8BMN9FWyI=; b=nygvVlEWtENjgMaqbyPRNva52kUJatvvQ1RtulLHiItNcC0W16SwqslTugDUTaQdlTdQz/ rj2UXAGYbRoQXcvw/9hI8ATvJ8Rp73y8yhXfDnjJ7Bhg6xGEsVoxQgVMLJr1h/LN06p5oJ 1bLAK+GCmkSU4MZpIGN2QnbJUqUa2mYYOW2jgKY34iAMEXQVomNBPm7MBeb6rEqtE6xxYe HpZLmXqFIRtdU2TNipXGvAN2vXUB1cA7tOdCKj/qrVxSrPZUdLMEfENq69ei2hoilqwpiK 7Xr8BltrCJswuGc2dHlS7vURVQk8jKGK5rvmrdoe67ntx/e4kqm6m1Ux3l6prQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111215; a=rsa-sha256; cv=none; b=tgfwmTPaSo2PQxq0bS7kpa2vx3RUuwFLRN4RQotultzswaTEsR+2/e7YlON23FF+xDZyLj Anvh7inz2BPxYVIIF6seljANIsYHcK1UMo0YrQ127d6CSXtyI2DTsWlws5DL0Ls31LVsHJ hd1Quae350xJyAGlI+93bHTjVV7HvnsUE9kc9q2q7sTCfh0f8pAgrAW9/fZu9+wjZj6DA5 EbRBnZnWz3dCsVOREp+9uB2xsEsTVuGGdBbgxCfJGdE0/D7QMzI+D/zfba+jTTMvgF/+/p 8AVubzAe2LvMWTGkrjXECGGaeObMRbeAWsmHQTl2YwP/HfY0lAjiAfUwXLsibQ== 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 4cJWDH68vWz16XY; Fri, 05 Sep 2025 22:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585MQtHn014595; Fri, 5 Sep 2025 22:26:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585MQtB9014591; Fri, 5 Sep 2025 22:26:55 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:26:55 GMT Message-Id: <202509052226.585MQtB9014591@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: bb2287ec1b01 - stable/14 - netstat: improve statistic output for sctp 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: bb2287ec1b0170e0f52a13c44d5571dbcfd6fff0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bb2287ec1b0170e0f52a13c44d5571dbcfd6fff0 commit bb2287ec1b0170e0f52a13c44d5571dbcfd6fff0 Author: Michael Tuexen AuthorDate: 2025-08-26 12:57:20 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 22:26:39 +0000 netstat: improve statistic output for sctp Provide counters for receive and transmit checksum offloading for SCTP. (cherry picked from commit 6d988ec3a76135409730313877b3eb0b8a7517fc) --- usr.bin/netstat/sctp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c index 09aea6cbf46d..87573929010c 100644 --- a/usr.bin/netstat/sctp.c +++ b/usr.bin/netstat/sctp.c @@ -630,6 +630,10 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) "{N:/fast path receives all one chunk}\n"); p1a(sctps_recvexpressm, "\t\t{:receives-fast-path-multipart/%ju} " "{N:/fast path multi-part data}\n"); + p1a(sctps_recvswcrc, "\t\t{:performed-receive-crc32c-computation/%ju} " + "{N:/performed receive crc32c computation}\n"); + p1a(sctps_recvhwcrc, "\t\t{:performed-receive-crc32c-offloading/%ju} " + "{N:/performed receive crc32c offloading}\n"); /* * output statistics @@ -656,6 +660,10 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) "{N:/output AUTH chunk%s}\n"); p1a(sctps_senderrors, "\t\t{:send-errors/%ju} " "{N:/ip_output error counter}\n"); + p1a(sctps_sendswcrc, "\t\t{:performed-receive-crc32c-computation/%ju} " + "{N:/performed transmit crc32c computation}\n"); + p1a(sctps_sendhwcrc, "\t\t{:performed-transmit-crc32c-offloading/%ju} " + "{N:/performed transmit crc32c offloading}\n"); /* * PCKDROPREP statistics From nobody Fri Sep 5 22:27: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 4cJWF95tJ0z66Vds; Fri, 05 Sep 2025 22:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWF954vtz3skw; Fri, 05 Sep 2025 22:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111261; 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=2iWLBmsjxrYgRaZ5hYVW6Zx37fY21dDOGFMc203c1mo=; b=eR2YY1sJMD5/ERbF7S48sc6PK4HlOmu2VRKGfpeLyhY9IEqsgVz16+JQsptWjf4ZmvT4tD M8R3Q854HfynXJnUDbDm2aPiGX6PP8WHZs4oswKSloL7nLlDPdEMWl53fEruJUxK9qflHc d3bCG6nWvhfHIYFaJ10hlzsFXk7l+NzD6QZoeloHBSRTTy48HsHiynNX371nxA76+k3soL lVKT0UKjvi4nzUKBYbB4M/a/gfe41F4cAAtJ30WV+R6/sxUkaFNPyFIewaqpU5cB3XSpG9 kpd1AMl3GpmsJ8mZiFQcJecqRXL8Eckef3q+Bt7g9GLyl0HGk5BLmAT3EZ3Pog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111261; 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=2iWLBmsjxrYgRaZ5hYVW6Zx37fY21dDOGFMc203c1mo=; b=Jp6V78BEtVwGE1v+YOcbmg/rhPJeGBORo6PzEUcuMuvo5l2EbIPCgZRqgZHE4iUV2Qpajd IpbjJvkKAjF9YI3nt0l47pBsNmjDIs80CNwwTL23X+khKT6UKfFbArpbLe6O6ZL6Xp6W87 S7Xh0SCbwyJW8Nl14qrWOtxWnvXfyPVlegefXrS7Q7bMhpBNfPtqOWOJWBn+3O7qagv2Iv jW7N0PcUQH4iNnk/9DQpBjs5+U3KDvDVirROe1//keQ3/13DwuQnpAAQwLTEeCxMydsPKn p24Z78i1kDJxud8mhqcQBaPWCseZ+2cPyglnOxnNVJp+v+EsMwqKzvMNZwY1Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111261; a=rsa-sha256; cv=none; b=uxO5F5cc8Wp2KBB02qYVRyBoSHWQstjU1ck2KLmgzLXHuqMKbp82ZYpuP4+b5FzmQsnpvc A3DG3fTsJ2ZvffDSLsgDkcm3FdLFHVRQpIGOISc06odlqSknnf47vbzxxM3YM2AVR3XQtG +/+qrioVlyEby5ZiEhUbDhh+hMD1fWdVadpi0JBwjyk1+/oHlqWOloOK3VKVxd6KNKmbE1 zniFeijMPEZyaeeLj9MKOwL6RlXAzDMIH+qHzKY6LQSlhyq7LaYTFPMtfrboGjZ8KhlFGn 9QHKw45BMECNxBdoIbC+mFzCabqYPqq3RpkSn2az3vgfNDuiUcqGe7yWVsz1sw== 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 4cJWF94X8dz16vc; Fri, 05 Sep 2025 22:27: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 585MRfxc014927; Fri, 5 Sep 2025 22:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585MRfqD014924; Fri, 5 Sep 2025 22:27:41 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:27:41 GMT Message-Id: <202509052227.585MRfqD014924@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: f0f1e749448f - stable/14 - vtnet: fix computation of sysctl variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0f1e749448fff002a781c0b649d402a8e7133a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f0f1e749448fff002a781c0b649d402a8e7133a1 commit f0f1e749448fff002a781c0b649d402a8e7133a1 Author: Michael Tuexen AuthorDate: 2025-08-28 09:27:00 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 22:27:27 +0000 vtnet: fix computation of sysctl variables Fix the aggregation of the interface level counters * dev.vtnet.X.tx_task_rescheduled, * dev.vtnet.X.tx_tso_offloaded, * dev.vtnet.X.tx_csum_offloaded, * dev.vtnet.X.rx_task_rescheduled, * dev.vtnet.X.rx_csum_offloaded, and * dev.vtnet.X.rx_csum_failed. Also ensure that dev.vtnet.X.tx_defrag_failed only counts the number of times m_defrag() fails. While there, mark sysctl-variables used for exporting statistics as such (CTLFLAG_STATS). Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D51999 (cherry picked from commit 03da4395158d374b5e38623f6744ce31302b530c) --- sys/dev/virtio/network/if_vtnet.c | 131 ++++++++++++++++++++++++++++++++++---- 1 file changed, 117 insertions(+), 14 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index bc31957d492c..98ef949992bc 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2549,8 +2549,10 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, error = sglist_append_mbuf(sg, m); if (error) { m = m_defrag(m, M_NOWAIT); - if (m == NULL) + if (m == NULL) { + sc->vtnet_stats.tx_defrag_failed++; goto fail; + } *m_head = m; sc->vtnet_stats.tx_defragged++; @@ -2566,7 +2568,6 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, return (error); fail: - sc->vtnet_stats.tx_defrag_failed++; m_freem(*m_head); *m_head = NULL; @@ -4171,6 +4172,102 @@ vtnet_setup_queue_sysctl(struct vtnet_softc *sc) } } +static int +vtnet_sysctl_rx_csum_failed(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + struct vtnet_statistics *stats = &sc->vtnet_stats; + struct vtnet_rxq_stats *rxst; + int i; + + stats->rx_csum_failed = 0; + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + rxst = &sc->vtnet_rxqs[i].vtnrx_stats; + stats->rx_csum_failed += rxst->vrxs_csum_failed; + } + return (sysctl_handle_64(oidp, NULL, stats->rx_csum_failed, req)); +} + +static int +vtnet_sysctl_rx_csum_offloaded(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + struct vtnet_statistics *stats = &sc->vtnet_stats; + struct vtnet_rxq_stats *rxst; + int i; + + stats->rx_csum_offloaded = 0; + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + rxst = &sc->vtnet_rxqs[i].vtnrx_stats; + stats->rx_csum_offloaded += rxst->vrxs_csum; + } + return (sysctl_handle_64(oidp, NULL, stats->rx_csum_offloaded, req)); +} + +static int +vtnet_sysctl_rx_task_rescheduled(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + struct vtnet_statistics *stats = &sc->vtnet_stats; + struct vtnet_rxq_stats *rxst; + int i; + + stats->rx_task_rescheduled = 0; + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + rxst = &sc->vtnet_rxqs[i].vtnrx_stats; + stats->rx_task_rescheduled += rxst->vrxs_rescheduled; + } + return (sysctl_handle_64(oidp, NULL, stats->rx_task_rescheduled, req)); +} + +static int +vtnet_sysctl_tx_csum_offloaded(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + struct vtnet_statistics *stats = &sc->vtnet_stats; + struct vtnet_txq_stats *txst; + int i; + + stats->tx_csum_offloaded = 0; + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + txst = &sc->vtnet_txqs[i].vtntx_stats; + stats->tx_csum_offloaded += txst->vtxs_csum; + } + return (sysctl_handle_64(oidp, NULL, stats->tx_csum_offloaded, req)); +} + +static int +vtnet_sysctl_tx_tso_offloaded(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + struct vtnet_statistics *stats = &sc->vtnet_stats; + struct vtnet_txq_stats *txst; + int i; + + stats->tx_tso_offloaded = 0; + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + txst = &sc->vtnet_txqs[i].vtntx_stats; + stats->tx_tso_offloaded += txst->vtxs_tso; + } + return (sysctl_handle_64(oidp, NULL, stats->tx_tso_offloaded, req)); +} + +static int +vtnet_sysctl_tx_task_rescheduled(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + struct vtnet_statistics *stats = &sc->vtnet_stats; + struct vtnet_txq_stats *txst; + int i; + + stats->tx_task_rescheduled = 0; + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + txst = &sc->vtnet_txqs[i].vtntx_stats; + stats->tx_task_rescheduled += txst->vtxs_rescheduled; + } + return (sysctl_handle_64(oidp, NULL, stats->tx_task_rescheduled, req)); +} + static void vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, struct sysctl_oid_list *child, struct vtnet_softc *sc) @@ -4215,14 +4312,17 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_proto", CTLFLAG_RD, &stats->rx_csum_bad_proto, "Received checksum offloaded buffer with incorrect protocol"); - SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_failed", - CTLFLAG_RD, &stats->rx_csum_failed, + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rx_csum_failed", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, + sc, 0, vtnet_sysctl_rx_csum_failed, "QU", "Received buffer checksum offload failed"); - SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_offloaded", - CTLFLAG_RD, &stats->rx_csum_offloaded, + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rx_csum_offloaded", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, + sc, 0, vtnet_sysctl_rx_csum_offloaded, "QU", "Received buffer checksum offload succeeded"); - SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_task_rescheduled", - CTLFLAG_RD, &stats->rx_task_rescheduled, + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rx_task_rescheduled", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, + sc, 0, vtnet_sysctl_rx_task_rescheduled, "QU", "Times the receive interrupt task rescheduled itself"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_csum_unknown_ethtype", @@ -4245,14 +4345,17 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_defrag_failed", CTLFLAG_RD, &stats->tx_defrag_failed, "Aborted transmit of buffer because defrag failed"); - SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_csum_offloaded", - CTLFLAG_RD, &stats->tx_csum_offloaded, + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_csum_offloaded", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, + sc, 0, vtnet_sysctl_tx_csum_offloaded, "QU", "Offloaded checksum of transmitted buffer"); - SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_tso_offloaded", - CTLFLAG_RD, &stats->tx_tso_offloaded, + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_tso_offloaded", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, + sc, 0, vtnet_sysctl_tx_tso_offloaded, "QU", "Segmentation offload of transmitted buffer"); - SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_task_rescheduled", - CTLFLAG_RD, &stats->tx_task_rescheduled, + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_task_rescheduled", + CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, + sc, 0, vtnet_sysctl_tx_task_rescheduled, "QU", "Times the transmit interrupt task rescheduled itself"); } From nobody Fri Sep 5 22:28: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 4cJWG56WD6z66VZn; Fri, 05 Sep 2025 22:28: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWG55tPdz3t55; Fri, 05 Sep 2025 22:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111309; 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=yop7bQDUkk9hsFwvItXXZELD/clSOe1fiDMPQ8/BCy8=; b=U/f5hEhuFro05IxILPmCjeB8IV1+TbYNCBuj7S2MT2XpX0jhL9ikW2DFw5XlSpJrvCdVfP eC8zRvNHEWPk998c6epThJfa5X+TXxBY0PKx/ozyAB5cPFDwRvCExcjqdUMARFJ99ouvQb FXZK7ufV+271+4Nl43LuZdD9lZ/GKPP6ATK+qreNbZKYM9sW3Qc8EDd436KAoDYj7x+WG+ a+gMLRU5MQK23YBp13L7M4bn+ORrPPkllpjErQ7jfs2uNhWqX1mku8Y8bK46RYv53/a29N 5LB3v8I0Z3IIbipgxx3pDZCaOZhf7A+q1gYp89hJhk6yg69r+4ld/GlU/a05KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111309; 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=yop7bQDUkk9hsFwvItXXZELD/clSOe1fiDMPQ8/BCy8=; b=xsoXALsY6uPjIgR5d+fn4cSsTFBMowZYrH6/GhTSEiGu3botNKVa0o/P4LeEJ2Mr1QxXNC vDKpoZKfqIqgylX+8MqkIiSCAQv2OuM58aAvMSstPqPV7yghbPLBgkoMZfaA88r4YCvpxA lUsyLtF38z5xbn/RyH0tsgbueGIrSs2tgU7r4YZIayatr1qA0euitUckolqAy+wxiMyO+I 0Mdasl73vfxYhrhm+iCv073/SdpdnZhD93wuS60HSLOuovtOsnKfy9X7ZUDdJ0PHLRNHjG jZVbFnbq2xTUu1SIYra5MjwZuSz1HfjsWat1jyymxQ4xv+ZrOrWToVsP6uDZ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111309; a=rsa-sha256; cv=none; b=t45+d9cSEaouLGWfZ3iOl/tR4ZiZ+6+SzfY1BAY/VlI/gMrDFbRXxGysHQKXZ2MKmWErLJ gzg0iNEIs1WofOLbZcLDc1STqgi/8+mOxdElkpZbm+jAT/vqh0xqesVb0/8etITq+Ivcan OY/rmdOJPaU2jj9jYD5QhPYZxZvBPRqujE3AwOkB31Mz9hG3hZoDghtBw23hsXuSjr9x3w 81neMGlfWAVxfX++VtZYMWku8uaqNgHW0JmZKlXqyG6M6yDj+B2YBOhMMWbGRNh6/eRhB9 xDrzNC50n2Eg2xhrSZ5zxqSpya8aze+qPIihklP2cLMUMaSQK9DTjuPRPgldcQ== 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 4cJWG55Q94z163J; Fri, 05 Sep 2025 22:28: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 585MST3m015272; Fri, 5 Sep 2025 22:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585MST9H015269; Fri, 5 Sep 2025 22:28:29 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:28:29 GMT Message-Id: <202509052228.585MST9H015269@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: 2db6762a6950 - stable/14 - tcp: remove stale 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: 2db6762a6950f4c7699dca6c2b65a1a2f2c52213 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2db6762a6950f4c7699dca6c2b65a1a2f2c52213 commit 2db6762a6950f4c7699dca6c2b65a1a2f2c52213 Author: Michael Tuexen AuthorDate: 2025-08-28 09:35:19 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 22:28:01 +0000 tcp: remove stale comment Sponsored by: Netflix, Inc. (cherry picked from commit 9a4b30dabf075ce1c7565ffbec1d34d52f7dbefd) --- sys/netinet/tcp_syncache.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 15244a61d8da..5a12aa3ed21a 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1298,7 +1298,6 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, } else TCPSTAT_INC(tcps_sc_completed); -/* how do we find the inp for the new socket? */ if (sc != &scs) syncache_free(sc); return (1); From nobody Fri Sep 5 22: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 4cJWHB4vC2z66VZr; Fri, 05 Sep 2025 22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWHB40X4z3tVp; Fri, 05 Sep 2025 22: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=1757111366; 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=lU2ePBUrHX3ts3vo1o8gPduZqBTF+fESNf8itRLDwpw=; b=DLY31NVZwXJugaKDDIqul0i4w+GfLaBifRvGhSyujBeEHdjNuCpMIfqBXUgBaG4HPL8PPG Ay0586HodOYpBP/K6vLKDn/k2Aaf70+n03DcCbOeaBbGNW/M3pEsPcMoKPJZgMEiCfkQsz HlxiaHTiIoSgyfDEYB4pH5wxWtB+i8Trs+XhGgTxcneTYkUtCAyIDzmtQCy8chQP2DIuJp U6oImveYxC1Rk2DDKmJM6zg6MUvUqONek1BQtsKr4TNczZ7mVdIFVj3r53ZM4DPHau81v0 TLTsGSn1iXKHhhXjWCbeOcHxIf4bMxvjFl+QM0JU/21j37RkYjyEoX/FhN9GIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111366; 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=lU2ePBUrHX3ts3vo1o8gPduZqBTF+fESNf8itRLDwpw=; b=idifLxcepQ4TSMVi1OFqxBZNso85jHkyNspbnDf3RZ0YZWtXKKFUqNZyt87Gh6QA9r/3vY qsVRrkJJdysetMD/Fvmxmo6xG/BaPfisf7+tQRkuc6f4dwsX9UUdWJ+L9zVVxCzHwfcstF SCquUvU715eurhuZwW0ui19VXyJcunLvH52KYa2jBPSWiiO8Hw6thGOM4CeJTGOxYNGGYz BzBEA55DHgnIGzwLYuK7hk0VJFPWgVAI/dxlaxFExoyAoW80LJbyf9t1QP9gy1sWZmweSY Q6NElQ3/S1l5Ra3pOHFKqNxG0RrGorvf5cdvVKVbeAfMSbG0beQcathRAKQmmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111366; a=rsa-sha256; cv=none; b=j98xCTdTigCgTRWFn6k/NXVqQX1FPp2D3OCqvT5h/oPj7+rs+rpkquZqkb1ICTZBot3a5O JobMuGE+eyu8Ib1mHOWlu1O/cEg3R94xcl70fWJOR8bwLdDjCffaRmvvZ63Z+7MNy2SKML YLimhOM9E7NaPz2NVYcu6/9IZa2vDjPPtbjIqIPaDPBoglr9sFnt+eRW2qsbMrdlKQGzhE lFglGGP4VQRoNtdl30CgvzpS88A1FmlA7AloLfU2z8t22eti8ZgrdG5AGUXJf4x3v5N7bs vIDwC28Ot7nnsxxKx/6fY5JZXinplFTnZ04FyPDEHJ9RWmLnBq/r31sVjbbcIg== 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 4cJWHB3bzNz16Xb; Fri, 05 Sep 2025 22: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 585MTQRW015788; Fri, 5 Sep 2025 22: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 585MTQA4015785; Fri, 5 Sep 2025 22:29:26 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:29:26 GMT Message-Id: <202509052229.585MTQA4015785@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: 35693dc5d55b - stable/14 - vtnet: mark statistic counters with CTLFLAG_STATS 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: 35693dc5d55bca988af04f251d99d6c9975d0c95 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=35693dc5d55bca988af04f251d99d6c9975d0c95 commit 35693dc5d55bca988af04f251d99d6c9975d0c95 Author: Michael Tuexen AuthorDate: 2025-08-28 10:36:59 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 22:28:48 +0000 vtnet: mark statistic counters with CTLFLAG_STATS Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D51999 (cherry picked from commit e6253eac1ab346d70db79d638c200bffa65cae02) --- sys/dev/virtio/network/if_vtnet.c | 70 +++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 98ef949992bc..bf7ee6e29632 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -4102,21 +4102,29 @@ vtnet_setup_rxq_sysctl(struct sysctl_ctx_list *ctx, stats = &rxq->vtnrx_stats; - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ipackets", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ipackets", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_ipackets, "Receive packets"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ibytes", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ibytes", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_ibytes, "Receive bytes"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "iqdrops", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "iqdrops", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_iqdrops, "Receive drops"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ierrors", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ierrors", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_ierrors, "Receive errors"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_csum, "Receive checksum offloaded"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum_failed", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum_failed", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_csum_failed, "Receive checksum offload failed"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "host_lro", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "host_lro", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_host_lro, "Receive host segmentation offloaded"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vrxs_rescheduled, "Receive interrupt handler rescheduled"); } @@ -4137,17 +4145,23 @@ vtnet_setup_txq_sysctl(struct sysctl_ctx_list *ctx, stats = &txq->vtntx_stats; - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "opackets", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "opackets", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vtxs_opackets, "Transmit packets"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "obytes", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "obytes", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vtxs_obytes, "Transmit bytes"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "omcasts", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "omcasts", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vtxs_omcasts, "Transmit multicasts"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vtxs_csum, "Transmit checksum offloaded"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "tso", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "tso", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vtxs_tso, "Transmit TCP segmentation offloaded"); - SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled", CTLFLAG_RD, + SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled", + CTLFLAG_RD | CTLFLAG_STATS, &stats->vtxs_rescheduled, "Transmit interrupt handler rescheduled"); } @@ -4287,30 +4301,30 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, stats->tx_task_rescheduled = txaccum.vtxs_rescheduled; SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "mbuf_alloc_failed", - CTLFLAG_RD, &stats->mbuf_alloc_failed, + CTLFLAG_RD | CTLFLAG_STATS, &stats->mbuf_alloc_failed, "Mbuf cluster allocation failures"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_frame_too_large", - CTLFLAG_RD, &stats->rx_frame_too_large, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_frame_too_large, "Received frame larger than the mbuf chain"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_enq_replacement_failed", - CTLFLAG_RD, &stats->rx_enq_replacement_failed, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_enq_replacement_failed, "Enqueuing the replacement receive mbuf failed"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_mergeable_failed", - CTLFLAG_RD, &stats->rx_mergeable_failed, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_mergeable_failed, "Mergeable buffers receive failures"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_ethtype", - CTLFLAG_RD, &stats->rx_csum_bad_ethtype, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_ethtype, "Received checksum offloaded buffer with unsupported " "Ethernet type"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_ipproto", - CTLFLAG_RD, &stats->rx_csum_bad_ipproto, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_ipproto, "Received checksum offloaded buffer with incorrect IP protocol"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_offset", - CTLFLAG_RD, &stats->rx_csum_bad_offset, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_offset, "Received checksum offloaded buffer with incorrect offset"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_proto", - CTLFLAG_RD, &stats->rx_csum_bad_proto, + CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_proto, "Received checksum offloaded buffer with incorrect protocol"); SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rx_csum_failed", CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, @@ -4326,24 +4340,24 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the receive interrupt task rescheduled itself"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_csum_unknown_ethtype", - CTLFLAG_RD, &stats->tx_csum_unknown_ethtype, + CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_csum_unknown_ethtype, "Aborted transmit of checksum offloaded buffer with unknown " "Ethernet type"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_csum_proto_mismatch", - CTLFLAG_RD, &stats->tx_csum_proto_mismatch, + CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_csum_proto_mismatch, "Aborted transmit of checksum offloaded buffer because mismatched " "protocols"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_tso_not_tcp", - CTLFLAG_RD, &stats->tx_tso_not_tcp, + CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_tso_not_tcp, "Aborted transmit of TSO buffer with non TCP protocol"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_tso_without_csum", - CTLFLAG_RD, &stats->tx_tso_without_csum, + CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_tso_without_csum, "Aborted transmit of TSO buffer without TCP checksum offload"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_defragged", - CTLFLAG_RD, &stats->tx_defragged, + CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_defragged, "Transmit mbufs defragged"); SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_defrag_failed", - CTLFLAG_RD, &stats->tx_defrag_failed, + CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_defrag_failed, "Aborted transmit of buffer because defrag failed"); SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_csum_offloaded", CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS, From nobody Fri Sep 5 22:30: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 4cJWJm11XWz66Vfw; Fri, 05 Sep 2025 22:30: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWJm0WGlz3trd; Fri, 05 Sep 2025 22:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111448; 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=/YEFz/IJ8B9hLgy7liRaB8VPNKsg78yw7erTh+QpYpM=; b=LNi3gxpaBRs5hfxQ5/r74GFhScQgF467o08STi47Lhqab2QEDUQaW/+8fdbnPUFQJnHe4+ hgVe4ewaOGQW/JzzEkwsTvF/xs3TWuf4QyEsw5j9IgkO4bfXEJHdZA2xqtXoFXx6BhbHHA +F8fY4ulcjeNCEkk5bD3ocu3cyfrnS6czjA1f9ahRH2NnXrzyCbJP8uFUjm2b48HtyeZQ5 Zrj/DpxyS8ktJ38Y4kibGDH32bYLaYFSk97EqMYb51nrlyNvPTwi1MZau/v/9G8Gssc7Wk 9G0CJHZB0Hq3cFXLu8ZDsWQfUHYoGniUK0PVbauGv9rtkN8lGcZVrPV8BjyRLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111448; 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=/YEFz/IJ8B9hLgy7liRaB8VPNKsg78yw7erTh+QpYpM=; b=hR36Jw9yDhtqQcV6N+f0bQN8+pUVg5EOrtoxfLKRiqf2aVkG5PUqR2vA440v/N+gS/8vda xQT2iq4uloRTP2/y/UFkVTECfF3XTcMdMsw0/mxgHeS9vfVHr0TI3szcQT/RYLJsvW128P j75Fo8KMjgOYwfqBEKgl3xx7z3otOvapIaFvm4B4qkRwwGQxTVXvkXlIccuq9wyQbJOXXA R040Qmp8AAaxG4XqDxxaA+cGRG9n+4VdCBa6h8bMlrcRrs5lG6jlUkVbzIV1PtgkPkHXbs Vq3guk1u/Cm98kgpzvqG+UjKynJ9xZgpJnNGny4ZRc+8g/rzpl46C36UeD09cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111448; a=rsa-sha256; cv=none; b=FOXbzR0PmuUxkXz7UY72770qBbv33LAfladSKU0a13W8tXXi/d05snNQK3Jsdk/FyMIqlK n6kReK6b6xESD1nPpjqsxwokhmQzeXdIj/j/nI3FolSpug+9cB/JWmCgqj0yeZRKfbPlwd tKBSu9nYk90gro5MaG9mFq5OhCwd1HKWbVQzwN0RFRNV3DMVv2tie17X3ivP7eSDYpzj2I Pw1Q+UqCMmwI5IONCvIsj5cR1asYiSg3vsKE8RQn7SGZoNS3C7VjBDnXmCKQscQytdeg3U hH1TeLsuVwN7Dt1CJLmCGHM+Okc8OIWSicc0sFflEtN3MtZ8eyZiESncwFsL9w== 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 4cJWJl6z0sz16vh; Fri, 05 Sep 2025 22:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585MUlYW024966; Fri, 5 Sep 2025 22:30:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585MUlpW024963; Fri, 5 Sep 2025 22:30:47 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:30:47 GMT Message-Id: <202509052230.585MUlpW024963@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: 0b3d82579a01 - stable/15 - 15.0: Mark the tree as ALPHA1 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/15 X-Git-Reftype: branch X-Git-Commit: 0b3d82579a01db4c5d874cda1ac468bb8f26c109 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0b3d82579a01db4c5d874cda1ac468bb8f26c109 commit 0b3d82579a01db4c5d874cda1ac468bb8f26c109 Author: Colin Percival AuthorDate: 2025-09-05 22:27:08 +0000 Commit: Colin Percival CommitDate: 2025-09-05 22:30:24 +0000 15.0: Mark the tree as ALPHA1 Builds for 15.0-ALPHA1 will begin shortly; we're just waiting for the latest amd64 package set to propagate out to mirrors. Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8b60da95741e..88f535f4800e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="PRERELEASE" +BRANCH="ALPHA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Sep 5 22:34: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 4cJWNY4hnvz66W08; Fri, 05 Sep 2025 22:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJWNY3NNkz3vZ3; Fri, 05 Sep 2025 22:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111645; 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=EHJUEmrz7ZHpiH7+Wr488WEUorBm6pMYVIX0msYZzpg=; b=bQwdSntQqILpLIK3xHbavpi/YeT2a5JZqks4eRPlG5Cm09ABJRVCnTv2SH+5qK8IcVMSOh h5CAQyQcVwTRYD3iUIoGbMJjEmBqb/Bzi7xAOlx0CkiMdwTA0SMQk3whU8tQ6EZ2OoepgJ Sii4hTubjQ7TEe0JVDFCouGmonnFl4SBa3VpSn8QD/g5TNH7xcgJ5zpOeiEDXVnHz5HJMg OPL6UDg6lfdfmMBOllh4zYWnxGAFTffEr78goYutmV56llvI+TjE2hxWBoaNO8gCmD4WXU K5ZTd+FNl3wP2omiWJtWUmYqjP7HGg2W+l8h26ppPEBiryQhYm1qmNG7JL3vQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757111645; 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=EHJUEmrz7ZHpiH7+Wr488WEUorBm6pMYVIX0msYZzpg=; b=yr9yuuryCII5AsMTiQuKmzr6gif0z5piEGCvqVN/3fd0F//iKwLyiMD1K0uoI1VEwFex2t 6lIbnZyJQ0WUEpF1htkVA95yI1LzvrluADdPowbjkj/vb5Cx2fa/9BkEJZ/ehX1NWGwUZo ZwtwezOsMXBSQ46bQTBcFl2p8ohjUYh4S9SYJsV6Fo67FYg8x5P6kLRxZZje2Vmipuxm+K 8M4MZz4kEo6g5C9vJ6Iom2bylf+5lRYxHwA9LU5Op07o4mPCh/5SvJC1uWEq60j0+MzsNA uupg3/rj3g1UAKog5bX5UEcK1U/av1KUtQZFw04GxSXqBjYX7KIEBAmJ0IjiIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757111645; a=rsa-sha256; cv=none; b=kxI7S1oaixFq4GdBDx3R9K6XMDT7WpyYHVCriQfoSIsAekmQBASr9hdpOy65m5icwLBNdB s/AuyFus5XlKvlCTJ9gdxDt8/AAX/gqEAMEFacYwdTnRh1P+1GniQ0QHFWAg/MsFgMAbJ1 tJP5DxeQyY+ud1fh2vO51BLK/nrOF/NMgv+3Pfv86liodsGE4CCiOkThqd54Tl6VPiruD/ aJfbpvPXAtHkyu029XJ6ynuktqbXquwTWUOmXhNb32IvfDRZmtgPalr3xuolQmTFFzcuhO ETmCnKvVytaWXUeSJWQa2SaCv7yP1yCyErbVMeaZLJeo3BwsWzgvRsHKVc2Mbw== 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 4cJWNY2gp2z16RH; Fri, 05 Sep 2025 22:34: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 585MY5qd032876; Fri, 5 Sep 2025 22:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585MY55w032873; Fri, 5 Sep 2025 22:34:05 GMT (envelope-from git) Date: Fri, 5 Sep 2025 22:34:05 GMT Message-Id: <202509052234.585MY55w032873@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: a2230148a649 - stable/14 - vtnet.4: remove stray line 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: a2230148a649404b44b1c5b8283c951f790c3b32 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a2230148a649404b44b1c5b8283c951f790c3b32 commit a2230148a649404b44b1c5b8283c951f790c3b32 Author: Michael Tuexen AuthorDate: 2025-09-03 09:19:48 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 22:33:50 +0000 vtnet.4: remove stray line Reported by: Timo Völker Fixes: ac87d70563f8 ("vtnet.4: improve existing descriptions and add missing ones") Sponsored by: Netflix, Inc. (cherry picked from commit 491986942dd2b3be8a6f232c487b3bb7c1ea412b) --- share/man/man4/vtnet.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 6dce8a2889de..124d72108506 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 21, 2025 +.Dd September 3, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -123,7 +123,6 @@ This tunable sets the depth of the software LRO mbuf queue. The default value is 0. .El .Sh TRANSMIT QUEUE STATISTICS -.Bl -tag -width "xxxxxx" For each transmit queue of each interface the following read-only statistics are provided: .Bl -tag -width "xxxxxx" From nobody Sun Sep 7 01:33: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 4cKCKQ2GfCz65xfq; Sun, 07 Sep 2025 01:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cKCKQ1jtYz3bnH; Sun, 07 Sep 2025 01:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757208826; 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=UynZx6amBSv+d4dw1owwLaRu6YbESc77GXueJL4klB8=; b=mT+yZI5Rm13YjF4iv+NsJ8t5Jx0j/QNoFNpgvbloZXItfU2J0B9Xn2De4qbwQ3FP7rKl7E 8V2fRN9FD9ck59Dd5c0ukh0vDIHmIzLNzBeDfEG/dqq+Uy1beiyLO6AK5JU/ghc044CnVP E5Ms8qGZC6FcYXtQMjWhC/NrDOvoyENY52sIYDa8XtUt+o0S0NYA4jNsVPaxYHGQQhYK2y qjvFTh+pk1deLl47N66ty+KTJTAVTWEqu1b7cBZAoH7ZY32pEUuNBjfQDELjqU5Gwdvreb 0cdzTPjO1Us5jNxZ2mITuFoY/D3gR/2vXrWrwF9XF/yYndmrjEZpTFYRoZmCAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757208826; 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=UynZx6amBSv+d4dw1owwLaRu6YbESc77GXueJL4klB8=; b=cFOWFD4rh7gHVrmsyG2N1LPF/RMfXEMBjaBs61wwKmomfF0LF0qpDX7Z8oce4j+8TGdwML dMLKZ1tYFxb+gF6xylmMrVpg3RCAuCHOv8vVcx0DvFlCY2+DCRRJFp8kW6LAX51GPmNSf3 S14l5OwqPQ4jMLqbj5gm4OGvKO3ZwZGtVXwD7zPnpuZ+klI9edTdKujMoYU9MTGHD1CZUm g9ptMF2zJ5hyPxL3xD4cPrBSz+y4qKD5+gWGo4veWsmeNJT/mdsjh6zc1ASbUWzeooM+XC OCmdHRzLoJiqj424dApPSPQawm5ZycCgLac6OVhiy/LbaUWQHwInKp37GA3q1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757208826; a=rsa-sha256; cv=none; b=WaIq2QK8Foc7yoQu4bwcLEIFK8yHbAS5dcMSWy4hiZjj4FbriJGmzK1YpeXsUImU3QRxsE MMKqNZz+0PwyteZIRn1cD4N7lOjJUcMPc6+EKhG/1KpgZjvjyik611uvMMVg3PRTQ15QDh WY+I5IWym1+rXMSc+ox0VrwFQSrcyJIA0Gi50rk/qq87PIS4ONQKq2hXLsdMwGSo4sTZbe lrEWjukpwKjL4R6sFK5HG35M9fpGEGgMA1bEeOXRjp7VWMTEksL/MFiL87Xz3nlh7oRY2p 1akD7qLd2adMHawrFXupaLJYfjnk0jBTwcPOBh5VIrVzzD3e4zKhtUsIELW9Uw== 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 4cKCKQ1Gnpzyp1; Sun, 07 Sep 2025 01:33: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 5871XkQX074325; Sun, 7 Sep 2025 01:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5871XkGJ074322; Sun, 7 Sep 2025 01:33:46 GMT (envelope-from git) Date: Sun, 7 Sep 2025 01:33:46 GMT Message-Id: <202509070133.5871XkGJ074322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: b84156e7f136 - stable/14 - nfsd: Fix the NFSv4 Readdir operation for an empty ZFS dir 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b84156e7f136792d3a34f5338635e5b41b256b4f Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b84156e7f136792d3a34f5338635e5b41b256b4f commit b84156e7f136792d3a34f5338635e5b41b256b4f Author: Rick Macklem AuthorDate: 2025-09-04 01:48:52 +0000 Commit: Rick Macklem CommitDate: 2025-09-07 01:31:05 +0000 nfsd: Fix the NFSv4 Readdir operation for an empty ZFS dir Commit 9a3edc8 modified the behaviour of ZFS's VOP_READDIR() such that it will reply EINVAL for an offset past EOF on the directory. This exposed a latent bug in the NFSv4 Readdir code, which would attempt a Readdir with an offset beyond EOF for a directory that consists of only "." and "..". This happened because NFSv4 does not reply "." or ".." to the client and, after skipping over them, attempted another VOP_READDIR(). This patch fixes the problem by checking the eofflag for the case where all entries have been skipped over. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52370 (cherry picked from commit 1c52d525f06411726d7755081f904de64749eb9b) --- sys/fs/nfsserver/nfs_nfsdport.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index c22d06ef0aeb..58107029c8c3 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2496,6 +2496,7 @@ again: * rpc reply */ if (siz == 0) { +ateof: vput(vp); if (nd->nd_flag & ND_NFSV3) nfsrv_postopattr(nd, getret, &at); @@ -2537,6 +2538,8 @@ again: ncookies--; } if (cpos >= cend || ncookies == 0) { + if (eofflag != 0) + goto ateof; siz = fullsiz; toff = off; goto again;