From nobody Mon Nov 10 03:07: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 4d4ZMm3TY1z6GTFV; Mon, 10 Nov 2025 03:07: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 4d4ZMm2zXyz3bbM; Mon, 10 Nov 2025 03:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762744036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IY//LLg0lgpDj7as+4d1bZfxk7QyXnolG6ToEaIk4Qg=; b=F3bXorW0i4ZKcB6KLsNK8F+LrR9wbq7EK2Q17RR6gVC9nONX7Cw3X91pTpqB0NAnm5mwXo Haw7+UXR+bFr3HeS1lLkaTUIZBfo3e08NTkk0XQvQ0sj4RskUGWbcTF8Eg83aDZMrgDZ4X wf7dJTysOWCt4HX/3E2d3O3eAXmJS73c7LL8UCRfl2cyjqA/CEV6hyno+vyTviNrWfsSzN dijhw8cbnLEIb7IcKDO+++bmWhxY4eDaJs2xLFEn1/5KNivxBbOOw3/pkGJK+F7nGfsi8U jS4SxxwLECPNt9w6J1tSDAb/jkqUYEOdywajlXnL+irB5+LE+lRh1Sh27RAsGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762744036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IY//LLg0lgpDj7as+4d1bZfxk7QyXnolG6ToEaIk4Qg=; b=pWPSELh1p58uByYvUq8UuelEekqnN3b/vRXnt8s+Cfsme8AclaxIDHItLAkgMdTpmM3f94 qETRyNnUKtYmkA2JMNhEjYBq97Pvc1oJP5PX6ive7QnH8MsA+XcTXrKD4Bo2V7C1n33rfc qpfe0Jp93xrvrrRA63NV86k68W8ulUjsXh8gOnH+8c0f6rJ6m2lVsUwUvYhqkhONkG5WUV YJXnPQqyjvIf+HpyuFsDLgiRCPCNszTKuqJbDZRbjnAiJOjTI42Pi++4CgG2x3jBquOEgQ Ad+cAW74/RCNPOUF5ARld04iPCMjokgavWwvkEqej1dQVXAzBeA3DSS0gbaF3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762744036; a=rsa-sha256; cv=none; b=blNF1WI4FathP+gfxu+zVGTKgS+Vi8FUq71FNNpSEccwQfe3q+ZUWXWQEoIOzbi4nJdBj7 AVz+SfYZry6H0JwuT8VX/Dfbvb/aPb1j3n2gdMMe8fUcFKGP45hzFXuC20oFc/r+UpiBlL lUMfXInnveVKqYjCGalLSa8S66qCAFbBI3hfdCclpBHBPXJ/YH6nLVRtrAVxr7XDpDF9hH 2YV4sRB9JrSSDzztdlH+Pq5R5KWlrM/thyEczWtXA+do0jK5+cxhq+g2Bgmq9xYyYYzp3a 8VXdCxOZ+2frO7DnWz7/KxOopBWNZaBOP7n8579v5GnOAueUNkPAtYi9YYnLzQ== 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 4d4ZMm2TGBz10Fs; Mon, 10 Nov 2025 03:07: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 5AA37G6E010104; Mon, 10 Nov 2025 03:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AA37GdC010101; Mon, 10 Nov 2025 03:07:16 GMT (envelope-from git) Date: Mon, 10 Nov 2025 03:07:16 GMT Message-Id: <202511100307.5AA37GdC010101@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: 980aa8d4cfdf - stable/15 - bsdinstall: Fix newfs bsddialog menu 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/15 X-Git-Reftype: branch X-Git-Commit: 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=980aa8d4cfdf57a1f99401fa4160c0d82c927d7c commit 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c Author: Ed Maste AuthorDate: 2025-11-07 22:53:01 +0000 Commit: Ed Maste CommitDate: 2025-11-10 03:06:53 +0000 bsdinstall: Fix newfs bsddialog menu The second and third members of struct bsddialog_menuitem are `bool on` and `unsigned int depth`. The newfs dialog options in bsdinstall's partition tool had these two swapped, so the default selection did not work. PR: 290857 Reviewed by: asiciliano Fixes: 50e244964e9b ("bsdinstall/partedit: Replace libdialog with libbsddialog") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53639 (cherry picked from commit 4e36942420712c2ab6ebc2c646e61d47b2b68e7b) --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 0bcd17950daf..8da85a805545 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -139,16 +139,16 @@ newfs_command(const char *fstype, int use_default) } else if (strcmp(fstype, "freebsd-zfs") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "fletcher4", "checksum algorithm: fletcher4", + {"", true, 0, "fletcher4", "checksum algorithm: fletcher4", "Use fletcher4 for data integrity checking. " "(default)"}, - {"", 0, false, "fletcher2", "checksum algorithm: fletcher2", + {"", false, 0, "fletcher2", "checksum algorithm: fletcher2", "Use fletcher2 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "sha256", "checksum algorithm: sha256", + {"", false, 0, "sha256", "checksum algorithm: sha256", "Use sha256 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "atime", "Update atimes for files", + {"", false, 0, "atime", "Update atimes for files", "Disable atime update"}, }; @@ -188,11 +188,11 @@ newfs_command(const char *fstype, int use_default) strcmp(fstype, "ms-basic-data") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "FAT32", "FAT Type 32", + {"", true, 0, "FAT32", "FAT Type 32", "Create a FAT32 filesystem (default)"}, - {"", 0, false, "FAT16", "FAT Type 16", + {"", false, 0, "FAT16", "FAT Type 16", "Create a FAT16 filesystem"}, - {"", 0, false, "FAT12", "FAT Type 12", + {"", false, 0, "FAT12", "FAT Type 12", "Create a FAT12 filesystem"}, }; From nobody Mon Nov 10 08:38: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 4d4jjQ5C4kz6GPDL; Mon, 10 Nov 2025 08:38: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 4d4jjQ4RfZz47CQ; Mon, 10 Nov 2025 08:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762763882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+DCl1wrvxE7Kpfulieh8Ju3+7rcM06sVE+hB1qPOf14=; b=lIwQtoEKahjqWR+C7VGpivQvLDxbUZCTs1/0yA45gBrcw7JmwZWG6eb1iUc/eghB86B5Qp blWr1tBjmAFAGCK2lXAc8xv8sjDzzGEbcjVjBz79Ry3VdBeB4NSBWwR+syREYlhnAl1wQe k0alpO7H+vj/5pneoqXit6tvnDY9/Mt4dZADf7SRMXwiID4z4kAfhZYMn06he0SsNP6htl vEpHkZltZ1Pq7+KPiv1HPz+Aow2fysAfwDJP1YxRcfbAqh43/AoDyZyxvOEl+sz8nzOyOP GVqzUEloxEYPUO3aYqa1hPVf4XzpIdk/9E/AoXH8VY6y4gf5ArQYgrfgkqHgdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762763882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+DCl1wrvxE7Kpfulieh8Ju3+7rcM06sVE+hB1qPOf14=; b=aXaFVN7Z0IdrXmy+/4MAyoFB6n0YSxrzDasSrNpohrD80hDbFwEJx5AkJ534ZjLjUMjRhS 4UuRbg/n7RvdOcZXVpE+ZnFAPzZjjNHVuh9m+Tp2yh/3cwVxNVQIL8BCdfq35P9Y7um9NW 1FShiVEdOl34XGkQ5vqsMWFyCsI+QwM6NGFtVWVUkulr8IvqcDnOrerRyefr06xrWq0U7V aqD7TfEYJg02NSOqWeNzcBhKnMZl9Dfy4HBLBbt56QIbVkzfQVwdZjw5k1F2PzDEykggtj e2tWz/F0Vlnb7Hq1AO/r9u/obnH1MnYISsWuxsH8Yi8QdaR951xL+v2+VDw3Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762763882; a=rsa-sha256; cv=none; b=D70/zUFN6ekUOdclo6nhvoZqO708vYos+Yb/f96pp15034siWNIaxZfC9Nr9G8TepMfmP8 DrO+aZsKcUaynx5KEg+QRb9sXV1sDeOOwPZIs/sOaigoN23mBmynWC55hSQClbHcbMrx2x MVSP9NPIKkGaSdb9alTEhocFTKXgwZxqr/hWMvr3oEzEK8K/XBw7iXu49MQXlLhaF72/w7 NPb3eb+rhKVsl8dgxC6IAXclkV4HGJh1h5UqlaaNwA8B7MXlk9kxUUox5iKOY5lvNIEttp 4qLFOcOW2nO8jyiO5bnGfWPBP3B0aHE+PqKmz0w63GEPHuH6nKcdh01jOp4iNQ== 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 4d4jjQ3lnZz19Mm; Mon, 10 Nov 2025 08:38: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 5AA8c2rR028788; Mon, 10 Nov 2025 08:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AA8c2kP028785; Mon, 10 Nov 2025 08:38:02 GMT (envelope-from git) Date: Mon, 10 Nov 2025 08:38:02 GMT Message-Id: <202511100838.5AA8c2kP028785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1c7c2027f2d1 - stable/15 - pf.conf.5: add nat-to/rdr-to to BNF 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c7c2027f2d1eaabd909382594062e46f90bae56 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c7c2027f2d1eaabd909382594062e46f90bae56 commit 1c7c2027f2d1eaabd909382594062e46f90bae56 Author: Kristof Provost AuthorDate: 2025-11-03 16:05:25 +0000 Commit: Kristof Provost CommitDate: 2025-11-10 08:37:48 +0000 pf.conf.5: add nat-to/rdr-to to BNF PR: 290705 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit cd7f3e4d9e8305f866cf15e91b2ad01eb7685ba2) --- share/man/man5/pf.conf.5 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 683f64f33c87..3b2588f51498 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 7, 2025 +.Dd November 3, 2025 .Dt PF.CONF 5 .Os .Sh NAME @@ -3440,6 +3440,12 @@ filteropt = user | group | flags | icmp-type | icmp6-type | "tos" tos | "dnpipe" ( number | "(" number "," number ")" ) | "dnqueue" ( number | "(" number "," number ")" ) | "ridentifier" number | + "binat-to" ( redirhost | "{" redirhost-list "}" ) + [ portspec ] [ pooltype ] | + "rdr-to" ( redirhost | "{" redirhost-list "}" ) + [ portspec ] [ pooltype ] | + "nat-to" ( redirhost | "{" redirhost-list "}" ) + [ portspec ] [ pooltype ] [ "static-port" ] | [ ! ] "received-on" ( interface-name | interface-group ) nat-rule = [ "no" ] "nat" [ "pass" [ "log" [ "(" logopts ")" ] ] ] From nobody Mon Nov 10 09:47: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 4d4lFz1ztNz6GTQM; Mon, 10 Nov 2025 09:47: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 4d4lFz19Ldz3Kp1; Mon, 10 Nov 2025 09:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOm4WzGAv+FGha1kZ5/2CRuQYO8sd++6h3b+OtX/wBE=; b=SEo3YWwTzTXBLmuLXsCIl4ihE31tOHg9kHw8BMEa6pmHHJOCP4yfd9483XqtBsz+VA06hv B/h2cjk8xlWpJljwJf0WOe7rWg5vtTEx02GVTSgnb9X+/YG0diW6pmABPJNFie2KABR6Gz jUK9Gct4GWJaL62sNO4rTuzRIiuOSQeH4WOMWxTt0K8cwZMfjMj/hLkFpjKU2aCEgeN6xP ycgXgOFDaAQlor//PViW+DY1TUcun9ujXjCRBK7XahGCM60ddopAb2C+OyknFEA95h5gvW LmuQxRhJwNanxPJhmH8xrNIYop55bgDK6JpwXkYqVUF++SreJTpqc/HlUw3RdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOm4WzGAv+FGha1kZ5/2CRuQYO8sd++6h3b+OtX/wBE=; b=TKBp++3Uqg77daSuF8t7nvouuAh4DKyQXDTLdab/v/auxxxFm+1Ksu+3pfoyhRJXByRfGm J3ZNbds/LOuzYDz2dd1VTLW6UOoiOvumhDFedl+7vuUWtXqnIIgXLhf8pBImOTGHyWdgpW cwgfaevLakpQDsUjjVOF2v5IZimei8hSPf6d+wHAVVFe8lBg+Z9X/zZ1dQaeww1fofiDZl C1W712O6vio/5IC6d7FJgAMNusIsvUDvZwB5aYeMHIrfY+h70TyU/tGkzIt+rbUygVEBe0 mK2uwb7f6srtySzBeQn4xNYE5qupngOTV4PU8wOUa8hITizbzctadc1/UToF2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762768071; a=rsa-sha256; cv=none; b=QmTJjOjgF7vtAq7KAuVjUrjaHs6Cx/pf2HPXTz6Y7B6YvMhG3AOPxhvvuuTe66fkaKUYtC jwnk5FyXYISlTc79JxKuSKFX1KN4++gQEZe4tJSjXgTuYfp4MAoTB6QOJKD2H65PNEv5eD RsxJwR9InqhpsaUVwkX9pVAPby6MSTDCbduOHQyxPMqZszXSpjmmHhulCZTYfLHiS0d6yk nLzR5Ln1jsxvv6NJ59zCPw4hgH/gynJd32zSZbdELQz7cPQa4OF0sGtJkJoMJSAjOkqRQZ eWoZXx6feAhLTPJvO8lCNa0OjRozXXlS7J5Jgu9pPOiNoGzLVoyLGw4UEZbYkw== 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 4d4lFz0VV1z1C0x; Mon, 10 Nov 2025 09:47: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 5AA9lotS060123; Mon, 10 Nov 2025 09:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AA9lo8T060120; Mon, 10 Nov 2025 09:47:50 GMT (envelope-from git) Date: Mon, 10 Nov 2025 09:47:50 GMT Message-Id: <202511100947.5AA9lo8T060120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1c0178baa7c3 - stable/15 - dtrace_vfs.4: Document the DTrace vfs provider 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c0178baa7c37c5d304e9930f2c945db8759c5a3 Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c0178baa7c37c5d304e9930f2c945db8759c5a3 commit 1c0178baa7c37c5d304e9930f2c945db8759c5a3 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-03 15:54:10 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-10 09:47:48 +0000 dtrace_vfs.4: Document the DTrace vfs provider Reviewed by: bcr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51317 (cherry picked from commit 2020e76450e2705d33d673a3d183c8f0a3910e28) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- share/man/man4/Makefile | 3 +- share/man/man4/dtrace_vfs.4 | 97 ++++++++++++++++++++++++++++ share/man/man9/VFS.9 | 3 +- 4 files changed, 103 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 25f86306bd71..a4c4fc52b165 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 30, 2025 +.Dd November 3, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -1305,6 +1305,7 @@ in .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , +.Xr dtrace_vfs 4 , .Xr elf 5 , .Xr d 7 , .Xr tracing 7 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index d4d39005a044..dee2a2671ad9 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1017,7 +1017,8 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_sctp.4 \ dtrace_tcp.4 \ dtrace_udp.4 \ - dtrace_udplite.4 + dtrace_udplite.4 \ + dtrace_vfs.4 MLINKS+= dtrace_audit.4 dtaudit.4 .endif diff --git a/share/man/man4/dtrace_vfs.4 b/share/man/man4/dtrace_vfs.4 new file mode 100644 index 000000000000..528d5da42f3d --- /dev/null +++ b/share/man/man4/dtrace_vfs.4 @@ -0,0 +1,97 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 3, 2025 +.Dt DTRACE_VFS 4 +.Os +.Sh NAME +.Nm dtrace_vfs +.Nd a DTrace provider for Virtual File System +.Sh SYNOPSIS +.Sm off +.Nm vfs Cm : fplookup : Ar function Cm : Ar name +.Nm vfs Cm : namecache : Ar function Cm : Ar name +.Nm vfs Cm : namei : Ar function Cm : Ar name +.Nm vfs Cm : vop : Ar function Cm : Ar name +.Sm on +.Sh DESCRIPTION +The DTrace +.Nm vfs +provider allows users to trace events in the +.Xr VFS 9 +layer, the kernel interface for file systems on +.Fx . +.Pp +Run +.Ql dtrace -l -P vfs +to list all +.Nm vfs +probes. +Add +.Fl v +to generate program stability reports, +which contain information about the number of probe arguments and their types. +.Pp +The +.Cm fplookup +module defines a single probe, +.Fn vfs:fplookup:lookup:done "struct nameidata *ndp" "int line" "bool status_code" , +that instruments the fast path lookup code in +.Xr VFS 9 . +.Pp +The +.Cm namecache +module provides probes related to the +.Xr VFS 9 +cache. +Consult the source code in +.Pa src/sys/kern/vfs_cache.c +for more details. +.Pp +The +.Cm namei +module manages probes related to pathname translation and lookup operations. +Refer to +.Xr namei 9 +to learn more. +.Pp +The +.Cm vop +module contains probes related to the functions responsible for +.Xr vnode 9 +operations. +.Sh COMPATIBILITY +This provider is specific to +.Fx . +.Sh EXAMPLES +Check what lookups failed to be handled in a lockless manner: +.Bd -literal -offset 2n +# dtrace -n 'vfs:fplookup:lookup:done { @[arg1, arg2] = count(); }' +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr d 7 , +.Xr SDT 9 , +.Xr namei 9 , +.Xr VFS 9 +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%P pp. 335\(en351 +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Sh AUTHORS +.An -nosplit +The +.Fx +.Nm vfs +provider was written by +.An Robert Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9 index a1d0a19bec13..6ea6570bbf6e 100644 --- a/share/man/man9/VFS.9 +++ b/share/man/man9/VFS.9 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 9, 2010 +.Dd November 3, 2025 .Dt VFS 9 .Os .Sh NAME @@ -42,6 +42,7 @@ function from rather than implementing empty functions or casting to .Fa eopnotsupp . .Sh SEE ALSO +.Xr dtrace_vfs 4 , .Xr VFS_CHECKEXP 9 , .Xr VFS_FHTOVP 9 , .Xr VFS_MOUNT 9 , From nobody Mon Nov 10 09:48: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 4d4lGJ4xCvz6GTQN; Mon, 10 Nov 2025 09:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4lGJ4B3mz3LBl; Mon, 10 Nov 2025 09:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0T24uunsLz0O/tgaVIwWtMue7kibkg1olKu4gbRmZDI=; b=Pwf5ujiX1hPr6htsIL6kgKy7h3MDoycV8ft9wQp3fH0yipbOgkhOQ/2+Eq0yKLmEI9klVN ea2UmuEJtLwzCShVEAKEEP/ou6Bbc8R+PrQBPZVuSZP7nnaDOkKj/F8VdVABBdhUgm4UBj mLWtwzCusQ/irZz1kcc/GAN6Xwa+h+7IhiSpeWaKYAJI2rTDBURlt5rDjDP14wlnlpB16e Nvvu7sh0007fJTTMOjtB8/lNzZr2KH1Z+e+t23Ey4l3V/FPU+jtbidemVUyMpcVrfNqQmg QQC9fykKFm/iGR6BA4RxrZDF3ekSo2KAjcEuPGMhdwvCvzLJq4Tl5NgbbsI32g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0T24uunsLz0O/tgaVIwWtMue7kibkg1olKu4gbRmZDI=; b=Y4paFtfD5UG7/zKbd2O/T3B/OhxZeO4VtPccQXwvcx/McXo+LYisGW48BUDAnVn/YT1bw7 QytmTcztXSLVxEOugUgekdx1n9oVTB1/lB4G2DQY6p/HKgNPG6OO5UmeKVeRFt25zn+We8 X6iTXjT0b0/BCrFMJzIGW6UYpVO4HR8fP02p4WI624h1DD7vD+yu1/OmWUtkI7GvA1OkiO AdOZPRWrYk2KbxGZBH/Bs1tRijioaWkXrcZzZaDYqrpuMGMrweoDeoY0RTG8JLBtXnqeFt xl8CFGFlZBD8vFQZdM96Bakq3djPKOII8dlemiNPWhYBmjczlbOu7YHkV5ZJ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762768088; a=rsa-sha256; cv=none; b=fCi5ZAHKsr918zNyKQ1KPpDrjGmNrM0GSZUvQ9L23PWvtqOGg5BZCnacedZqKQEoKNCzSz CBLK0JuLU2+w/HiAqrI+AVo9T8LBUJ9nLEmIyzzZlzvOkzWCAKz/m1tjBgJ8ynPaxWbvfi t7d9+T1VmJdoWN+wSY5u6PDmYGwvKOjDN/Gy2aYN1bxmzJb0/tjgy9HurlSQLZbdE3ZEf5 2zNvlSG8brgqv289HU5ghtzn2Hd70jJODBlL4NA7tayrSkTgFXWt5uxjAX3FTGHhQ3WGOU ctlFZ65bEnhnZ8lyfHzEemRRUOx6e79EovecyvZ03YandJv3eAtr3d+NvKndJw== 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 4d4lGJ3bdsz19rT; Mon, 10 Nov 2025 09:48: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 5AA9m8dE060352; Mon, 10 Nov 2025 09:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AA9m8Gc060349; Mon, 10 Nov 2025 09:48:08 GMT (envelope-from git) Date: Mon, 10 Nov 2025 09:48:08 GMT Message-Id: <202511100948.5AA9m8Gc060349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 04bb91e9c5f7 - stable/14 - dtrace_vfs.4: Document the DTrace vfs provider 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 04bb91e9c5f73bf6637a5cdb0840363e926d85df Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=04bb91e9c5f73bf6637a5cdb0840363e926d85df commit 04bb91e9c5f73bf6637a5cdb0840363e926d85df Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-03 15:54:10 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-10 09:48:00 +0000 dtrace_vfs.4: Document the DTrace vfs provider Reviewed by: bcr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51317 (cherry picked from commit 2020e76450e2705d33d673a3d183c8f0a3910e28) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- share/man/man4/Makefile | 3 +- share/man/man4/dtrace_vfs.4 | 97 ++++++++++++++++++++++++++++ share/man/man9/VFS.9 | 3 +- 4 files changed, 103 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 842505a5746f..c2443bc86491 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 30, 2025 +.Dd November 3, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -1302,6 +1302,7 @@ in .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , +.Xr dtrace_vfs 4 , .Xr elf 5 , .Xr SDT 9 .Rs diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e677e42c22d1..627ca85d1fff 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -949,7 +949,8 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_sctp.4 \ dtrace_tcp.4 \ dtrace_udp.4 \ - dtrace_udplite.4 + dtrace_udplite.4 \ + dtrace_vfs.4 MLINKS+= dtrace_audit.4 dtaudit.4 .endif diff --git a/share/man/man4/dtrace_vfs.4 b/share/man/man4/dtrace_vfs.4 new file mode 100644 index 000000000000..528d5da42f3d --- /dev/null +++ b/share/man/man4/dtrace_vfs.4 @@ -0,0 +1,97 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 3, 2025 +.Dt DTRACE_VFS 4 +.Os +.Sh NAME +.Nm dtrace_vfs +.Nd a DTrace provider for Virtual File System +.Sh SYNOPSIS +.Sm off +.Nm vfs Cm : fplookup : Ar function Cm : Ar name +.Nm vfs Cm : namecache : Ar function Cm : Ar name +.Nm vfs Cm : namei : Ar function Cm : Ar name +.Nm vfs Cm : vop : Ar function Cm : Ar name +.Sm on +.Sh DESCRIPTION +The DTrace +.Nm vfs +provider allows users to trace events in the +.Xr VFS 9 +layer, the kernel interface for file systems on +.Fx . +.Pp +Run +.Ql dtrace -l -P vfs +to list all +.Nm vfs +probes. +Add +.Fl v +to generate program stability reports, +which contain information about the number of probe arguments and their types. +.Pp +The +.Cm fplookup +module defines a single probe, +.Fn vfs:fplookup:lookup:done "struct nameidata *ndp" "int line" "bool status_code" , +that instruments the fast path lookup code in +.Xr VFS 9 . +.Pp +The +.Cm namecache +module provides probes related to the +.Xr VFS 9 +cache. +Consult the source code in +.Pa src/sys/kern/vfs_cache.c +for more details. +.Pp +The +.Cm namei +module manages probes related to pathname translation and lookup operations. +Refer to +.Xr namei 9 +to learn more. +.Pp +The +.Cm vop +module contains probes related to the functions responsible for +.Xr vnode 9 +operations. +.Sh COMPATIBILITY +This provider is specific to +.Fx . +.Sh EXAMPLES +Check what lookups failed to be handled in a lockless manner: +.Bd -literal -offset 2n +# dtrace -n 'vfs:fplookup:lookup:done { @[arg1, arg2] = count(); }' +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr d 7 , +.Xr SDT 9 , +.Xr namei 9 , +.Xr VFS 9 +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%P pp. 335\(en351 +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Sh AUTHORS +.An -nosplit +The +.Fx +.Nm vfs +provider was written by +.An Robert Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9 index a269d8d070cf..fcb07afa478d 100644 --- a/share/man/man9/VFS.9 +++ b/share/man/man9/VFS.9 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 9, 2010 +.Dd November 3, 2025 .Dt VFS 9 .Os .Sh NAME @@ -42,6 +42,7 @@ function from rather than implementing empty functions or casting to .Fa eopnotsupp . .Sh SEE ALSO +.Xr dtrace_vfs 4 , .Xr VFS_CHECKEXP 9 , .Xr VFS_FHTOVP 9 , .Xr VFS_INIT 9 , From nobody Mon Nov 10 09:48: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 4d4lGb09pSz6GTQX; Mon, 10 Nov 2025 09:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4lGZ2Pgtz3LYQ; Mon, 10 Nov 2025 09:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t4AMfzebPBydvPd1uEFq7ziHyYtRuOxATeVkYsy3Kyk=; b=h2dF/B9aZFInuSiOFPsRQnop1C/rKgiKdp0ZgPnOAASAMjOxr4MButO1NjH56t68UUie++ kMXYaOPCeq4crO3Ak7QI5zE83zMGANAJiFXJh8ys888flmWM13KUkkWnCtdfuR+1Cpl6LL zmmRpoXOvfmQ6KHiWhgJC0Mc01sRA/lRtznHmZsSkeoMAmm19Y10o5GjppFe7CbqPgTZrX aSY3LhWMPzNLM+XYrhy0g5PrRi66u+59UXFIwrF80ypoMFIsH1yeJQ4RSQ3V7eqjVOHDox eu3AjSLcrZuLxjPIKSfWye1aWo14Zw3Jcf6HtQOG25ybNUZZyCkYLskCbf5+Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t4AMfzebPBydvPd1uEFq7ziHyYtRuOxATeVkYsy3Kyk=; b=dE1AB96l3bfOmpMhvXaBuYLfrZEWBqE7EFXWOTeWOLsjcuoPGdhzjkp3YCnkpW7QcMPBpV QcabumjVhRc5wR8wzqzkdbDJsIxpALg9c6eS0taPmolG42al9JxmYsjCxw6Vzl5UtXjSrh HMDPgs4FXLdKmcZSFqfD5f+A7ahpLQ0zkvvFcFrwZgUzci+wYFzoZEDxtvAFbCntUT8fJ/ gUIjfJao/m2nfxLYJUztr7nth7STU2jW7jZ/xxzy/naO1CjG+Xz9m6u7FVh69dcqEFyu50 2SuYG7BXT4WZMi6bnTc2+Pp6SwmuZpr6RTBtLj7uquyA4ZRKrdx9wT1F+EfYyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762768102; a=rsa-sha256; cv=none; b=JspoumsL39m8dghge7mY/Tth0xGo7x6WSKWty2bctfnCKPHm4DgPqBSB4+io1THp2OCZ9/ F2lmOSBc1qAylYo83Ef+G6sCHhodYtG1KLKpB9uRQcxRBljk8/yAcVIU1sRgM1eH+45+oC Rzw/hfzSlKR6mdGs7r3Kg3NmU3cUD0HurW5GCrjYAY2CtEpLtpJ+LExRBr5mMMmtSJmT4d bbqwsHtLAIoje1H8koVo3lC06cSwpsOiCqWHGkEQWvRSmAs60Ji8O3wsU+tW86IvmhLzkF C9Jwi0hQRkcWYKIW24iqu+RgRMrDuMwUjgoohGVxSnaYMPNSEp4HWBrmZipW6g== 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 4d4lGZ1rFGz1C0y; Mon, 10 Nov 2025 09:48: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 5AA9mMZS060532; Mon, 10 Nov 2025 09:48:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AA9mM7t060529; Mon, 10 Nov 2025 09:48:22 GMT (envelope-from git) Date: Mon, 10 Nov 2025 09:48:22 GMT Message-Id: <202511100948.5AA9mM7t060529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1b5d2fc026d3 - stable/13 - dtrace_vfs.4: Document the DTrace vfs provider 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b5d2fc026d35d96ac65995e32cfef9e968f9a99 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5d2fc026d35d96ac65995e32cfef9e968f9a99 commit 1b5d2fc026d35d96ac65995e32cfef9e968f9a99 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-03 15:54:10 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-10 09:48:14 +0000 dtrace_vfs.4: Document the DTrace vfs provider Reviewed by: bcr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51317 (cherry picked from commit 2020e76450e2705d33d673a3d183c8f0a3910e28) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- share/man/man4/Makefile | 3 +- share/man/man4/dtrace_vfs.4 | 97 ++++++++++++++++++++++++++++ share/man/man9/VFS.9 | 3 +- 4 files changed, 103 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 7b80435c03e0..121c87323eba 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 30, 2025 +.Dd November 3, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -885,6 +885,7 @@ in .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , +.Xr dtrace_vfs 4 , .Xr elf 5 , .Xr SDT 9 .Rs diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 5f576c391086..332670598905 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -969,7 +969,8 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_sctp.4 \ dtrace_tcp.4 \ dtrace_udp.4 \ - dtrace_udplite.4 + dtrace_udplite.4 \ + dtrace_vfs.4 MLINKS+= dtrace_audit.4 dtaudit.4 .endif diff --git a/share/man/man4/dtrace_vfs.4 b/share/man/man4/dtrace_vfs.4 new file mode 100644 index 000000000000..528d5da42f3d --- /dev/null +++ b/share/man/man4/dtrace_vfs.4 @@ -0,0 +1,97 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 3, 2025 +.Dt DTRACE_VFS 4 +.Os +.Sh NAME +.Nm dtrace_vfs +.Nd a DTrace provider for Virtual File System +.Sh SYNOPSIS +.Sm off +.Nm vfs Cm : fplookup : Ar function Cm : Ar name +.Nm vfs Cm : namecache : Ar function Cm : Ar name +.Nm vfs Cm : namei : Ar function Cm : Ar name +.Nm vfs Cm : vop : Ar function Cm : Ar name +.Sm on +.Sh DESCRIPTION +The DTrace +.Nm vfs +provider allows users to trace events in the +.Xr VFS 9 +layer, the kernel interface for file systems on +.Fx . +.Pp +Run +.Ql dtrace -l -P vfs +to list all +.Nm vfs +probes. +Add +.Fl v +to generate program stability reports, +which contain information about the number of probe arguments and their types. +.Pp +The +.Cm fplookup +module defines a single probe, +.Fn vfs:fplookup:lookup:done "struct nameidata *ndp" "int line" "bool status_code" , +that instruments the fast path lookup code in +.Xr VFS 9 . +.Pp +The +.Cm namecache +module provides probes related to the +.Xr VFS 9 +cache. +Consult the source code in +.Pa src/sys/kern/vfs_cache.c +for more details. +.Pp +The +.Cm namei +module manages probes related to pathname translation and lookup operations. +Refer to +.Xr namei 9 +to learn more. +.Pp +The +.Cm vop +module contains probes related to the functions responsible for +.Xr vnode 9 +operations. +.Sh COMPATIBILITY +This provider is specific to +.Fx . +.Sh EXAMPLES +Check what lookups failed to be handled in a lockless manner: +.Bd -literal -offset 2n +# dtrace -n 'vfs:fplookup:lookup:done { @[arg1, arg2] = count(); }' +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr d 7 , +.Xr SDT 9 , +.Xr namei 9 , +.Xr VFS 9 +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%P pp. 335\(en351 +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Sh AUTHORS +.An -nosplit +The +.Fx +.Nm vfs +provider was written by +.An Robert Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9 index a269d8d070cf..fcb07afa478d 100644 --- a/share/man/man9/VFS.9 +++ b/share/man/man9/VFS.9 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 9, 2010 +.Dd November 3, 2025 .Dt VFS 9 .Os .Sh NAME @@ -42,6 +42,7 @@ function from rather than implementing empty functions or casting to .Fa eopnotsupp . .Sh SEE ALSO +.Xr dtrace_vfs 4 , .Xr VFS_CHECKEXP 9 , .Xr VFS_FHTOVP 9 , .Xr VFS_INIT 9 , From nobody Mon Nov 10 10:00: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 4d4lXD6TMXz6GVJ9; Mon, 10 Nov 2025 10:00: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 4d4lXD5vh5z3NY8; Mon, 10 Nov 2025 10:00:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=238iGdS2QrrSzcxhXqP7v1DEfEHmqIafTdlfvEM7at4=; b=XEzusXDrAwh4MChgxmBCqf7SxhjifH31RZ6OXNhhr3k8UojNCCqN2DjF2RqXYGf0aXmAav swmAwcYkeoy3dlrAp/JzmbN4E9PDAjQJJ4cKNgL4qhYD58rRzBNkmO6pemClNw+bxu7lwm 5JbjsxBcg8oFFdXGOn5YT8yOYc0tXTJVdgP8d/3XzlJm2RB9SruAncKAQrEQCwV12gtyc4 qBXBH1/ulwDtU2LDM8jSmxyo92jI06W9MAbSvjJUp1XS0GqrAcKXcdaGDVckO08KT4bKl/ R56BlBnmHwgv09oJ247k4Ui2BvISd4U6E8Y/WD4xpGjg9Aob4NkaKJSHa0xoAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762768812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=238iGdS2QrrSzcxhXqP7v1DEfEHmqIafTdlfvEM7at4=; b=gtP5U2kpO8oPu08T5AwUvhX7R6bWmUaZXFk/i/+54qHJSAw9WDQEQrF7c+QlyC94E0AO25 GO4PEaWZfUvkwpKDVolnzZGctrlyQ/QTOkuKMZrUWORRI+kxSh5vo+o/JBq8eNi4IcC29W wJo2dt5LDa2WchqUz+fvay6b50hRRDxDarQSM58p4xcQkvVWP0SAEJ6wjbTa4OUNYITd8d QLo/LYToefLU2y5rf7wmJhgAnpHxRkCFBW42D6TwSPhgU96U2I4t4wkyn0dT4DIzFeoOLG Ismi25VYWMyi1xCH8Qt5lPjwM1YJtqCHzXL5XYySq3DUchaTwQSLP4s4TiGdUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762768812; a=rsa-sha256; cv=none; b=tDKNmPZ1Xan45BZIzthsFfW4QYTsy48zS0RdCpPKXpQxEefyco6q8lwHBS1V5M53PqM9gz F9s+AuNv4kva2Tt4g2r1CkePGl6Sgs60fTz0POLkevVCIADisvhiwQE1PXREv0bdFS4/gJ f0Ir9C+NU08JwqtHXeQsqOUxutg+mmdjV/JS/qqgMTMr3hDHu+yQlPPZN5FXsaQmfGFBVL v21NMcafxo7PFP4UGyYMadqBXGyq1eWcBwSAdFg/XPMg5rie4Vr+W3SyQ9DPdggOFgo07g He5p27qzNhaWO2mPV1oCbun6oGkGxIH6hJubiQn3tROKZAi5I0e8o3ib/C+/Ow== 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 4d4lXD5Pkdz1By4; Mon, 10 Nov 2025 10:00: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 5AAA0CL9086516; Mon, 10 Nov 2025 10:00:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAA0CP9086507; Mon, 10 Nov 2025 10:00:12 GMT (envelope-from git) Date: Mon, 10 Nov 2025 10:00:12 GMT Message-Id: <202511101000.5AAA0CP9086507@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: 9eb7d0c65dea - stable/15 - mixer(8): Update FILES section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9eb7d0c65dea73da83f9813f8b87194f8e260470 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9eb7d0c65dea73da83f9813f8b87194f8e260470 commit 9eb7d0c65dea73da83f9813f8b87194f8e260470 Author: Christos Margiolis AuthorDate: 2025-11-06 12:56:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-10 10:00:08 +0000 mixer(8): Update FILES section While here, change "N" to "X" to match sndctl.8's notation. Sponsored by: The FreeBSD Foundation MFC after: 4 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53503 (cherry picked from commit 26e7e9a6a2a2ee8101b0d06c83ac6d66b78a985d) --- usr.sbin/mixer/mixer.8 | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 819d8ae73ab1..d7de675bceee 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd August 14, 2024 +.Dd October 31, 2025 .Dt MIXER 8 .Os .Sh NAME @@ -28,7 +28,7 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar device -.Op Fl d Ar pcmN | N Op Fl V Ar voss_device:mode +.Op Fl d Ar pcmX | X Op Fl V Ar voss_device:mode .Op Fl os .Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value .Ar ... @@ -47,10 +47,10 @@ The options are as follows: .It Fl a Print the values for all mixer devices available in the system .Pq see Sx FILES . -.It Fl d Ar pcmN | N +.It Fl d Ar pcmX | X Change the default audio card to -.Ar pcmN , -where N is the unit number (e.g for pcm0, the unit number is 0). +.Ar pcmX , +where X is the device's unit number (e.g for pcm0, the unit number is 0). See .Sx EXAMPLES on how to list all available audio devices in the system. @@ -246,30 +246,22 @@ makes the only recording device. .El .Sh FILES -.Bl -tag -width /dev/mixerN -compact -.It Pa /dev/mixerN -The mixer device, where -.Ar N -is the number of that device, for example -.Ar /dev/mixer0 . -PCM cards and mixers have a 1:1 relationship, which means that +.Bl -tag -width "/dev/mixerX" -compact +.It Pa /dev/mixerX +The mixer device, where X is the unit number of that device, +.Pa /dev/dsp* +devices and +.Pa /dev/mixer* +devices have a 1:1 relationship, which means that, for instance, .Pa /dev/mixer0 -is the mixer for -.Pa /dev/pcm0 -and so on. -By default, +is the mixer device for +.Pa /dev/dsp0 . +.It /dev/mixer +Alias to the default device's mixer device. .Nm -prints both the audio card's number and the mixer associated with it -in the form of -.Ar pcmN:mixer . -The -.Pa /dev/mixer -file, although it does not exist in the filesystem, points to the default -mixer device and is the file -.Nm -opens when the +opens this when the .Fl f Ar device -option has not been specified. +option is not specified. .El .Sh EXAMPLES List all available audio devices in the system: From nobody Mon Nov 10 14:55: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 4d4t5F4RdFz6Gq1J; Mon, 10 Nov 2025 14:55: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 4d4t5F3vJgz3sgW; Mon, 10 Nov 2025 14:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762786545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BVAhF0hLWGHGyjXWPCgWuv312hWhod5fPMpYxwRrdkY=; b=FKsVFIDRS7x9NFiOYUySJcAD9wdirI2He36JOwW38zDpjHfGqCtQGRh0e9znThvwYuCw31 2QPVantgDVjihn3rEXa0CgFFEyTq9WBkJUCL1oFmSSzfyoRLJz5+Bsc3mea9e5xh/p8HeH CsCpsWIAbX8nLz6E5qVJhNn6NYxbjaD9wL1n4VyuGCkBJW92sm3s7PFIBVZ6baTo7Y6iyA EpHencFP3zFbLbph9otQ8YG7TxB4n6rLce5RWESqkJ7rTbxRJoaAMTHcDePWVIHxqaITGZ FXHI4+Cgk2EP/oKpZi/2EOuljF6ar0gN0ij+qH6bexGor8Xy9zW9sPDsTDiZlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762786545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BVAhF0hLWGHGyjXWPCgWuv312hWhod5fPMpYxwRrdkY=; b=PMedeui/tZMXq92NX5cHrcqEj4vXhMLLvCv+fj8/8tFkclFemuzRNbt+Ifd8k33ARW21hO UUWErNagRCowXAdN3VctyGJIVK4rW9LbJ6CWJxjqHbpIFcfYiVY+jJQmVlQId80bd/TQMQ m4I8o6GGhSyInA82ENKS6wORjg2/tjtQ+mhEvSJwiF/PQhQ0aWDtq0Y63uccfplho7F1km igvoLkt7iq27J7bDLy/z0/k0roG8EAtGnQk20WCsVPCqDt67uN4HTO21qbUXtGUX+u7D9C dZaZIxquF1Mp1sSnaQlwjTvogUiyaGi1AWjWdAttxUFf08Y5PPxK8Y+aLQT/Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762786545; a=rsa-sha256; cv=none; b=Ob3nq/bm7OmaDRUzyxrcl9fRaKK7E/A0ikckqo050EF2SKC+sKRJM+WK6iTMbl7OxafPLJ +k26R9UIMh+aFNzgASR1RzaiKeFI5wWzc9Ev5Xw5t7nxA7YvX9XXZ7QC4YdmgfuDC4U5YE NWXlVF5qYWT/ZzizHOlUfCkLqhhkYnySJYUzL8PQcXhaQzhHcFcucrnNCyUDkjzj+Pu3g/ VBz/5wi1hOMU0aRTCbmOCqx1C8qvi1N2zgNDUGlZRX1nCkPGgeEJnljhDflybqLf1h+y2c x0VsCH1gMn6drErXiOHODaswa3HQTSoVCQxYjNNkCjoSchyYtGOxuMZCVlzOGQ== 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 4d4t5F3GnKz6wq; Mon, 10 Nov 2025 14:55: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 5AAEtjAj041933; Mon, 10 Nov 2025 14:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAEtjgA041930; Mon, 10 Nov 2025 14:55:45 GMT (envelope-from git) Date: Mon, 10 Nov 2025 14:55:45 GMT Message-Id: <202511101455.5AAEtjgA041930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a4c1644adbdf - stable/15 - ktrace: Only enable EXTERROR traces for 'x' 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a4c1644adbdf25d1f8287d41ab36bd8d178584f3 Auto-Submitted: auto-generated The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a4c1644adbdf25d1f8287d41ab36bd8d178584f3 commit a4c1644adbdf25d1f8287d41ab36bd8d178584f3 Author: John Baldwin AuthorDate: 2025-11-06 02:47:37 +0000 Commit: John Baldwin CommitDate: 2025-11-10 14:55:25 +0000 ktrace: Only enable EXTERROR traces for 'x' Add a missing break statement to avoid falling through to the '+' case. Fixes: 96f4be881e8e ("ktrace(1): teach about KTR_EXTERR") (cherry picked from commit 0b8d17c861194057261d898d94eb45ca9ea310b4) --- usr.bin/ktrace/subr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c index 422a37bb413d..fac335948f46 100644 --- a/usr.bin/ktrace/subr.c +++ b/usr.bin/ktrace/subr.c @@ -89,6 +89,7 @@ getpoints(char *s) break; case 'x': facs |= KTRFAC_EXTERR; + break; case '+': facs |= DEF_POINTS; break; From nobody Mon Nov 10 17:36: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 4d4xg62y5Kz6H270; Mon, 10 Nov 2025 17:36: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 4d4xg621v7z4MkW; Mon, 10 Nov 2025 17:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762796210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XuNkJCDVa6cpPn8/zKPsPov3FrGVLQmOFTVNm/4lw+c=; b=pYcV5edd45EsNbFuim8Qn0h1d+K2Pdr7dAyD8uLAKucM3eNyvHcDFnYCDdlxW0/XsQwdrm mQI4xxNmV6XwxlSVQpzvOtwcn1iXO3EOX7iqHo2N0/VQwtZ/jaK2ewh9VJAUTeocd6nL8Q uUAfPJaWweNcBYdVpuOYjv27+AMACFHS7vQ06ddaqWgNmLiX31PloOd4V9Q9BtZ+5ZdUBi DGykvGXCJO4Y/SqzLO2YAtvXiSiMqQOXojEH7a09wimMbQ8TsR0xjOqmJH0WuaIkDsChPk nWtoDYZrfOR6AY/i4uZ3kT6TVr2R8HwH8+1AyE2q1RIrfbJwDKrFEXqZxDUukA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762796210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XuNkJCDVa6cpPn8/zKPsPov3FrGVLQmOFTVNm/4lw+c=; b=rLxf2dXflTK9xrGxv3qH/18e9P8U7s/eregwqpceR1gLXATjpkeZYRbeGh69xpNQ/qA2/e 21751Omq7EEAsfQKk5I9ZMDPK6Kl7/lDN8ev8UEKBaPmzkiMFFPZ4t14j/klMV3RTmxY5O xHu8uMgAZbZCLF4yDXh4GXSs3wfObIx46UPmqAF0Ef+8y0Xne6LbGCywCxW4a8hww69dAB zVHvgc89eHwcp+Z5QrW7uiVcMHHhlzVZJSX0qsrfwhbBMY6pbHuk1xdL+byy+mBAqzw613 C/h57qpj9lwo/KywTw3C4gvqCjKRt676fGIFIM/STL4dbMxHaWRaS5GND/rlHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762796210; a=rsa-sha256; cv=none; b=INYBFOiZ67YU0OMrCX/t4CX98zCORgWu161gpd/jd8wviLZ7WgYO6RmsDOakEmVfawwOvG IPx4eOIf5P8eYpOz5crP7lWvwam93SrVlIzkQhLKqRuPRZ90cgwKsqANZoO/4oPuUW23mV vp42shb4zAOsIMKT7yZszgVXOGgz+FPc6t8r68YasT4cP1nIdsIRKkJMAApVBMhStkNqOW hPJKM7MzD7VZmkMBX3P3xOzr99I1LfxmWLPKtvkjUWEKrZdT4qPyKddzcgRIM2pJUu3+R7 pZxXXKrWbkNw1ok6YagPXyVPoNrlDlJGK1JArPoK0zllLOZSG1Ol50Wu7wYG3w== 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 4d4xg618YpzC0y; Mon, 10 Nov 2025 17:36: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 5AAHaomP044666; Mon, 10 Nov 2025 17:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAHaoCB044663; Mon, 10 Nov 2025 17:36:50 GMT (envelope-from git) Date: Mon, 10 Nov 2025 17:36:50 GMT Message-Id: <202511101736.5AAHaoCB044663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: a3cd3a4fd68c - stable/15 - netlink: plug lock leak in genl_register_family() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a3cd3a4fd68c8a2ea9264f168441a2ce7d51b4c8 Auto-Submitted: auto-generated The branch stable/15 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a3cd3a4fd68c8a2ea9264f168441a2ce7d51b4c8 commit a3cd3a4fd68c8a2ea9264f168441a2ce7d51b4c8 Author: Bruno Silvestre AuthorDate: 2025-11-08 18:02:32 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-10 17:36:35 +0000 netlink: plug lock leak in genl_register_family() PR: 290893 (cherry picked from commit 335fc09ab8d25c3ced027d46f5a0f4103d5c8bee) --- sys/netlink/netlink_generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 00f47e60f013..d20ec4c7545f 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -366,8 +366,10 @@ genl_register_family(const char *family_name, size_t hdrsize, GENL_LOCK(); for (u_int i = 0; i < MAX_FAMILIES; i++) if (families[i].family_name != NULL && - strcmp(families[i].family_name, family_name) == 0) + strcmp(families[i].family_name, family_name) == 0) { + GENL_UNLOCK(); return (0); + } /* Microoptimization: index 0 is reserved for the control family. */ gf = NULL; From nobody Mon Nov 10 18:34:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d4yxm258Vz6H5cp; Mon, 10 Nov 2025 18:34: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 4d4yxm1VrGz3FgT; Mon, 10 Nov 2025 18:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762799676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IP+1r9nr2xq4aGCdlHx52gj3RKes8CWF3nmPq1CLmxs=; b=JOgPOq8D3AXjcx6X6XLFO01IIgETyOsH5UvBLlFepcSg2bcD5hjljC+XVrCF9Ff3h7VnmW yDhEV6C3rWnB+kOHGfPiw4xICfNkhjN9Eodt+dqbSjNotNZYj0LSlc1kvvKYWOo8Ou7ulw av36EfMJTxJN3W2uK0fcKG5JzvDdkh28ZJVYaWwPdmC5qUx8BxcuJbhK8qQ2f+xxK0FXur Hk6It8EwskAFdcDXLn4mZR/SHB1Nm6/CTEapQkEoaY4+8V6URODWLJ4N8MBlRlBlCUeZgV imWYyRcRYQotD3zkfrW+NX8lNUHmcnJ34Csyc9JclJn2iYZlbEgokuE/zXTIXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762799676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IP+1r9nr2xq4aGCdlHx52gj3RKes8CWF3nmPq1CLmxs=; b=lSVgxKtv13SYO+J3UK1cBjfhAVnEjdzvxB2kTlW+b6tKlrQVYlAOyv3s+pqk5/OtSI9kk+ sR/ReoDvixezS59B6pC4SifhQ1ZvCan1P0L7veN9SKdkdSGLEsVHVPx8cDet3qbM4QOMQk utn8j/jSWr2C451F5R7gS5K2eO8/Sm+96iXV5tIQtshX0A8BOpCR/spITd8A6x1zWylOJm ThPWaeBTEmfbHOY9KXf7gE9frR2mXCv8ja7IGUy5K6Gaj8s553jNtk7QBYI8xDb0d8orxM nUzT+w1eqXbqnYxyIHP5Nu5fnBU+fpMIAIdVY0Sj0BLM7IOsEVDY5nVoRynOLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762799676; a=rsa-sha256; cv=none; b=ZzUx63l7SkatNssWtiU8tyr17vCSRYfLvjR7d+jNZoDs8ZAx1w+cWyxyAWeCHGhc1r2w52 HYzqlAqC8d2rxE4FvCtG6/osDc6pUQlRg4zD9yolIvhsjCsLvpHZSKwj5huhN2Bc465yvU t2/QnoBwBxKCR2I4LKnEPLING/TreGx4ns8oeKYQFTbxDDVHehqR9C0szRgskLpysm5Hda VmpkURau7MUbetIQVL2/eN2Y1R08etDp/NsGEleCjDULsgXZr1yDfPaNkWF0arlfxuxFaz 1sJSiqKBGwzD9/rW4zFdSYByE9joMDI/woQVD6upR+DOOaVicQTKeztxg02gaQ== 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 4d4yxm0hByzTgM; Mon, 10 Nov 2025 18:34: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 5AAIYZK3055677; Mon, 10 Nov 2025 18:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIYZ3N055674; Mon, 10 Nov 2025 18:34:35 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:34:35 GMT Message-Id: <202511101834.5AAIYZ3N055674@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: 2e2a460f9a39 - stable/15 - release: Add WITHOUT_QEMU to IMAKE 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: 2e2a460f9a3965607d863cfd226f4b2f3318b20e Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2e2a460f9a3965607d863cfd226f4b2f3318b20e commit 2e2a460f9a3965607d863cfd226f4b2f3318b20e Author: Colin Percival AuthorDate: 2025-11-07 19:56:14 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:34:30 +0000 release: Add WITHOUT_QEMU to IMAKE We have NO_ROOT here, so we need WITHOUT_QEMU to avoid problems. 15.0 candidate. Reviewed by: emaste, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53637 (cherry picked from commit f89aa18848ae9924fbae48ba36e7b6b38bddce4c) --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index c142bc35a45c..6e74d00de9fc 100644 --- a/release/Makefile +++ b/release/Makefile @@ -56,7 +56,7 @@ TARGET_ARCH= ${TARGET} .endif .endif IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} \ - -DNO_ROOT -DDB_FROM_SRC + -DNO_ROOT -DWITHOUT_QEMU -DDB_FROM_SRC DISTDIR= dist # Define OSRELEASE by using newvers.sh From nobody Mon Nov 10 18:53: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 4d4zM81Mmsz6H6SJ; Mon, 10 Nov 2025 18:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4zM80pRkz3Hhy; Mon, 10 Nov 2025 18:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XG7Qa2oie2HNaaYIm4UmnBjnh7KkTsS7iosPcTd5eEU=; b=rV/eeVBC/UklF0hL7JCjaaFcupmRAggIMKVkummIDzkKoWDVh9vJY21Degmr9Ni9yBwXr2 C04wseTJApXqufEQFuIEsAw3wGtxKr+9+i8J4P6pm2D5gIJSdT81xApVB//0cD6tJOFdkg DCKeg7KFvWK6HUg9+kNfmqSRgmOIKJ+0clBxFLvqEqlC0cqjGCNbrs4iz45JZvWxa+vtSF OWw/ODwNCA30Og18N1enMxlpgw5sJPyDcZu0fVWHrSnEGn4HXXZjT8jZXgTBKGhGyw4s1k dl6Y0fWcu9uXFYKnGfku4YNIt2m8b9CJSCFGtsGAsjzwXA7hw/uKD4axibmURA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XG7Qa2oie2HNaaYIm4UmnBjnh7KkTsS7iosPcTd5eEU=; b=qVGllTIdgtQgO+a+7LeoPtIUwFAOJAaldFshXNtMMhAqlksTwqc8vVpkXVn8zQAFxf9rz2 PbwMEJXsMsmx0MCKa6gqH7j5GlVOp5rNyRTAPyuh4KEceGiu4Jrn2QkrH5Ary9rkS+5Vv1 jS1wMIs8PXATIvsgPeSWhz/UrtFFVS1kznK4yLA0ca1mV1MrO0dJa5iDRCIPOjOPExjQvD jyVd64qcPPseLNKjjmVZZEn24TqBAFR3sKs1uoD5OWmMGfHzivZ63crNirQDLilCwzJbm0 klbLNOg6m8WIIfDV14d0t9b7B1LzPbIkjqs3ZuGorpnY2shrMWT90O8WpAaGhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800788; a=rsa-sha256; cv=none; b=plTaykpGnagaanWLg+18KRMD//sWn7soxWcsb5F8Y9TM+K87kSca0ghSdbCR7MvgN2V0mh yRz3p7r3l6rkgChTFke5Df9bu7R57Vnxgl3XlA4WEt24Eb8AgMziB1gKdypgG9cA3i5499 oavaadJN1ifqaFZa7ucPEkvJJ+j7FosVzuvhY6r65FdE/jWY0esJ3gm8GqJMEmbNv0QDyy 2FJMa/O9HqPJ/Gkn3j391pZ5dB9NsLpMmuSY/1OFRXc3NixxGImOI2BadbzjAmLMDzXYiD fUJXj+ix+PUlMf7cCCV0sauO4pIzL/Zm9Vw4d5fJM0rh4NhfjpL0xvd8TlTe8g== 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 4d4zM80PDkzVTd; Mon, 10 Nov 2025 18:53: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 5AAIr7TM092841; Mon, 10 Nov 2025 18:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIr7Bo092838; Mon, 10 Nov 2025 18:53:07 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:53:07 GMT Message-Id: <202511101853.5AAIr7Bo092838@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: 854651d47e65 - releng/15.0 - release: Add WITHOUT_QEMU to IMAKE 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 854651d47e658d1ebf1d27f731a7c852be149da9 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=854651d47e658d1ebf1d27f731a7c852be149da9 commit 854651d47e658d1ebf1d27f731a7c852be149da9 Author: Colin Percival AuthorDate: 2025-11-07 19:56:14 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:49:04 +0000 release: Add WITHOUT_QEMU to IMAKE We have NO_ROOT here, so we need WITHOUT_QEMU to avoid problems. 15.0 candidate. Approved by: re (cperciva) Reviewed by: emaste, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53637 (cherry picked from commit f89aa18848ae9924fbae48ba36e7b6b38bddce4c) (cherry picked from commit 2e2a460f9a3965607d863cfd226f4b2f3318b20e) --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index c142bc35a45c..6e74d00de9fc 100644 --- a/release/Makefile +++ b/release/Makefile @@ -56,7 +56,7 @@ TARGET_ARCH= ${TARGET} .endif .endif IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} \ - -DNO_ROOT -DDB_FROM_SRC + -DNO_ROOT -DWITHOUT_QEMU -DDB_FROM_SRC DISTDIR= dist # Define OSRELEASE by using newvers.sh From nobody Mon Nov 10 18:53:09 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 4d4zM93jBFz6H6YG; Mon, 10 Nov 2025 18:53: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 4d4zM91fCKz3Hqn; Mon, 10 Nov 2025 18:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dr9TcGf/MZp1teTnKLgwLFUJzuPNowB4x4I3xAXCRqQ=; b=VBQf2uJlGExHBACntVGpokDwY5isBq7yVrznQUy/UvZ1vd1fre0XFSURfPGMzPETfGRsl7 wSMjLkGVApLGD5ExHR5usvv4A+o1ShZrqG+neEPlfD7FJN88yclsnwBVp2jaOuRV3yqBGJ QUFya9uoyPk5TxhB9nUwcwBVflf3Y0LxpgYhY5116S7xNkiaQX1Grb0Hc7JMEd8Q/ffv6Z BUwUyK9fz8VIUjaLCkYGkdBWl8hy1uEoqL0CL2KzmDeoE2tMwqyb7kzt8ePCui7kdy15uJ qUlZrRIaL+Mplat98teT1fH1KNjk1BWT31gCvl+nqNsKZk9wkEBv7+XKcd7cpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dr9TcGf/MZp1teTnKLgwLFUJzuPNowB4x4I3xAXCRqQ=; b=W7GClU1IGcXCn5dZBXE9zSnx7IKUDT32wlL+uH7tFJP8TujL7tzGSdmILvxpFZSLXX66xV Rb8gz5e0hBCxwrad7MJGy5oVfQlcqwT3Y1NkDh0xvp92ojse+yV/wQYQ3A8X6B//PsiaJE J58csMV71NsOHRvcgws4Sb2oKldMUqBPjXx3P9sqiayAiWJgobwy5PFP9Hoie+1tuUbbCL l3mfSbLqNZ/txyuV4bNNFcMuOnQVKPoVjDkdOYeDInTNu8eF2XoPhO4JW2lacpsElQbxYt Th7FwrkgfKns6bFHWJzGzsM+ATXibnM48wRCp39alOJ+0IIdFrgyHcko2p3neQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800789; a=rsa-sha256; cv=none; b=G6lhmssh6L5bKW54qVa/ZBlXOIFFLusdjBPGsE9+fWH+7+1xmRxX5/1h+jflQ9LZgGgMas 320DVS33hjUio7nHyBIje+wGsMvntVv7pZefE2cxA2ACAODutJ8I7bM9N/IfmXzHLs/MjA xZfWQkcTIyZjqe3/x2jzGKJt3Yre+wVULe1nkxZxkCieRtvFOIakwO0s3cw4waxGlSHR+2 OsjXPzqPWPOm3C9gdzDCdsIgjN2Gg4HWNahXI5p1D6WfU94HpqYvsV//X0i1BG7VLECVvE ESQul6NJqDxBctu7xlRNBI3zofO/zuCGeVWyUL1ulGb5S72vQMEm7DvoggD6KQ== 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 4d4zM919wszVTD; Mon, 10 Nov 2025 18:53: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 5AAIr9gB092878; Mon, 10 Nov 2025 18:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIr96g092875; Mon, 10 Nov 2025 18:53:09 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:53:09 GMT Message-Id: <202511101853.5AAIr96g092875@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: ee234a8f1703 - releng/15.0 - freebsd-update: Swap pkg(8) flags in check_pkgbase() 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ee234a8f17039ca770fda42e45ba9559bc2eb24a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ee234a8f17039ca770fda42e45ba9559bc2eb24a commit ee234a8f17039ca770fda42e45ba9559bc2eb24a Author: Mark Johnston AuthorDate: 2025-11-06 16:06:12 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:49:08 +0000 freebsd-update: Swap pkg(8) flags in check_pkgbase() Unbootstrapped pkg will ignore -N if -r is specified first. Flip the order. Prior to commit 66c75fa63aff this worked by accident. Approved by: re (cperciva) PR: 290393 Reported by: olgeni MFC after: 3 days Fixes: 66c75fa63aff ("freebsd-update: Fix the pkgbase check") (cherry picked from commit 645352316be6901077dc1a3ce26f41934136f412) (cherry picked from commit addc0556ce547425f9810fe081b46e8472340333) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 7815502dba39..23f1106e3bde 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1103,7 +1103,7 @@ IDS_check_params () { check_pkgbase() { # Packaged base requires that pkg is bootstrapped. - if ! pkg -r ${BASEDIR} -N >/dev/null 2>/dev/null; then + if ! pkg -N -r ${BASEDIR} >/dev/null 2>/dev/null; then return 1 fi # uname(1) is used by pkg to determine ABI, so it should exist. From nobody Mon Nov 10 18:53:10 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 4d4zMB5PsFz6H6Pr; Mon, 10 Nov 2025 18:53:10 +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 4d4zMB2Lt9z3HlQ; Mon, 10 Nov 2025 18:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHIJ2M5jrvKeKX0qbTfcaV2PzQAYWufTtc8RLOoKTvM=; b=xivvKqkVQX1R5kpyndTmeiEOuvUI7HwZsSJkMwyOt501IOCJC+D3XVaUw+blZFL153fqMD IjsWkHXW/2XrZ8nk/9jW2nov1ZhqLCoF2FxAeXcmwfc+7cf7Vi9PbDEcdEx0XUFaudfZg3 wq9YFqvADCj6RHSTAqN3NMDWFjMBjbNSn3TaIsClrukGqrQ9zV5mPSUYmkecmg9IWMiqt5 WKyrHmPQ7tw/ui8AhKhAuGTzw/vHBbPuTxor5IttTxHE6Qom3h7Z48dV6AYNOrlw4JECKJ HSBatQyzVURPuUG5ACovFjE9JTwB3cL2CmMbXSgvDak7sehMMGgBNjgi8RC5YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHIJ2M5jrvKeKX0qbTfcaV2PzQAYWufTtc8RLOoKTvM=; b=PrIcjhVFHVAAZuN50AE3rpu/zTHk5xGCWiIHb+14VmigDSyhETujZN0D1RYUDF4/wwuHaL NIdU0VyIlBU6sbaWV3LUBzVJSxbTt9aSQvU0mWQUakXzCLCRTV1h4RG6Ou3mr8uT95e4pf fhp3VbNf3XKTXLdZNKG/1fYAFHCgELRQhBYbYDthBxvLAzLz1tSKe9mUcfyanj1H3r9UFQ XzvlTN5OdIehIpLTU3VOsLXoNocmpkK2Fd0hbC4vRyRQSPdRDirwJ7XlxydOg+aUO40Vxl yNH99gntAFmL4R49CVp/cApy9CxzjTL0ScXR7eFrV/QA4oWq8KOiyrxPxfLvng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800790; a=rsa-sha256; cv=none; b=yurQe3e1BzXOctiysvX759RpjRegl6J7lVFo7o86WAUxyOKG12/WwoqA7opePrpyVpC9yD bCTnd5vEp/Q2dexhfek7vtxrCjRAZHozgzbMyAMMcBALTZR4jcVZ8NaC2AbuYWzOwUvkBj shP/jpSlGC7p3YRZ1Vg7uHpC/uXCgBLRZcrIriiH0E65v9JqDFOpni2zYVvU/eRCLh5ZdA CsY3LGY7t4v2jzYZmY75/quJsS38Iuz8Y8R6fvPIS4ItkZqO29zAFGYpoiFJX/Gw2yDyLy 9v5kVpO5GdYNBWmph2gZ5eL20WU6RkFN5E0yz/ZWJsmh/TiQST0VGT1xk6AzjQ== 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 4d4zMB1qTtzVTf; Mon, 10 Nov 2025 18:53:10 +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 5AAIrA0i092912; Mon, 10 Nov 2025 18:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIrAqT092909; Mon, 10 Nov 2025 18:53:10 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:53:10 GMT Message-Id: <202511101853.5AAIrAqT092909@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: 40056e8abc42 - releng/15.0 - netlink: plug lock leak in genl_register_family() 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 40056e8abc4261651991320488d5e9a1068e6888 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=40056e8abc4261651991320488d5e9a1068e6888 commit 40056e8abc4261651991320488d5e9a1068e6888 Author: Bruno Silvestre AuthorDate: 2025-11-08 18:02:32 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:49:11 +0000 netlink: plug lock leak in genl_register_family() Approved by: re (cperciva) PR: 290893 (cherry picked from commit 335fc09ab8d25c3ced027d46f5a0f4103d5c8bee) (cherry picked from commit a3cd3a4fd68c8a2ea9264f168441a2ce7d51b4c8) --- sys/netlink/netlink_generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 00f47e60f013..d20ec4c7545f 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -366,8 +366,10 @@ genl_register_family(const char *family_name, size_t hdrsize, GENL_LOCK(); for (u_int i = 0; i < MAX_FAMILIES; i++) if (families[i].family_name != NULL && - strcmp(families[i].family_name, family_name) == 0) + strcmp(families[i].family_name, family_name) == 0) { + GENL_UNLOCK(); return (0); + } /* Microoptimization: index 0 is reserved for the control family. */ gf = NULL; From nobody Mon Nov 10 18:54: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 4d4zP32rpSz6H6QK; Mon, 10 Nov 2025 18:54: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 4d4zP32DDpz3L9t; Mon, 10 Nov 2025 18:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHiAGDiUIF+0j3cJ02c44zoow184HmF5iDeKM5hWCwM=; b=rjbA10J/fvFN5VJBiK6G0hNpalLBL22ARuVNcrg7RtrbAaPyqjCZe/VF47NUWMMBF5dvp2 gLlNP72jAGdiEQUcqjs1xS0S//W/cD0naW4L8YCUlYTnBffuReezidmXmZQ0TFgM3dJ0ok eD8LxKOgG3xEOmdgcXB4BkEm3WV2jEnILYtUP8ibf23dMq/VO8rDZPmIZjCV9TNTqZsEet jTGqcqXHwmOTc0Qe/k4EcnO0LhvdnhOFVot16nyG9YHEoO00jL0SNRORu2s1mTyRol2oXu QjtT8o8aO273obXDXAPiln3FkWKukfmjmDL4zmQcMoydLPv3VG6URuWK54dFdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHiAGDiUIF+0j3cJ02c44zoow184HmF5iDeKM5hWCwM=; b=a01Z9Zu+FyRacgC0y3ommUrv0Nt4LY9SmkYXmGR9NVcKfNveSwhdrnqptaDK4Qn4zuB0vv FVBwiWFcL16xx61YoAzkpH0H5vzGbWBs+o3Hrhgn3MLNmt3qWW67lD3sRJYXiFeEDRsWCo kfc65x3sA1DUWGu6/cYeJjK9gmQSld6aDjdLBdtChPX0ivYOUKzRuTOnuy31ELh0PV2970 wgGMUc6SMqOJkiPqtyAtp0/GJShwOvzKfyw3qI50+uLV2F9iZHkPbiHHhWLwiM168sqmjO MqlZq+qBlYubrsmqZBTT0KcHWti1IXr55LbNgcFI+y0vDaZv9Ww18P9Z0lrRcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800887; a=rsa-sha256; cv=none; b=hDG/9YZtgVOwfkIa5NCcGWaSKgCzge8QS71UaaqpcrNS68S9D8k6IPLS+xIXcv71YaGuhN aV8HHyYwOEma60v7wkob72m9rAgJpIyRwwhbdKI+i62KAPvVMSq0Ad1RcftBDJXL/6w70m yGLTfkPt9pd2gwoBaj7wzzOgfHsOUUquBpWp+DTwA7Pc6bklvA1LOmQCv12dXFVfRjKPMM CP2sv5RpUqqd0wmwaxxj5U+eYp7PxykM3Mze+DlraHamNpfPHG++DxD+xbn5qp4uH1cWSf 73aBXwwglbpViD3chooLgTTqtnYt5SPZn99jB7UPrvaT9n0IQAYuuN1o/+7APA== 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 4d4zP31hBRzVS9; Mon, 10 Nov 2025 18:54: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 5AAIsltI093489; Mon, 10 Nov 2025 18:54:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIsl9O093486; Mon, 10 Nov 2025 18:54:47 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:54:47 GMT Message-Id: <202511101854.5AAIsl9O093486@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: 0339b24f8d30 - releng/15.0 - random: Have RANDOM_PURE_START be a cross-platform source 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0339b24f8d30f92979c4ec5ba2556cd83cce9e98 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0339b24f8d30f92979c4ec5ba2556cd83cce9e98 commit 0339b24f8d30f92979c4ec5ba2556cd83cce9e98 Author: David E. O'Brien AuthorDate: 2025-11-08 02:18:13 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:54:37 +0000 random: Have RANDOM_PURE_START be a cross-platform source and one that will be with us in the long-term future. (this helps reduce diffs in the future and for down-stream users that trim entropy sources). Also, move deprecated (removed in 16.0) sources to the bottom of the list to reduce changes to 15.x. Approved by: re (cperciva) Reviewed by: glebius Obtained from: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53311 (cherry picked from commit 9f3886347c1750cf80a82314470fc7186088eb9a) (cherry picked from commit e224f2c1b98ba065942c83d322cdb8e3987d0c81) --- sys/dev/random/fenestrasX/fx_pool.c | 20 ++++++++++---------- sys/dev/random/random_harvestq.c | 8 ++++---- sys/sys/random.h | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 3aefe17a045a..35d06c2a9df1 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,13 +167,7 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_SAFE] = { - .entc_cls = &fxrng_hi_push, - }, - [RANDOM_PURE_GLXSB] = { - .entc_cls = &fxrng_hi_push, - }, - [RANDOM_PURE_HIFN] = { + [RANDOM_PURE_TPM] = { .entc_cls = &fxrng_hi_push, }, [RANDOM_PURE_RDRAND] = { @@ -200,9 +194,6 @@ static const struct fxrng_ent_char { [RANDOM_PURE_DARN] = { .entc_cls = &fxrng_hi_pull, }, - [RANDOM_PURE_TPM] = { - .entc_cls = &fxrng_hi_push, - }, [RANDOM_PURE_VMGENID] = { .entc_cls = &fxrng_hi_push, }, @@ -215,6 +206,15 @@ static const struct fxrng_ent_char { [RANDOM_PURE_ARM_TRNG] = { .entc_cls = &fxrng_hi_pull, }, + [RANDOM_PURE_SAFE] = { + .entc_cls = &fxrng_hi_push, + }, + [RANDOM_PURE_GLXSB] = { + .entc_cls = &fxrng_hi_push, + }, + [RANDOM_PURE_HIFN] = { + .entc_cls = &fxrng_hi_push, + }, }; CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index f2206044fe7d..0e90b4d6ef9b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -662,9 +662,7 @@ static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ - [RANDOM_PURE_GLXSB] = "PURE_GLXSB", - [RANDOM_PURE_HIFN] = "PURE_HIFN", + [RANDOM_PURE_TPM] = "PURE_TPM", /* PURE_START */ [RANDOM_PURE_RDRAND] = "PURE_RDRAND", [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", @@ -673,11 +671,13 @@ static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_PURE_BROADCOM] = "PURE_BROADCOM", [RANDOM_PURE_CCP] = "PURE_CCP", [RANDOM_PURE_DARN] = "PURE_DARN", - [RANDOM_PURE_TPM] = "PURE_TPM", [RANDOM_PURE_VMGENID] = "PURE_VMGENID", [RANDOM_PURE_QUALCOMM] = "PURE_QUALCOMM", [RANDOM_PURE_ARMV8] = "PURE_ARMV8", [RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG", + [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_GLXSB] = "PURE_GLXSB", + [RANDOM_PURE_HIFN] = "PURE_HIFN", /* "ENTROPYSOURCE" */ }; CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); diff --git a/sys/sys/random.h b/sys/sys/random.h index af6b1e117423..64f2a1e1b40c 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,9 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_SAFE = RANDOM_PURE_START, - RANDOM_PURE_GLXSB, - RANDOM_PURE_HIFN, + RANDOM_PURE_TPM = RANDOM_PURE_START, RANDOM_PURE_RDRAND, RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, @@ -100,11 +98,13 @@ enum random_entropy_source { RANDOM_PURE_BROADCOM, RANDOM_PURE_CCP, RANDOM_PURE_DARN, - RANDOM_PURE_TPM, RANDOM_PURE_VMGENID, RANDOM_PURE_QUALCOMM, RANDOM_PURE_ARMV8, RANDOM_PURE_ARM_TRNG, + RANDOM_PURE_SAFE, + RANDOM_PURE_GLXSB, + RANDOM_PURE_HIFN, ENTROPYSOURCE }; _Static_assert(ENTROPYSOURCE <= 32, From nobody Mon Nov 10 19:00: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 4d4zWX2bBdz63GVx; Mon, 10 Nov 2025 19:00: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 4d4zWX1Yvpz3LmP; Mon, 10 Nov 2025 19:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YLQLZ3/BP2hOubI124SAfYpZMSqYbTgW0LGeJlukPXw=; b=kznqx5T5SA4v5QFKUtcOUXeWapiPHVnWMJ549olwc3KGovUSxEip8ZRjf8rtwc+cOEM+pf 0MW8HpRGatAvHazudeDEy+7gifPLpBV520TDloBtqC4QH50Qu2w18/lruAWEg+NBHFkm1V Mj16QqqI4pUpqJEqksaEcgwyl7LePsenYd5PUq9FtJprg1MN9imKzuJrq8ZQBAfaoL5/xs AwFosEF5Bg6u2bcVNXtO0v+WOOvl1EvkGyNxukXKqe1WET/572j047V+vkpOagLFEKq2CE s2qP227bW6Qepd9tPPwF6qsS+B74YM7x0TuTUEPrpP9Q9VCk4Z4F2lA9tM2fpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YLQLZ3/BP2hOubI124SAfYpZMSqYbTgW0LGeJlukPXw=; b=SebPL+m6ftcFjpr1x+HA9Rd0tL8ISQmOurSQzPixcOsuF/cmIWlW8clOF6Xta7DiTWPwFm C97nmV++5Q7GIOKYvN0zNMPr0v8ELOU8JtTj5CH2v3ZDkNEYTKMxtS/f1bpDOpEG0d0ROf TMAmwTCmWWTogRvye45E1Gv0Au1KGSPXxzIADbxDQlrPjFhBIsi9hPz8TV70uUGBAeuA24 /uT8pD+x6eU+xtweEGeEj6BLyrIu9+wYnl3jPCh17pgUEJwA7RoJQitUN4eC0C3d37to9e adUIAhNzvCXCjZcOF4UJSytsvS/BqRktX/VQgrAPM2Gw0ZSMoISPCHWBd25ZBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762801224; a=rsa-sha256; cv=none; b=IbnHTqOo5vaeF9prGvwEU30sSKroaWCTykToOwfGqMWwJxloHEuEK7xbOsZHbrh1LSofVR xozG/t4v2eg91WU0NPUdJmMaPjgRlk78Bdq9X46ua1AjZT0+GS3WVZ9aqMNjcmd2tvwwNU cZCLou9JjMDD+eo4BlCDrjntJjDHI6s4FRE/CbgXPevgaa+4c+Sssg8w4cbhYmbeSmfGeq 7z3WsHNUC2XmVSLMtn7Na81c+9T+qP+1HDNXW9VYgJUubvj4MT4dWp83NOxIjTjZR0AnWh 020gyHEWzpagyAPlwrC6j5ieN1815i7yHGyDWuWKzaqlwnBJSDz6ZV6k66hY2w== 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 4d4zWX0tpNzVV3; Mon, 10 Nov 2025 19:00: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 5AAJ0Orx005047; Mon, 10 Nov 2025 19:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJ0O6L005043; Mon, 10 Nov 2025 19:00:24 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:00:24 GMT Message-Id: <202511101900.5AAJ0O6L005043@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: dd1ed088f090 - releng/15.0 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: dd1ed088f090ded90a60a47b1eb5dfbacc1e158a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dd1ed088f090ded90a60a47b1eb5dfbacc1e158a commit dd1ed088f090ded90a60a47b1eb5dfbacc1e158a Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-10 19:00:10 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Approved by: re (cperciva) Obtained from: openssh-portable PR: 288773 Reported by: wosch Sponsored by: The FreeBSD Foundation (cherry picked from commit ce03706ab26c5770150f1ef96aca36b69baa535f) (cherry picked from commit 0a45aa9e954acc75484d59ad42ee440aa7f034c7) --- crypto/openssh/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index dd0bd032ae3c..1ed71646ebe4 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2535,8 +2535,10 @@ format_absolute_time(uint64_t t, char *buf, size_t len) time_t tt = t > SSH_TIME_T_MAX ? SSH_TIME_T_MAX : t; struct tm tm; - localtime_r(&tt, &tm); - strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); + if (localtime_r(&tt, &tm) == NULL) + strlcpy(buf, "UNKNOWN-TIME", len); + else + strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); } /* From nobody Mon Nov 10 19:00: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 4d4zWY3T3kz63GJx; Mon, 10 Nov 2025 19:00: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 4d4zWY2TkXz3LmQ; Mon, 10 Nov 2025 19:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fzsO8qzw9v7pLxqLPNtFNSGQJCr9fa1q0yJTpL8MQw=; b=NnqrHHt9AjnRfTt7SuUjWe3bkdivjJJrG5zjbRhBQqRluyqS1/50bOODdu/iuk6RDEomB+ rVTTEJjzDdv3GW8MadfmT9wL+fqUCyjHkayVN+70xrJ6a+3N/8wFJt2oKuhznKRVsT73Ck U2HAl+8Z4Seydm+s1zzNZhczvylLCEQc2GhHkyF0KPAZdnYQFf932mavN5iRo2OXeFUUxX 54T+If0W5nhzoGrpvT3NVrvscriAxPhM+TVnfvjCr23cPwdnW50p//SLqSuh0feroHF5aJ 07e2y8SNHNN1IZpockxbksaDsBKVogNwQoUzBsNqT+7gOI53MnuMkH1Ts6Habg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fzsO8qzw9v7pLxqLPNtFNSGQJCr9fa1q0yJTpL8MQw=; b=e0D6wjVUoWkHqRx5Dq2N/iHelMJJd2BS2Zxo/uqfdbZATmnA6BhorQrKH47B6VpAAJFGeN zpgwoTkpBxiDQR6hY11dv8QRicH8vsub7ME1dZNYxQxf9Jv1at1Dpu23z7+Jwvxk5FliFD RHOagP9NsdmY2WZu045/UfKTYMqk2bJHIhITpRLDtvR67LwmCjlpHm4cua0OLoe5jsfuLL 9AdezakhMk+kBT8KpohreM3NL+okxce60aobfBOPn0qsZX5PIa7lKaEr9KJK4IyubamyCX sLu8YzNn24kZmsDBr3dM/pbi63orEfFqDFSFI/qEPFn5x03lM9KHlStOzl7nhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762801225; a=rsa-sha256; cv=none; b=AXv5vsh4M1HHQfIqD/UHG6S9HdRkd0eyB0Urfp1cuT/mm1aNxCl9c0l5t/gPxDrLzRVk1z fEtOBFUxCyO8wDNWnisL1VWbD4mjk7Ruxe3b6pqa4xJd/Q0WTcmegVK08EHf2VXcm52m8i lxs5hSPWw4Ma9lOmT2qEHPaB+rFO1RSZBhn5e3lx9OaekUTxME8E8qri0Lxd9hIFWwuQR9 39Tf3vn9QViVUSjqmVIO1rKimTCsjZ0MleLHMebTU/jEzmPgHNd72sJIcITJnaCA47IyUr LtXo+XD2gHYQPfJbUVwnh7B1YzyR19fDgrZ3WZ1Ui2WuFYpyRIcqlkKFm1kl5Q== 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 4d4zWY1dJCzVTj; Mon, 10 Nov 2025 19:00: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 5AAJ0POF005082; Mon, 10 Nov 2025 19:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJ0Pfp005079; Mon, 10 Nov 2025 19:00:25 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:00:25 GMT Message-Id: <202511101900.5AAJ0Pfp005079@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: e55b2f03215e - releng/15.0 - bsdinstall: Fix newfs bsddialog menu 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e55b2f03215ed91df015445c40f9caf052cbb343 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e55b2f03215ed91df015445c40f9caf052cbb343 commit e55b2f03215ed91df015445c40f9caf052cbb343 Author: Ed Maste AuthorDate: 2025-11-07 22:53:01 +0000 Commit: Colin Percival CommitDate: 2025-11-10 19:00:15 +0000 bsdinstall: Fix newfs bsddialog menu The second and third members of struct bsddialog_menuitem are `bool on` and `unsigned int depth`. The newfs dialog options in bsdinstall's partition tool had these two swapped, so the default selection did not work. Approved by: re (cperciva) PR: 290857 Reviewed by: asiciliano Fixes: 50e244964e9b ("bsdinstall/partedit: Replace libdialog with libbsddialog") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53639 (cherry picked from commit 4e36942420712c2ab6ebc2c646e61d47b2b68e7b) (cherry picked from commit 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c) --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 0bcd17950daf..8da85a805545 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -139,16 +139,16 @@ newfs_command(const char *fstype, int use_default) } else if (strcmp(fstype, "freebsd-zfs") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "fletcher4", "checksum algorithm: fletcher4", + {"", true, 0, "fletcher4", "checksum algorithm: fletcher4", "Use fletcher4 for data integrity checking. " "(default)"}, - {"", 0, false, "fletcher2", "checksum algorithm: fletcher2", + {"", false, 0, "fletcher2", "checksum algorithm: fletcher2", "Use fletcher2 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "sha256", "checksum algorithm: sha256", + {"", false, 0, "sha256", "checksum algorithm: sha256", "Use sha256 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "atime", "Update atimes for files", + {"", false, 0, "atime", "Update atimes for files", "Disable atime update"}, }; @@ -188,11 +188,11 @@ newfs_command(const char *fstype, int use_default) strcmp(fstype, "ms-basic-data") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "FAT32", "FAT Type 32", + {"", true, 0, "FAT32", "FAT Type 32", "Create a FAT32 filesystem (default)"}, - {"", 0, false, "FAT16", "FAT Type 16", + {"", false, 0, "FAT16", "FAT Type 16", "Create a FAT16 filesystem"}, - {"", 0, false, "FAT12", "FAT Type 12", + {"", false, 0, "FAT12", "FAT Type 12", "Create a FAT12 filesystem"}, }; From nobody Mon Nov 10 19:04: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 4d4zcf6tmHz63Gxf; Mon, 10 Nov 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 4d4zcd6NKzz3Ph4; Mon, 10 Nov 2025 19:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bSEQswrurYqIQDMtdoSu69p8N3H3SzD4MaMdtdLjfVw=; b=E8qhODtOqZHv8KBTcD44aTDKy/Lp5cL6UZinWGd8SqK/E+kwr2Wt93qViCNm2gdSVKiDl9 zsr8eElpZLPRyR43E7w7PZ/c2TJD6p+XGtfD7YwgfUDYd5fVZIbu3zCyw3+Nv1R6vtnhi6 jXebBuTS6a3lxL1Iy6eqOv4rKedjUMREu++fv8byj+yV44ihQPqcMW/fSxhrsFRnBDMsep pHy50qpEUjmVhSxfwVa9MXHl7BLskDINGofqi3E0Q5dACvsLlOmiF6XWLgqOwdzpY29d0R tT1plbR6byxmr3Rqv6JQEEMefTxFRZjk5tfKU+7OpGmc5xvBHEOXgWsvbUNUuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762801489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bSEQswrurYqIQDMtdoSu69p8N3H3SzD4MaMdtdLjfVw=; b=QL8SbwnnG5WNuMN1sIbOEjVzf5IvVgvz1UcpIpM11/twK/RsyY6EkWb6dUgt/Am4egLf6z 0JNPZlg2rU3YBTSIZdrbxIUGO3PH4gwjjGvP/bmsWsTXyZX6XeucNG+OvMa4nmeS5CN0Lh WdqdxlqiJHMbLuOVDwacMXX3vAZia90ZRblOcRjsOpP4Y/+LjOeV8UqtwbkiUwXdPfiaPv 55ywVcYlN96B9Ys1EK4fzbrTDC2oDeb6DdgyKoeK5Y/VhFKh6t3FueRiApDI36PV3dma7J XO3yz9/tm4a/9lQR3xpdnvdLE1BB5B6b0cbXKB5vnV7OmJK3s7PH7hTqAzfSiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762801489; a=rsa-sha256; cv=none; b=KJLyzGMQbd6zdb4fLQ0/Qkx52CxhcOV8+hBaw9pcR3sFhPdzyp/4kM1zA5r6VWi6JuR9GE Dg2VdXB/PBdDHqJciBQf3vnYDt5U/uQ3aXEpMCnh79crPUaCvtNUYz4bTSm+Wq47qCFBF0 1H2bKAAw9xTU/Y/uVZ66obUmZdxpqzPAO28CuMscDHMOGNs5DRtNwXavm5LGouotx4l6G7 VxtqZYfB1v1I1CgBkNEoOFgbLnnEEYRRg1q5HWEA8VVaxNeJjyoXQJVo6wplOeCIbWezk2 TkHP7/Xi0DuBpiI/YQyPARtwltmqmY0VyPcnLXoPOy7AHnwmnGPS0QN9r4Qdng== 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 4d4zcd5ztXzVhc; Mon, 10 Nov 2025 19:04: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 5AAJ4nZs013177; Mon, 10 Nov 2025 19:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJ4nLx013174; Mon, 10 Nov 2025 19:04:49 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:04:49 GMT Message-Id: <202511101904.5AAJ4nLx013174@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: 27aaff3c09f2 - stable/14 - chroot.2: Remove fchroot reference 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: 27aaff3c09f2ec058e108faff5ea138ef5fc3c23 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=27aaff3c09f2ec058e108faff5ea138ef5fc3c23 commit 27aaff3c09f2ec058e108faff5ea138ef5fc3c23 Author: Ed Maste AuthorDate: 2025-10-24 15:23:58 +0000 Commit: Ed Maste CommitDate: 2025-11-10 19:04:35 +0000 chroot.2: Remove fchroot reference fchroot does not exist in stable/14. Sponsored by: The FreeBSD Foundation --- lib/libc/sys/chroot.2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2 index cf17b9ab577c..a1cf1adebb97 100644 --- a/lib/libc/sys/chroot.2 +++ b/lib/libc/sys/chroot.2 @@ -102,9 +102,7 @@ still present on other systems. .Sh ERRORS The .Fn chroot -and -.Fn fchroot -system calls +system call will fail and the root directory will be unchanged if: .Bl -tag -width Er .It Bq Er EPERM From nobody Mon Nov 10 19:29: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 4d509V2jP7z63JVq; Mon, 10 Nov 2025 19:29: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 4d509V29wbz3RTg; Mon, 10 Nov 2025 19:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762802990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/bOe5B21lI/VlC/cBSsY3NU6kHwBssANE8SzFbKk6U=; b=nM7R8Vj+/oNwClmfz4BnaHfQ8XIjXN3KEKpYc00O2d2mEMJuiPDON+K1ocubb174vXJugu nNq+nwiiZN//AiLqtyVCmr3DvGCr/HHyoS3UsIxrrPy99QbI4pLzir+2mtbs+LfPgivged c9QLziUx0bhU140r4HnoiFcRY46Mo7CHQnd5YMIfUO/MVnsEP2ewVLL0kxK1iQHOYaHKw2 F9OYT8L2jEPorvFc8W0C/C5/wCmEB2Nyw5LcXNv0Pi5eXMBqB/O8/M5t0UIoLc0wA9m17d KHM6dRYCT8hN1S2YXIUx6gmjsnJyQrh5eMsUN3uFHwj7B66o7A1R5r+sZ6WY7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762802990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/bOe5B21lI/VlC/cBSsY3NU6kHwBssANE8SzFbKk6U=; b=CBshgQzyJ12CbCMvlS8KEeEpvCv88VtkfVMWU3au8Ny+UhT7AzN77iHUhwwOQzV1FgxhKT e+/cHaiATBgOFbDqlAaLNPHNHhH+heR2xeYmMAriFVxM9HthfI88n9miOw1EV9WVlFOJ7Y Kk8Fqfbd8Dts4jMhsO3rFLzjwUEIcSLhvHnAR+0Mim9wUoJ/6DAhSXGWW1SzffI5bmKrH7 IYMYozy0yo5Z570lIEZOupo8UyIyAr1CKSCxrtH69O9j/LxdW1pgIAQVjExcM+ogtBMeSp 6VsmQYkMwRLjjhe44n1MDRPUY6w1tiOOrbAKgPuqzHxdLf9oFePQ0UXPIjf+qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762802990; a=rsa-sha256; cv=none; b=qiL29EHmB/pDw7n+aTgVRMaVXJAJUpi5MdhotbDv7ablGiZDMcEdipV1hQmBWVP1pfPntW mbl8Un63FdI1Z1kJWtnON38RL1+aV0FBBW7tBZFGQP7J4HpkA0KPkIcBoOhi+0TTZW3JHQ jyGDomxblVIV2Cs246LqDSKpD+fFxTJqoi0yfvkqJm3QCi93x5VszJarB44EX9PJ0IwVTF M8WWSGg6VuCmvFFixxCHjLkikZa09Kigd+AMx0Duh7zgwYVKS8iKK/cfA6Y6ce4T0s5L9d lZgtlaPfHHkS2nGkFEXOk99hAeXCGKeDGMa2+gEgjYd9VcVGVV+6+9yfTiTOWQ== 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 4d509V1Vn2zWpX; Mon, 10 Nov 2025 19:29: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 5AAJTo7e052494; Mon, 10 Nov 2025 19:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJTo5L052491; Mon, 10 Nov 2025 19:29:50 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:29:50 GMT Message-Id: <202511101929.5AAJTo5L052491@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: c64b00a1fa8c - stable/14 - ddb: whitespace change 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: c64b00a1fa8ce7f53ec33949a418adfa6f816ee7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c64b00a1fa8ce7f53ec33949a418adfa6f816ee7 commit c64b00a1fa8ce7f53ec33949a418adfa6f816ee7 Author: Michael Tuexen AuthorDate: 2025-10-31 18:01:50 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:28:30 +0000 ddb: whitespace change No functional change intended. Sponsored by: Netflix, Inc. (cherry picked from commit 3adaacad117b23abaf93a5332d538037420e1daa) --- sys/netinet/in_pcb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 7d665c7d2a73..69b68c77ba84 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3250,15 +3250,15 @@ db_print_inpflags(int inp_flags) } if (inp_flags & INP_ONESBCAST) { db_printf("%sINP_ONESBCAST", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_DROPPED) { db_printf("%sINP_DROPPED", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_SOCKREF) { db_printf("%sINP_SOCKREF", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & IN6P_RFC2292) { db_printf("%sIN6P_RFC2292", comma ? ", " : ""); From nobody Mon Nov 10 19:31:10 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 4d50C30TLPz63JWC; Mon, 10 Nov 2025 19:31: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 4d50C26x0sz3S6w; Mon, 10 Nov 2025 19:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7jkeb6WoJg4Rq3Krv+FJypU0wPU8XPeW2IWQbkOF8g=; b=YbriVm2B3G12xHHcUNAcbpE3eiJoAcR5gG9cz9dJ8Iw3t84lbWpsb2fSpwJ35Rmu9+BSX3 NF9S6JOkhN0hHjKaTHDTOrNshaJOc3+vmDdO6MbfXjgtzX5xAFL9DO8JW7sMAy/QAjMhpm zfSHn0b7ikbFNHgyCyRC6DmIgUgZvPcO1OhZ8nE8znFL7aiY74sBsLtPccQjxIPjdDe1vZ LMq0ZWN1nbOoPKQN6KV3OPljWZsx+ot/7KiQnfUqjSK/NWxkWap0yMXzubFe11C4J9oPra cMrgACV6CJwK8ganTBdSF5SXl1RF/CzW868eMYVW3GfKMA4m97lWUPP0xACd0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7jkeb6WoJg4Rq3Krv+FJypU0wPU8XPeW2IWQbkOF8g=; b=WZgFwjijV636QXNg7kf4alcROYARw2trYDRzrhxZLsdaXQK87wTQGsz17Ta7zQyn60tata X2id+jrKQ4hNwfl16RUcXByTxefd1kFz79DqR9k+T4kC+7rmmM8ucmxAHpcpThyH4PTpGu DO5aKi3mkEFq4A9neNLdwe06gxW+3b904y9r1CQSx/FxkLb1Tz46grPHTyVu24IJZSkFIG bHE7m85mDtD6NS+GumrAAUzJtJzecY5zGy2g1OK41/iBiYIxx5ONppjjuv5kK+R/m6CuSD SmHOSkQoJxPz1B4nqlzEgqxcEPfTGtJaoy9uTsuuLeu8h3CdPnlNIDV2OzSksA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803071; a=rsa-sha256; cv=none; b=i43JSbHZbrrlwFURkuuZyxpBWVlAmJM6/v6WGenjVaikgcL5aNJgX2wlij2U07EdgsaMYC 4tQn9dqFRMNx2OHbOiB5vk0VxtrM3yccnydQEf+svewCxrnZPQzEcVVA1cdXQEnESOHg5b FZVtcTePDbqpRzoa4qU0cl0qrY9vybbHzdKwOm/vYPCeHlAUHEIpCsqpZvOZh0ohuWtjE0 0xNIbjh7V5OyySVRtA/Tn1Lf4UxvNTmtSRiRZ10Jp6RRv0iE0jZ/eCyWSNz3Q0++RscQMu EpY9lfT/Zyn6cvokLMCn09B7AHCTLDtrR/H4uUKLReE3p+DJTi9Djgx2Z0krMw== 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 4d50C26Nk3zXG2; Mon, 10 Nov 2025 19:31:10 +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 5AAJVA6Z062658; Mon, 10 Nov 2025 19:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJVAWg062655; Mon, 10 Nov 2025 19:31:10 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:31:10 GMT Message-Id: <202511101931.5AAJVAWg062655@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: 6f92ed52e9de - stable/15 - ddb: whitespace change 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: 6f92ed52e9de71152957db18b555984d6c0d4831 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6f92ed52e9de71152957db18b555984d6c0d4831 commit 6f92ed52e9de71152957db18b555984d6c0d4831 Author: Michael Tuexen AuthorDate: 2025-10-31 18:01:50 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:28:01 +0000 ddb: whitespace change No functional change intended. Sponsored by: Netflix, Inc. (cherry picked from commit 3adaacad117b23abaf93a5332d538037420e1daa) --- sys/netinet/in_pcb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 712ff28768dc..3b11a7718cff 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3154,15 +3154,15 @@ db_print_inpflags(int inp_flags) } if (inp_flags & INP_ONESBCAST) { db_printf("%sINP_ONESBCAST", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_DROPPED) { db_printf("%sINP_DROPPED", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_SOCKREF) { db_printf("%sINP_SOCKREF", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & IN6P_RFC2292) { db_printf("%sIN6P_RFC2292", comma ? ", " : ""); From nobody Mon Nov 10 19:33: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 4d50FV6j1Qz63K3j; Mon, 10 Nov 2025 19:33: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 4d50FV5x99z3Snx; Mon, 10 Nov 2025 19:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuzSwbmmBZQIwA337F2GvtXs7178yCAA/euEY5BMIOE=; b=rW/ZBZlYxabnB45HzTXt+KL/8LU2xnrS3t49n2qDYvdmPFibHGHwM3oiafigrEfMdehobH N13cExlM/WVoKWCJuQexS+j9FX/sz6rLT+9jFHDbXjLVvvrQb8C6f/V/7/qsDwDLI4C9+8 Jr1Lq9AkLYQFByl4WXYV1ga7G9xDRD2mfsv/HySzfLKDLBnW7JUTPbZQB7F7lfNT2cli9b v6ZDZS+AG6S7qj8/OR9pJPCuYeq7osvX5W779nAYrOEuLo5sOxGpqzwNcdI8C4vfTUSuei NAas95sDKUjU95LWbpPaLmfk8EHrukBJzQ5BhIKe3g92cHxMQkwk+p0fB4IKlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuzSwbmmBZQIwA337F2GvtXs7178yCAA/euEY5BMIOE=; b=TwJgj9RNAt/+Ku+PDl2ZMIVugUJIVT8v+xR6j3fr4GwfhVBgM7TCBS6CwiLtoBTJ/L2Vqa +Kw9wBO8Og4WqfxYwwYbUcfgnDYTMbtEBc2EIHZatQag7g1JyxDCMJi3oIeKLJPrS+FwKW FIadbGBIJQMFfGaxIKo6rnxJJ3dH6Gteppof+n69rPIT3LZDCWkj4putdVkD/77JPompy8 hcc6A0aP5cOBzovMkpXariE45y1DM8pZwhoUIkN6j6lVAhH6In4VJm/dK9FkeOS2Bou9FO Y7f/K9v+mqxeUHsVOpDzHBAXE5grCLzOvDlKkiQzVH2NKcskdusR12lg64DdHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803198; a=rsa-sha256; cv=none; b=b5tycS6ZHuV5foEwD8/dX/cCT/HnZqQNGD9waeC2ed0FboTHtNnJa7NicklMGMIobCplXs jnBz5gtKhHt3mkP0afpc55wqFxhNrfd6GVHzxKvyAkk0Ek9Z+41CqwidTrTAqAs/DrbSsE VEtrudMd+Fs0TJnsRFsrwCDgcPTDWY6Uw85xcodYzWGgXsAIrwwPw0V5THmEAKaM4Mpe+K YN5I4+lnFkm9i1mfCj8y2F28Bc8YBpp7EFB55m4PAWgLFanOkUM0b3dwi0i+pI4J/zUl6c h+bl1q3/MVu2Jb0HOKNabr77cR7xQZ5jzdwPme64jiZW/FAd7wjpOdHh04KsBQ== 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 4d50FV5K69zXKR; Mon, 10 Nov 2025 19:33: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 5AAJXIUS068882; Mon, 10 Nov 2025 19:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJXIZg068879; Mon, 10 Nov 2025 19:33:18 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:33:18 GMT Message-Id: <202511101933.5AAJXIZg068879@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: d463a4c4bb1f - stable/15 - ddb: optionally print inp when printing 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/15 X-Git-Reftype: branch X-Git-Commit: d463a4c4bb1f05439a74da5e44c106e0f8e9721c Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d463a4c4bb1f05439a74da5e44c106e0f8e9721c commit d463a4c4bb1f05439a74da5e44c106e0f8e9721c Author: Michael Tuexen AuthorDate: 2025-10-31 18:05:02 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:31:45 +0000 ddb: optionally print inp when printing tcpcb Add /i option to the ddb commands show tcpcb and show all tcpcbs, which enables the printing of the t_inpcb. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53497 (cherry picked from commit 9aa5a79e2af9a6a8930bbe8a7a024df2cf44e433) --- share/man/man4/ddb.4 | 12 +++++++++--- sys/netinet/in_pcb.c | 2 +- sys/netinet/in_pcb.h | 3 +++ sys/netinet/tcp_usrreq.c | 21 ++++++++++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 3c4894c03d62..a882a5204fb2 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 June 10, 2025 +.Dd October 31, 2025 .Dt DDB 4 .Os .Sh NAME @@ -604,12 +604,15 @@ The modifier will print command line arguments for each process. .\" .Pp -.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm l +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm i 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. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. Using the .Cm l modifier will limit the output to TCP control blocks, which are locked. @@ -1106,7 +1109,7 @@ on i386.) Not present on some platforms. .\" .Pp -.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Oc Ar addr +.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Ns Cm i Oc Ar addr Print TCP control block .Vt struct tcpcb lying at address @@ -1117,6 +1120,9 @@ header file. The .Cm b modifier will request BBLog entries to be printed. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. .\" .Pp .It Ic show Cm thread Op Ar addr | tid diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 3b11a7718cff..53300eb10e09 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3058,7 +3058,7 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) ntohs(inc->inc_fport)); } -static void +void db_print_inpflags(int inp_flags) { int comma; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 9e0618e87601..7d41e3d690e0 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -730,6 +730,9 @@ int in_pcbquery_txrlevel(struct inpcb *, uint32_t *); void in_pcboutput_txrtlmt(struct inpcb *, struct ifnet *, struct mbuf *); void in_pcboutput_eagain(struct inpcb *); #endif +#ifdef DDB +void db_print_inpcb(struct inpcb *, const char *, int); +#endif #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 98c934955121..c4a54646f3a2 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3088,7 +3088,8 @@ db_print_bblog_state(int state) } static void -db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) +db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, + bool show_inpcb) { db_print_indent(indent); @@ -3096,6 +3097,9 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) indent += 2; + if (show_inpcb) + db_print_inpcb(tptoinpcb(tp), "t_inpcb", indent); + db_print_indent(indent); db_printf("t_segq first: %p t_segqlen: %d t_dupacks: %d\n", TAILQ_FIRST(&tp->t_segq), tp->t_segqlen, tp->t_dupacks); @@ -3227,33 +3231,36 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) { struct tcpcb *tp; - bool show_bblog; + bool show_bblog, show_inpcb; if (!have_addr) { - db_printf("usage: show tcpcb \n"); + db_printf("usage: show tcpcb[/bi] \n"); return; } show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != NULL; tp = (struct tcpcb *)addr; - - db_print_tcpcb(tp, "tcpcb", 0, show_bblog); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); } DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) { VNET_ITERATOR_DECL(vnet_iter); struct inpcb *inp; - bool only_locked, show_bblog; + struct tcpcb *tp; + bool only_locked, show_bblog, show_inpcb; only_locked = strchr(modif, 'l') != NULL; show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != 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, show_bblog); + tp = intotcpcb(inp); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); if (db_pager_quit) break; } From nobody Mon Nov 10 19:33: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 4d50Fb5LShz63K1X; Mon, 10 Nov 2025 19:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d50Fb4WXtz3T3K; Mon, 10 Nov 2025 19:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrM7rr26KkYbUVaBSZEx8jynJ5dQdpp53QgAOHi3kGU=; b=LZn1oxRzHKEXxWPNd46rp5/TMjf44kAE7nmHKVPQjGTC+xWlcawSmM4eeGckqFcDFi9+CR E96fa2+u4eLCMw/T9dXelJ6H/sn0cGf1JFGxHn+xucinGRL07a8fUtmRd6coLE9fQvUFgZ +yTwd/+Smszgvf49PvR6CRWMtTiiGZwdn4KA0hpT7h284Stbq2CRz1seWeokXtPH3FzTvQ NOYPkpNJHKGOb0xR2L6vvmL7GVBRSp5f+ocPil7tBauyCG8wP6WBkVMtHDf07zw/rBbDN8 ADIzrfb72uPbob8/DHUbWvupeE/nNo1ELRuoK/lWGofl1HA/lXjp6ZXUD3J0Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrM7rr26KkYbUVaBSZEx8jynJ5dQdpp53QgAOHi3kGU=; b=VGrriJgGZXfwo/5VPIg+AH0rwPziO1jSxO+c6zZ5Wnd9GYXer4JfDyvYa8kS3bnWF56ziy Zv8h3R6MOuSogZj6kntZNH5wgyTocCfU/9XUADrAics45KhFCBg0N+teRpn9CSiZYWQNuN ZfBb/2Ie4n1tzefU+M9DcVtiGPBW/DxYfSTEeDHHFyUyMsab/PAbDEADUDPr9O/YwCTBkT MicmVA+9pI3FjSeH8oFO8s/W8ATP3s6WiZUuxdbMfSZfxpG66rfkv48Fwi57j3S/CCJkEX 4CpnIpD6dwgWnVHhCPcn21Oh+qtpvyQJ27PTr9jw7+imwtTvZFDD7TV7XUq8MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803203; a=rsa-sha256; cv=none; b=hR9vCmsNECSYdQyTSy4G5+Znr17aCGY456tCMAE0mTaMB/9fieEWuP7omUht8RbfTJyOyU gddEKCrdWuq5S1nqYfJ+OYhglk0MuimJmzZ+YJijfEHk4bQnf/ojMmP6b6o2IIgqvcruWP EYBDDaggZrCrvaaoygxaLTcWynrmD+IJhO1+1Pf76Kp2j/FemUEC48ryCfdSif+XaEtTLl obST9JwS1WJMxu2CbAvKXQiWnUnl2DEG2uJS+KIcooqf7eUXsUz1bMmbhCDcHRKwSWGoEr CH+6INnEciE0Oh9cSCPoq1TYIftWlv7HCZw2hSak90LMO3l9D/GTJY1s0O+5xA== 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 4d50Fb463zzXKF; Mon, 10 Nov 2025 19:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AAJXNbN069027; Mon, 10 Nov 2025 19:33:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJXNa0069024; Mon, 10 Nov 2025 19:33:23 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:33:23 GMT Message-Id: <202511101933.5AAJXNa0069024@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: 117e70a21f7a - stable/14 - ddb: optionally print inp when printing 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: 117e70a21f7a950395e97f6b352867b6767f5dbc Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=117e70a21f7a950395e97f6b352867b6767f5dbc commit 117e70a21f7a950395e97f6b352867b6767f5dbc Author: Michael Tuexen AuthorDate: 2025-10-31 18:05:02 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:32:05 +0000 ddb: optionally print inp when printing tcpcb Add /i option to the ddb commands show tcpcb and show all tcpcbs, which enables the printing of the t_inpcb. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53497 (cherry picked from commit 9aa5a79e2af9a6a8930bbe8a7a024df2cf44e433) --- share/man/man4/ddb.4 | 12 +++++++++--- sys/netinet/in_pcb.c | 2 +- sys/netinet/in_pcb.h | 3 +++ sys/netinet/tcp_usrreq.c | 21 ++++++++++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 08e804c64ff8..031df9c27bf2 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 June 10, 2025 +.Dd October 31, 2025 .Dt DDB 4 .Os .Sh NAME @@ -580,12 +580,15 @@ The modifier will print command line arguments for each process. .\" .Pp -.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm l +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm i 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. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. Using the .Cm l modifier will limit the output to TCP control blocks, which are locked. @@ -1082,7 +1085,7 @@ on i386.) Not present on some platforms. .\" .Pp -.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Oc Ar addr +.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Ns Cm i Oc Ar addr Print TCP control block .Vt struct tcpcb lying at address @@ -1093,6 +1096,9 @@ header file. The .Cm b modifier will request BBLog entries to be printed. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. .\" .Pp .It Ic show Cm thread Op Ar addr | tid diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 69b68c77ba84..2761c6979f7d 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3154,7 +3154,7 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) ntohs(inc->inc_fport)); } -static void +void db_print_inpflags(int inp_flags) { int comma; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 17f24ba0bee7..9095e6bb71bf 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -723,6 +723,9 @@ int in_pcbquery_txrlevel(struct inpcb *, uint32_t *); void in_pcboutput_txrtlmt(struct inpcb *, struct ifnet *, struct mbuf *); void in_pcboutput_eagain(struct inpcb *); #endif +#ifdef DDB +void db_print_inpcb(struct inpcb *, const char *, int); +#endif #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index daa04845ab79..38c640569f5b 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3116,7 +3116,8 @@ db_print_bblog_state(int state) } static void -db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) +db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, + bool show_inpcb) { db_print_indent(indent); @@ -3124,6 +3125,9 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) indent += 2; + if (show_inpcb) + db_print_inpcb(tptoinpcb(tp), "t_inpcb", indent); + db_print_indent(indent); db_printf("t_segq first: %p t_segqlen: %d t_dupacks: %d\n", TAILQ_FIRST(&tp->t_segq), tp->t_segqlen, tp->t_dupacks); @@ -3255,33 +3259,36 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) { struct tcpcb *tp; - bool show_bblog; + bool show_bblog, show_inpcb; if (!have_addr) { - db_printf("usage: show tcpcb \n"); + db_printf("usage: show tcpcb[/bi] \n"); return; } show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != NULL; tp = (struct tcpcb *)addr; - - db_print_tcpcb(tp, "tcpcb", 0, show_bblog); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); } DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) { VNET_ITERATOR_DECL(vnet_iter); struct inpcb *inp; - bool only_locked, show_bblog; + struct tcpcb *tp; + bool only_locked, show_bblog, show_inpcb; only_locked = strchr(modif, 'l') != NULL; show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != 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, show_bblog); + tp = intotcpcb(inp); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); if (db_pager_quit) break; } From nobody Mon Nov 10 19:34: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 4d50Gy5MDDz63K5l; Mon, 10 Nov 2025 19:34: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 4d50Gy3zwsz3TR8; Mon, 10 Nov 2025 19:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ABk/uIt2M4hVPlAmKm/qhg0+tkFiB0cV9ExXOkq0+c=; b=Wxif84H/sBb0Qj1XaR1Ela4WOV/pZfCTu5HiCjjI0IcM+t0fmtG0St/Y85fNCDLNhbIN/e CON7KwFC2VeOKycSrnhgnOMYh1twjBz1nsslTOIB7EiOCje9jpHu+UOUWVZYygnGxc0YXe F8LZiUBxEUt/5aMckJ6X6nZQMF5+J/qK1Gw2X2+4veTjgJuWafwvso89pFwCwdEIBZ/E2t 7A6MmiyZ1dA4jhT8HnRA4Hdd0FNWD7c13Ohk0zhRPNGaz2GuFHtlyNy6lpYEtbYsouM7UO UwSIW0Vjn+RnUfeDN1HrU2kZrSuQZu043L/yWyZXM4qdjAEGvskPT/hpZtMe5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ABk/uIt2M4hVPlAmKm/qhg0+tkFiB0cV9ExXOkq0+c=; b=Q58H0brMzLA535o8JkgIwEeqgwECELqcvFJr60bFk0Aht6JyVkGG2OdrUE4e5NzvbKyDaj veiy10+sbdyPbKEQwlbPTJ1Q3mkIhTODydVd8+yzjdAWvMASHu0nzpGVREwAXD9xQQgpms hQt4SYTi6fMl0VuYYWoDJBeNC529La15AWz8c/ZNCy5ZUK3iL57xydeDWQuu5NSnyJDbf/ 2JaKPMZKCqSCi6xO41y+5N0Fi8TnLykAtaCPojnU0R1/prg9c7zU8ijARrbbx9Kkx7Qrd1 HmSsVKWBzDQhSS6F8G+W5DHKpdGqavkOelCteH1/MTF7LmFUuCARmOd5q0WjSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803274; a=rsa-sha256; cv=none; b=CZY3FccWd0Lme5wu37R+SU9mRamnreerXGzB0N+ZUhfhxocucVYEtGN0FzvZq3UyyqKQcH 4At6UZykC0IHWb+f5Pt2B0JfFxSeAJU7lrJDExjwAbu00P8pCEstGk3qIta94KMlW1W5Kj DwuvmAe50A2nk0W6zYHR+nLbSRqSrQTc6zAO6o5Ki+uBm70pVXoSoFNQ1dsKJmaKR6HGA8 IYK4FfdXe68VIJ6mX3OQWr7CJJ+1nw4ycnShjx/4CgbnUqRYX8+U6x/5GavIF7ePqnuN98 duXe971eq/mO1+aDs6Vs/GBShGIZ9vwes9og029R0OfGk4LT9Bhm6RETZT33pw== 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 4d50Gy3YWmzXKX; Mon, 10 Nov 2025 19:34: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 5AAJYYaH069466; Mon, 10 Nov 2025 19:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJYYH8069463; Mon, 10 Nov 2025 19:34:34 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:34:34 GMT Message-Id: <202511101934.5AAJYYH8069463@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: ca35cee7c388 - stable/15 - ddb: improve printing of inp_flags 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: ca35cee7c38879d8c2e53f449846822b3bf05f7c Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ca35cee7c38879d8c2e53f449846822b3bf05f7c commit ca35cee7c38879d8c2e53f449846822b3bf05f7c Author: Michael Tuexen AuthorDate: 2025-10-31 17:58:46 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:33:47 +0000 ddb: improve printing of inp_flags Add four missing flags (INP_BINDANY, INP_INHASHLIST, INP_RESERVED_0, INP_BOUNDFIB) used in inp_flags and remove one flag (INP_ORIGDSTADDR), which is actually a flag used in inp_flags2 and not in inp_flags. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53498 (cherry picked from commit fee2e6b9fae277d383b129573df2528ce0407efa) --- sys/netinet/in_pcb.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 53300eb10e09..f573e07163fd 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3076,10 +3076,6 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_RECVDSTADDR", comma ? ", " : ""); comma = 1; } - if (inp_flags & INP_ORIGDSTADDR) { - db_printf("%sINP_ORIGDSTADDR", comma ? ", " : ""); - comma = 1; - } if (inp_flags & INP_HDRINCL) { db_printf("%sINP_HDRINCL", comma ? ", " : ""); comma = 1; @@ -3112,6 +3108,14 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_DONTFRAG", comma ? ", " : ""); comma = 1; } + if (inp_flags & INP_BINDANY) { + db_printf("%sINP_BINDANY", comma ? ", " : ""); + comma = 1; + } + if (inp_flags & INP_INHASHLIST) { + db_printf("%sINP_INHASHLIST", comma ? ", " : ""); + comma = 1; + } if (inp_flags & INP_RECVTOS) { db_printf("%sINP_RECVTOS", comma ? ", " : ""); comma = 1; @@ -3164,6 +3168,14 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_SOCKREF", comma ? ", " : ""); comma = 1; } + if (inp_flags & INP_RESERVED_0) { + db_printf("%sINP_RESERVED_0", comma ? ", " : ""); + comma = 1; + } + if (inp_flags & INP_BOUNDFIB) { + db_printf("%sINP_BOUNDFIB", comma ? ", " : ""); + comma = 1; + } if (inp_flags & IN6P_RFC2292) { db_printf("%sIN6P_RFC2292", comma ? ", " : ""); comma = 1; From nobody Mon Nov 10 19:34: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 4d50H02tsYz63K9W; Mon, 10 Nov 2025 19:34: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 4d50H02KxJz3TK5; Mon, 10 Nov 2025 19:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viC4ON8jTZ/Nh6nJUOdkzyEG/utKSIoBPIcEciMTwog=; b=MzDf9NAqSlWjAYzCFX8P6OvbEpj3KYux2JBA1acy3PsggWxRvn6lZHVIeIjDKWCQ7yVoJ2 rps9LECdKczBrRU/X1ryZxo03upfZpfh9NNc0ND+sjjEdq8JvWiw5+IF6wOI1/X/fcg0CE YVCcqptS7yOQ97p2fywdh6jXR/jsaOVkD4+/7QT/xAkIMFB3aSYFXcE5vy9GsFbHuIjjwm 5ZOcp2xEZNFlCzBgyEEo0maB3/gYRIi1yWGumQtdwUYyp9p05DNA46/vwRwTvHSCL3U5/v gvYCowpLXxsxOvHp6OUYJPB2LdP9P9bzxykaVVT0mTZkHPCQzUA3U1qB8vUoUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viC4ON8jTZ/Nh6nJUOdkzyEG/utKSIoBPIcEciMTwog=; b=TacFk8wNeFSl31+ZpMhcIfcp2nMZmAm3iKQnm1J1gyH5wDQ2yCdhf7zaExupRq4pd5XSSF y+HTUyajtgNQV/R6yNP/FeUEi78bKgW36Xkm4JtN3SBTn1f2bG0xldEB5eOzTsK+YeDCJm Mw0lurI3j/B8rOI9HRZcGz3G2Vf1yJXs/hK8qtFYM6j60fv3QGZSgKsW4GqT3cdLsmxMxz wIygp6xAZ1RX5QwTVpfBrUtpE3A2xQSn9pK2RLEyeA7Zl7JoR/ROEXmPGJFJ2M7xvtHaJ0 v5BTxt0zJPVlB5MEkK9/Fr0bCHphqzzlwUDSm72yAxh3/ZcIN51YA6stUwdFNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803276; a=rsa-sha256; cv=none; b=UMaK3M7XUvP1g8DrAguhQfFQweJCMHhLJSYtOk3N8KQ2VIzrHo9gct1V0//1wc2Y/lHf+2 Ve9E509FwjTFq+cdlqp3rNteWxiDYWkMikVmZlYxuGY7Fw6//C78+eIrB/5qRlk0O+7Tox XY+mI/DLYf4WuOdRs4D4xGqVm8+tyugUPLwGQH0W0NBjiMqxSjAmnAVdF936Wtuf7xHrOS qT2dAZVxUimqgGFfGVGyPL+AaQ1/HKiYJRczve6RSg5w3hAxu6267sWYZ0vZHoLshsNWI9 qAeHReBykeOYy5007uKDsrtPJwlJ9VthvIvLQ3l2rG8P/+c+0qjrGYS/tg8aFA== 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 4d50H01sH9zXKS; Mon, 10 Nov 2025 19:34: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 5AAJYaJK069596; Mon, 10 Nov 2025 19:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJYaUL069593; Mon, 10 Nov 2025 19:34:36 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:34:36 GMT Message-Id: <202511101934.5AAJYaUL069593@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: 8236a5ef8910 - stable/14 - ddb: improve printing of inp_flags 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: 8236a5ef891067d79f68eaa2273babddd7375015 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8236a5ef891067d79f68eaa2273babddd7375015 commit 8236a5ef891067d79f68eaa2273babddd7375015 Author: Michael Tuexen AuthorDate: 2025-10-31 17:58:46 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:34:07 +0000 ddb: improve printing of inp_flags Add four missing flags (INP_BINDANY, INP_INHASHLIST, INP_RESERVED_0, INP_BOUNDFIB) used in inp_flags and remove one flag (INP_ORIGDSTADDR), which is actually a flag used in inp_flags2 and not in inp_flags. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53498 (cherry picked from commit fee2e6b9fae277d383b129573df2528ce0407efa) --- sys/netinet/in_pcb.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 2761c6979f7d..dd35f9583650 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3172,10 +3172,6 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_RECVDSTADDR", comma ? ", " : ""); comma = 1; } - if (inp_flags & INP_ORIGDSTADDR) { - db_printf("%sINP_ORIGDSTADDR", comma ? ", " : ""); - comma = 1; - } if (inp_flags & INP_HDRINCL) { db_printf("%sINP_HDRINCL", comma ? ", " : ""); comma = 1; @@ -3208,6 +3204,14 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_DONTFRAG", comma ? ", " : ""); comma = 1; } + if (inp_flags & INP_BINDANY) { + db_printf("%sINP_BINDANY", comma ? ", " : ""); + comma = 1; + } + if (inp_flags & INP_INHASHLIST) { + db_printf("%sINP_INHASHLIST", comma ? ", " : ""); + comma = 1; + } if (inp_flags & INP_RECVTOS) { db_printf("%sINP_RECVTOS", comma ? ", " : ""); comma = 1; @@ -3260,6 +3264,14 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_SOCKREF", comma ? ", " : ""); comma = 1; } + if (inp_flags & INP_RESERVED_0) { + db_printf("%sINP_RESERVED_0", comma ? ", " : ""); + comma = 1; + } + if (inp_flags & INP_BOUNDFIB) { + db_printf("%sINP_BOUNDFIB", comma ? ", " : ""); + comma = 1; + } if (inp_flags & IN6P_RFC2292) { db_printf("%sIN6P_RFC2292", comma ? ", " : ""); comma = 1; From nobody Mon Nov 10 19:42: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 4d50SH2yYsz63KVB; Mon, 10 Nov 2025 19:42: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 4d50SH2Hyqz3W27; Mon, 10 Nov 2025 19:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8iDcv4qExKQrlfKFV4excfoVLCERnn+7VlnIYxGY1c=; b=mkLJ6IvUuu0LAj0vEitQuQaH6dOWWc1XSOeUV47easpkIzXTYz8bJJGHyC7AyFAn1BgxoF LeXqpI9pFKv0yJ/ySOS04NVm24wkfpK4f71nekwvez4B+HIrHPaSqLieXL4ZSQWAAskvBW 2g+UkCPJV5v1yd2fy5J0XTlaf963L2oH8O64PSQiT+KsvWFqjF3ya6GkvKcvtQQYxr1pbA ITcTWTDwsx/GHaMJMOcpbGBK95YJ0zJvwjfLC0tiruKf4RdX82QDTlYy//wAvcV+OEgZFq 0OyZ/L/ki9pbPwYuUf6mmrAcoM4aV+yD7eAT8us1ENF4//1xuZOyMlwQS5Pafw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8iDcv4qExKQrlfKFV4excfoVLCERnn+7VlnIYxGY1c=; b=w38Bwoiw+ZgubyyVbXaILKZ/OUVB1Cr//8pvpK0oboQ6o2jLMGx307zJBxxIdAgdo0U3ro YBnWfcm0pOCCdaGLz7HOmP2XIhJXvIIs8vFJyo/b+BPWJ48dWXrJgVgQ0udbVnEMl6Q7/S KzwYFabJlYuvDKznxiJTl7Y2VzxfQDM3vMdOLAJqGVtmYdi0hYCyph6j44LCbp0vNVT8ZQ xjauur1BvohJF0uiTYDDlWfCXZysTcIcMh2oCxQB0owmF+cKi6sJsdXxSv3CxPzH0lc+Pz Wy51tg0++7ddKr4IOBO1gTdQclB57OaMVLSaC7LTbwl/NBfvqGlTWXSCY0tWMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803759; a=rsa-sha256; cv=none; b=QLkq0RHpmZBpGwvSM0w8qUVpcRC01+nabeEZ6JaHzKxM9w1u23KCYKZBc+HmcyMRjgihTW 6xTOEshN+EtiPk2abVewnt5KxfxZW50tnQDFw6a7KceKoP4gNEiZ3yr/6JJCHoSvYNyuyS oPBH/5Arm0GkwihpuqPdMRyjQCFKP4xQ3oOjdhSHno3xPuwgTIkVqIaY4dsCfhOBFCRlRn 2wc+uJk9/F8JMEa+Bv4ZWf147h30p0LcrzapCindcfJ8bZvSC81McHi7vlgqhnjogeJGeq WSoGVLEFxLXO6fWrhPTOlp/8tI60jbGyb8DMX0rGUW5DCIki0kW1K8VBK6+QAA== 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 4d50SH1jFjzXM5; Mon, 10 Nov 2025 19:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AAJgcb2087917; Mon, 10 Nov 2025 19:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJgcnc087912; Mon, 10 Nov 2025 19:42:38 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:42:38 GMT Message-Id: <202511101942.5AAJgcnc087912@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: 1d767ecd4a9a - stable/15 - ddb: use %b when showing flags for a 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/15 X-Git-Reftype: branch X-Git-Commit: 1d767ecd4a9a6485e790e3c179a5fa31402829bf Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d767ecd4a9a6485e790e3c179a5fa31402829bf commit 1d767ecd4a9a6485e790e3c179a5fa31402829bf Author: Michael Tuexen AuthorDate: 2025-11-02 16:15:47 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:35:07 +0000 ddb: use %b when showing flags for a tcpcb This is much more compact. Thanks to markj@ for suggesting the change. Reviewed by: markj, Peter Lei, imp, Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53510 (cherry picked from commit 8e8956f7f99759b21bc07e884ad89d1927c39e8d) --- sys/netinet/tcp_usrreq.c | 265 +---------------------------------------------- sys/netinet/tcp_var.h | 29 ++++++ 2 files changed, 33 insertions(+), 261 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index c4a54646f3a2..4d1a6455d09e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2798,258 +2798,6 @@ db_print_tstate(int t_state) } } -static void -db_print_tflags(u_int t_flags) -{ - int comma; - - comma = 0; - if (t_flags & TF_ACKNOW) { - db_printf("%sTF_ACKNOW", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_DELACK) { - db_printf("%sTF_DELACK", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NODELAY) { - db_printf("%sTF_NODELAY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NOOPT) { - db_printf("%sTF_NOOPT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTFIN) { - db_printf("%sTF_SENTFIN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_REQ_SCALE) { - db_printf("%sTF_REQ_SCALE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RCVD_SCALE) { - db_printf("%sTF_RECVD_SCALE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_REQ_TSTMP) { - db_printf("%sTF_REQ_TSTMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RCVD_TSTMP) { - db_printf("%sTF_RCVD_TSTMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SACK_PERMIT) { - db_printf("%sTF_SACK_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NEEDSYN) { - db_printf("%sTF_NEEDSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NEEDFIN) { - db_printf("%sTF_NEEDFIN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NOPUSH) { - db_printf("%sTF_NOPUSH", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_PREVVALID) { - db_printf("%sTF_PREVVALID", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WAKESOR) { - db_printf("%sTF_WAKESOR", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_GPUTINPROG) { - db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_MORETOCOME) { - db_printf("%sTF_MORETOCOME", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SONOTCONN) { - db_printf("%sTF_SONOTCONN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LASTIDLE) { - db_printf("%sTF_LASTIDLE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RXWIN0SENT) { - db_printf("%sTF_RXWIN0SENT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FASTRECOVERY) { - db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASFRECOVERY) { - db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SIGNATURE) { - db_printf("%sTF_SIGNATURE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FORCEDATA) { - db_printf("%sTF_FORCEDATA", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_TSO) { - db_printf("%sTF_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_TOE) { - db_printf("%sTF_TOE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CLOSED) { - db_printf("%sTF_CLOSED", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTSYN) { - db_printf("%sTF_SENTSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LRD) { - db_printf("%sTF_LRD", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FASTOPEN) { - db_printf("%sTF_FASTOPEN", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_tflags2(u_int t_flags2) -{ - int comma; - - comma = 0; - if (t_flags2 & TF2_PLPMTU_BLACKHOLE) { - db_printf("%sTF2_PLPMTU_BLACKHOLE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PLPMTU_PMTUD) { - db_printf("%sTF2_PLPMTU_PMTUD", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PLPMTU_MAXSEGSNT) { - db_printf("%sTF2_PLPMTU_MAXSEGSNT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_LOG_AUTO) { - db_printf("%sTF2_LOG_AUTO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DROP_AF_DATA) { - db_printf("%sTF2_DROP_AF_DATA", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_PERMIT) { - db_printf("%sTF2_ECN_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_SND_CWR) { - db_printf("%sTF2_ECN_SND_CWR", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_SND_ECE) { - db_printf("%sTF2_ECN_SND_ECE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ACE_PERMIT) { - db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CPU_SET) { - db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_FBYTES_COMPLETE) { - db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_USE_ECT1) { - db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_TCP_ACCOUNTING) { - db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CALLS) { - db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_L_ACKS) { - db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_ACKCMP) { - db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_SUPPORTS_MBUFQ) { - db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_QUEUE_READY) { - db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DONT_SACK_QUEUE) { - db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_CANNOT_DO_ECN) { - db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PROC_SACK_PROHIBIT) { - db_printf("%sTF2_PROC_SACK_PROHIBIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_IPSEC_TSO) { - db_printf("%sTF2_IPSEC_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_NO_ISS_CHECK) { - db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_toobflags(char t_oobflags) -{ - int comma; - - comma = 0; - if (t_oobflags & TCPOOB_HAVEDATA) { - db_printf("%sTCPOOB_HAVEDATA", comma ? ", " : ""); - comma = 1; - } - if (t_oobflags & TCPOOB_HADDATA) { - db_printf("%sTCPOOB_HADDATA", comma ? ", " : ""); - comma = 1; - } -} - static void db_print_bblog_state(int state) { @@ -3114,14 +2862,10 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, db_printf(")\n"); db_print_indent(indent); - db_printf("t_flags: 0x%x (", tp->t_flags); - db_print_tflags(tp->t_flags); - db_printf(")\n"); + db_printf("t_flags: 0x%b\n", tp->t_flags, TF_BITS); db_print_indent(indent); - db_printf("t_flags2: 0x%x (", tp->t_flags2); - db_print_tflags2(tp->t_flags2); - db_printf(")\n"); + db_printf("t_flags2: 0x%b\n", tp->t_flags2, TF2_BITS); db_print_indent(indent); db_printf("snd_una: 0x%08x snd_max: 0x%08x snd_nxt: 0x%08x\n", @@ -3168,9 +2912,8 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, tp->t_rttupdated, tp->max_sndwnd, tp->t_softerror); db_print_indent(indent); - db_printf("t_oobflags: 0x%x (", tp->t_oobflags); - db_print_toobflags(tp->t_oobflags); - db_printf(") t_iobc: 0x%02x\n", tp->t_iobc); + db_printf("t_oobflags: 0x%b t_iobc: 0x%02x\n", tp->t_oobflags, + TCPOOB_BITS, tp->t_iobc); db_print_indent(indent); db_printf("snd_scale: %u rcv_scale: %u request_r_scale: %u\n", diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c3be95c80798..f9297be46af7 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -795,6 +795,17 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF_WASCRECOVERY 0x40000000 /* was in congestion recovery */ #define TF_FASTOPEN 0x80000000 /* TCP Fast Open indication */ +/* t_flags description for use with printf(9) %b identifier. */ +#define TF_BITS "\20" \ + "\1TF_ACKNOW\2TF_DELACK\3TF_NODELAY\4TF_NOOPT" \ + "\5TF_SENTFIN\6TF_REQ_SCALE\7TF_RCVD_SCALE\10TF_REQ_TSTMP" \ + "\11TF_RCVD_TSTMP\12TF_SACK_PERMIT\13TF_NEEDSYN\14TF_NEEDFIN" \ + "\15TF_NOPUSH\16TF_PREVVALID\17TF_WAKESOR\20TF_GPUTINPROG" \ + "\21TF_MORETOCOME\22TF_SONOTCONN\23TF_LASTIDLE\24TF_RXWIN0SENT" \ + "\25TF_FASTRECOVERY\26TF_WASFRECOVERY\27TF_SIGNATURE\30TF_FORCEDATA" \ + "\31TF_TSO\32TF_TOE\33TF_CLOSED\34TF_SENTSYN" \ + "\35TF_LRD\36TF_CONGRECOVERY\37TF_WASCRECOVERY\40TF_FASTOPEN" + #define IN_FASTRECOVERY(t_flags) (t_flags & TF_FASTRECOVERY) #define ENTER_FASTRECOVERY(t_flags) t_flags |= TF_FASTRECOVERY #define EXIT_FASTRECOVERY(t_flags) t_flags &= ~TF_FASTRECOVERY @@ -815,6 +826,9 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TCPOOB_HAVEDATA 0x01 #define TCPOOB_HADDATA 0x02 +/* t_oobflags description for use with printf(9) %b identifier. */ +#define TCPOOB_BITS "\20\1TCPOOB_HAVEDATA\2TCPOOB_HADDATA" + /* * Flags for the extended TCP flags field, t_flags2 */ @@ -842,6 +856,21 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF2_IPSEC_TSO 0x00200000 /* IPSEC + TSO supported */ #define TF2_NO_ISS_CHECK 0x00400000 /* Don't check SEG.ACK against ISS */ +/* t_flags2 description for use with printf(9) %b identifier. */ +#define TF2_BITS "\20" \ + "\1TF2_PLPMTU_BLACKHOLE\2TF2_PLPMTU_PMTUD" \ + "\3TF2_PLPMTU_MAXSEGSNT\4TF2_LOG_AUTO" \ + "\5TF2_DROP_AF_DATA\6TF2_ECN_PERMIT" \ + "\7TF2_ECN_SND_CWR\10TF2_ECN_SND_ECE" \ + "\11TF2_ACE_PERMIT\12TF2_HPTS_CPU_SET" \ + "\13TF2_FBYTES_COMPLETE\14TF2_ECN_USE_ECT1" \ + "\15TF2_TCP_ACCOUNTING\16TF2_HPTS_CALLS" \ + "\17TF2_MBUF_L_ACKS\20TF2_MBUF_ACKCMP" \ + "\21TF2_SUPPORTS_MBUFQ\22TF2_MBUF_QUEUE_READY" \ + "\23TF2_DONT_SACK_QUEUE\24TF2_CANNOT_DO_ECN" \ + "\25TF2_PROC_SACK_PROHIBIT\26TF2_IPSEC_TSO" \ + "\27TF2_NO_ISS_CHECK" + /* * Structure to hold TCP options that are only used during segment * processing (in tcp_input), but not held in the tcpcb. From nobody Mon Nov 10 19:42: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 4d50SM6qv5z63Kb6; Mon, 10 Nov 2025 19:42: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 4d50SL6m6wz3WP7; Mon, 10 Nov 2025 19:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqy7pWV80Uq8LE1jdL/ySeIePu4ijFgt5NPoUFIipoM=; b=yiXOONWZJbU/YpNWERnNFY/P+BQF+F4zLl5IIRv/hJp2eAiiVpMnir4FAW+AiE99NPCCNu Bkw2dNX0CDZkltoOb9p6SumMZuZNz82quMgwBV4k3Rz/wYSwYdP0NfW74sCFjV3MzSAEEb 8y9TW8AmczIsOasTknx1NGZWjbpaOhlyNIjYBy+TqG4pGV+aj1d6pAwf+RqVAiQ6gInD73 4RukdWu3aRIJtBSLGym3VK9PHAq86R+BcpfUyRbzGNmC81IsMXYJIW/EnwadnyJbh9srE3 qe8foJ1dlgEpvBoRAhxUtLVKXby+ZpBJ2sCka61qBYyz8qnNt8ttefrI9HeaPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqy7pWV80Uq8LE1jdL/ySeIePu4ijFgt5NPoUFIipoM=; b=PD1eohmGZGAwP65Nems+VN07swm3TQZ1VZdxE1ZVYvVPsBaRqpk+2bMUXtsei9S+uZ6NcT jPccxsZxRmcnGQtOvKCM73v7F1pZxcir6Ay7zlO5vLgPuFYhZ+GYOeA30DSjZraFxExdsF oHVAeuhq/nZLq5uCY3p5fddGQZiVM4B+yEWoLxLltYtYnW/x8W9tpVJKY3+Vv1v21NIMx0 9cB+AcauVzir+AlGNS7IpLASbI2DKxrYLDv7ntBtGCYBlzNawH+c4Zb4Y3uZsnONOKw5P0 utpI5q7tNVpi54Fo85JjW6DvcRJJ1ayOr2FKhqMuNgKW5QS0lUm3M+QKxbV2IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803763; a=rsa-sha256; cv=none; b=a/U3EJ9CcU70OyzrVGjsACLDUQObTiI7aiub0ovIlGKR8T3YpWRuO5rRvJGYOLwiAaYgv6 9v+y9ZYpUP7X2VsaF/J885NbGvyrPaas8BpJ6ropG9dyPzJIcwRzUTLqeF5affhpxGZds3 C4ckbSgD+R1mF2Hdg5q8ed/BIQoIcpegri5wbPg101Y0IGzBIGcbGLNI7uS/7hBfQ969eD J3iKIcOlpap/CNVZ8Lmp771XxCkKxcM+U6peukdmdlsKL2BfANZ3Wb4rSCVbkAhq7WbV46 82Y77KmD6IqqcpP0ODiOXJNDT0ZQLOhtTnFwLaKQklhb2mZmaMcQj+5oh0/TxA== 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 4d50SL5ppyzXM6; Mon, 10 Nov 2025 19:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AAJggp7088060; Mon, 10 Nov 2025 19:42:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJggGf088057; Mon, 10 Nov 2025 19:42:42 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:42:42 GMT Message-Id: <202511101942.5AAJggGf088057@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: 3f75cdcd3979 - stable/14 - ddb: use %b when showing flags for a 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: 3f75cdcd397995262f9e8a2a59250d43cd88d459 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3f75cdcd397995262f9e8a2a59250d43cd88d459 commit 3f75cdcd397995262f9e8a2a59250d43cd88d459 Author: Michael Tuexen AuthorDate: 2025-11-02 16:15:47 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:41:45 +0000 ddb: use %b when showing flags for a tcpcb This is much more compact. Thanks to markj@ for suggesting the change. Reviewed by: markj, Peter Lei, imp, Nick Banks Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53510 (cherry picked from commit 8e8956f7f99759b21bc07e884ad89d1927c39e8d) --- sys/netinet/tcp_usrreq.c | 257 +---------------------------------------------- sys/netinet/tcp_var.h | 29 ++++++ 2 files changed, 33 insertions(+), 253 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 38c640569f5b..9d26f5a9715c 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2834,250 +2834,6 @@ db_print_tstate(int t_state) } } -static void -db_print_tflags(u_int t_flags) -{ - int comma; - - comma = 0; - if (t_flags & TF_ACKNOW) { - db_printf("%sTF_ACKNOW", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_DELACK) { - db_printf("%sTF_DELACK", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NODELAY) { - db_printf("%sTF_NODELAY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NOOPT) { - db_printf("%sTF_NOOPT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTFIN) { - db_printf("%sTF_SENTFIN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_REQ_SCALE) { - db_printf("%sTF_REQ_SCALE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RCVD_SCALE) { - db_printf("%sTF_RECVD_SCALE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_REQ_TSTMP) { - db_printf("%sTF_REQ_TSTMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RCVD_TSTMP) { - db_printf("%sTF_RCVD_TSTMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SACK_PERMIT) { - db_printf("%sTF_SACK_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NEEDSYN) { - db_printf("%sTF_NEEDSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NEEDFIN) { - db_printf("%sTF_NEEDFIN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NOPUSH) { - db_printf("%sTF_NOPUSH", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_PREVVALID) { - db_printf("%sTF_PREVVALID", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WAKESOR) { - db_printf("%sTF_WAKESOR", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_GPUTINPROG) { - db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_MORETOCOME) { - db_printf("%sTF_MORETOCOME", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SONOTCONN) { - db_printf("%sTF_SONOTCONN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LASTIDLE) { - db_printf("%sTF_LASTIDLE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RXWIN0SENT) { - db_printf("%sTF_RXWIN0SENT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FASTRECOVERY) { - db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASFRECOVERY) { - db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SIGNATURE) { - db_printf("%sTF_SIGNATURE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FORCEDATA) { - db_printf("%sTF_FORCEDATA", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_TSO) { - db_printf("%sTF_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_TOE) { - db_printf("%sTF_TOE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CLOSED) { - db_printf("%sTF_CLOSED", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_UNUSED1) { - db_printf("%sTF_UNUSED1", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LRD) { - db_printf("%sTF_LRD", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FASTOPEN) { - db_printf("%sTF_FASTOPEN", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_tflags2(u_int t_flags2) -{ - int comma; - - comma = 0; - if (t_flags2 & TF2_PLPMTU_BLACKHOLE) { - db_printf("%sTF2_PLPMTU_BLACKHOLE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PLPMTU_PMTUD) { - db_printf("%sTF2_PLPMTU_PMTUD", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PLPMTU_MAXSEGSNT) { - db_printf("%sTF2_PLPMTU_MAXSEGSNT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_LOG_AUTO) { - db_printf("%sTF2_LOG_AUTO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DROP_AF_DATA) { - db_printf("%sTF2_DROP_AF_DATA", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_PERMIT) { - db_printf("%sTF2_ECN_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_SND_CWR) { - db_printf("%sTF2_ECN_SND_CWR", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_SND_ECE) { - db_printf("%sTF2_ECN_SND_ECE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ACE_PERMIT) { - db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CPU_SET) { - db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_FBYTES_COMPLETE) { - db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_USE_ECT1) { - db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_TCP_ACCOUNTING) { - db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CALLS) { - db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_L_ACKS) { - db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_ACKCMP) { - db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_SUPPORTS_MBUFQ) { - db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_QUEUE_READY) { - db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DONT_SACK_QUEUE) { - db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_CANNOT_DO_ECN) { - db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_NO_ISS_CHECK) { - db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_toobflags(char t_oobflags) -{ - int comma; - - comma = 0; - if (t_oobflags & TCPOOB_HAVEDATA) { - db_printf("%sTCPOOB_HAVEDATA", comma ? ", " : ""); - comma = 1; - } - if (t_oobflags & TCPOOB_HADDATA) { - db_printf("%sTCPOOB_HADDATA", comma ? ", " : ""); - comma = 1; - } -} - static void db_print_bblog_state(int state) { @@ -3142,14 +2898,10 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, db_printf(")\n"); db_print_indent(indent); - db_printf("t_flags: 0x%x (", tp->t_flags); - db_print_tflags(tp->t_flags); - db_printf(")\n"); + db_printf("t_flags: 0x%b\n", tp->t_flags, TF_BITS); db_print_indent(indent); - db_printf("t_flags2: 0x%x (", tp->t_flags2); - db_print_tflags2(tp->t_flags2); - db_printf(")\n"); + db_printf("t_flags2: 0x%b\n", tp->t_flags2, TF2_BITS); db_print_indent(indent); db_printf("snd_una: 0x%08x snd_max: 0x%08x snd_nxt: 0x%08x\n", @@ -3196,9 +2948,8 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, tp->t_rttupdated, tp->max_sndwnd, tp->t_softerror); db_print_indent(indent); - db_printf("t_oobflags: 0x%x (", tp->t_oobflags); - db_print_toobflags(tp->t_oobflags); - db_printf(") t_iobc: 0x%02x\n", tp->t_iobc); + db_printf("t_oobflags: 0x%b t_iobc: 0x%02x\n", tp->t_oobflags, + TCPOOB_BITS, tp->t_iobc); db_print_indent(indent); db_printf("snd_scale: %u rcv_scale: %u request_r_scale: %u\n", diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index ccbc308ddfd8..1196e8d4ef0e 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -813,6 +813,17 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF_WASCRECOVERY 0x40000000 /* was in congestion recovery */ #define TF_FASTOPEN 0x80000000 /* TCP Fast Open indication */ +/* t_flags description for use with printf(9) %b identifier. */ +#define TF_BITS "\20" \ + "\1TF_ACKNOW\2TF_DELACK\3TF_NODELAY\4TF_NOOPT" \ + "\5TF_SENTFIN\6TF_REQ_SCALE\7TF_RCVD_SCALE\10TF_REQ_TSTMP" \ + "\11TF_RCVD_TSTMP\12TF_SACK_PERMIT\13TF_NEEDSYN\14TF_NEEDFIN" \ + "\15TF_NOPUSH\16TF_PREVVALID\17TF_WAKESOR\20TF_GPUTINPROG" \ + "\21TF_MORETOCOME\22TF_SONOTCONN\23TF_LASTIDLE\24TF_RXWIN0SENT" \ + "\25TF_FASTRECOVERY\26TF_WASFRECOVERY\27TF_SIGNATURE\30TF_FORCEDATA" \ + "\31TF_TSO\32TF_TOE\33TF_CLOSED\34TF_SENTSYN" \ + "\35TF_LRD\36TF_CONGRECOVERY\37TF_WASCRECOVERY\40TF_FASTOPEN" + #define IN_FASTRECOVERY(t_flags) (t_flags & TF_FASTRECOVERY) #define ENTER_FASTRECOVERY(t_flags) t_flags |= TF_FASTRECOVERY #define EXIT_FASTRECOVERY(t_flags) t_flags &= ~TF_FASTRECOVERY @@ -841,6 +852,9 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TCPOOB_HAVEDATA 0x01 #define TCPOOB_HADDATA 0x02 +/* t_oobflags description for use with printf(9) %b identifier. */ +#define TCPOOB_BITS "\20\1TCPOOB_HAVEDATA\2TCPOOB_HADDATA" + /* * Flags for the extended TCP flags field, t_flags2 */ @@ -866,6 +880,21 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF2_CANNOT_DO_ECN 0x00080000 /* The stack does not do ECN */ #define TF2_NO_ISS_CHECK 0x00400000 /* Don't check SEG.ACK against ISS */ +/* t_flags2 description for use with printf(9) %b identifier. */ +#define TF2_BITS "\20" \ + "\1TF2_PLPMTU_BLACKHOLE\2TF2_PLPMTU_PMTUD" \ + "\3TF2_PLPMTU_MAXSEGSNT\4TF2_LOG_AUTO" \ + "\5TF2_DROP_AF_DATA\6TF2_ECN_PERMIT" \ + "\7TF2_ECN_SND_CWR\10TF2_ECN_SND_ECE" \ + "\11TF2_ACE_PERMIT\12TF2_HPTS_CPU_SET" \ + "\13TF2_FBYTES_COMPLETE\14TF2_ECN_USE_ECT1" \ + "\15TF2_TCP_ACCOUNTING\16TF2_HPTS_CALLS" \ + "\17TF2_MBUF_L_ACKS\20TF2_MBUF_ACKCMP" \ + "\21TF2_SUPPORTS_MBUFQ\22TF2_MBUF_QUEUE_READY" \ + "\23TF2_DONT_SACK_QUEUE\24TF2_CANNOT_DO_ECN" \ + "\25TF2_PROC_SACK_PROHIBIT\26TF2_IPSEC_TSO" \ + "\27TF2_NO_ISS_CHECK" + /* * Structure to hold TCP options that are only used during segment * processing (in tcp_input), but not held in the tcpcb. From nobody Mon Nov 10 19:51: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 4d50fh1vyXz63LCF; Mon, 10 Nov 2025 19:51: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 4d50fh1Pdfz3X3T; Mon, 10 Nov 2025 19:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fQuQa3M6KEZPAX21wxDnfOMWiR07UxTDx2r19qKAOwA=; b=DRI7Z4VEsKWTWlbBqeImEbEjwgr7OlJydiH6nZis1zyXQiIAH59mPw9vhjcZ7WBxk3qnNv NEr0KR/9ez3uxDH4teP1Jdu2pF9MTFSeLP20sw2sZA+Ue3qKVOwvD6YJ1QdcuW5MRLQFRV yzwQ/zFxE+I2LHE8Qt9LdyGgdE3070cwbXfiVL5GEkbh9DeVwciAdVG6Jjv2G8qooY4yRT ef95pI5f0XOgw2xfxOInYGIHOvsfWNp20eh9HQbEx7MXwRd12GyLGT6gKCBwSLAjFnY2ie ejHxZJ1gNfUREVCxzm1xC/UbYayYPJxc6mgll7BMOYwS1lL9Nlqyl7WFNjzKHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fQuQa3M6KEZPAX21wxDnfOMWiR07UxTDx2r19qKAOwA=; b=TE3A4sTAsRIuzkdlylDy1BsmhxjnsBFgCerPMbeGJ5s6PmuLcwvQe3XZIlryY4C9ft+44A FO1sMwZ3+OV68Xjs1QZ3WN264Vw+IX2I5OVe+6kGKk8zPdgP9NXjBh0Pv26IsTaA25rWai PG2BIBpZ6q3PnW6x80APzQpb51+YpL+C5ZipiPCi4UHdaY9iexslkoOzAgSrGIToAKiqpe hTCmk4mASXTVkl6vS6ZwAmYIAZjOlY1SpH/43SsuRyQIn3X9NMaLyUBLtcd7QCI4+wWkMQ BES0XtKdcZiAwxi3xtlh1+vR7M707H13/hawcVChX9aN/3B3BgmH7L+BoYcC5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804300; a=rsa-sha256; cv=none; b=C3xHW8RAssnJA436hXTIMZC3EEJHPhx4qFqgApCE8QKv4yXEL3x6eQJjRHW9togVDgA/CX non1yR9l68CeBD7sJeozqIwL12dJtEoIpbRLijLjwIJxwL0Ecp0nLwY00xjjMw9NeZRLMD ZShk4G3P/U25Zyc1wEuQwrj485c6B7jcesQbaGjSfl07qz7SpJ4Octppllzs6D1SdsmP04 vWiBFC7eMIVag1M2YK4deiquDbEwrUtzXamaG5Llh/HqzzdqK3BknmCUNZspf8GHa9uO6g d6wv/KD6laFERKTgaDVRjfr5bI/N/x/LMSElBmO6uSzy9SEV0sBS+07C5lN45Q== 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 4d50fh0pR6zXMJ; Mon, 10 Nov 2025 19:51: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 5AAJpebk004448; Mon, 10 Nov 2025 19:51:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJpeUC004445; Mon, 10 Nov 2025 19:51:40 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:51:40 GMT Message-Id: <202511101951.5AAJpeUC004445@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: 44305e736871 - stable/15 - ddb: use %b when showing flags for an inp 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: 44305e736871be896c8a3280a749f2c786b5da26 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=44305e736871be896c8a3280a749f2c786b5da26 commit 44305e736871be896c8a3280a749f2c786b5da26 Author: Michael Tuexen AuthorDate: 2025-11-02 16:12:32 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:46:09 +0000 ddb: use %b when showing flags for an inp This is much more compact. Thanks to markj@ for suggesting the change. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53507 (cherry picked from commit e8c50058e8d03af17b7458bb560ddee29062082f) --- sys/netinet/in_pcb.c | 160 ++------------------------------------------------- sys/netinet/in_pcb.h | 14 +++++ 2 files changed, 18 insertions(+), 156 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index f573e07163fd..4a1a8cdea619 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3059,154 +3059,6 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) } void -db_print_inpflags(int inp_flags) -{ - int comma; - - comma = 0; - if (inp_flags & INP_RECVOPTS) { - db_printf("%sINP_RECVOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVRETOPTS) { - db_printf("%sINP_RECVRETOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVDSTADDR) { - db_printf("%sINP_RECVDSTADDR", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_HDRINCL) { - db_printf("%sINP_HDRINCL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_HIGHPORT) { - db_printf("%sINP_HIGHPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_LOWPORT) { - db_printf("%sINP_LOWPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_ANONPORT) { - db_printf("%sINP_ANONPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVIF) { - db_printf("%sINP_RECVIF", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_MTUDISC) { - db_printf("%sINP_MTUDISC", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVTTL) { - db_printf("%sINP_RECVTTL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_DONTFRAG) { - db_printf("%sINP_DONTFRAG", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_BINDANY) { - db_printf("%sINP_BINDANY", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_INHASHLIST) { - db_printf("%sINP_INHASHLIST", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVTOS) { - db_printf("%sINP_RECVTOS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_IPV6_V6ONLY) { - db_printf("%sIN6P_IPV6_V6ONLY", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_PKTINFO) { - db_printf("%sIN6P_PKTINFO", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_HOPLIMIT) { - db_printf("%sIN6P_HOPLIMIT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_HOPOPTS) { - db_printf("%sIN6P_HOPOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_DSTOPTS) { - db_printf("%sIN6P_DSTOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RTHDR) { - db_printf("%sIN6P_RTHDR", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RTHDRDSTOPTS) { - db_printf("%sIN6P_RTHDRDSTOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_TCLASS) { - db_printf("%sIN6P_TCLASS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_AUTOFLOWLABEL) { - db_printf("%sIN6P_AUTOFLOWLABEL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_ONESBCAST) { - db_printf("%sINP_ONESBCAST", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_DROPPED) { - db_printf("%sINP_DROPPED", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_SOCKREF) { - db_printf("%sINP_SOCKREF", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RESERVED_0) { - db_printf("%sINP_RESERVED_0", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_BOUNDFIB) { - db_printf("%sINP_BOUNDFIB", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RFC2292) { - db_printf("%sIN6P_RFC2292", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_MTU) { - db_printf("IN6P_MTU%s", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_inpvflag(u_char inp_vflag) -{ - int comma; - - comma = 0; - if (inp_vflag & INP_IPV4) { - db_printf("%sINP_IPV4", comma ? ", " : ""); - comma = 1; - } - if (inp_vflag & INP_IPV6) { - db_printf("%sINP_IPV6", comma ? ", " : ""); - comma = 1; - } - if (inp_vflag & INP_IPV6PROTO) { - db_printf("%sINP_IPV6PROTO", comma ? ", " : ""); - comma = 1; - } -} - -static void db_print_inpcb(struct inpcb *inp, const char *name, int indent) { @@ -3221,16 +3073,12 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) db_print_inconninfo(&inp->inp_inc, "inp_conninfo", indent); db_print_indent(indent); - db_printf("inp_label: %p inp_flags: 0x%x (", - inp->inp_label, inp->inp_flags); - db_print_inpflags(inp->inp_flags); - db_printf(")\n"); + db_printf("inp_label: %p inp_flags: 0x%b\n", + inp->inp_label, inp->inp_flags, INP_FLAGS_BITS); db_print_indent(indent); - db_printf("inp_sp: %p inp_vflag: 0x%x (", inp->inp_sp, - inp->inp_vflag); - db_print_inpvflag(inp->inp_vflag); - db_printf(")\n"); + db_printf("inp_sp: %p inp_vflag: 0x%b\n", inp->inp_sp, + inp->inp_vflag, INP_VFLAGS_BITS); db_print_indent(indent); db_printf("inp_ip_ttl: %d inp_ip_p: %d inp_ip_minttl: %d\n", diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 7d41e3d690e0..60f129bce216 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -539,6 +539,9 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, #define INP_IPV6 0x2 #define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ +/* inp_vflags description for use with printf(9) %b identifier. */ +#define INP_VFLAGS_BITS "\20\1INP_IPV4\2INP_IPV6\3INP_IPV6PROTO" + /* * Flags for inp_flags. */ @@ -582,6 +585,17 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\ IN6P_MTU) +/* inp_flags description for use with printf(9) %b identifier. */ +#define INP_FLAGS_BITS "\20" \ + "\1INP_RECVOPTS\2INP_RECVRETOPTS\3INP_RECVDSTADDR\4INP_HDRINCL" \ + "\5INP_HIGHPORT\6INP_LOWPORT\7INP_ANONPORT\10INP_RECVIF" \ + "\11INP_MTUDISC\12INP_FREED\13INP_RECVTTL\14INP_DONTFRAG" \ + "\15INP_BINDANY\16INP_INHASHLIST\17INP_RECVTOS\20IN6P_IPV6_V6ONLY" \ + "\21IN6P_PKTINFO\22IN6P_HOPLIMIT\23IN6P_HOPOPTS\24IN6P_DSTOPTS" \ + "\25IN6P_RTHDR\26IN6P_RTHDRDSTOPTS\27IN6P_TCLASS\30IN6P_AUTOFLOWLABEL" \ + "\31INP_INLBGROUP\32INP_ONESBCAST\33INP_DROPPED\34INP_SOCKREF" \ + "\35INP_RESERVED_0\36INP_BOUNDFIB\37IN6P_RFC2292\40IN6P_MTU" + /* * Flags for inp_flags2. */ From nobody Mon Nov 10 19:51: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 4d50fl2xB2z63LPG; Mon, 10 Nov 2025 19:51: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 4d50fl2Mlvz3WwP; Mon, 10 Nov 2025 19:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pgC6n43kkOCBDgJc4DkB86kCPXuFh3sOTqlUVME+hA=; b=S2qXrQ1U15CWhLla57nrRkMTuE260MWvsDCVAh3JyJRD5En6xv59wsM5948zTRIGpUNeJJ 2B2bNGviCYvEhg/63FI9whtPN5Ah7JER+BFxDfQ5qDZpsl5gxs538iX/ThFBkNqmj9KL7B NppFZXNsGvVZTguEium9sBIs85ek8uuJuTN5A5QQhpj36bnbHwsAGHC2CJmXml6+WcK/4t 1jEm10A1WtX1OJXdmyLYtct5IVbics1Dep3jD6VfQpLPc5N/XLpnlQfS3lT6xYx/PRZJc8 vBL8s89qo21iY6eOkAU2M6x0f3OZnYietkr96yPY7Vj8ZC+Xei7ZtU4xT0fA5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pgC6n43kkOCBDgJc4DkB86kCPXuFh3sOTqlUVME+hA=; b=EVFZf48c3Ub0UWBoDBaAaa4TPAjQN7l3u3W7ltvoZ867lF8vnoOSpkQtE2QfMFedodkBGn h7ScQF4GgSmGNIKnoAfV8kGTDzOWjbPSjZzaU92/EaS+ngN0OlUsUtvwqLEpMyejfii74a K/5FWaxBqFiPXxKRItLZHEaqu2zxLluSEIKhyMq7+7ukY0t2/PAbH0v3Pu4wicFjP4hydD 905BuvnBU3HE6L2m1Et9whTd5R80dHwkrdLa1nxLpz/7rAIxG/4Csus7KWZSCyeCh2qGqo t2XBbaab5pg7EyZl5zEm0QpMCANnEcKu4KSMpMUluggRBuzpCL7yVp4/AawGbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804303; a=rsa-sha256; cv=none; b=a1yDiLXIuZM7y7TgACYHtVZX/hZTjS8gvlzFRFkidOJdFXlpgO77vSmoiZtlHVIfzqQ4tA mM+QiUBgqUNPqksK3f5/00vADv+QMkSGhqb7OV0IFgxIMiciAWE/eBgVx3obfJDN9GZ4yX QbgsQupTmTrV1Hw5TrfexCJyqx7CpgZWuveoxzT1jEv9pW2UKn80scUlParxS8WbnfBweC SE/uuFSYZDRkse82pOM2J1CVzloNKaZ3HGRuwDpY/dKMMwThwCWeUyrA0pOwc2wa0eC9D8 ovNgKzFgxJbxAkrxjc9QblljAFpFG/mGa53JpbB2gfrQorl+YKJHRHFOKe2/gA== 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 4d50fl1l6dzXXd; Mon, 10 Nov 2025 19:51: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 5AAJphZB004586; Mon, 10 Nov 2025 19:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJphdu004583; Mon, 10 Nov 2025 19:51:43 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:51:43 GMT Message-Id: <202511101951.5AAJphdu004583@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: 1ccc6de2d215 - stable/14 - ddb: use %b when showing flags for an inp 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: 1ccc6de2d215647b074a45462c86a09c65cf467c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccc6de2d215647b074a45462c86a09c65cf467c commit 1ccc6de2d215647b074a45462c86a09c65cf467c Author: Michael Tuexen AuthorDate: 2025-11-02 16:12:32 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:50:10 +0000 ddb: use %b when showing flags for an inp This is much more compact. Thanks to markj@ for suggesting the change. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53507 (cherry picked from commit e8c50058e8d03af17b7458bb560ddee29062082f) --- sys/netinet/in_pcb.c | 160 ++------------------------------------------------- sys/netinet/in_pcb.h | 14 +++++ 2 files changed, 18 insertions(+), 156 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dd35f9583650..2263997ea154 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3155,154 +3155,6 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) } void -db_print_inpflags(int inp_flags) -{ - int comma; - - comma = 0; - if (inp_flags & INP_RECVOPTS) { - db_printf("%sINP_RECVOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVRETOPTS) { - db_printf("%sINP_RECVRETOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVDSTADDR) { - db_printf("%sINP_RECVDSTADDR", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_HDRINCL) { - db_printf("%sINP_HDRINCL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_HIGHPORT) { - db_printf("%sINP_HIGHPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_LOWPORT) { - db_printf("%sINP_LOWPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_ANONPORT) { - db_printf("%sINP_ANONPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVIF) { - db_printf("%sINP_RECVIF", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_MTUDISC) { - db_printf("%sINP_MTUDISC", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVTTL) { - db_printf("%sINP_RECVTTL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_DONTFRAG) { - db_printf("%sINP_DONTFRAG", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_BINDANY) { - db_printf("%sINP_BINDANY", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_INHASHLIST) { - db_printf("%sINP_INHASHLIST", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVTOS) { - db_printf("%sINP_RECVTOS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_IPV6_V6ONLY) { - db_printf("%sIN6P_IPV6_V6ONLY", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_PKTINFO) { - db_printf("%sIN6P_PKTINFO", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_HOPLIMIT) { - db_printf("%sIN6P_HOPLIMIT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_HOPOPTS) { - db_printf("%sIN6P_HOPOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_DSTOPTS) { - db_printf("%sIN6P_DSTOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RTHDR) { - db_printf("%sIN6P_RTHDR", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RTHDRDSTOPTS) { - db_printf("%sIN6P_RTHDRDSTOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_TCLASS) { - db_printf("%sIN6P_TCLASS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_AUTOFLOWLABEL) { - db_printf("%sIN6P_AUTOFLOWLABEL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_ONESBCAST) { - db_printf("%sINP_ONESBCAST", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_DROPPED) { - db_printf("%sINP_DROPPED", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_SOCKREF) { - db_printf("%sINP_SOCKREF", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RESERVED_0) { - db_printf("%sINP_RESERVED_0", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_BOUNDFIB) { - db_printf("%sINP_BOUNDFIB", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RFC2292) { - db_printf("%sIN6P_RFC2292", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_MTU) { - db_printf("IN6P_MTU%s", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_inpvflag(u_char inp_vflag) -{ - int comma; - - comma = 0; - if (inp_vflag & INP_IPV4) { - db_printf("%sINP_IPV4", comma ? ", " : ""); - comma = 1; - } - if (inp_vflag & INP_IPV6) { - db_printf("%sINP_IPV6", comma ? ", " : ""); - comma = 1; - } - if (inp_vflag & INP_IPV6PROTO) { - db_printf("%sINP_IPV6PROTO", comma ? ", " : ""); - comma = 1; - } -} - -static void db_print_inpcb(struct inpcb *inp, const char *name, int indent) { @@ -3321,16 +3173,12 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) inp->inp_ppcb, inp->inp_pcbinfo, inp->inp_socket); db_print_indent(indent); - db_printf("inp_label: %p inp_flags: 0x%x (", - inp->inp_label, inp->inp_flags); - db_print_inpflags(inp->inp_flags); - db_printf(")\n"); + db_printf("inp_label: %p inp_flags: 0x%b\n", + inp->inp_label, inp->inp_flags, INP_FLAGS_BITS); db_print_indent(indent); - db_printf("inp_sp: %p inp_vflag: 0x%x (", inp->inp_sp, - inp->inp_vflag); - db_print_inpvflag(inp->inp_vflag); - db_printf(")\n"); + db_printf("inp_sp: %p inp_vflag: 0x%b\n", inp->inp_sp, + inp->inp_vflag, INP_VFLAGS_BITS); db_print_indent(indent); db_printf("inp_ip_ttl: %d inp_ip_p: %d inp_ip_minttl: %d\n", diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 9095e6bb71bf..0492bf78bfaa 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -524,6 +524,9 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, #define INP_IPV6 0x2 #define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ +/* inp_vflags description for use with printf(9) %b identifier. */ +#define INP_VFLAGS_BITS "\20\1INP_IPV4\2INP_IPV6\3INP_IPV6PROTO" + /* * Flags for inp_flags. */ @@ -567,6 +570,17 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\ IN6P_MTU) +/* inp_flags description for use with printf(9) %b identifier. */ +#define INP_FLAGS_BITS "\20" \ + "\1INP_RECVOPTS\2INP_RECVRETOPTS\3INP_RECVDSTADDR\4INP_HDRINCL" \ + "\5INP_HIGHPORT\6INP_LOWPORT\7INP_ANONPORT\10INP_RECVIF" \ + "\11INP_MTUDISC\12INP_FREED\13INP_RECVTTL\14INP_DONTFRAG" \ + "\15INP_BINDANY\16INP_INHASHLIST\17INP_RECVTOS\20IN6P_IPV6_V6ONLY" \ + "\21IN6P_PKTINFO\22IN6P_HOPLIMIT\23IN6P_HOPOPTS\24IN6P_DSTOPTS" \ + "\25IN6P_RTHDR\26IN6P_RTHDRDSTOPTS\27IN6P_TCLASS\30IN6P_AUTOFLOWLABEL" \ + "\31INP_INLBGROUP\32INP_ONESBCAST\33INP_DROPPED\34INP_SOCKREF" \ + "\35INP_RESERVED_0\36INP_BOUNDFIB\37IN6P_RFC2292\40IN6P_MTU" + /* * Flags for inp_flags2. */ From nobody Mon Nov 10 19:55: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 4d50lN5MQrz63LWX; Mon, 10 Nov 2025 19:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d50lN4dfsz3Yth; Mon, 10 Nov 2025 19:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxFAp+1gRnJiAhmCZjWn+heV+WPDHWlxVcIS8rY+4sM=; b=nHy1IkAX5P7r1cgGwp1YJqHm5BieYZMugEAgeXz9qoFShFfIbfCwbdMixldH4cc9Imp5XR 5C6trRWhWW5ISFOaRKQQGSiNU/aODFCA1FBBHi80MM3aMXvB7X+s6SdI+TCEVSgC6if968 bQnok2suUpOpF9KNrYUFqUps9CaMZVWFf5Clv1Z7buLUSZ/qhl34hKOUu6+I3AB/WPFuaF FnVUYWs1mVMeEGETyZdP/hrN4NZkBWuXHYnz5SrddOJidugorT6oLjd21cX96IE/pn0mpa UfwoywlPms4aSYokO3RyeM3KswHJb7N/FGiehQQw0HyIjXbrkfr+LmZjf4ODDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxFAp+1gRnJiAhmCZjWn+heV+WPDHWlxVcIS8rY+4sM=; b=t3pbLY1MS2TtfbUDaH5QcaPXWPGp2JLYQDeF/mlctPFTSnEmB4Cy77BakWYNUGDEplY1xP V13bgb5yNs+nqEH+iIT1okNxtAIQVS7jMRCfrrkE0fEJg7SuWPJupM4xteMF6V5TtHyV75 ekw6GPMDyBzeBjl2+4kxXqakfGK/C9LfepIMk833wMracLe6JK0bCLHxbMvrsyh1+aM5/U FHJI0hPNsQ3gMUGbm2GcNTJ2erV8jbI0OiyAivQsY61OUBf6s+yPwlhtXmXaOT5WvZTjLD lDz5CshD/xu6fl3Z+xWiPsQhTHrYE20Wgp9SuFhOzlrsBfBaYszEsFnHne6+pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804544; a=rsa-sha256; cv=none; b=xg/eTJC07bQrpEYpcV1lvo7NMW+jNQuntM93nl4slD5T46xQK66WuL586HNhbcakehCWzf YrTvMw6Cagw3u0GMIC/SfgxDyKeP3Ikpqz++is563ByugdqBU5ctF59u1AdF5JcO7VW7ts vfsbSd2hMeRoM1ICKIUlJ3BKctVJjd/YsEPHWGHPlNf0NN6AnIeBAzQzGXOXNnwkexxjsa whGoiHqEdR9Mc9I6TeItATryumKgDG6DXgKLt5FDea0aqJY7WFVHFR/huRTVXp3vN3tlQO VDs+0LXdnQ5biV4JmETmAwMd6JaSn8HzkkTqNelWGPnuJKFYD7YtDYb2Wgivow== 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 4d50lN4138zXYB; Mon, 10 Nov 2025 19:55: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 5AAJtir5008281; Mon, 10 Nov 2025 19:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJtie3008278; Mon, 10 Nov 2025 19:55:44 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:55:44 GMT Message-Id: <202511101955.5AAJtie3008278@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: e082156ae14b - stable/15 - tcp: drop SYN ACK segment for listening sockets 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: e082156ae14b6717f08dccfff62d1fcbb3b26487 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e082156ae14b6717f08dccfff62d1fcbb3b26487 commit e082156ae14b6717f08dccfff62d1fcbb3b26487 Author: Michael Tuexen AuthorDate: 2025-11-03 10:50:49 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:52:56 +0000 tcp: drop SYN ACK segment for listening sockets When a SYN ACK is received for a listening socket, just drop it instead of killing the SYN-cache entry and send a RST. This closes the possibility to kill a TCP connection during its handling in the SYN-cache. Reviewed by: Nick Banks, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53540 (cherry picked from commit 239464e99321ede07664782426ec4e54cd8a618d) --- sys/netinet/tcp_input.c | 5 ++--- sys/netinet/tcp_syncache.c | 17 ----------------- sys/netinet/tcp_syncache.h | 1 - 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2146b0cac48f..9c58c2815d13 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1192,11 +1192,10 @@ tfo_socket_result: if (thflags & TH_ACK) { if ((s = tcp_log_addrs(&inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Listen socket: " - "SYN|ACK invalid, segment rejected\n", + "SYN|ACK invalid, segment ignored\n", s, __func__); - syncache_badack(&inc, port); /* XXX: Not needed! */ TCPSTAT_INC(tcps_badsyn); - goto dropwithreset; + goto dropunlock; } /* * If the drop_synfin option is enabled, drop all diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 3a7755e9f09e..fa7035771714 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -712,23 +712,6 @@ done: SCH_UNLOCK(sch); } -void -syncache_badack(struct in_conninfo *inc, uint16_t port) -{ - struct syncache *sc; - struct syncache_head *sch; - - if (syncache_cookiesonly()) - return; - sc = syncache_lookup(inc, &sch); /* returns locked sch */ - SCH_LOCK_ASSERT(sch); - if ((sc != NULL) && (sc->sc_port == port)) { - syncache_drop(sc, sch); - TCPSTAT_INC(tcps_sc_badack); - } - SCH_UNLOCK(sch); -} - void syncache_unreach(struct in_conninfo *inc, tcp_seq th_seq, uint16_t port) { diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h index 37f6ff3d6ca9..c916b4de6ae0 100644 --- a/sys/netinet/tcp_syncache.h +++ b/sys/netinet/tcp_syncache.h @@ -45,7 +45,6 @@ struct socket * syncache_add(struct in_conninfo *, struct tcpopt *, void *, void *, uint8_t, uint16_t); void syncache_chkrst(struct in_conninfo *, struct tcphdr *, struct mbuf *, uint16_t); -void syncache_badack(struct in_conninfo *, uint16_t); int syncache_pcblist(struct sysctl_req *); struct syncache { From nobody Mon Nov 10 19:55: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 4d50lP6nPXz63L5k; Mon, 10 Nov 2025 19:55: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 4d50lP5vCtz3Ywg; Mon, 10 Nov 2025 19:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qj8QGwMMWTNNjx+r1R2UChmGcrqgqkKATpScP4DG2Bk=; b=wv6IWTswesL/ZBz0HyALAZu1g2UP3/ZWmE31HaestTDyq/0allgM1dEGRfW6Sx7dFQzHsl 9r/eHbLsfM7T+euGtLNn6XPs7XN8uSrKh5SL7qdCgAZf8+KnoS9h9hKYpoITsSoHDHlkuR CC9gwSUuCvtCcBYX0FqcfRRTEBCUT/RoXc2KtMnOnrsQIcQ7Cbek6vuYe7MJtoHJdIwahu cRO02AG66eKz537GLrknl5En3Ewf8jvfgjTCXMPp1s0cg8Gj49J7Eoi3YSlWNCeeFGH8XL vTNQXzSAeH3H+dQB51UKCnn4kcYHCmgKtmtSE53/3D5i0GhF1e1TRffYPKCNTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qj8QGwMMWTNNjx+r1R2UChmGcrqgqkKATpScP4DG2Bk=; b=Wu6K3PZNKUgbrIXAlJMUiiYE+Jg9EuF50G8wHb5qFpMWmwnllMCDc/ppzUyQMF1OwumsZt aCeHfpWXzDeYQMwCg/KPN1UmBitnBeQnAMRFrAFHhUEQBzqusjzEEP4AwjzaSmnO0xFpGA nX4ukQqCUSlTJDJLhS4zudDsJwCaK9ZpQy6UuETP/GK8yfrhCNrZYO9QZ5Vp9jW/REiSLh yk8ZKdjIjqNh318pFHb/P98Z6sJu4vxdSMq5mOBKlCnIm866HrrwZEt8CLHYlrUQw+wOVm tdzrY+Dwm6o1rpIGxZmtr8uLbbBU6Ek4uiuU76EyFjQgLotU2B+QE51tqgLU/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804545; a=rsa-sha256; cv=none; b=OqBrhYL32eq1kJxTJL5KzmodS5hqiPz3oHBRkQI/Ls1h/fMYlpX4W6W1Ebt7AcJylU4RYA lKLych+ExweGrrNf5BrhOAfcxhAvydhAfCfGoabUOFZR6sJsMrHC4J1U9Md6UY9GaZHxU8 rvYhYF+0D7Hx5Z6fy//xrGd7PtDFU1OvLzj0kFyX8diU+Guxu/Q/+NpLJ4pF1N1iD0EoJN EfFWLZX1PBqPFlWQJ05C3o6+Y1qV/Jicoiu3ulM5aHJFXwff9H/PfSk5tlLOIe1kXMQCrA OkvJLev97l9UxPTJeTiLgL05sg8kohTqW5QrgIDAuiPT20e807VykL12dSqr0g== 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 4d50lP5FMwzXqw; Mon, 10 Nov 2025 19:55: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 5AAJtjuS008317; Mon, 10 Nov 2025 19:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJtj05008314; Mon, 10 Nov 2025 19:55:45 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:55:45 GMT Message-Id: <202511101955.5AAJtj05008314@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: b5a4cc3f4331 - stable/15 - ddb: provide inp_flags2 when printing inpcbs 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: b5a4cc3f4331bd14b47808fc862079c8fcd4da11 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a4cc3f4331bd14b47808fc862079c8fcd4da11 commit b5a4cc3f4331bd14b47808fc862079c8fcd4da11 Author: Michael Tuexen AuthorDate: 2025-11-03 11:17:29 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:54:12 +0000 ddb: provide inp_flags2 when printing inpcbs Reviewed by: markj, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53542 (cherry picked from commit 5f43b0cb7c3cb7c3209598f8c0818cb47cd9de96) --- sys/netinet/in_pcb.c | 3 +++ sys/netinet/in_pcb.h | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 4a1a8cdea619..f60802d255e1 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3076,6 +3076,9 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) db_printf("inp_label: %p inp_flags: 0x%b\n", inp->inp_label, inp->inp_flags, INP_FLAGS_BITS); + db_print_indent(indent); + db_printf("inp_flags2: 0x%b\n", inp->inp_flags2, INP_FLAGS2_BITS); + db_print_indent(indent); db_printf("inp_sp: %p inp_vflag: 0x%b\n", inp->inp_sp, inp->inp_vflag, INP_VFLAGS_BITS); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 60f129bce216..975b8129c70d 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -624,6 +624,13 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, #define INP_2PCP_MASK (INP_2PCP_BIT0 | INP_2PCP_BIT1 | INP_2PCP_BIT2) #define INP_2PCP_SHIFT 18 /* shift PCP field in/out of inp_flags2 */ +/* inp_flags2 description for use with printf(9) %b identifier. */ +#define INP_FLAGS2_BITS "\20" \ + "\11INP_RECVFLOWID\12INP_RECVRSSBUCKETID" \ + "\13INP_RATE_LIMIT_CHANGED\14INP_ORIGDSTADDR" \ + "\22INP_2PCP_SET\23INP_2PCP_BIT0\24INP_2PCP_BIT1" \ + "\25INP_2PCP_BIT2" + /* * Flags passed to in_pcblookup*(), inp_smr_lock() and inp_next(). */ From nobody Mon Nov 10 19: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 4d50lS3848z63Lfr; Mon, 10 Nov 2025 19: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 4d50lS2KfJz3Z7V; Mon, 10 Nov 2025 19: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=1762804548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x4lRBLtgrqlOVk8X8fsO9FZ2+kMe3Ed4dt8C4zKOOHo=; b=PIcenYR72Op8lsvRSsRtcOVIOtd5/Q5i4tk6l3v3PUROqzWGgCPbhJqdEhpkmDkWMwhJhL fPkDEYXFJnIj2bK7gzZRj3NVR3EEm0CSUg5P/Vl8qRioEKXD0eWw/6SG7eFPQxstKYz+8z CEik9xaTLD+0OLyxC4xvGLkM9f0JK+r0vu8z5YJmtGIX24MAYvGlTU2laSAEb70RNK8P30 MDlGa1j7GYpljbe8DM+OYGDsWklPBCdQ9rK/8RDNtMs5rP+d/Q4DF/wApRVZJMLY6kZmJS ElsHI3uPti5Dg5fMBkELcbg/a4Hra6WLemY9h8dNCkPK4uDGvIe3/OgGV1n8Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x4lRBLtgrqlOVk8X8fsO9FZ2+kMe3Ed4dt8C4zKOOHo=; b=nPVEn4VijXKafS09Vs1Pq//qgAZEVWgYxQSq4n0YC/xgpowYtcbczYXf2l1NCrNsNq+yv4 qg/oi2FdOQfek4OwDNXF6GtQt+Wgcoo7Jpr4F8dDavY3q1RKggbys9uxOn7OUoPex199hu IgHYRjGK5Ltd3yLw/KsTWLFkeYM7bhHQ/Bl2IQ+U324PeJw/fxyDcATHJ7RRy/pmF9emEd 5xwOkOBG19XRsGljqbdGQUZuslVUyRCzT+QhKxC4na2rQgAyoWu4Q8WE9X5kZBBypSFqVc O+Bz+o2sbU0hWHUemnLpNaejzvy+nNCK3jlxEjVNMJrRQKXsgGxhRWhlMkMDCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804548; a=rsa-sha256; cv=none; b=SvjmkhQsFMzMj+agksMcWVrXuPPsVaOLtElEJb4oLA3VzKv822GMDTwoe5dJgomfDjp47N 1AYXte18hjKzC+WXNuLZXTjpYOuV0NzxjgyW33iNi9VRvmQbidoeIsjAnDcse+4W/iLY8J rG6aEFyDimM3Xe+4cfffPoLfUyN5XIdpmkPJxlh49tCZJsPubFKDU6t3m9VkPBoAhZaIDX rB8dc/+7iKml9F/QaWC6AuyGAZPYW4PFFQ12cZQqaEXvnNd/7imAJ/4BzaE6e+OB2BgNcz 1ZDwrZDIlj0DAg6Xy7f6KBmizx7iQurTqIRBk7vVjoWRwxyAn8QWmO/kizfRyA== 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 4d50lS1XlQzXMb; Mon, 10 Nov 2025 19: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 5AAJtmGI008451; Mon, 10 Nov 2025 19: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 5AAJtmI3008448; Mon, 10 Nov 2025 19:55:48 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:55:48 GMT Message-Id: <202511101955.5AAJtmI3008448@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: b1ed408e0346 - stable/14 - tcp: drop SYN ACK segment for listening sockets 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: b1ed408e034655e89be91d91d5677f7e90224024 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b1ed408e034655e89be91d91d5677f7e90224024 commit b1ed408e034655e89be91d91d5677f7e90224024 Author: Michael Tuexen AuthorDate: 2025-11-03 10:50:49 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:53:28 +0000 tcp: drop SYN ACK segment for listening sockets When a SYN ACK is received for a listening socket, just drop it instead of killing the SYN-cache entry and send a RST. This closes the possibility to kill a TCP connection during its handling in the SYN-cache. Reviewed by: Nick Banks, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53540 (cherry picked from commit 239464e99321ede07664782426ec4e54cd8a618d) --- sys/netinet/tcp_input.c | 5 ++--- sys/netinet/tcp_syncache.c | 17 ----------------- sys/netinet/tcp_syncache.h | 1 - 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 4a6f8d80f231..9dfd38d679e9 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1209,11 +1209,10 @@ tfo_socket_result: if (thflags & TH_ACK) { if ((s = tcp_log_addrs(&inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Listen socket: " - "SYN|ACK invalid, segment rejected\n", + "SYN|ACK invalid, segment ignored\n", s, __func__); - syncache_badack(&inc, port); /* XXX: Not needed! */ TCPSTAT_INC(tcps_badsyn); - goto dropwithreset; + goto dropunlock; } /* * If the drop_synfin option is enabled, drop all diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 713f6a35ad45..376a5d958504 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -720,23 +720,6 @@ done: SCH_UNLOCK(sch); } -void -syncache_badack(struct in_conninfo *inc, uint16_t port) -{ - struct syncache *sc; - struct syncache_head *sch; - - if (syncache_cookiesonly()) - return; - sc = syncache_lookup(inc, &sch); /* returns locked sch */ - SCH_LOCK_ASSERT(sch); - if ((sc != NULL) && (sc->sc_port == port)) { - syncache_drop(sc, sch); - TCPSTAT_INC(tcps_sc_badack); - } - SCH_UNLOCK(sch); -} - void syncache_unreach(struct in_conninfo *inc, tcp_seq th_seq, uint16_t port) { diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h index 9445940bcec5..b188e6ad2ab6 100644 --- a/sys/netinet/tcp_syncache.h +++ b/sys/netinet/tcp_syncache.h @@ -47,7 +47,6 @@ struct socket * syncache_add(struct in_conninfo *, struct tcpopt *, void *, void *, uint8_t, uint16_t); void syncache_chkrst(struct in_conninfo *, struct tcphdr *, struct mbuf *, uint16_t); -void syncache_badack(struct in_conninfo *, uint16_t); int syncache_pcblist(struct sysctl_req *); struct syncache { From nobody Mon Nov 10 19:55: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 4d50lT5CMHz63LZ0; Mon, 10 Nov 2025 19:55: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 4d50lT2jfnz3YxK; Mon, 10 Nov 2025 19:55:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHfJXIcZL5dKdbeoHz8Umj7freJLe26eYZa9XVyFK8k=; b=KHTD7N9o2+d8IJ7KYrM99+IxKYvSJGQu+3PKDQAohBuDx+aGJUKVx9jbPhomOCcSLikYYG TFFAybGSHrsw4tGKb/+fQrNLzo2PXuGYrKJLBiMXM/BkrIQB2pQrMe9QoJNllu59zqAV5p ZRYFMtbBXMq2zlKSFLQhmhF/09bslI/NeMAWzgUfkWWmfllDgUoxFiezp4ztw0T2La9efZ 9s2ZDrRKkeLPvScSYC6guX9ZdAifKCMMUHBjKcC4IIrotVJlvR0WFkEIeud8GdmMT41EaF HomBd2hGeRcaPBzg+6ulxW4XIBPZY4L8SPtR07w8IDSWDoti3vklZCwj/KE+ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHfJXIcZL5dKdbeoHz8Umj7freJLe26eYZa9XVyFK8k=; b=IfD6V+dM1BMKbtGiGHJIAOvmsA1Vl5gft11BExidKz3izyui+oI7a+klSsOXqUEuELRyDC k8qAjZvtegIOOrx4EVahUmeyreCQeTIKLqJ/5S9JP8iCOm7q1LO6Be0pdhkQG6DqjiY6N3 rGT1EkeyyaAgpj8Bxyx5mJmG5HdbVT4IWbpb68Bh4ZM33woc/ZL3UeX9n2fv+Ir1zS1N6K foZ8dFKMZoswrUUwZpZcwTRE6FiaZkWbWGpC4x4mdd0xekUcThD5yyjjpotuZu0wnLgudD 1q/2WwoohFCWU1RS8KhTwliR/BejTScm0x1Dnqus6kkP2+bUbjuiKo+B0PIi7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804549; a=rsa-sha256; cv=none; b=Yhfrz1A9KECOdPhIV+pj5ha7+NiboI0h7tnziuohHE2Goras97whJkS6eNACMsvJxcorj4 rBY4RkO74DYdnNip2rkB/WZ0V0b8CRIt+O5nzPKg0rMZ6KfQGNtuzFMRSnp/bDir2e9Zvk 5m5HHeX1/z/7qVcfqNVTGt1DtREBKBgtfcbsB5VZOBzBxI2qoIztUpjfLh69m2gUS0H2lP eRlVuOzTCLmFMN7s5zStCBnbXwKlvMcuIH7v870b8NcmdwOfL0ZZskMan0iUr2fV9W/lY0 9t9Ar38nVHW+bpzTK2WyzXD8nA4M6cTPcZ8fphwfxMrmINnIE69kVFx3jUKyWA== 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 4d50lT29JWzXhZ; Mon, 10 Nov 2025 19:55: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 5AAJtnoO008486; Mon, 10 Nov 2025 19:55:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJtnPF008483; Mon, 10 Nov 2025 19:55:49 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:55:49 GMT Message-Id: <202511101955.5AAJtnPF008483@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: 21780b009b39 - stable/14 - ddb: provide inp_flags2 when printing inpcbs 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: 21780b009b398949c7c23dc7f8371f38cd3af02c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=21780b009b398949c7c23dc7f8371f38cd3af02c commit 21780b009b398949c7c23dc7f8371f38cd3af02c Author: Michael Tuexen AuthorDate: 2025-11-03 11:17:29 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:54:33 +0000 ddb: provide inp_flags2 when printing inpcbs Reviewed by: markj, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53542 (cherry picked from commit 5f43b0cb7c3cb7c3209598f8c0818cb47cd9de96) --- sys/netinet/in_pcb.c | 3 +++ sys/netinet/in_pcb.h | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 2263997ea154..427887bbc58a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3176,6 +3176,9 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) db_printf("inp_label: %p inp_flags: 0x%b\n", inp->inp_label, inp->inp_flags, INP_FLAGS_BITS); + db_print_indent(indent); + db_printf("inp_flags2: 0x%b\n", inp->inp_flags2, INP_FLAGS2_BITS); + db_print_indent(indent); db_printf("inp_sp: %p inp_vflag: 0x%b\n", inp->inp_sp, inp->inp_vflag, INP_VFLAGS_BITS); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 0492bf78bfaa..69ebaf0535c7 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -609,6 +609,13 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, #define INP_2PCP_MASK (INP_2PCP_BIT0 | INP_2PCP_BIT1 | INP_2PCP_BIT2) #define INP_2PCP_SHIFT 18 /* shift PCP field in/out of inp_flags2 */ +/* inp_flags2 description for use with printf(9) %b identifier. */ +#define INP_FLAGS2_BITS "\20" \ + "\11INP_RECVFLOWID\12INP_RECVRSSBUCKETID" \ + "\13INP_RATE_LIMIT_CHANGED\14INP_ORIGDSTADDR" \ + "\22INP_2PCP_SET\23INP_2PCP_BIT0\24INP_2PCP_BIT1" \ + "\25INP_2PCP_BIT2" + /* * Flags passed to in_pcblookup*(), inp_smr_lock() and inp_next(). */ From nobody Mon Nov 10 19:57: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 4d50nK2z1Dz63Ln2; Mon, 10 Nov 2025 19:57: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 4d50nK2MGjz3bn9; Mon, 10 Nov 2025 19:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9OrA9Br0DmvXZX9LQv/TR+duY6arMhKgwwqVHzc5EM=; b=BjCqneCkMalKC0FrC//vcnt59RvF7gfSY6TdOaKKAF1RE8mMvvCQ4wa9aehPfvG0Dvr/CV p7X2juLmFu039PzvuZM0xnoJccDeiUpMu/IW8H9e8JmQzWxAvadJY4TPVW+ic9sHFrsxNN JZiWHGCYujVvkzOvLfoWYKVDIJ1Hzzpb4RqjWOJruTHiFLDIbyAqZN+7R316OZC4GOkLzy +o/HqHjVsIHApHRzBxEwiNtEmGMVK866OgRz8kp4NWVYKeoh52M24lqyfFBKCgHpdlkrI2 uHwu5KDFk4WGwT1aWXy+3HV7YNruW8ddsr578mcoC50TLNI91UwkvTDpeyd7/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9OrA9Br0DmvXZX9LQv/TR+duY6arMhKgwwqVHzc5EM=; b=bLiUCWu5w2yX/4Q/MWUUXpqUCqzuEoN0nMUDbNDQEmdcImSySTmBqBi9kDMN09+eb2I5ut TaqT+RTcWaTBma7Rf3+V4ZEGY3q9u01S9vlBW06MLu6TUhj3QIBnz26+/5FNuv488cjfkz +SEfkqvT5sGhpLL+gn2h6+fHHMkc3K903VAw35oxK9YoQeCP0UOZ/ZEeGyX/4CgeV0aGYv Jg8+9zN2kM17EPQySIlu2xHlh+hg6WDCfVUKSoY0ZwsGGIQ1oUfI//d8a/cB6WnaNsBMva gwebqsU813HA9gwPyi/TsWn9rGvXkYsAE80CO0ZozVR+nace7bL0N98y+WpLzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804645; a=rsa-sha256; cv=none; b=APgz71aWJc8jEKU+XxR1AY0tOLt7ureTN8RffqAoKWpSchg3cMYwMz1OA9hXLgEOFApgmY lIxP2coL+eehfdOChppxnR56UUVGqAHA6Ar6MzZoH005wo4qXcJNpDA2K0oEH6D3ZjdlLb KtRpdDe3FJs+EjfpIiveykwm04zxdTdnC1YsBc6C4c0DOmkRohGPG9ESHWkp9wlfzY8FiU Ys+0G6+xPukx0ct0wzsci4hX5ObEDTwgnxFO7pJap/WcdPY+HcS0dSCFWautcVUHjZVEG2 VaRvLlKIG+nCWi5rUSBCvrkOxSSrLSLIIPVGCMiHPJpj7gUuRmZGjA6juCaPJw== 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 4d50nK1k2HzY5B; Mon, 10 Nov 2025 19:57: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 5AAJvPkd009044; Mon, 10 Nov 2025 19:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJvPj7009041; Mon, 10 Nov 2025 19:57:25 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:57:25 GMT Message-Id: <202511101957.5AAJvPj7009041@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: 7cd81bf4e74f - stable/14 - tcp: improve comments in the syncache code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7cd81bf4e74f39b784f97afe1a5c4a251f1fd39f Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7cd81bf4e74f39b784f97afe1a5c4a251f1fd39f commit 7cd81bf4e74f39b784f97afe1a5c4a251f1fd39f Author: Michael Tuexen AuthorDate: 2025-11-07 15:27:56 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:56:59 +0000 tcp: improve comments in the syncache code Add a comment explaining why syncache entries are dropped and fix a typo in a comment. Reviewed by: rrs, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53564 (cherry picked from commit 17fb082104ee281365b72bd5135604cea5051df2) --- sys/netinet/tcp_syncache.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 376a5d958504..41195fa02a4e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -543,6 +543,10 @@ syncache_timer(void *xsch) TCPSTAT_INC(tcps_sndtotal); TCPSTAT_INC(tcps_sc_retransmitted); } else { + /* + * Most likely we are memory constrained, so free + * resources. + */ syncache_drop(sc, sch); TCPSTAT_INC(tcps_sc_dropped); } @@ -742,7 +746,7 @@ syncache_unreach(struct in_conninfo *inc, tcp_seq th_seq, uint16_t port) goto done; /* - * If we've rertransmitted 3 times and this is our second error, + * If we've retransmitted 3 times and this is our second error, * we remove the entry. Otherwise, we allow it to continue on. * This prevents us from incorrectly nuking an entry during a * spurious network outage. @@ -1569,6 +1573,10 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); } else { + /* + * Most likely we are memory constrained, so free + * resources. + */ syncache_drop(sc, sch); TCPSTAT_INC(tcps_sc_dropped); } @@ -1754,6 +1762,9 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); } else { + /* + * Most likely we are memory constrained, so free resources. + */ if (sc != &scs) syncache_free(sc); TCPSTAT_INC(tcps_sc_dropped); From nobody Mon Nov 10 19:57: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 4d50nP11PSz63LjC; Mon, 10 Nov 2025 19:57: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 4d50nP0C3Lz3c0F; Mon, 10 Nov 2025 19:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=elCWHLKiXaxkqyL2x4ycu7IlvNkRYsCdzasK2Wqqi50=; b=Rl+o13t/muTFvsy56rPEZsiCjk6bzicJ36TcfsHO5Ha6A+yd12Sw18ZjWQlgeMBjGQ6f5o mIBK6g+Qdx8CSs91Kfi9Q32blHUsrMptYw/7imE9DshPGecjuZKrFZDhDbT7+iB9SB9l3x Q1LBni830yyF7iBq8p+R8y1AbcaXzQOOGYcJo91t9rFkobVhP+B/EQg6tdbUIGLDR3IdjE n/9yxOZgP7uS0ZnW2j2ZIrJEjbVMVMC3PeQaHQTqWZPayzrL1pcrCXJKvXJC9dlh3aE+6F 9RPmZNe2Mqjb87rf+Gie0QA4H7Ejn84K+D9emME2iz7+i1XOCj05Td4O5rqgbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762804649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=elCWHLKiXaxkqyL2x4ycu7IlvNkRYsCdzasK2Wqqi50=; b=BY+uXCsBFUUs4cIBXNzMi7QaDwvn813N7jICzHpyy4QpyJBux2+62I5FnoXFYefXJAJN+m kfxYwvsblMHVtfJxMj1ynfWyH6BaT4BygOldYPwGDYttppixrSSQSQ+D/5mFswc2IlNFU+ DUGPtYS6ZZn193sei5NIA/mYQ6qAmkHOaRh/+sm3eUmJE96uOICJdF1cRf+d0nPTR/M74T n4MlaBpz4OkzG1kPngGg/JmbiwQ49SVqXWmSPAXEJH6hjORtbzdGRVWSIJMzNUbh/ZioTD /JGsUbfuy+LItPgaHMrWgcHrTPW/s2xb41J4X7z8PjFFHoY1ZNosONusIyhfLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762804649; a=rsa-sha256; cv=none; b=dBCkEcQ87syoE6wTzd+vE6ECka4yW4drj9pKQnlbiz+HgIXrOVBjYqqyPTqX+0bN4knxit iYDmEmDLocPS98juZDXij0a7B7mP8slx9sq2Ckpuf89hVT8ODKrfB4JfTuu0WNcKqqtCe8 uxzo/3QhdfIDo4EdxrU6Gty5FpKR4ux6UCuYCsTGegGRtK5V6Lmbr60ZCHvVvVWcqXgg9Z 24bsaOrxMOzIk3HWrkjLSu+wuzcY98LXIijtKq21mkrcFtQqpSRN4+F3ZYqQFKkbygEVjO cDjbTwHPv+P5yZuFhOp9CfxH4W1jDB0/Ha8cj9YFB2BVZf3TaMG+KmnmHYXLzg== 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 4d50nN6QcdzY5C; Mon, 10 Nov 2025 19:57: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 5AAJvSqC009181; Mon, 10 Nov 2025 19:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJvSu6009178; Mon, 10 Nov 2025 19:57:28 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:57:28 GMT Message-Id: <202511101957.5AAJvSu6009178@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: ff9dbbc2c6f4 - stable/15 - tcp: improve comments in the syncache code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff9dbbc2c6f4f4c06c8e3f0aa790a647b7788c73 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ff9dbbc2c6f4f4c06c8e3f0aa790a647b7788c73 commit ff9dbbc2c6f4f4c06c8e3f0aa790a647b7788c73 Author: Michael Tuexen AuthorDate: 2025-11-07 15:27:56 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:56:34 +0000 tcp: improve comments in the syncache code Add a comment explaining why syncache entries are dropped and fix a typo in a comment. Reviewed by: rrs, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53564 (cherry picked from commit 17fb082104ee281365b72bd5135604cea5051df2) --- sys/netinet/tcp_syncache.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index fa7035771714..6c072e0fec38 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -535,6 +535,10 @@ syncache_timer(void *xsch) TCPSTAT_INC(tcps_sndtotal); TCPSTAT_INC(tcps_sc_retransmitted); } else { + /* + * Most likely we are memory constrained, so free + * resources. + */ syncache_drop(sc, sch); TCPSTAT_INC(tcps_sc_dropped); } @@ -734,7 +738,7 @@ syncache_unreach(struct in_conninfo *inc, tcp_seq th_seq, uint16_t port) goto done; /* - * If we've rertransmitted 3 times and this is our second error, + * If we've retransmitted 3 times and this is our second error, * we remove the entry. Otherwise, we allow it to continue on. * This prevents us from incorrectly nuking an entry during a * spurious network outage. @@ -1562,6 +1566,10 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); } else { + /* + * Most likely we are memory constrained, so free + * resources. + */ syncache_drop(sc, sch); TCPSTAT_INC(tcps_sc_dropped); } @@ -1747,6 +1755,9 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); } else { + /* + * Most likely we are memory constrained, so free resources. + */ if (sc != &scs) syncache_free(sc); TCPSTAT_INC(tcps_sc_dropped); From nobody Tue Nov 11 17:39:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d5YgC3WZ7z6GmMb; Tue, 11 Nov 2025 17:39: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 4d5YgC30CDz3rr1; Tue, 11 Nov 2025 17:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762882743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNBekvoaldJvaPPqkArxQAk42U9z3mEEMIoEAl8+qOU=; b=ZNoJ89UTGF0JGSL/XMJ1DOKmXvtt64k35D6MFdmQnW2mHaudxK5gA3oEUsV6fXOs/Sxmku mNTvjDmTuH++sRdn+0930WOez/KxKwCEOU2UKArspf19WtkzbS6QPqp3IXoM/Ah29+6ms0 guUnKR5+Tm0QbE1yOS4PkwhW1bJb1N77xQD3QGkEMBahf1Zl+UR7+9ZJ4bKEgNNF3RRTVG X33BwqRCBTHAD0YhCQinVrKX8hekKDu1h2exOdpMrMYUkc3yZ1R47kkBqUh7+qFnbqudjU zFna4w1sb6yOhSKDxuSGlJmnVRZZ/xDlyDbpv1WcNqYW8m1GlhI5v6O7bKnJ1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762882743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNBekvoaldJvaPPqkArxQAk42U9z3mEEMIoEAl8+qOU=; b=AhZBLMSEVsbuxaGMm892Yoq1VMtL+bng2Mv8DLAg+2jGnbaomrcbFzXi8iOOce+MRpYLEu Q+Qm2ZgbJSvOTagIyNH6dDZFMRUU0auL8qIy/0dHwTdbZPuuKQ9/4F6xjYCKCbiBMhVKEl rUn8rUMhGvuVu+xIEKmP4boRiXpKCdqvetWim7VM1/UrfxUpVix8H196UthSfylw19HcL/ 6ktF3sP/SsG2nkhx+h0ZzsSVne3DRiSF9ZR97qxFLAL3wzyF5QoNhGo9WrlEdtSPJATW84 fGpSPnmylfHOP4IZoebxui/qeWDwNCZ1+ACb1amW0/GpQfNtwzPTOKICTshgtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762882743; a=rsa-sha256; cv=none; b=pLgkRHudAfYl/V7Ne7BT4ZwzuKv41lu4oO/MYMNxdH8GeifVM6yY9FpuKIItufPNu38Aus KV2Bvqu6yI4R/Qokg+m12Iv4MAy02bUAlljIZnw4q26a70nAQ98tHydZ4xxy6/HAZafCnC JOcEM9Mli/OWU5PDrZop0pDPOjiENm0m6B+Zk0wWABXMZsoSKCtDWdYK9L6AnTaBCK6H9N wDLZhhCXt8AEkejG0Dx+iLe2AV8DyU3O2fnfR+wBLQE1a77PPpyGWdfcchRBvYnW9gpIm+ tvOBVkP1CLMMnR1RE3irV8puq39x8Z5oe7evIorQ7N20TgFBoG9VKyR2zH6wtA== 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 4d5YgC2YXFz1Cc5; Tue, 11 Nov 2025 17:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ABHd3EM058327; Tue, 11 Nov 2025 17:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABHd3fx058324; Tue, 11 Nov 2025 17:39:03 GMT (envelope-from git) Date: Tue, 11 Nov 2025 17:39:03 GMT Message-Id: <202511111739.5ABHd3fx058324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kajetan Staszkiewicz Subject: git: 562648ad4145 - stable/15 - pf: Make nat-to and rdr-to work properly both on in and out rules 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: ks X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 562648ad414545bb4fb1f6da26273032c20875f3 Auto-Submitted: auto-generated The branch stable/15 has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=562648ad414545bb4fb1f6da26273032c20875f3 commit 562648ad414545bb4fb1f6da26273032c20875f3 Author: Kajetan Staszkiewicz AuthorDate: 2025-10-01 13:51:46 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-11-11 13:16:42 +0000 pf: Make nat-to and rdr-to work properly both on in and out rules New-style address translation is done by nat-to and rdr-to actions on normal match and pass rules. Those rules, when used without address translation, can be specified without direction. But that allows users to specify pre-routing nat and post-routing rdr. This case is not handled properly and causes pre-routing nat to modify destination address, as if it was a rdr rule, and post-routing rdr to modify source address, as if it was a nat rule. Ensure that nat-to action modifies source address and rdr-to destination address no matter in which direction the rule is applied. The man page for pf.conf already specifies that nat-to and rdr-to rules should be limited to respective directions. PR: 288577 Reviewed by: kp MFC after: 3 days Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D53216 (cherry picked from commit 646798b6783184fb194a2d97667e05895e00c358) --- sys/netpfil/pf/pf_lb.c | 16 +++++++++++++-- tests/sys/netpfil/pf/nat.sh | 47 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 29d7a32e0bdc..bee9f4637091 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -974,6 +974,7 @@ pf_get_transaddr(struct pf_test_ctx *ctx, struct pf_krule *r, { struct pf_pdesc *pd = ctx->pd; struct pf_addr *naddr; + int idx; uint16_t *nportp; uint16_t low, high; u_short reason; @@ -988,8 +989,19 @@ pf_get_transaddr(struct pf_test_ctx *ctx, struct pf_krule *r, return (PFRES_MEMORY); } - naddr = &ctx->nk->addr[1]; - nportp = &ctx->nk->port[1]; + switch (nat_action) { + case PF_NAT: + idx = pd->sidx; + break; + case PF_BINAT: + idx = 1; + break; + case PF_RDR: + idx = pd->didx; + break; + } + naddr = &ctx->nk->addr[idx]; + nportp = &ctx->nk->port[idx]; switch (nat_action) { case PF_NAT: diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 5ea1dd6d8b2f..25cac1810349 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -474,14 +474,50 @@ no_addrs_random_cleanup() pft_cleanup } -nat_pass_head() +atf_test_case "nat_pass_in" "cleanup" +nat_pass_in_head() { - atf_set descr 'IPv4 NAT on pass rule' + atf_set descr 'IPv4 NAT on inbound pass rule' atf_set require.user root atf_set require.progs scapy } -nat_pass_body() +nat_pass_in_body() +{ + setup_router_server_ipv4 + # Delete the route back to make sure that the traffic has been NAT-ed + jexec server route del -net ${net_tester} ${net_server_host_router} + # Provide routing back to the NAT address + jexec server route add 203.0.113.0/24 ${net_server_host_router} + jexec router route add 203.0.113.0/24 -iface ${epair_tester}b + + pft_set_rules router \ + "block" \ + "pass in on ${epair_tester}b inet proto tcp nat-to 203.0.113.0 keep state" \ + "pass out on ${epair_server}a inet proto tcp keep state" + + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4201 + + jexec router pfctl -qvvsr + jexec router pfctl -qvvss + jexec router ifconfig + jexec router netstat -rn +} + +nat_pass_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "nat_pass_out" "cleanup" +nat_pass_out_head() +{ + atf_set descr 'IPv4 NAT on outbound pass rule' + atf_set require.user root + atf_set require.progs scapy +} + +nat_pass_out_body() { setup_router_server_ipv4 # Delete the route back to make sure that the traffic has been NAT-ed @@ -500,7 +536,7 @@ nat_pass_body() jexec router netstat -rn } -nat_pass_cleanup() +nat_pass_out_cleanup() { pft_cleanup } @@ -823,7 +859,8 @@ atf_init_test_cases() atf_add_test_case "no_addrs_random" atf_add_test_case "map_e_compat" atf_add_test_case "map_e_pass" - atf_add_test_case "nat_pass" + atf_add_test_case "nat_pass_in" + atf_add_test_case "nat_pass_out" atf_add_test_case "nat_match" atf_add_test_case "binat_compat" atf_add_test_case "binat_match" From nobody Wed Nov 12 08: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 4d5xdL0yy0z6Gf0n; Wed, 12 Nov 2025 08:38: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 4d5xdL0F7Tz3CVp; Wed, 12 Nov 2025 08:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3rB1UJ14zN/kWZU9JW7i3WxKCQAzRHaHdvWvMDjGhQ=; b=SxVGNZCrnq/Oyff/ElA8yO/CGHYdw2R1YYztboJPSk333Rf7325/ZCEdE20QHlc60vIte6 Pz57IofpsVUOmrbMj2VcP8AsPf7xoTwwPnZls136PldVgJODr5X/XPzDugUrMPTbXSrpRh MBi6ddlT6peRPbhw+RQk1ghBTbezMcCt7REHJf6wmt+Gu4djXG1505L+JyarclwDSQf5i3 tzoGqgnvYsII/B+yBrJt5hYskP73vzIVl9eB9Yi70hxqHBlXuGxt4qvSQmYE+eE/w3RvdR VpmFYIT5qGcsS80UDMu619Og2eEDNOeuJVFfPIcPr3AYnuFcX3SLHAce2O4m0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3rB1UJ14zN/kWZU9JW7i3WxKCQAzRHaHdvWvMDjGhQ=; b=uQBPUMBvmrtpsnHX8GmS3i3Y3fwsZCgy7fVDYkQm0+rt9I7AHy+RJAwbGYqmbVKTSrLLkf SIZH8m6iDHMhR+FhqVoRNSBCw6GtE3mBiE34rRs2V5s27n5w/ApOh8D9SFwH/FrAwhOjCD A/kyK5euhZhg4ade9bbABA90DOcjahfvwLQIXbKn9gKz941tpPf5jIkABlzdbbWOWgLNwr OmzHuxQT6H4l+cOmaKoNpNLHJZylkvXSWaiHAaI7H0mB3Pmvo1KYfhvPs5kZerlQRMZy+A z8Vhb8DLkKFw5fbSj5F49CKaTdJHELIIecnHHreLnvzmm0DO0jA0C1eyICP2hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936726; a=rsa-sha256; cv=none; b=Y6i0Eg+YJBDo6K9AugFZFx6pD0oq0HtbF0CSMvGVsRXIeAxchiHmeEidjo32xbT4UJh+eH 58zJY5rrfRaJWH0cgxIGmHXRUTlDD+nHYqReUvcwDfKjV/1Pu176D7T4gdYnL51Oor+a5y jp1Du1z4K3pBcifJmDvnV6nlxh1Cp/Na+FelkOye+tBGLN0PlSUFYeBzPXVd+wBpVUJZYV Ikl8GQrOWc1J87xqGOlJeltZjfi4eJLFeYkmRiFtLwts/OSy4R8mVGlXo95poGv8r/7WTe CvKm3f9cA2SLq3c5m1KYOs46dE9C+qoaLYzwmN1rGa1ApesgSXNa42LqQqli4Q== 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 4d5xdK6Lg7zBjZ; Wed, 12 Nov 2025 08: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 5AC8cjmS047014; Wed, 12 Nov 2025 08: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 5AC8cjMv047011; Wed, 12 Nov 2025 08:38:45 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:38:45 GMT Message-Id: <202511120838.5AC8cjMv047011@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: ca38822e05d7 - stable/14 - vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID 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: ca38822e05d7343aa0eab86ebed3685f15f5ac31 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ca38822e05d7343aa0eab86ebed3685f15f5ac31 commit ca38822e05d7343aa0eab86ebed3685f15f5ac31 Author: Michael Tuexen AuthorDate: 2025-11-10 15:28:04 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:37:08 +0000 vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID According to section 5.1.6.2.1 of version 1.3 of the virtio specification, the driver MUST NOT set VIRTIO_NET_HDR_F_DATA_VALID in the flags. So don't do that. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D53650 (cherry picked from commit 836b3cd9d7910aff5225e9e58189067ca03fae30) --- sys/dev/virtio/network/if_vtnet.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 846b2d49b15d..8c08a81820e7 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2503,10 +2503,6 @@ vtnet_txq_offload(struct vtnet_txq *txq, struct mbuf *m, hdr->csum_start = vtnet_gtoh16(sc, csum_start); hdr->csum_offset = vtnet_gtoh16(sc, m->m_pkthdr.csum_data); txq->vtntx_stats.vtxs_csum++; - } else if ((flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) && - (proto == IPPROTO_TCP || proto == IPPROTO_UDP) && - (m->m_pkthdr.csum_data == 0xFFFF)) { - hdr->flags |= VIRTIO_NET_HDR_F_DATA_VALID; } if (flags & (CSUM_IP_TSO | CSUM_IP6_TSO)) { @@ -2620,8 +2616,7 @@ vtnet_txq_encap(struct vtnet_txq *txq, struct mbuf **m_head, int flags) m->m_flags &= ~M_VLANTAG; } - if (m->m_pkthdr.csum_flags & - (VTNET_CSUM_ALL_OFFLOAD | CSUM_DATA_VALID)) { + if (m->m_pkthdr.csum_flags & VTNET_CSUM_ALL_OFFLOAD) { m = vtnet_txq_offload(txq, m, hdr); if ((*m_head = m) == NULL) { error = ENOBUFS; From nobody Wed Nov 12 08:40: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 4d5xfp4QYjz6Gf58; Wed, 12 Nov 2025 08:40: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 4d5xfp3Sv3z3CcY; Wed, 12 Nov 2025 08:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TK68nlb/WJOq2q5wdw+2JzXNDQRf2kYgAlOlXvrXr1o=; b=wuntbTk/bkkpwCktp0QGmX0J6VVFFMicyfgjhHR8Q2rYvShfum8uqV1kaA9O49sYocRWyt Ymtsf3wYaRsKuTpnNRB1MpoIbUjPf/TjjLiJu6FAl43D0t52i+MLRFU+K1xea0dVxByRjs Ps+zRbKvbE9/ASgF2EVKTaZytthaMKxEMf/v/SfOamb1lSXh4Q3bJOQ8XxPjIjKZs4Qeq8 z7yMfjd8aTm4MBm4oJJGxVUpnzj7OHy5LYsWZR/w9uk1aXv1N1A8iZZ3tMLOqCgVI4l8h3 WxIYYN2Vrv3FmewTq6UTXd3JAqrYFb7XN/O11IUCTfGGdZ4IB7/PB9Zc+ktvOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TK68nlb/WJOq2q5wdw+2JzXNDQRf2kYgAlOlXvrXr1o=; b=rLpM8I/Vn/hwaCcL3FFfC7F5DeudpM8oHLplSWk6gEiZje7/aODP9vK3CiX9ThzOo257Cu YY+/uSvRvS3UoWYhFaBR+01jiZGi8Cs3QmvFsw5Z55Znlq1oeSFUyaVwlut2PhEIo8f4D9 9Ps8CX4wqfdccJl/MuSu9sDvvSNKiE9xvQH4sberIx5/I0vUAw5rZbcjnEUE6dN4B9g0rt mW46515Om3tgBlRfaPqVH8+SnJhijAabqMdd/ME5/RRPmKSDeae2F8+Y68iZ1lHsueKZSl 2k6GN4cffY/HZmEh80nAQRDPSmne0R6zJLTAEGhoGkcGzQoJBgNQaGt6mPraIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936802; a=rsa-sha256; cv=none; b=FZfuk+x/aF1l2Mp6BXjBquMto6hN6qBKK6xcFatN/NOkmA1muu3woD5gX8MpfovC0aaEYi LMPx8dpbschjdTX3vAxUxGtbfnOPUe12wiA0cSanJWU3FhlSZU7fIO+P10I1dHBFSekurp pbWcZD8x/wzF3vtifm3xadN2ER0CeeSgASALYdH6FaBmy2dKZKCpASo35FT+Y43iaICuGF nzu38oCAgGv+bAZzI54xd6I0euAPFrZ1uLkcLyCN1v/dgi2Ml658mYgINdjwP6uDF2kniM d38uysI1vCxPVQiihXzWqpu2PXBCMrbeCmqDNx+G2c88tFQ8KZyDTIV/3b31Lw== 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 4d5xfp2klwz9ld; Wed, 12 Nov 2025 08:40: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 5AC8e2Qv049585; Wed, 12 Nov 2025 08:40:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC8e2Mm049581; Wed, 12 Nov 2025 08:40:02 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:40:02 GMT Message-Id: <202511120840.5AC8e2Mm049581@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: 52df18d91b83 - stable/14 - vtnet: fix enabling/disabling tso 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: 52df18d91b83038d870c595799a47d983d7da645 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=52df18d91b83038d870c595799a47d983d7da645 commit 52df18d91b83038d870c595799a47d983d7da645 Author: Michael Tuexen AuthorDate: 2025-11-10 15:34:53 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:39:01 +0000 vtnet: fix enabling/disabling tso Transmit segment offloading depends on transmit checksum offloading. Enforce that constraint. This also fixes a bug, since if_hwassist bits are from the CSUM_ space, not from the IFCAP_ space. PR: 290773 Reviewed by: Timo Völker Tested by: lg@efficientip.com Differential Revision: https://reviews.freebsd.org/D53629 (cherry picked from commit 4c50ac68166caf7e08c5a9984d63fa91490fa50d) --- sys/dev/virtio/network/if_vtnet.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 8c08a81820e7..643353190966 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1344,20 +1344,40 @@ vtnet_ioctl_ifcap(struct vtnet_softc *sc, struct ifreq *ifr) VTNET_CORE_LOCK_ASSERT(sc); if (mask & IFCAP_TXCSUM) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM && + if_getcapenable(ifp) & IFCAP_TSO4) { + /* Disable tso4, because txcsum will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO4); + if_sethwassistbits(ifp, 0, CSUM_IP_TSO); + mask &= ~IFCAP_TSO4; + } if_togglecapenable(ifp, IFCAP_TXCSUM); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD); } if (mask & IFCAP_TXCSUM_IPV6) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6 && + if_getcapenable(ifp) & IFCAP_TSO6) { + /* Disable tso6, because txcsum6 will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO6); + if_sethwassistbits(ifp, 0, CSUM_IP6_TSO); + mask &= ~IFCAP_TSO6; + } if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD_IPV6); } if (mask & IFCAP_TSO4) { - if_togglecapenable(ifp, IFCAP_TSO4); - if_togglehwassist(ifp, IFCAP_TSO4); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM | IFCAP_TSO4)) { + /* tso4 can only be enabled, if txcsum is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO4); + if_togglehwassist(ifp, CSUM_IP_TSO); + } } if (mask & IFCAP_TSO6) { - if_togglecapenable(ifp, IFCAP_TSO6); - if_togglehwassist(ifp, IFCAP_TSO6); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM_IPV6 | IFCAP_TSO6)) { + /* tso6 can only be enabled, if txcsum6 is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO6); + if_togglehwassist(ifp, CSUM_IP6_TSO); + } } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6 | IFCAP_LRO)) { From nobody Wed Nov 12 08:40: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 4d5xgL0FFxz6Gf5C; Wed, 12 Nov 2025 08:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d5xgK6pkCz3DF0; Wed, 12 Nov 2025 08:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tl4Jh+bfDdFxOQDUK18uOLIdrV1tmfFkj5TYbnKf0Nk=; b=Rv+AzSDbmdB+JlBUZDkcy+KzrRwcPiItqzBul7/XkEXlqVj+C5zrPzqY4mCVinHIGI6vlA aYywQXHQeQRHpvJWDcK4oLFm+hEG8VCOH3yF4e+EotKpsnHKCvSkax/lU+yaKTBPk/VzkU zqQC5/wKerC+xo55iTlSY7A59SLUIOzOEz9ezfddOMH2vuyhRuYBF82RHFA2rOgxHW+8Kw eWFb0xc/TOScdF4Xfb75Lysy4bbZXCSlqQ+BuTf4Kh565fxpN1iEhPgSIVM5dDJ8fPVyF2 tK7Y1g69xcAOiINSc7K4aUIwwkZpyNuvZTqCNNTLyGHdJQiHYowzSsnIXqay+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tl4Jh+bfDdFxOQDUK18uOLIdrV1tmfFkj5TYbnKf0Nk=; b=TQDelil3bKra7vM+6OuO3r1feO6flESqHBidoKKzAIlP5pmgKst5OoPZdUZbCWFRViJbae dAPyqr6CMx2z7fw743fl7TpCbqOQfavFGw9G8OBnL/iNyXHqvDB108QX6NPlaZq7oWAQBP nOBB1Y76dfejEmWsNW8gz5DXsbvITkLW2Oc8jwxVbh959I413N8mYXTxXg96kBewlMDVRg e1hcCX3Zrz84vxWMgwG34EtR8oxU6Gf0yjd1ShZBD3WPuw1qNiApwAT1V3J/xQuMCyguB9 SBdrUvZCxif5IA5/Rdq5gZqyR6ufKVIjWDwtNWkswlaKp4E1GAD+qDqynnXBNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936830; a=rsa-sha256; cv=none; b=nSLcC+uY3htY3/RBYwe9P4BY34pP5yjJmIKWlnLEt8ERqoSJbzP2/3crvF85/ZXWPHqVN2 TlUEKt4nHNXOv2F8/io50vLT1182b4X4Spo6ifB2nCfJfcQraLkrn162E1fJVamniS20fJ p65sfC0UfcdHAXIEQWcf/HxEp7LxKbbB/SFzsJWFsnvATJCUpHsmZL4NAomODBZX63V5jc OqxwCLSQCwY1TqCwqHSrZhoTbDDn1ewZlocxS4pGwBOvL7VTA5cRe/ASboknMch87Ti5Z+ yh+TkQ8MztzgpVXTB8/O84wlssW7v9HpFkKQKg3xTkM8kThi8yBXj5qXnvwpGg== 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 4d5xgK6PnLz9rw; Wed, 12 Nov 2025 08:40: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 5AC8eTxI056518; Wed, 12 Nov 2025 08:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC8eTSC056515; Wed, 12 Nov 2025 08:40:29 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:40:29 GMT Message-Id: <202511120840.5AC8eTSC056515@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: 0ef06b5bccf4 - stable/15 - vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID 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: 0ef06b5bccf43ca807e237122746dec122600157 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0ef06b5bccf43ca807e237122746dec122600157 commit 0ef06b5bccf43ca807e237122746dec122600157 Author: Michael Tuexen AuthorDate: 2025-11-10 15:28:04 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:33:33 +0000 vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID According to section 5.1.6.2.1 of version 1.3 of the virtio specification, the driver MUST NOT set VIRTIO_NET_HDR_F_DATA_VALID in the flags. So don't do that. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D53650 (cherry picked from commit 836b3cd9d7910aff5225e9e58189067ca03fae30) --- sys/dev/virtio/network/if_vtnet.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 471c6b3714b2..a61b0aac0bfa 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2505,10 +2505,6 @@ vtnet_txq_offload(struct vtnet_txq *txq, struct mbuf *m, hdr->csum_start = vtnet_gtoh16(sc, csum_start); hdr->csum_offset = vtnet_gtoh16(sc, m->m_pkthdr.csum_data); txq->vtntx_stats.vtxs_csum++; - } else if ((flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) && - (proto == IPPROTO_TCP || proto == IPPROTO_UDP) && - (m->m_pkthdr.csum_data == 0xFFFF)) { - hdr->flags |= VIRTIO_NET_HDR_F_DATA_VALID; } if (flags & (CSUM_IP_TSO | CSUM_IP6_TSO)) { @@ -2622,8 +2618,7 @@ vtnet_txq_encap(struct vtnet_txq *txq, struct mbuf **m_head, int flags) m->m_flags &= ~M_VLANTAG; } - if (m->m_pkthdr.csum_flags & - (VTNET_CSUM_ALL_OFFLOAD | CSUM_DATA_VALID)) { + if (m->m_pkthdr.csum_flags & VTNET_CSUM_ALL_OFFLOAD) { m = vtnet_txq_offload(txq, m, hdr); if ((*m_head = m) == NULL) { error = ENOBUFS; From nobody Wed Nov 12 08:41: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 4d5xh10Pdlz6Gf2l; Wed, 12 Nov 2025 08:41: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 4d5xh072x8z3Dlj; Wed, 12 Nov 2025 08:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rBzXkY1PzZRMtcyA3Mn63ViXev2gokEz9fpY1wzMBQ=; b=McPQnEULjw1VikDajLNoRFN/FrJI8cY0duYmRZSECk0xYtUP1QlyeTbBStkpl/VWsNL+OI PCp/3+CchBPX8wcPByUX7dZARNYw1jchtG40/JGZZne9UXC7Fa2pSuw7CVDQrRntYNgszb X7+jgS6FXKriw/kaDkp6YzaXCcstGqmCeOVue3M97qILqiCgXoZZ2YFvW6VmnXasZcB44U kEmlE/CbfYl0ZRzkyW3tYpU2qeNVj2ffNpe2QNa4U+OIrR6ZBqGktotuoqL0WhrQeDZaqA Cm9S1mtd8edkS0aHoML58S5CzuYAqb812XjeWSMzTtRwG6Kd07tTQ4ljzYZdGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rBzXkY1PzZRMtcyA3Mn63ViXev2gokEz9fpY1wzMBQ=; b=gi3m1zDkznKvPkziUaOIZm+JCfnt0WuIiKxcC58SQKznX94cD3M//kkEN+JUg3DOmsf0Mq xV/928P+Rj30NC0SUMVQ12pAeQEnN6tVMiP+YP4DXUO0WDwgvq36n2xLTJtrBvAIWriRo8 epCKoXEelNUpQKmFPYy0AhxMkMIlgkxWfwAi5bJtIvQQJEx510cXRoAGSxnq+Myxql7qfI YxE/hs/BHk8Pa5o1msk0A6jWbeWTyuhZ7zRDwdwMntvkWzlFhcfvXUFLAf/LbVMzOjJKHZ Vs42lZ4JPlamRNmtkX7ek+a+FsNxYnLeECAoUDAngBiULeizQdceSXKcshAH4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936865; a=rsa-sha256; cv=none; b=CwcC5JgBw0N7BBqaqu9dXEuzvG82wE1Trbkero/OacqbTyLvhMRbSGhXg+Wf21qx6vbMZZ 16F3D2Pw7qzV8aKrKGnWjyzedNxzQTp/N+6qmxshYPuxekhLdn8guAztCigYaZImpbKRIX IsgKJBcIB8Xw2sthwbPmguo/0GJAKGAJlYRV/F4EWDnfjy/a+ipGoiJi7VFyDXPisrLJao aVhLcrARTPS/FX110DVRVD1m3NztpQ2iUcrSL31nsMx9ZuCQXxcwoEtZljOrQ/Mu81lWDr D/FNFRjIYdq84F1fy9X8BPapWqpPd18OtdyXxt/Hc5VinSKLgo/SJjmPW3uNPQ== 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 4d5xh067FNzBw1; Wed, 12 Nov 2025 08:41: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 5AC8f4jv058720; Wed, 12 Nov 2025 08:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC8f4ks058717; Wed, 12 Nov 2025 08:41:04 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:41:04 GMT Message-Id: <202511120841.5AC8f4ks058717@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: 0fb0ba51d8bc - stable/15 - vtnet: fix enabling/disabling tso 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: 0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8 commit 0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8 Author: Michael Tuexen AuthorDate: 2025-11-10 15:34:53 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:40:44 +0000 vtnet: fix enabling/disabling tso Transmit segment offloading depends on transmit checksum offloading. Enforce that constraint. This also fixes a bug, since if_hwassist bits are from the CSUM_ space, not from the IFCAP_ space. PR: 290773 Reviewed by: Timo Völker Tested by: lg@efficientip.com Differential Revision: https://reviews.freebsd.org/D53629 (cherry picked from commit 4c50ac68166caf7e08c5a9984d63fa91490fa50d) --- sys/dev/virtio/network/if_vtnet.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index a61b0aac0bfa..d9daa5bfd70a 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1346,20 +1346,40 @@ vtnet_ioctl_ifcap(struct vtnet_softc *sc, struct ifreq *ifr) VTNET_CORE_LOCK_ASSERT(sc); if (mask & IFCAP_TXCSUM) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM && + if_getcapenable(ifp) & IFCAP_TSO4) { + /* Disable tso4, because txcsum will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO4); + if_sethwassistbits(ifp, 0, CSUM_IP_TSO); + mask &= ~IFCAP_TSO4; + } if_togglecapenable(ifp, IFCAP_TXCSUM); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD); } if (mask & IFCAP_TXCSUM_IPV6) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6 && + if_getcapenable(ifp) & IFCAP_TSO6) { + /* Disable tso6, because txcsum6 will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO6); + if_sethwassistbits(ifp, 0, CSUM_IP6_TSO); + mask &= ~IFCAP_TSO6; + } if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD_IPV6); } if (mask & IFCAP_TSO4) { - if_togglecapenable(ifp, IFCAP_TSO4); - if_togglehwassist(ifp, IFCAP_TSO4); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM | IFCAP_TSO4)) { + /* tso4 can only be enabled, if txcsum is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO4); + if_togglehwassist(ifp, CSUM_IP_TSO); + } } if (mask & IFCAP_TSO6) { - if_togglecapenable(ifp, IFCAP_TSO6); - if_togglehwassist(ifp, IFCAP_TSO6); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM_IPV6 | IFCAP_TSO6)) { + /* tso6 can only be enabled, if txcsum6 is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO6); + if_togglehwassist(ifp, CSUM_IP6_TSO); + } } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6 | IFCAP_LRO)) { From nobody Wed Nov 12 09:43: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 4d5z4B2m2kz6Gk3B; Wed, 12 Nov 2025 09:43: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 4d5z4B2CNxz3Lw4; Wed, 12 Nov 2025 09:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762940618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKUhKgnb4S4PFCv1M/CxAljPHnD3dpyDjQjq74caxsU=; b=fVyYkkhAGMIt9MYu8hvMf9O+XXj3CnyDFMT/otW1/WZGZ5yCekQGhN//Q1V4nWJFrTVU3m jZMSRerjs9EIwVVRio5KPpMPhQ7g1fCvL++H4wqwCEGY/wVy/1WLzg4tSCbIfsMLXjE2ei qO5cZpt0yhdeYIse3u10V+vmp+q2v1iJPQve+9QiCu2vIVqGa7B4+eOHmf0mLjX2LO5WtU /CZ2l9z/JN2LIMQxQhQrDz9cLc9jboKc2Ur7Ai3DzFqdsAw6yedt8ntEYe+Bxo/eBE4Opd Se6GEjZwafhwmvlwZC0if/I1+remRU+DuEpN1WE+dVr3jwCsNs540ImTiJ7bmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762940618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKUhKgnb4S4PFCv1M/CxAljPHnD3dpyDjQjq74caxsU=; b=QsrfrT7ZiDAJwn4CbG/8mOmbX5LD501JjoVAoi6gUVgVwWJzqjhIJdZSXFEx9/gOSymYty YNkUqAXGT0oJ07S5+nFJASaaFFDjixLbIWq8oYS8lPzxKrKH8eUZ2/HLI7I4V+ZnhPPp3h 8l4gTv8XLGHllq1dMA+8giZNUjcWfmwspIdifHhimiZbJVxmnU0m/hGYV538YTNcf5cYVO I9rwU+TLx39dKuBEsdK75VHr68f78GQG5s2d7GWZqEtcy9iHtnJ3aPLlAtKnjT0QSuniR3 oJRH8lRkZtiyF4ORc2QNmN3xTa+aYk3B93IQJnENvaiiw2U8JX83/AGMeUJbgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762940618; a=rsa-sha256; cv=none; b=uYcw+u+KNLRuNn8yUs+plom4/tgDsRmuXXjL0xDkQUtkO4IyPv5iihj38cgXlgCkSPm+/F yEd/8rn5ruiTJwlTiNJCLk7pdoH4CBa6Gc9vEeRwdIwuVtgKQcYoDTunDQbPqnnSTPDRaJ /cgtxIKtVMyweNdZY7w0Uc0hc+sHIHKCB6vordpXsR7WBqFj+Iawf2Zv37DiBQGpZzcQPQ zsfBkzvVjSsEWyv8PCmyIZcxCjtOZGtJ/UzThQkJwtubiaXrvjfZYyKlbyCAw9t5hTN2++ VoROnHXYnghtKFG4Pnd7AuT9fGARjxCY48uJGyJmDrFfCVL8jCnUKv5XUxU3rQ== 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 4d5z4B1lqvzDVn; Wed, 12 Nov 2025 09:43: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 5AC9hcen077383; Wed, 12 Nov 2025 09:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC9hcJH077380; Wed, 12 Nov 2025 09:43:38 GMT (envelope-from git) Date: Wed, 12 Nov 2025 09:43:38 GMT Message-Id: <202511120943.5AC9hcJH077380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6ef503c80ff3 - stable/15 - date.1: Lint with mandoc 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6ef503c80ff3d5d219b30e63124f704721148a4b Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ef503c80ff3d5d219b30e63124f704721148a4b commit 6ef503c80ff3d5d219b30e63124f704721148a4b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-05 12:34:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-12 09:43:34 +0000 date.1: Lint with mandoc Specifically, remove Tn macors, replace Li with Ql, and escape %N to address date.1's rendering issues on man.freebsd.org. PR: 290801 Reported by: jinwookjeongg@gmail.com MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit e878ba8eea7206b3a435338c6eed0e4264e0ce14) --- bin/date/date.1 | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index b86a660a924d..f68892bd408d 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 1, 2025 +.Dd November 5, 2025 .Dt DATE 1 .Os .Sh NAME @@ -143,7 +143,8 @@ values are .Cm minutes , .Cm seconds , and -.Cm ns No Pq for nanoseconds . +.Cm ns +.Pq for nanoseconds . The date and time is formatted to the specified precision. When .Ar FMT @@ -172,7 +173,7 @@ Obsolete flag, accepted and ignored for compatibility. .It Fl R Use RFC 2822 date and time output format. This is equivalent to using -.Dq Li %a, %d %b %Y \&%T %z +.Ql %a, %d %b %Y \&%T %z as .Ar output_fmt while @@ -194,9 +195,7 @@ and can be specified in decimal, octal, or hex. Print the date and time of the last modification of .Ar filename . .It Fl u -Display or set the date in -.Tn UTC -(Coordinated Universal) time. +Display or set the date in UTC (Coordinated Universal) time. By default .Nm displays the time in the time zone described by @@ -328,7 +327,7 @@ The format string may contain any of the conversion specifications described in the .Xr strftime 3 manual page and -.Ql %N +.Ql \&%N for nanoseconds, as well as any arbitrary text. A newline .Pq Ql \en @@ -468,7 +467,7 @@ will display: .Dl "Sun Jan 4 04:15:24 GMT 1998" .Pp where it is currently -.Li "Mon Aug 4 04:15:24 BST 1997" . +.Ql "Mon Aug 4 04:15:24 BST 1997" . .Pp The command: .Pp @@ -493,29 +492,31 @@ will display the last Friday of the month: .Dl "Fri Aug 29 04:31:11 BST 1997" .Pp where it is currently -.Li "Mon Aug 4 04:31:11 BST 1997" . +.Ql "Mon Aug 4 04:31:11 BST 1997" . .Pp The command: .Pp .Dl "date 8506131627" .Pp sets the date to -.Dq Li "June 13, 1985, 4:27 PM" . +.Ql "June 13, 1985, 4:27 PM" . .Pp .Dl "date ""+%Y%m%d%H%M.%S""" .Pp may be used on one machine to print out the date suitable for setting on another. -.Qq ( Li "+%m%d%H%M%Y.%S" -for use on -.Tn Linux . ) +.Po Use +.Ql "+%m%d%H%M%Y.%S" +with GNU date on +Linux . +.Pc .Pp The command: .Pp .Dl "date 1432" .Pp sets the time to -.Li "2:32 PM" , +.Ql "2:32 PM" , without modifying the date. .Pp The command @@ -591,10 +592,10 @@ flag is compatible with .St -iso8601 . .Pp The -.Ql %N +.Ql \&%N conversion specification for nanoseconds is a non-standard extension. It is compatible with GNU date's -.Ql %N . +.Ql \&%N . .Sh HISTORY A .Nm @@ -615,6 +616,6 @@ flag was added in .Fx 12.0 . .Pp The -.Ql %N +.Ql \&%N conversion specification was added in .Fx 14.1 . From nobody Wed Nov 12 09:43: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 4d5z4T2YKpz6Gjr5; Wed, 12 Nov 2025 09:43: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 4d5z4T20qBz3MVl; Wed, 12 Nov 2025 09:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762940633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WDkVbBHT9Ut+XOrNS5aTa5Qctpd9WgG2gFF6c6m9YRU=; b=XFzxPo7XtE8wjqM0akpg/Eu+wcA52B3uivEEoxYIPYthKEkgopeLrFoQsaSgF+mafn3Qfx IZQ2jgH3xy9HQfhD8D1YZM+u9NhLS7i+NJeBcv8xJczBlwTDOcCL0joF+vuW3/F3hxYZep l1aSPUNW0GrjD5HxIW2a6CwTZE9kASU+rKKqOcmcMS+IIY7/Kf9pbUtYTR4G3EZawCLKQN aMQcsvgqeWbLu6GjmQ1TBqrhLdE1YPt5DFZIqT2b2m+AV9hbJf+rH3YmuQqESZYQbIEDky 990UMy2wqi7eFJ4gh8lH3pb7UPA3yWZp4rnSRNN06azkBt6vGWB0wcl7joV/lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762940633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WDkVbBHT9Ut+XOrNS5aTa5Qctpd9WgG2gFF6c6m9YRU=; b=o+2X19+kYndnVV67MkeF2BN2NFplAMElCD7E2BQw6yBDLQFq5Gw/QnaGM0antQUREkMWIn SX8xO4ap8pQCYwTbst1/PfLE1WntjM2D1vdUk1xWlC0rf/syerzz8SCICgqqcx0DG0wbB5 f2L3fO/OFtjoYCL5NEyOLnK+zca3Glk7OJsnPSSUexRWjdiZR/0/3iqVmUzGzFC4Z4re+H qE1AMpDLUq0M8CC0R7QgUjhLJyDrNQxDq196c2t0A9Q0CWWSyKJ83VrygqJLpArvZwlmSV MWeGjXM2Bw07yuTCYEm2zLrUMN0gsNx9cX082Ku7/1JqEFxmB/OCp0vkzGFXzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762940633; a=rsa-sha256; cv=none; b=Y6lKglHM3Znpv5q6ElyXYAmSyLKBXoo1CxngDb0+8EGTSFgBRxkthezpjOhWjRkGNGFfxl 9zwEFO1SRV66a8Y7ZRiF9pTrIV8L7w+8W3+v7sUPbUlvRAXJWCK7KUEISBgrbP5OF5ZN0n CvVRisE6jLKlv63R8097nuxOKCEiz+B4mAiq38yxfgsISvqomVw4+L1Jd7aCrSqliSw/0V mS4gagjcu7eLLupdyaM8fhQeTz1HUPMZpNSCt6y5Yj+QvsO9D3n6YF3VPh1zIcrGqmaw8O EiC5RyAzvvm6EcxYk2k/IGxiCjcCofKp1Rsa3KpiFHZ9lc4ikYgdUG1MPFYJBA== 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 4d5z4T1YY0zCmY; Wed, 12 Nov 2025 09:43: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 5AC9hrxE077602; Wed, 12 Nov 2025 09:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC9hrnc077599; Wed, 12 Nov 2025 09:43:53 GMT (envelope-from git) Date: Wed, 12 Nov 2025 09:43:53 GMT Message-Id: <202511120943.5AC9hrnc077599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6c185061a63b - stable/14 - date.1: Lint with mandoc 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6c185061a63b6db6676c6a24e6bf0802774a07fa Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6c185061a63b6db6676c6a24e6bf0802774a07fa commit 6c185061a63b6db6676c6a24e6bf0802774a07fa Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-05 12:34:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-12 09:43:49 +0000 date.1: Lint with mandoc Specifically, remove Tn macors, replace Li with Ql, and escape %N to address date.1's rendering issues on man.freebsd.org. PR: 290801 Reported by: jinwookjeongg@gmail.com MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit e878ba8eea7206b3a435338c6eed0e4264e0ce14) --- bin/date/date.1 | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index b86a660a924d..f68892bd408d 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 1, 2025 +.Dd November 5, 2025 .Dt DATE 1 .Os .Sh NAME @@ -143,7 +143,8 @@ values are .Cm minutes , .Cm seconds , and -.Cm ns No Pq for nanoseconds . +.Cm ns +.Pq for nanoseconds . The date and time is formatted to the specified precision. When .Ar FMT @@ -172,7 +173,7 @@ Obsolete flag, accepted and ignored for compatibility. .It Fl R Use RFC 2822 date and time output format. This is equivalent to using -.Dq Li %a, %d %b %Y \&%T %z +.Ql %a, %d %b %Y \&%T %z as .Ar output_fmt while @@ -194,9 +195,7 @@ and can be specified in decimal, octal, or hex. Print the date and time of the last modification of .Ar filename . .It Fl u -Display or set the date in -.Tn UTC -(Coordinated Universal) time. +Display or set the date in UTC (Coordinated Universal) time. By default .Nm displays the time in the time zone described by @@ -328,7 +327,7 @@ The format string may contain any of the conversion specifications described in the .Xr strftime 3 manual page and -.Ql %N +.Ql \&%N for nanoseconds, as well as any arbitrary text. A newline .Pq Ql \en @@ -468,7 +467,7 @@ will display: .Dl "Sun Jan 4 04:15:24 GMT 1998" .Pp where it is currently -.Li "Mon Aug 4 04:15:24 BST 1997" . +.Ql "Mon Aug 4 04:15:24 BST 1997" . .Pp The command: .Pp @@ -493,29 +492,31 @@ will display the last Friday of the month: .Dl "Fri Aug 29 04:31:11 BST 1997" .Pp where it is currently -.Li "Mon Aug 4 04:31:11 BST 1997" . +.Ql "Mon Aug 4 04:31:11 BST 1997" . .Pp The command: .Pp .Dl "date 8506131627" .Pp sets the date to -.Dq Li "June 13, 1985, 4:27 PM" . +.Ql "June 13, 1985, 4:27 PM" . .Pp .Dl "date ""+%Y%m%d%H%M.%S""" .Pp may be used on one machine to print out the date suitable for setting on another. -.Qq ( Li "+%m%d%H%M%Y.%S" -for use on -.Tn Linux . ) +.Po Use +.Ql "+%m%d%H%M%Y.%S" +with GNU date on +Linux . +.Pc .Pp The command: .Pp .Dl "date 1432" .Pp sets the time to -.Li "2:32 PM" , +.Ql "2:32 PM" , without modifying the date. .Pp The command @@ -591,10 +592,10 @@ flag is compatible with .St -iso8601 . .Pp The -.Ql %N +.Ql \&%N conversion specification for nanoseconds is a non-standard extension. It is compatible with GNU date's -.Ql %N . +.Ql \&%N . .Sh HISTORY A .Nm @@ -615,6 +616,6 @@ flag was added in .Fx 12.0 . .Pp The -.Ql %N +.Ql \&%N conversion specification was added in .Fx 14.1 . From nobody Wed Nov 12 13:24: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 4d63zP6QwKz6Gysd; Wed, 12 Nov 2025 13:24: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 4d63zP5vCDz3mx7; Wed, 12 Nov 2025 13:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762953889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhjx72z4mjvn853j+Wfa5NX3zyyQgmagnNNV+Uhe7c4=; b=sNupo/Z2+mywubvNMFFQjeSnK8nIld7iJBbTSo0QDbT8KjUEO+maDiQ/yvrdhYRmV9b/yT bHdBCuNQJw32tQI3Hc0dVnUbqIzitGeJSbr0zamfspUShgcLNGH3fqDBsZ9UEYTejfStoQ lEH95X32Eam5sFSXYCl3UXB0LdjwpexRGZb0B+KTTZXXyEEqnsnyASfTO5A3ZWgYZz8G1y hKx+nBRPlKssrMMYBjH2AZrUVzelSSAopnEisL1ZQneOmtNRS7oycGZG9I2RzRlDn3cGHN zcCsTNxkqLiUo/tDlICLSPAlj3AzjaoHg0gMGRNttPvUoL3KsYGS5vrw3aUDOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762953889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhjx72z4mjvn853j+Wfa5NX3zyyQgmagnNNV+Uhe7c4=; b=c3G46JaYos2d3ArIcMZ+a6x/P5FSNgPdOHywdAgejV/8j1b7JGo8X2l07CfnaOv0kiP6ro 2KCRwsxkqeMU66PT984KnuRyMPB4evYsHZccnr0NasuacEHFolZvvfJxTrmAMyd0ai93H2 LKODO0jvu6kMn3uRKVt6VXmtc5A2mktvUVWfZr01kCPX/9eLAPcnFOwZQMWcL/8JtpUfjN 1pCSBBrDTdPw1G9AFXTyaJLe93GJasUK8T7MqnwQu3fzkFIWa+GR2uJK5iSy7OleSL/hAm SElpzL8fcn/q9qeDExEClOfLuwYd8G/nH7+6KTF9sMrY7cUjHupFKc8qb7VZWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762953889; a=rsa-sha256; cv=none; b=tbSnQxoyqRUoxSZ72NX7fmxw3jx+X6oKER1RfVTlDUPDnoGy3I6bZOWVs9g8DjS0ZZJziN co3hENglUCpfHdw73Selhxzx2IhevAlD2LyymjTHzFLg0cBBYNOGIzvfLnFsDrY4HnbHbx teG3QozEw43z6U7TKtZpeq38YdzrsHOrrZirp6J1HFbZOoUMvcACQQveDq/sVh52ZtKhW+ j9hJrB3/Vrfj/uF8iyo0gIGO835Z8RqfZ7J8jh5snWFTm42Qj09rjuwiLfyZaXA+j70eSZ 0bmujYxLuOKcXqAgLXppaoLzjpcl8ahPM7gyfAUcHZyJB2qQxKF3tTsinZcsQQ== 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 4d63zP5LZYzcnp; Wed, 12 Nov 2025 13:24: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 5ACDOnKi091813; Wed, 12 Nov 2025 13:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACDOnH9091810; Wed, 12 Nov 2025 13:24:49 GMT (envelope-from git) Date: Wed, 12 Nov 2025 13:24:49 GMT Message-Id: <202511121324.5ACDOnH9091810@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: 65e347d31544 - stable/15 - bsdinstall: Use fat32 EFI system partition for ZFS 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/15 X-Git-Reftype: branch X-Git-Commit: 65e347d315449e8c28dbcb0c5bb64f79d822d024 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=65e347d315449e8c28dbcb0c5bb64f79d822d024 commit 65e347d315449e8c28dbcb0c5bb64f79d822d024 Author: Ed Maste AuthorDate: 2025-11-07 22:48:30 +0000 Commit: Ed Maste CommitDate: 2025-11-12 13:23:51 +0000 bsdinstall: Use fat32 EFI system partition for ZFS This is consistent with other operating systems and with bsdinstall's UFS config and with bsdinstall's ZFS config prior to commit 0b7472b3d8d2. PR: 290857 Fixes: 0b7472b3d8d2 ("Mount the EFI system partition (ESP) on newly-installed systems.") Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53642 (cherry picked from commit 4109cdf0f817162cf3032aa589dd180dfa910025) --- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 9ea6ec3a4ac9..a4c9220a709c 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -216,7 +216,7 @@ KLDLOAD='kldload %s' LN_SF='ln -sf "%s" "%s"' MKDIR_P='mkdir -p "%s"' MOUNT_TYPE='mount -t %s "%s" "%s"' -NEWFS_ESP='newfs_msdos "%s"' +NEWFS_ESP='newfs_msdos -F 32 -c 1 "%s"' PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\"" PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"' SHELL_TRUNCATE=':> "%s"' From nobody Wed Nov 12 13:35: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 4d64CY57Sdz6H0h5; Wed, 12 Nov 2025 13:35: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 4d64CY4K4nz3ppC; Wed, 12 Nov 2025 13:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762954521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V4rBlSNl5jCxQQ56eZTDLaOlK5CXtLMSnvzpZP+97oo=; b=jl9kA1c+5XX1+VZlZCfmY0r+MHBYec08RoTvQ5pZbuZZ6aW/V1cTJ2JGz4L6O7fCwQ4WHi pMuIFUjBWN9EkQKl6t9ehLStWrk6avO1CO0utI8b7hhRpa7z/jd0uUatyN7BDRzAskau8/ JPnfKtMlKux/LQuUke/Zs+pxvD+XQfwtkb1ebRojJl7DyEB9IKBaNJqyJnYcn/qfGbEzl3 gAhe2UkS/RZaB4W9JcC3virCatUJszpU/VsYsJ7Xh0Xk351PGZURnpBR+IyJQPbcYLxwvw 2T2YK3NgmhCAGIKKvi4vsHuYR5pa+2lOToewxVcq28xI1jZTrkJODxE9wGcCGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762954521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V4rBlSNl5jCxQQ56eZTDLaOlK5CXtLMSnvzpZP+97oo=; b=FTMMVVnjQ8v13whz5he8zOx9uNaSDh7MyVIiVZcP0CpQi3F5OHMlny29QZkOyoRu7Hswrj nRCFrMcyioQdFjUcIuluWbB40MT9tvA9qgZdhojoqCRAvaNc7s905hbnzHgglIc31hrQdX kRuEZYpXQsRiiJa4jXcMH8wFxPdGdwCzRD9yY18SebJO+kqPX2HJaMaI+xomWS8P2G6yhz UHls6UNtYgsWFXgfw5i5enBiBKhY1Zzm0YxBMHoqhGOM8Z+dtbvAdZP4aT5s3L7+vRyREZ Oq3jC5K4dwfZNaZLfQfvxqFDl73QeTW2Md8yLwQVzZM6mtmqIlMiPaJt8qe+3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762954521; a=rsa-sha256; cv=none; b=Qqf9qWcir8kLPOtgdI9/EuuV8kEC9SJhoYCu8JAMI8cmiAJhh96Qbt3wFiod711PwVpLQI /A9L+myd3d7kgkkkZf3PtUQhQX7i0+KVoKMjVVRKyWcQhyPF11KwpzqOPyGoUZC5FnFtty PE1leXo9LqE/KEjCFpQk0UI+DX78sP/L7ydsq9MMErKHVn4d9N5eeXWaI6xcz1Yaxf87ME lHxuThmUVrLIlo4yr1KWHvn1IoWT8nvVx0OC1Y2BZJ+3O+J4/MvyreRt+wnRYlDTi4Ssei mrufxvsrPhagAUHneXBMH0CjJlRkNb87Frso/ssZmKvi8AxuVFLJ4mkZEoDmTg== 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 4d64CY3bjdzcy7; Wed, 12 Nov 2025 13:35: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 5ACDZL57011553; Wed, 12 Nov 2025 13:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACDZL1q011550; Wed, 12 Nov 2025 13:35:21 GMT (envelope-from git) Date: Wed, 12 Nov 2025 13:35:21 GMT Message-Id: <202511121335.5ACDZL1q011550@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: e69669bcd7de - stable/14 - partedit: make minimum FreeBSD install size just under 1 GiB 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: e69669bcd7decb1866484c454c45fd9d7fc4167d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e69669bcd7decb1866484c454c45fd9d7fc4167d commit e69669bcd7decb1866484c454c45fd9d7fc4167d Author: Ed Maste AuthorDate: 2023-03-02 23:35:33 +0000 Commit: Ed Maste CommitDate: 2025-11-12 13:35:04 +0000 partedit: make minimum FreeBSD install size just under 1 GiB 1 GiB is a convenient disk image size for testing. It is also the installer's minimum size, but the minimum applies to the partition rather than the whole disk. Testing with a 1 GiB image resulted in the counterintuitive error "There is not enough free space on to install FreeBSD (1.0 GB free, 1.0 GB required)." Reduce the installer's minimum size slightly to support this case. Reviewed by: brd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38881 (cherry picked from commit 57e12d397387542b13f175d4c0b8b5adca198690) --- usr.sbin/bsdinstall/partedit/part_wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index ba01e115bcf4..e0711efd47d5 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -40,7 +40,7 @@ #include "partedit.h" -#define MIN_FREE_SPACE (1024*1024*1024) /* 1 GB */ +#define MIN_FREE_SPACE (1023*1024*1024) /* Just under 1 GB */ #define SWAP_SIZE(available) MIN(available/20, 4*1024*1024*1024LL) static char *wizard_partition(struct gmesh *mesh, const char *disk); From nobody Wed Nov 12 15:41: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 4d671V3w0Kz6G9HT; Wed, 12 Nov 2025 15:41: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 4d671V3JxYz3Chb; Wed, 12 Nov 2025 15:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSEHwZmAyNSrILpbaPOp2meeWYHl/Kzg3UaS991BVpY=; b=ecPpD5Nip3jCTUbIwpHJjPYLdroGl6jURg90Wttl2niZshleY3BopF89i8mfdfboUIn6hq rX7H+zO4PyYCBeFHwQZy4AFJDUOesfES+sxxbrIMae8pn85HmDuQTLGMWOPiGelnLo8+7A jdQioXwf6minzkcguCsVf5O3D20DxqfHO2drXG6v3n86M9SE0M2+RpQ74/bTemJE1WL7OP Q+K6xKnf9uFzp9nfURYf36zlwOF4s1RIVjQk8ipa0W0LToqNr8zEgmPhDxKwjdJDI93/bz kojKQkmQxQww+EXXKgTb7SbwUAdpz3GerOj2c/ln2I3h/jr+1ESSacHTEaOinA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSEHwZmAyNSrILpbaPOp2meeWYHl/Kzg3UaS991BVpY=; b=ovx1rJv5bfuaWe0A8sEQEEt+PlGGoLzqNhbUDRYuWLA5stQeZdZpE0wfy43othTKAf115G MAfuHex4WQHWtbGi16g06sI6JSP2gZ3gg6bGajqMXnQzWJDtdg+v8J1PKL3XrFal+vW7Ol /t8lTAwQyqmxxGQB4NTAa1W1LiuN+erDnsgiks6QLqsgcByfG4zdhKF5LRVXa0Aoo99DFz ZUx6tnE6bHPbwaebImSjj/SwiHErm//0GS+4bu6YJ7kMaTm/r9MPoBJzZRuQ9HXxd+uv3i HcNOpZUrv7cPAjt0kCmxiM8rWsn/ID6WrZOOLKrXZVmIX/zn1YfhQgmMUf/fYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762962110; a=rsa-sha256; cv=none; b=VnWfaB3wTQ+okx0Wd5431uAaET/sCTl5uyvIOO/0e4qdgYDyNtq4UHFXGGaWKvp+sUxlBt bx2jamgGO7gZuYV8WLsJD1T6iEiQLTMGQ6BaW55jIUfEjLVJ9hy2i14CAOdUvMro1Vzl4V 03ZYMbXhsr8dleAszm/5mTjkYIJAHkZokP/x4w0k6za3+dS4OAt66c5cIY8GAGCSjy+ON9 6lTAQ0pDRi2bo4FR1+WknH1iPK5HUvNyw5HlSxnwutCt6GF5egilRBpFz8XfHU0i2j5/Z5 snC0H6Yx14OMNhOGJWew3jA6rtdNk02eyx9K5LluLTcqr50YwpHInMQ3JeJEdQ== 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 4d671V26Mjzgqj; Wed, 12 Nov 2025 15:41: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 5ACFfo28056972; Wed, 12 Nov 2025 15:41:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACFfoIq056969; Wed, 12 Nov 2025 15:41:50 GMT (envelope-from git) Date: Wed, 12 Nov 2025 15:41:50 GMT Message-Id: <202511121541.5ACFfoIq056969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a77abd53e83c - stable/15 - LinuxKPI: 802.11: clear CONF_IDLE earlier 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a77abd53e83c4357ad8a8006a6e89759e65e3a5b Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a77abd53e83c4357ad8a8006a6e89759e65e3a5b commit a77abd53e83c4357ad8a8006a6e89759e65e3a5b Author: Bjoern A. Zeeb AuthorDate: 2025-11-10 19:41:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-12 15:41:24 +0000 LinuxKPI: 802.11: clear CONF_IDLE earlier When starting to scan and ending a scan we clear/set the hardware to idle. Similarly we set the hw to idle when we remove the channel context but when starting we only set it to non-idle when we went from assoc to run. This apparently was not a problem most of the time as the switch from a failed hardware scan to a software scan was racing against net80211. ad4ddc83ebf8 fixed that specifically for rtw88 and while we were more consistently scanning, this broke authentication as the setting of idle at the end of the scan was now happening reliably. Move the unsetting of idle from assoc_to_run to scan_to_auth for when we create the chanctx to keep it symmetrical. This makes authentication work again for rtw88 (though not for everyone due to other possible problems with net80211). This likely also fixes the problems in the listed PRs. iwlwifi(4) mvm and mld driver parts do not use this information at all and were never affected. Sponsored by: The FreeBSD Foundation PR: 290850, 288186, 281979 PR: 272145 (the non skb-mem-limit parts) (cherry picked from commit b568711f8ef1afd7c86ea2d8bd2f94f399f54dc1) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0dc3b2631804..f025f191a3bd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2308,6 +2308,10 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int changed |= IEEE80211_CHANCTX_CHANGE_WIDTH; lkpi_80211_mo_change_chanctx(hw, chanctx_conf, changed); } else { + /* The device is no longer idle. */ + IMPROVE("Once we do multi-vif, only do for 1st chanctx"); + lkpi_hw_conf_idle(hw, false); + error = lkpi_80211_mo_add_chanctx(hw, chanctx_conf); if (error == 0 || error == EOPNOTSUPP) { vif->bss_conf.chanreq.oper.chan = chanctx_conf->def.chan; @@ -3081,8 +3085,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->in_mgd = false; } - lkpi_hw_conf_idle(hw, false); - /* * And then: * - (more packets)? From nobody Wed Nov 12 15:48: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 4d678t3lcsz6G9sp; Wed, 12 Nov 2025 15:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d678t32nNz3F0M; Wed, 12 Nov 2025 15:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SndZElk+POPJhG+bUjWIG/AKw24KpE9f2254WIis2Rw=; b=ttmbkZdRjWSMHuwVD5JmkjT+g2Ue+00nZ6p1n/nKdD+DAI1cez+TlPFy8fI8F3OIrZM7gg R9drmXSPwuCEikCweJcCZnn4yCQX96YgVSdCfSnjNSmD28wkOCAqQiO8yIwWbsxrsPIzPX Jwi0TicTOCp++1FZY1L+B3JvjZSFI6skdAWT/ZYTainBTQUBAA8YDyKcxZF8xlaX3L2znO NAC6qlYsSzfKGW6dxMnGzvyX2UNSUXDhpiULxNvmiSLlzq5LSnahatPb+s3y2+s1Q9FKFz qafTPURllYRCURZ9bAZOumvauWOm64XK0Z6Ec3XS4TkhJ5TBHXMt6BYeqqrQqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SndZElk+POPJhG+bUjWIG/AKw24KpE9f2254WIis2Rw=; b=tuFVM7pM1ObU9wxkJuC/soa68JoFMrNvDL6yIA4ibQIOOG1Enual06S46HNxB/val6iXYp lIfGY059B9SKh4vuvB8dLz66NJDtNdXz43+0KnkviR1QhL1fKY5dpRiTZx1UhBcW/mXtV3 gMWOir7olEqkWMS6ZXteS+sPI3Y5FCGnyxsGN61NRz1FLyv/ifI+XqVmewnXZVtBqAXAnY 4TtIllRLp67ku/Saj6UtsQO5ih+wBfbp7Y7r+dhQ6TCnSFnryCzTN6GKDvaR9jKCqcQ8Uq 90EvSKMti/78wrQT9uwozcnR6iOsCYKuzvVyuyA33xKZE4u4gUjY1IbYqLh5wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762962494; a=rsa-sha256; cv=none; b=uo3n7JLuZsRMuE4CDdkBqTd/YwHatPZi8qvm2/McOYQESUEROTeNqLt9WydyOvvL09KPqy g7n8uYYIuu8RpzVQTx/AdUEE5lF6xx6BwcygMeTf4QL1aN2ifwpkddKFnmn0ztD59W3iJw aE4y2NqLjN0dL7if2Ap3ayRxavcZOq+wHX1t5csWtKeIbjOE+XW1dXejm0AN6Q/Q/NctBK jdzqwNeYfnuFkt7oFNIVuv+A1UZ9AWXoIiVQbqQbDAUqwpgTle/38mjl1uYeeeRvnGd6xJ Q0G/rNIAy/M2vddTxczoRhPSfNbyFHZFIq7vgVWFqwURYPrhxBo/ic48sTg6sg== 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 4d678t2Nq3zhN0; Wed, 12 Nov 2025 15:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ACFmEIq059098; Wed, 12 Nov 2025 15:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACFmEu0059095; Wed, 12 Nov 2025 15:48:14 GMT (envelope-from git) Date: Wed, 12 Nov 2025 15:48:14 GMT Message-Id: <202511121548.5ACFmEu0059095@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: 3ced4a2b482f - stable/14 - bsdinstall: Fix newfs bsddialog menu 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: 3ced4a2b482f50672bba26de3f26273a73f75b9c Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ced4a2b482f50672bba26de3f26273a73f75b9c commit 3ced4a2b482f50672bba26de3f26273a73f75b9c Author: Ed Maste AuthorDate: 2025-11-07 22:53:01 +0000 Commit: Ed Maste CommitDate: 2025-11-12 15:47:42 +0000 bsdinstall: Fix newfs bsddialog menu The second and third members of struct bsddialog_menuitem are `bool on` and `unsigned int depth`. The newfs dialog options in bsdinstall's partition tool had these two swapped, so the default selection did not work. PR: 290857 Reviewed by: asiciliano Fixes: 50e244964e9b ("bsdinstall/partedit: Replace libdialog with libbsddialog") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53639 (cherry picked from commit 4e36942420712c2ab6ebc2c646e61d47b2b68e7b) (cherry picked from commit 980aa8d4cfdf57a1f99401fa4160c0d82c927d7c) --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 5c4ec5706c1c..b598d4cb8bcb 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -139,16 +139,16 @@ newfs_command(const char *fstype, int use_default) } else if (strcmp(fstype, "freebsd-zfs") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "fletcher4", "checksum algorithm: fletcher4", + {"", true, 0, "fletcher4", "checksum algorithm: fletcher4", "Use fletcher4 for data integrity checking. " "(default)"}, - {"", 0, false, "fletcher2", "checksum algorithm: fletcher2", + {"", false, 0, "fletcher2", "checksum algorithm: fletcher2", "Use fletcher2 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "sha256", "checksum algorithm: sha256", + {"", false, 0, "sha256", "checksum algorithm: sha256", "Use sha256 for data integrity checking. " "(not recommended)"}, - {"", 0, false, "atime", "Update atimes for files", + {"", false, 0, "atime", "Update atimes for files", "Disable atime update"}, }; @@ -188,11 +188,11 @@ newfs_command(const char *fstype, int use_default) strcmp(fstype, "ms-basic-data") == 0) { int i; struct bsddialog_menuitem items[] = { - {"", 0, true, "FAT32", "FAT Type 32", + {"", true, 0, "FAT32", "FAT Type 32", "Create a FAT32 filesystem (default)"}, - {"", 0, false, "FAT16", "FAT Type 16", + {"", false, 0, "FAT16", "FAT Type 16", "Create a FAT16 filesystem"}, - {"", 0, false, "FAT12", "FAT Type 12", + {"", false, 0, "FAT12", "FAT Type 12", "Create a FAT12 filesystem"}, }; From nobody Wed Nov 12 15:48: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 4d678v4svRz6G9vR; Wed, 12 Nov 2025 15:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d678v3BfDz3F2S; Wed, 12 Nov 2025 15:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TgjEY4LaakzOrvE/crBKTLP3Ur2txL0NmDEZpzbz7E=; b=l1BB9CeJdBQqxkN53ky/hHIZlddZeNm/dJIp/6XUMTc4lkD7Vyd40S0h+yVSiH9Ytp6yf3 Sow5qGTtu0T17tR2rMPkzupQnuG+Xi/2lbtpVgWPwMjkYdriqZjlnweCtGCgVpSICtvBfy syQ7MPRnPMBLfWOF5YPIiJO5ll/ewW+jxzWYIZr/hOwabmW2uEZoShoUXYD0CmCxsMv5I1 XJgtQWnpxlE5N7E1IDbSGVaoFbQq4J83YrhlBa2Y+R8QahiKMwn8sOXQ14moolj4oKwbC1 IFJhrnzJNeDvQBfB4AebmIhyEgNXHV/AEfAi9hGT6sTnsoxNUhQe0pbnZiqy4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762962495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TgjEY4LaakzOrvE/crBKTLP3Ur2txL0NmDEZpzbz7E=; b=JVUh9JMAxdd+P0REXYM47k/gdBQgYnRDFZhKFWRjihEdBWFBsnKbTx3Ru/WAJwKfEG0Gub X5ZqXD/TULEUHoJcscqwx51OZaiWPWVCIV7ILe8cY8acF0UQ0PgJfZMIERdDw5Yo8rPOcl apVST3Pv1SNUwi9Xa527cN9g4LZEBV6gY/+1LwTegNUX1Mc5FK6NioXq5ZC5bX/Le6Rqon sDLH3EDAVC8mrCXK6Qcv5ZeueHGkFT03NCtclfd5+GUs9VQJO4dm0wA27W023lWz6W9mBw o2K9ASwI03/I/pdU6wQ1rZaiWDRBkRePluruvx3Ck43KRtHK+usVDLyXZVhnwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762962495; a=rsa-sha256; cv=none; b=wZOpas8JN/wwPGAaCuXL8lH1hoNzuZnla/Vz/XSDcuEuq/uCmo/ogdSn0gcc6UuTbJplBp CM/6coUZQXtAx2TD+ucc4pwAtUNeCzFqb6UDTwnjKk+MFpQb1UkKBy/rrNwmEVmwrUrz1Z URv0dB3EYJRABAqkGJYpcDHspOdXbJHml8PzHkMSG/KjPD2Gep/KcUrrP+vJV+vrcdyim/ otNjw7kFeTbNkhTMRvTKRUPw3oQfJA57Dhf6zBNBOrzsQJ9Yb+J6eVbo1NyiHHo5IjjkuS NHgejyN12x8dGb1c+G5z0HGahYvkr1AUPBTOd9XzCp0J4jUuVdd6oGQ/TKXozQ== 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 4d678v2gd9zhN1; Wed, 12 Nov 2025 15:48: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 5ACFmFcI059131; Wed, 12 Nov 2025 15:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACFmFZ9059128; Wed, 12 Nov 2025 15:48:15 GMT (envelope-from git) Date: Wed, 12 Nov 2025 15:48:15 GMT Message-Id: <202511121548.5ACFmFZ9059128@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: ad17166c57bb - stable/14 - bsdinstall: Use fat32 EFI system partition for ZFS 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: ad17166c57bb0ccd683b3136c170d8f66304d5b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ad17166c57bb0ccd683b3136c170d8f66304d5b2 commit ad17166c57bb0ccd683b3136c170d8f66304d5b2 Author: Ed Maste AuthorDate: 2025-11-07 22:48:30 +0000 Commit: Ed Maste CommitDate: 2025-11-12 15:47:42 +0000 bsdinstall: Use fat32 EFI system partition for ZFS This is consistent with other operating systems and with bsdinstall's UFS config and with bsdinstall's ZFS config prior to commit 0b7472b3d8d2. PR: 290857 Fixes: 0b7472b3d8d2 ("Mount the EFI system partition (ESP) on newly-installed systems.") Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53642 (cherry picked from commit 4109cdf0f817162cf3032aa589dd180dfa910025) (cherry picked from commit 65e347d315449e8c28dbcb0c5bb64f79d822d024) --- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 387ff7c18091..a0a22656a493 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -216,7 +216,7 @@ KLDLOAD='kldload %s' LN_SF='ln -sf "%s" "%s"' MKDIR_P='mkdir -p "%s"' MOUNT_TYPE='mount -t %s "%s" "%s"' -NEWFS_ESP='newfs_msdos "%s"' +NEWFS_ESP='newfs_msdos -F 32 -c 1 "%s"' PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\"" PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"' SHELL_TRUNCATE=':> "%s"' From nobody Wed Nov 12 18:45:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6C5C3H37z6GQrj; Wed, 12 Nov 2025 18:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6C5C2D4Qz3fYV; Wed, 12 Nov 2025 18:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpZB6FIr3PIN9qQtdOz+u7hxkyKaIi31QdAFSBqUj78=; b=gkqAzTleRkZeBMkPWSZq80KXiEq+ZM0c6d/7keNm9t6zLbyUmE9O6oO/QaLGnNxDJGyrr0 F5bWSnSgiZGPZluMmvo/t7+jvw/I7WWfzb2iDhHxxBRH5OTQLsFjzyOyGLQmooj1SC8IC6 VnMuh4cdbn2/t2VSCje6bAUrzxyTuSyuEt/zRa3oOyxM4rGQYSVCj3o7gEe+Nsvl+rbw21 1CRxllsck5iw991RGECs5DHC5U/TTk9PfmzpfeePIbBetJj4wvfZ81EvPDg8cSZIIKiWW9 igj3JF1hXkXnhaABuGOMYZJMmD052v36dQWjSJM5WycZ8aoZhfRWIFNVC1oTyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpZB6FIr3PIN9qQtdOz+u7hxkyKaIi31QdAFSBqUj78=; b=wsQ6AG1bo5UuoQNFcIKowhCNgh1HFb8hzOAWJ/ZMGUHuMUbcHMYt5hJLq+BgCiA9mM5i/Q 5Y0YoekTqdLulmtGwm4Y8XEkWcEYn8IAe3gEfKWfILY6LBK4ulgGFtaRkBgoZ3Rhm79zbI Znlw28ZMxhhMWA8hbCyiNOguOVgwuRAzoalmCF/+jBHunmBUl/OGhEzfv8MjAPuPa9F48J cWPprOFCW/CxTeDtGYlUyEvCPRzEPzaQUTYhoXlumU0nqJsZVP3bD3mJi3vGpsywSjdCK3 yLOmrvkGIWrhr3hv1z3Vb4DT0mprU/4a+3FTmjgelnYDRjQym1bIuhsTIFbHkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973119; a=rsa-sha256; cv=none; b=iewUh5+rsQhP1MUYfnTvgvlpUKCYThns+Fg/K1DQuS/bAW9CB+W/qh5YRPBP7+pOCkaOhe N/2goXzluAoflzADmRWqWgS+OqCR1REAA2sO0PEELglOJUVOWtc9WUQtS0LbPZSox0tqtl 5blOookG3iLMh7F1oqVlFTBEUuK3GUgqp0hfhDwP+HbaOoxSNE9mUClY0/pCKWwyZbxTyM p0RArAMplK3oWrGz6BZ3rqtBcAUc/fdxYuq5+cDs2b0MXEv90OfftRMvfrkvu6pv5LNV9t xwUrGZiWs/BSLk2me0qOgNEGY2xsQdD47jBSWkeCxwByntwcHVxqVP/HHpGTUw== 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 4d6C5C1BWGzm7g; Wed, 12 Nov 2025 18:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ACIjJ40097302; Wed, 12 Nov 2025 18:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIjJRN097299; Wed, 12 Nov 2025 18:45:19 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:45:19 GMT Message-Id: <202511121845.5ACIjJRN097299@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: eee338692b02 - stable/15 - Azure: Fix image 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eee338692b02bdb763a8256fe720efb5ffa07fe5 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eee338692b02bdb763a8256fe720efb5ffa07fe5 commit eee338692b02bdb763a8256fe720efb5ffa07fe5 Author: Colin Percival AuthorDate: 2025-11-11 02:33:54 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:44:58 +0000 Azure: Fix image names We need to specify the correct image names -- *.vhdf, not *.vhd -- in order for them to upload. 15.0 candidate Reviewed by: lwhsu MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53684 (cherry picked from commit df84867e8af49437bdc76a0df41d78f5a362cd24) --- release/Makefile.azure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 09dcde6af636..577221ee3899 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -39,7 +39,7 @@ azure-check-depends: .endif .for _FS in ${AZURE_FSLIST} -AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhd +AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhdf AZURE_TARGET_${_FS}= ${OSRELEASE}-${_FS}${SNAPSHOT_DATE} azure-do-upload-${_FS}: From nobody Wed Nov 12 18:46: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 4d6C6X1zpnz6GR7P; Wed, 12 Nov 2025 18:46: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 4d6C6X1PTmz3g7T; Wed, 12 Nov 2025 18:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n40yyy4aoiQu8yEe5ug2dyXLNf9quHZBFQ+KYcy1Wgs=; b=qFYudUlmBZxfY3B1hOKOt3f5Wm857IP+dPDNVLOxNvaNiftfW4MosTsPnvLNMVzE4ou7Uf QKy615ed86LuHcZzC2owIXh0ph4QHYnKxAX4SXYxMfS4vEVFE2sWLlt92tLE2JB6QGszHO X7hCCWcNeMoBJ4k/v2zu732SdN9C95KPEuqox5HueCKZ8N0qDMoUtODWNSjj0eguxkuhLe JJtQ6EVOLcbzN/kqe//KiYN54tXoma5JaUynZY1ph4QWRRVKVNTN8qaeFuhFRmNzIGqAqk LX3CYg37BgZ8df0hQdZlMIUmQt+DzsqcbRFMkXbrCPA/hs/+K4QMLzdg1hs7PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n40yyy4aoiQu8yEe5ug2dyXLNf9quHZBFQ+KYcy1Wgs=; b=A5NjJo1BAvT9Hr39Z1SfAYpObY19lI72iU3gtSlkxTCvakBRTY3cUQm4Mpp30EcxDDLFxk gWiapc3lVCFsBA0f/VovV0EjwJdCZSuZCsdBYUQuwpqXdv1iRP5barb5ms+zatV8DjWgHj pquo9Er5u+6AhCM/JdkJweAor/osPP4TXOtSLpxEiQ4oGBo5hkOTsRO6FNesOiKksdu+cl NxF97hVZiVv5UMjG+uWUTt8P3q9oMStuQZrBwy+sYxpvgGXIXN81+r4I4xhTugnOP8nu6S XGMRJF/D12K49k5ATlkRX2PJci0feYI5ixvSrQPZMB/LmhwarmlliZBojFpyQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973188; a=rsa-sha256; cv=none; b=QSd8cyC1LQoa69cZUr9R0TBLsjmr4dBwwfIAYi2N9HWigw9hdQW6LxggXT1V6z5ABnN2X4 8Iw5hT7xshimD2/OLEt92K9pvwTc5RNxCEgsENVmNnooLXwN3w1JmWG5NibZ+oCQaM8b+h 7VktfhIKeHyM966qv8Et0gtvGW9FDYHLtLx9brH8oCo8a0avxwlX53wCjikY3qpaQwSgHh ZU92oespFNobtjylRdnkYsbqBHjRSMOZATrTa057JVOtCcRFXP4U2ecLQEFUkxqTnS1uPm dGQIWCX+M+U5qEmZJHzzottQorh/vJQ8ImQRT78qSRvGLQhmZyqQBNcprAH8sA== 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 4d6C6X0wV9zmgG; Wed, 12 Nov 2025 18:46: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 5ACIkSSK097748; Wed, 12 Nov 2025 18:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkRbG097745; Wed, 12 Nov 2025 18:46:27 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:27 GMT Message-Id: <202511121846.5ACIkRbG097745@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: bd4cf77ba2bb - releng/15.0 - tcp: drop SYN ACK segment for listening sockets 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: bd4cf77ba2bba0b0f3849cf8c299fdb5f81bf6a9 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bd4cf77ba2bba0b0f3849cf8c299fdb5f81bf6a9 commit bd4cf77ba2bba0b0f3849cf8c299fdb5f81bf6a9 Author: Michael Tuexen AuthorDate: 2025-11-03 10:50:49 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:02 +0000 tcp: drop SYN ACK segment for listening sockets When a SYN ACK is received for a listening socket, just drop it instead of killing the SYN-cache entry and send a RST. This closes the possibility to kill a TCP connection during its handling in the SYN-cache. Approved by: re (cperciva) Reviewed by: Nick Banks, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53540 (cherry picked from commit 239464e99321ede07664782426ec4e54cd8a618d) (cherry picked from commit e082156ae14b6717f08dccfff62d1fcbb3b26487) --- sys/netinet/tcp_input.c | 5 ++--- sys/netinet/tcp_syncache.c | 17 ----------------- sys/netinet/tcp_syncache.h | 1 - 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2146b0cac48f..9c58c2815d13 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1192,11 +1192,10 @@ tfo_socket_result: if (thflags & TH_ACK) { if ((s = tcp_log_addrs(&inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Listen socket: " - "SYN|ACK invalid, segment rejected\n", + "SYN|ACK invalid, segment ignored\n", s, __func__); - syncache_badack(&inc, port); /* XXX: Not needed! */ TCPSTAT_INC(tcps_badsyn); - goto dropwithreset; + goto dropunlock; } /* * If the drop_synfin option is enabled, drop all diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 57aeb86f6351..a6a39b760a47 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -712,23 +712,6 @@ done: SCH_UNLOCK(sch); } -void -syncache_badack(struct in_conninfo *inc, uint16_t port) -{ - struct syncache *sc; - struct syncache_head *sch; - - if (syncache_cookiesonly()) - return; - sc = syncache_lookup(inc, &sch); /* returns locked sch */ - SCH_LOCK_ASSERT(sch); - if ((sc != NULL) && (sc->sc_port == port)) { - syncache_drop(sc, sch); - TCPSTAT_INC(tcps_sc_badack); - } - SCH_UNLOCK(sch); -} - void syncache_unreach(struct in_conninfo *inc, tcp_seq th_seq, uint16_t port) { diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h index 37f6ff3d6ca9..c916b4de6ae0 100644 --- a/sys/netinet/tcp_syncache.h +++ b/sys/netinet/tcp_syncache.h @@ -45,7 +45,6 @@ struct socket * syncache_add(struct in_conninfo *, struct tcpopt *, void *, void *, uint8_t, uint16_t); void syncache_chkrst(struct in_conninfo *, struct tcphdr *, struct mbuf *, uint16_t); -void syncache_badack(struct in_conninfo *, uint16_t); int syncache_pcblist(struct sysctl_req *); struct syncache { From nobody Wed Nov 12 18:46: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 4d6C6Y4D0lz6GRCM; Wed, 12 Nov 2025 18:46: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 4d6C6Y2Zkkz3fvF; Wed, 12 Nov 2025 18:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mNw2EAZ3thz40b8V5o/GvuAOaTWdcVRDn+M1gswlI1g=; b=uKk00fWupHwUnUpuCPqgl97UxSu3vMrghbkVONkiSntSXOrxb1cM0t7IHgaiDShfOo1Pcy Y4+sQaDTR+cUrjZcVNwUI3+6wzKDsTsrrCwITML4C0ItdHiQejN+Mgyutk3LHAOcIEA1fc HfUv0aqjwrfBSTRcHAEvk4aNmZ3CXY4GaxoZlaQgdnjWeLfLUs/Ew8Zay03nZD+Rn1WmTp f9HnLIAxj41Qbf0QUX+DF+RxXAgOlM46RdUYkHQpP1vDMgz/CknghM2d0kkY0e2hRq3eY0 Q7rA1Zix6Jsa6HyUhvNYKFlwyFZyX9Q25xlJfd40TDLhVL5xVCokxpIuWxDJwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mNw2EAZ3thz40b8V5o/GvuAOaTWdcVRDn+M1gswlI1g=; b=dJcxFj+zcLPERLK7iE2VspvBy43ihmc67l+3JTH9iJInGUkJLyI7vK3UtEF/2FzuB0EXb4 4LTEqF8oM1ALZgFqpr8OqKGJavxIHHL+LMdcIY4sIJl1pS+Vv8tQpomnBgmo7Bsr9ul33p KE5bEvf6aLB1x+p60lrH/irNgW6XApra8CpRSXMmFNpI5eOHn6QZrUVKNbnqRUaS8M3yhB w64jPIlxutby3aNBWjBmRKCSgwYl5djUrAE0ZfOUy2RR0sMrCVG8zg59sCoPDkTTELC9Wy e5mO5s+4dPtOSfsRtEv9BPQNGNl4zsheeLG5fJKO8lPntWfxP8b70xVKoNYdgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973189; a=rsa-sha256; cv=none; b=EIDhDPpMxPXe1TQLeeyDUYiYXdAvZ5KRtJOKOLb6WoaLU3nY8HZL8o+R9iSdzjLss4+gqx W7zhys91ECXnXVxtBohQdPZjk41v6T9k75IFWRwyeFZJBPYcD/KwSjtdDOJWZamk42PaR6 ErbFr8VNYhg/rOo4Aku+O9nIuQzBaanjbto+Yg5YlVRa3TP7+VHSIic7iZ8kXaap00Sb9g kL1znzf9218xf9jGIn+K74ydhVt/Ko7ZaTQ9j+jS+d4ONHsd6CxA94j6o1aD+fIslRc9Ga Cgo+UgqaJuEjQRvojYui51FmTpxxOCQmA4P8rNNVdm+b9Mhkx5hyzpOqdAhepA== 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 4d6C6Y1xk6zmgH; Wed, 12 Nov 2025 18:46: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 5ACIkTIw097781; Wed, 12 Nov 2025 18:46:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkTqS097778; Wed, 12 Nov 2025 18:46:29 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:29 GMT Message-Id: <202511121846.5ACIkTqS097778@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: b91bf9f0e2c4 - releng/15.0 - vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: b91bf9f0e2c4aa60b172f75e3065e103781da3f4 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b91bf9f0e2c4aa60b172f75e3065e103781da3f4 commit b91bf9f0e2c4aa60b172f75e3065e103781da3f4 Author: Michael Tuexen AuthorDate: 2025-11-10 15:28:04 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:06 +0000 vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID According to section 5.1.6.2.1 of version 1.3 of the virtio specification, the driver MUST NOT set VIRTIO_NET_HDR_F_DATA_VALID in the flags. So don't do that. Approved by: re (cperciva) Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D53650 (cherry picked from commit 836b3cd9d7910aff5225e9e58189067ca03fae30) (cherry picked from commit 0ef06b5bccf43ca807e237122746dec122600157) --- sys/dev/virtio/network/if_vtnet.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 471c6b3714b2..a61b0aac0bfa 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2505,10 +2505,6 @@ vtnet_txq_offload(struct vtnet_txq *txq, struct mbuf *m, hdr->csum_start = vtnet_gtoh16(sc, csum_start); hdr->csum_offset = vtnet_gtoh16(sc, m->m_pkthdr.csum_data); txq->vtntx_stats.vtxs_csum++; - } else if ((flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) && - (proto == IPPROTO_TCP || proto == IPPROTO_UDP) && - (m->m_pkthdr.csum_data == 0xFFFF)) { - hdr->flags |= VIRTIO_NET_HDR_F_DATA_VALID; } if (flags & (CSUM_IP_TSO | CSUM_IP6_TSO)) { @@ -2622,8 +2618,7 @@ vtnet_txq_encap(struct vtnet_txq *txq, struct mbuf **m_head, int flags) m->m_flags &= ~M_VLANTAG; } - if (m->m_pkthdr.csum_flags & - (VTNET_CSUM_ALL_OFFLOAD | CSUM_DATA_VALID)) { + if (m->m_pkthdr.csum_flags & VTNET_CSUM_ALL_OFFLOAD) { m = vtnet_txq_offload(txq, m, hdr); if ((*m_head = m) == NULL) { error = ENOBUFS; From nobody Wed Nov 12 18:46:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6C6Z6gQ8z6GQt2; Wed, 12 Nov 2025 18:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6C6Z3Pctz3frW; Wed, 12 Nov 2025 18:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2WAN4N363p5bfDZywXiO4lkHdoJP5wNCzhiKMTfMoc=; b=hNXlu/8p9FpzZ2thlmOvQXi4tnbL7KEYyAsAg1gzFV45cFgojzAjv21IJk2tpfcuBUQYBb hpbl4fRZqMwJliBSbmzjV6qnJpzxaLly7WydLNyhIgKo+/nu3/R+mnU0v6DlMG6UngZ+LX DKGvRJUg0TIxX7vmMmkahuo9diEmQ9B0TYbhrtsECKMaTkSCwhdDtwflb8tNgcqSHrsJsH o91aKr9j27SxoMxrFwu0RbQiZon0mI8R26swsHFB5ckV/RtH0Ojq/2PIJsOeQ8rmzGRk4r JJFpHAW2hU3eXqMHRqHA3vok3qUyDQ2u3iDuGx4rx2pHmTd4CH2yMQ25feXwmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2WAN4N363p5bfDZywXiO4lkHdoJP5wNCzhiKMTfMoc=; b=f8zvyN5c2+Oz2LngvhZiVN6wy+zIebADfJl/H3sggMH2kStL6UuEo+dxlmEkFNBqsDL2FB WUCIuNBg9eOFQLZm7fkyqg1dZngLD2d+gDiLUwyImkWR9/HvZn2V8RF3JOpMvNtxvN1p7g 6M1y9y7sMGVylSwK8oon0S4kL5nj8SzYW9R8faTv8MbHl+QRMpnUgx/iWuNTEmTFR/nGrD kKQdT2VlBtagdfzIz0fcpmk4oWRaIqiRvCPT8svkGPIwu6LEUWeLZEzXiGnQFZGaQtzjH0 SRgKQTnGyVE96LHQtlbnNuwU1POGEUc7CzKO6Ha5XM1M0Hz1aMHRytrgqaKN1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973190; a=rsa-sha256; cv=none; b=m5dmoz5cYfqFtfjYi7hJKg3Wmj3/biuMdEZOvCnNVUZhpkjbuiMGcP6SZ0FBwSMFv0cEOd vYz0eWc/r1OTK0OwO+cJPzRjW9LfCzpRiWACD8ii7MsqjpgY/5s5+WavH0oxWz000rZjRo Em4CbqolG09jT7MasAHxMYWJ/YmkO+jJDJhH89wA37h6C+nBjV21AS313nwGAXsGwIFLJn ElHOaOL2Sdl2jgQH3OYX6V+dGmKR83ceE7NfA6e1cf2bK0WW7x5PLn7JcGA0XJpNcOvrym B4ieD0b9sWmnvlzBgT2HV4n5YJ9antuuh+Ou1zmizEyqa5KhXq0FSor7qNrB+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d6C6Z2FRPzmgJ; Wed, 12 Nov 2025 18:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ACIkUfl097821; Wed, 12 Nov 2025 18:46:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkULt097818; Wed, 12 Nov 2025 18:46:30 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:30 GMT Message-Id: <202511121846.5ACIkULt097818@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: c50312b774e1 - releng/15.0 - vtnet: fix enabling/disabling tso 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c50312b774e1f26e90d743ad7e02072738923a03 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c50312b774e1f26e90d743ad7e02072738923a03 commit c50312b774e1f26e90d743ad7e02072738923a03 Author: Michael Tuexen AuthorDate: 2025-11-10 15:34:53 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:09 +0000 vtnet: fix enabling/disabling tso Transmit segment offloading depends on transmit checksum offloading. Enforce that constraint. This also fixes a bug, since if_hwassist bits are from the CSUM_ space, not from the IFCAP_ space. Approved by: re (cperciva) PR: 290773 Reviewed by: Timo Völker Tested by: lg@efficientip.com Differential Revision: https://reviews.freebsd.org/D53629 (cherry picked from commit 4c50ac68166caf7e08c5a9984d63fa91490fa50d) (cherry picked from commit 0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8) --- sys/dev/virtio/network/if_vtnet.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index a61b0aac0bfa..d9daa5bfd70a 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1346,20 +1346,40 @@ vtnet_ioctl_ifcap(struct vtnet_softc *sc, struct ifreq *ifr) VTNET_CORE_LOCK_ASSERT(sc); if (mask & IFCAP_TXCSUM) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM && + if_getcapenable(ifp) & IFCAP_TSO4) { + /* Disable tso4, because txcsum will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO4); + if_sethwassistbits(ifp, 0, CSUM_IP_TSO); + mask &= ~IFCAP_TSO4; + } if_togglecapenable(ifp, IFCAP_TXCSUM); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD); } if (mask & IFCAP_TXCSUM_IPV6) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6 && + if_getcapenable(ifp) & IFCAP_TSO6) { + /* Disable tso6, because txcsum6 will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO6); + if_sethwassistbits(ifp, 0, CSUM_IP6_TSO); + mask &= ~IFCAP_TSO6; + } if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD_IPV6); } if (mask & IFCAP_TSO4) { - if_togglecapenable(ifp, IFCAP_TSO4); - if_togglehwassist(ifp, IFCAP_TSO4); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM | IFCAP_TSO4)) { + /* tso4 can only be enabled, if txcsum is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO4); + if_togglehwassist(ifp, CSUM_IP_TSO); + } } if (mask & IFCAP_TSO6) { - if_togglecapenable(ifp, IFCAP_TSO6); - if_togglehwassist(ifp, IFCAP_TSO6); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM_IPV6 | IFCAP_TSO6)) { + /* tso6 can only be enabled, if txcsum6 is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO6); + if_togglehwassist(ifp, CSUM_IP6_TSO); + } } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6 | IFCAP_LRO)) { From nobody Wed Nov 12 18:46: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 4d6C6b6spMz6GQt5; Wed, 12 Nov 2025 18:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6C6b3zHsz3frj; Wed, 12 Nov 2025 18:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBKpYymIY9fiZllTNcVxGP4PCd8EP0rs6izdD+In8nQ=; b=k4yGMMF8CVq7vonJsPpnf4g4Pwsf+zw5YRn+Z1PYVELo4dzb1Q1M3SH44rOrB2ABkb6eCe v12WhtOBbGhj0+BbiJVW0vFFPuy5GVRM/a+bC/QPF+ytxwQjSmUZxKWrT8KXXgxSDtjTAS Jc9Mz1flxjUlBpDmROeKk20hiDOX5XkXAM0VwsoR2L2JJsKyCoH8IdXcuCz5V/8Zn2Ygju USm4YGE88IauMbcfvzK3TcKOaW44aj7r6GDP1fxtY5PQREp5Fh8oIZ0+ONtj/hNE72XEdx d4mxCvbS0PyjsqiI0Wuou4wAmyS8nNErzLJFdui9RB3fBbwNhMixRGdqMKamkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBKpYymIY9fiZllTNcVxGP4PCd8EP0rs6izdD+In8nQ=; b=dCjgrWQHMI6NXPUVIW13dMrC1DMuT4MJGj/Q6fWyRkBi0IhCwDlIB8oCb10Rxs0I2ueQdu ntJT7mE4LpawBCXfjidmdsAkaQuM/Naeug82hFbh+Jkw3VcjHTbq3b/4YgPpmOI0Ti7y8m gTrghS/6ScErQXHvFBPSr2plcal+eBRStj9fc/QVATsruxXFociWwR6o3c/5aVc8DI3kq9 5TJ28NYsDLhreyBm+YBwcJy4+EVI+vYSWI3J33Y1sVM57a29j8B8otDpMFWzmbCER57ydi nDbhoCjNEuA0OT1Z6tZgSQkikmQj9urQbzDK45QYZvxSSRPAjxuq5lfN86hH2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973191; a=rsa-sha256; cv=none; b=GlhhNGrfUg6AbC5UDilZEn5dUTOV6q1XB+Y37YBoVWNXijuG3GSkTpLEX9R6Vx0S8ZODCN xzAr7jKtSLNlqjbm/W2zvQAFjfWCxQ0V86pWPQUf6lc4wZWqXfamGg3Vwup1Wku6WcBKMx JuqL18cE9EGdHCPrXzEo/PRprJwAw31NW5QcMVlrqV1tOowUW2IOJGdf1pr4QlCdswiKDF gQM1uRfIoh3D/pjNkRiQKFfXW0MyU+kbj4LsIzHapgJChmDP6+lpu1nCiOMwYfaJ4kLx3x 4d+ZQoc8CtOtPXmhfLuRW2qiWnnYldfmBjzjZV4OxWVoK2Har15+a8kaba29fg== 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 4d6C6b39Cnzmtl; Wed, 12 Nov 2025 18:46: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 5ACIkV0S097854; Wed, 12 Nov 2025 18:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkVXi097851; Wed, 12 Nov 2025 18:46:31 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:31 GMT Message-Id: <202511121846.5ACIkVXi097851@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: c5977a934c6a - releng/15.0 - bsdinstall: Use fat32 EFI system partition for ZFS 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c5977a934c6ac4f8a6483829486a489aec6aacdd Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c5977a934c6ac4f8a6483829486a489aec6aacdd commit c5977a934c6ac4f8a6483829486a489aec6aacdd Author: Ed Maste AuthorDate: 2025-11-07 22:48:30 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:12 +0000 bsdinstall: Use fat32 EFI system partition for ZFS This is consistent with other operating systems and with bsdinstall's UFS config and with bsdinstall's ZFS config prior to commit 0b7472b3d8d2. Approved by: re (cperciva) PR: 290857 Fixes: 0b7472b3d8d2 ("Mount the EFI system partition (ESP) on newly-installed systems.") Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53642 (cherry picked from commit 4109cdf0f817162cf3032aa589dd180dfa910025) (cherry picked from commit 65e347d315449e8c28dbcb0c5bb64f79d822d024) --- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 95cbba3fa131..8d1fb4148244 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -216,7 +216,7 @@ KLDLOAD='kldload %s' LN_SF='ln -sf "%s" "%s"' MKDIR_P='mkdir -p "%s"' MOUNT_TYPE='mount -t %s "%s" "%s"' -NEWFS_ESP='newfs_msdos "%s"' +NEWFS_ESP='newfs_msdos -F 32 -c 1 "%s"' PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\"" PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"' SHELL_TRUNCATE=':> "%s"' From nobody Wed Nov 12 18:46:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6C6d0YwVz6GR7Z; Wed, 12 Nov 2025 18:46: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 4d6C6c4wZFz3g6J; Wed, 12 Nov 2025 18:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKb8aliKx7OO/4nRGf25exPVSCDesTNRHThmjhtv6Oc=; b=i6nI1mcnro+y40Bu2uo36Lh708+2ur0URApPVcIgk1rV3sJSmPIJ7aIlPsYyqRw1obNIJt 37tiC313GxEiCTQeFZHxZSAcU1Gj1+QCc6jwQ12/75zoZM+bjnIIfNtl81eUtMrjgranPr A/v/1KUylJzvQC03UgEjOe5UfuRciA8h7JAxuX8eQjjPq1nrDjSDEuPD6jxgsMLF3gLCXY j5sLS0XZroNV6qIb7v/Jnll+LPdRdyIhVeU/dK2KKdAb+LA3ThaLWFdDmuBZaOK27HMRb4 kS/eGW1YQs6dBUBqY/olBubiAUMl3713HWW7+EvGedP3Y3ehppYYQf+efs0e+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKb8aliKx7OO/4nRGf25exPVSCDesTNRHThmjhtv6Oc=; b=V/5YVtuX6Mhr0aFKI9gUA64fc38a/1feRC8aJE+6Pk2eWmhp1lkwqsyfzSIoIbLMpt9Uyg 7uXomgtxmo91q5yrN3xJKfXo4VQaRUrhCozGwUsSiEgBCXwcbqwRWSTWHOGo8yssywj2yd oS5GdGggGg1QDFj2eWxheXcipG2wcf/j57RB4dox+pv/ghY0S+LBbT1eZsj7PWboZRETIA TMbk3V3pgTEq812EXheD11Aa9IE1gCyneWzbn8YF1fWmnYq1tnjKqEe4k8aK5U6523ZDkA qPxFqT5s1QxIk77mGzdHKAoh6SR74NkiREGTCpywRPt5CUvbja0mmMHXDotiCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973192; a=rsa-sha256; cv=none; b=R7NVhyLpz/IA4nGsMYSHbrQYztbIiRomSR/J6U6jDWyK7fzvMOTIXNseRJgRMnHuft/UA1 Sb2WfFe/pPwZGQxEg7USQKSFIkbCJ/H/WMVR09rPCb3TjHl/h7/3N5JnilcCAlZAvbWiuK K/qgaxbB/nia8288dFBzUPgmu+K6WIcx18SKs7oePpb33bpMi1E9PzHv1cNfplviRiso87 MelJcj1tG9Zy8XF6aEUOKSOzoi826Ej9AOUXN9fI8am8s4TKN2ti4ih6XqGN88utbnNL75 m/kp++GDAVMtJSyVTfBzSL9chz422V/YTYDOpbhdS7gtwj2L+779/DMCUA31Lg== 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 4d6C6c46sxzmhw; Wed, 12 Nov 2025 18:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ACIkWoS097888; Wed, 12 Nov 2025 18:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkWCl097885; Wed, 12 Nov 2025 18:46:32 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:32 GMT Message-Id: <202511121846.5ACIkWCl097885@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: f490eae83f7f - releng/15.0 - LinuxKPI: 802.11: clear CONF_IDLE earlier 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f490eae83f7f90de8be5d1dea593227dbfb98f36 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f490eae83f7f90de8be5d1dea593227dbfb98f36 commit f490eae83f7f90de8be5d1dea593227dbfb98f36 Author: Bjoern A. Zeeb AuthorDate: 2025-11-10 19:41:08 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:14 +0000 LinuxKPI: 802.11: clear CONF_IDLE earlier When starting to scan and ending a scan we clear/set the hardware to idle. Similarly we set the hw to idle when we remove the channel context but when starting we only set it to non-idle when we went from assoc to run. This apparently was not a problem most of the time as the switch from a failed hardware scan to a software scan was racing against net80211. ad4ddc83ebf8 fixed that specifically for rtw88 and while we were more consistently scanning, this broke authentication as the setting of idle at the end of the scan was now happening reliably. Move the unsetting of idle from assoc_to_run to scan_to_auth for when we create the chanctx to keep it symmetrical. This makes authentication work again for rtw88 (though not for everyone due to other possible problems with net80211). This likely also fixes the problems in the listed PRs. iwlwifi(4) mvm and mld driver parts do not use this information at all and were never affected. Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation PR: 290850, 288186, 281979 PR: 272145 (the non skb-mem-limit parts) (cherry picked from commit b568711f8ef1afd7c86ea2d8bd2f94f399f54dc1) (cherry picked from commit a77abd53e83c4357ad8a8006a6e89759e65e3a5b) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0dc3b2631804..f025f191a3bd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2308,6 +2308,10 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int changed |= IEEE80211_CHANCTX_CHANGE_WIDTH; lkpi_80211_mo_change_chanctx(hw, chanctx_conf, changed); } else { + /* The device is no longer idle. */ + IMPROVE("Once we do multi-vif, only do for 1st chanctx"); + lkpi_hw_conf_idle(hw, false); + error = lkpi_80211_mo_add_chanctx(hw, chanctx_conf); if (error == 0 || error == EOPNOTSUPP) { vif->bss_conf.chanreq.oper.chan = chanctx_conf->def.chan; @@ -3081,8 +3085,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->in_mgd = false; } - lkpi_hw_conf_idle(hw, false); - /* * And then: * - (more packets)? From nobody Wed Nov 12 18:46: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 4d6C6d6sVMz6GQw9; Wed, 12 Nov 2025 18:46: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 4d6C6d5l17z3fs1; Wed, 12 Nov 2025 18:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kd/A/r4hcrK696sT7IkFhZGrynIBwz+BB+VZh9HqEQI=; b=hIxQpgrGlRLUa8OMgpg6jNJ1uMM7gpZ4kpLQfu62RmdpfuaCY7ufGiscZw248QF/r+rD6+ T/ZO7SFOV8b49VxGVqIpH98OIjah9m3USuKj3avr8C3JzgQE7W0JtBd8/cG+eJrj9InvMR tBdNx+dOExhcwQjGcs9nzSjqSt1fOq/ka7tQ1l09t1gKfF4uSrvbLcMstKJexe5R1Cf97v 5LiJ0nntSQbKFxfquFKhvJx0VlrgFYfT0PlFjEprGyKNk6njjFL/pyFecw1othW6pLereA C12MwCX5wjKZCtouSH04JeLiOiIs/1KSHUfzfNqxL5rhrLv5KOCu4W6AWS/GDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kd/A/r4hcrK696sT7IkFhZGrynIBwz+BB+VZh9HqEQI=; b=t0JBPorBiJ+bzlx5J0Po1u8uBeeS1nRNw5CsKPxKP1bpF07L8MmsjSiDjTYuVIrz/jwO/a JdmoPQz9gbhnYuAQGB6+ujdR2ak5z9GJzkaSq3rmH+P/dKMYROmZawZ4ZE8SgXSbMnNNec xINwsrkUuQNEyhe5ixLViXBQsfZL7UQ2msumLX/9P/5BsIHat5L/pWtXijQ6f1Sy/SXD26 r/rX5ENqroISpgbcdzB2joJd/iPS+Ve16O5znOhaxrhVxrPRc6unSO9HpLKA3Mi3Gv0g1M 3KzZXLbttwcto90QElN0DaaQ67wkWb1BVnUDBtpAXsOPFS6w0UmtbV9B8Fbq/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973193; a=rsa-sha256; cv=none; b=uTJio5CoamwpaEPRr0H29pkHtYrGg5xEcXRCDOdP8Qid0YM8RKJAfgkU0v9HaMd3FLKwtF bZM+Z1WkuKklcIWOEuwzN6bojlqtueZnNvEZwbWbuGu9SczeFj+4kZndXCBOXP3YBw+bLd UP8HgT1e8VoBfJ+ZeAmPs+rSmK1r6YbL61CUjMwq5+PPEsPpGh70N3xrvTx6cW832+PNPI TpHoG/AZFgcO1r1oyg4WfLfMaLSi0eptowW+MyuNTOE67JAoKY1tkYjXvu/zxApGCGqNGT EPVH8BOvMqIaNjZs+tUzT1vn1A0NVfvM+gU4Rn7baYTrzEO787awyA0rP8/0CA== 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 4d6C6d58Fyzmpn; Wed, 12 Nov 2025 18:46: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 5ACIkXNe097922; Wed, 12 Nov 2025 18:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkX4S097919; Wed, 12 Nov 2025 18:46:33 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:33 GMT Message-Id: <202511121846.5ACIkX4S097919@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: bee506b8833d - releng/15.0 - Azure: Fix image 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: bee506b8833db8794867dc22647638b38461036c Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bee506b8833db8794867dc22647638b38461036c commit bee506b8833db8794867dc22647638b38461036c Author: Colin Percival AuthorDate: 2025-11-11 02:33:54 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:18 +0000 Azure: Fix image names We need to specify the correct image names -- *.vhdf, not *.vhd -- in order for them to upload. 15.0 candidate Approved by: re (cperciva) Reviewed by: lwhsu MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53684 (cherry picked from commit df84867e8af49437bdc76a0df41d78f5a362cd24) (cherry picked from commit eee338692b02bdb763a8256fe720efb5ffa07fe5) --- release/Makefile.azure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 09dcde6af636..577221ee3899 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -39,7 +39,7 @@ azure-check-depends: .endif .for _FS in ${AZURE_FSLIST} -AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhd +AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhdf AZURE_TARGET_${_FS}= ${OSRELEASE}-${_FS}${SNAPSHOT_DATE} azure-do-upload-${_FS}: From nobody Wed Nov 12 23:30: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 4d6KPn75Y9z6Gmlf; Wed, 12 Nov 2025 23:30: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 4d6KPn6SWBz4Pm9; Wed, 12 Nov 2025 23:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762990205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBu2Cg7KXfEMwDWxalYl9yfpBJYXUTr4G3eWi57t6ao=; b=bvC8l5Vr+1NTUizvhjnLH/PSoSYvWiDgPPL8RIULQMesjLtuSTA78rORQrRQxVZCsWdhl+ 1TEl1wwLY1TONT3wrdT4A69MDEnuwi10yInY/FVWT63ky+zyC4qkqyxlieIFGQ84WzUWFv 5wAmDypfEksa1LbmFElJ0Ry1cpVSFCwcXqHCeXrKXQlB+TmmQVB6dBe0c2SjXOvHCoLqO3 DNWYgyk4UV4oa+JakXq4tBC993zlcHMxG8KTsc2NbBdXpb//2AN8zed9oCokh010LX6LCl f/Xsq3YFWzxyWWN8SuW3MnwoheNFxEe5xQfcWJSKUpdstJ4Gew6X6q5kK2utvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762990205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBu2Cg7KXfEMwDWxalYl9yfpBJYXUTr4G3eWi57t6ao=; b=CJCM+sY/gxC5MKFwpLJ4KnWKAMTwW2Wt2v90fGN7FeHoQqIlRVMUR9v22ma2x9TlhbfhLX tIGEwmfqpz14SBp4XtIo7bEZaaCHWX+no1A2z3fQEj8ExkZLj1caemUxlEb6Z5jwc+vyHY VBxyfyiW31m+8r5nGzKioMDDnQ/zClBEnPdGx6qCQEYJq6SKDQbRissM143h0HO9nOMAA4 LeTCyrzi+yXCrMRSzyvHgTeRJLAz3pZBZuxRDqQKVcItGYslmwtLa59IrTFNUKnhdRVAt5 9zLMHk0fxEoYe4ZIGaJjkTnQ4H5LdE/Ey79LmAYdRV9mUta3p2LmlhI+DK0vBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762990205; a=rsa-sha256; cv=none; b=FlsPv9MPjNR1Pvh/zf1JnQLru3AChmhMh/+iVz/G/yqx4o2RRAQDv8I8o2nFJ9hUdmli/K wPQZ5ON0i9EaAuJa6WzWircSKoyhU5P1tywrIymDwFjIaB3vPPrg4FZhvEF8oMwUc9zGGB QtHP79F2WR+t+1+kY23nobhFsSaSnaZQSS+r0JkvfsPd03yJZ5e42AkH5cPmAzrOpfRtAb SJHC+/C8j6VnC5bLhewZkBnfud2JnHvinP1zKbn4X/ea4C2764kk2uMzWyP/nhUgNU15Io KgXBigljtJtqunHmHIf4dEk49Vd3Stdm3SaWkpkjvQsDIWu3exbdhKHY/Zp4GQ== 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 4d6KPn4mwMzvpV; Wed, 12 Nov 2025 23:30: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 5ACNU5Ke033787; Wed, 12 Nov 2025 23:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACNU52T033783; Wed, 12 Nov 2025 23:30:05 GMT (envelope-from git) Date: Wed, 12 Nov 2025 23:30:05 GMT Message-Id: <202511122330.5ACNU52T033783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ac562a719ba0 - stable/15 - libpfctl: fix error handling 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ac562a719ba0b3fe83d1c86387b8b0c23c147aaf Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac562a719ba0b3fe83d1c86387b8b0c23c147aaf commit ac562a719ba0b3fe83d1c86387b8b0c23c147aaf Author: Kristof Provost AuthorDate: 2025-11-03 13:55:44 +0000 Commit: Kristof Provost CommitDate: 2025-11-12 23:29:36 +0000 libpfctl: fix error handling In two cases we returned E2BIG where it should have been a boolean ('false'). MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 9bb1c46b4c38c44565fc24f13acdc19b0cb5a1c4) --- lib/libpfctl/libpfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index fbf9796d9887..8dea373d8941 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1484,7 +1484,7 @@ snl_attr_get_pf_rule_labels(struct snl_state *ss, struct nlattr *nla, bool ret; if (l->i >= PF_RULE_MAX_LABEL_COUNT) - return (E2BIG); + return (false); ret = snl_attr_copy_string(ss, nla, (void *)PF_RULE_LABEL_SIZE, l->labels[l->i]); @@ -1554,7 +1554,7 @@ snl_attr_get_pf_timeout(struct snl_state *ss, struct nlattr *nla, bool ret; if (t->i >= PFTM_MAX) - return (E2BIG); + return (false); ret = snl_attr_get_uint32(ss, nla, NULL, &t->timeouts[t->i]); if (ret) From nobody Thu Nov 13 01:39: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 4d6NHd0l4Jz6Gx34; Thu, 13 Nov 2025 01:39: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 4d6NHd07xXz3T8K; Thu, 13 Nov 2025 01:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762997997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7AFivbO+lY5ejMyaSs1wONtc4tCCROD142LwIqJjZY=; b=Q6diu5UUGZDdzXNceNwp44vXuz6IcFOVYwYfWCYyn3mhoHvVdioFNwQvGdcK2yDX0kZ3yx VgEQ64qoHKzmTYtCqmWOFZQ3bRu6+G+/yi9W28U+t+NrXjfFqR8/JSukUviVB1UZQax5ZM RtS0cs3J5eS8tNJCR0nX1ZINPTR6oTTDpGBbp3LuykThKiuyWVvz9HynAj1hTE093sSShf nqZJ4Jdwmbr19GUiRJi3H4Phq+o2cbCxw3pYe0A1s38w3xgiWrVwagVME+9/kBM0QvhB2V vfZ/BMjymtWjOOaj/IGjqbycvbXixx3tNXU1jKPb/1UBOKB9wywd6acDpoJQDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762997997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7AFivbO+lY5ejMyaSs1wONtc4tCCROD142LwIqJjZY=; b=fHCdgIa4saLuRIS3O0sIe7FJvwKcCyastQttpfslVxzXTEKjkpYuRiLBfTNPUwhRQQfZGI DtTwcmU2L4Yu5Ovf6Nl+D0z1EfJMq2swTYngt0hbSqTE/Yggm4fDWpkoyX1zpPSvQvEDAI lnuqwl4p6DzmvcC+0V4nxsbXRUCDWIMQ+YxI/B6aYmz5qq534DOYezq3EkDIbgxLz05AJ5 dIwTFZ7k5hRN7cddKLA55XU0WG+xfojFtqeA2eLeKQZm7F6vffQgPJVLA2zNmzo5Hf6Vqe ypB2JFiwABSmX60yFrRFRH51QwLOsZbHeCEP7RKZ9WtDbgqUb7h7jL/F1oWTqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762997997; a=rsa-sha256; cv=none; b=Ynet/CNV5VzIdcv4Mm76LODI//sYnLgwZhsycf2NbKmODRgWzUGnngXYX9zwen+yCStYep n5X3cZda+/k7+kR4emaZWLDfdiufFRPCAf2Dy71FI65Ze6Y6nDGbSrW4BEdh2ugThAon8h AT5dqOrqZeQtvZjwpli13nJb9AysptBre+yjcA/ylJoN4/WwMTsuhmFwZDOcZr3mf3uT3c JwCQ5Snyamqfi5llbP0uAbOxgNiCcMyEGm6wEEHNQ0+PWPiGWWWAR/u2q1d235/8XQSTvg 14iXQP4p52qceVhVRMpjZ023MbvoPFHw9s2Hboqzpx54C2IDV7AJHeUmB+yYLA== 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 4d6NHc6rsKz10R7; Thu, 13 Nov 2025 01:39: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 5AD1duDi076777; Thu, 13 Nov 2025 01:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AD1duBk076774; Thu, 13 Nov 2025 01:39:56 GMT (envelope-from git) Date: Thu, 13 Nov 2025 01:39:56 GMT Message-Id: <202511130139.5AD1duBk076774@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: b991b25ed35a - stable/14 - makefs: Calculate indirect block count properly for large files on ffs 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: b991b25ed35a15ab03d61fabf4b7f2c3b1178982 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b991b25ed35a15ab03d61fabf4b7f2c3b1178982 commit b991b25ed35a15ab03d61fabf4b7f2c3b1178982 Author: Boris Lytochkin AuthorDate: 2025-08-27 18:49:12 +0000 Commit: Ed Maste CommitDate: 2025-11-12 15:47:43 +0000 makefs: Calculate indirect block count properly for large files on ffs When building an ffs image containing large file(s), space requirements were calculated incorrectly yielding a bigger image than necessary. The reason is that amount of indirect blocks estimation was done wrong: - single indirect block was treated as it can hold just 12 data blocks - nested indirect blocks were not taken into account at all Add support for indirect blocks and fix another tiny bug with underestimated space requirement for files with size between (UFS_NDADDR-1)*blksz+fragsz ... (UFS_NDADDR)*blksz requesting N>1 fragments instead of a whole block. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D52120 (cherry picked from commit 9ce29249ec5d7d1d0a9f5f7655e1b37d54622665) --- usr.sbin/makefs/ffs.c | 94 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 8c4b790f53b0..0e6d3075ed8d 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -593,6 +593,75 @@ ffs_create_image(const char *image, fsinfo_t *fsopts) return (fsopts->fd); } +static void +ffs_add_size(fsinfo_t *fsopts, size_t file_len) +{ + ffs_opt_t *ffs_opts = fsopts->fs_specific; + size_t blocks, fs_nindir, overhead; + int indir_level; + + blocks = howmany(file_len, ffs_opts->bsize); + + if (blocks <= UFS_NDADDR) { + /* Count full blocks. */ + fsopts->size += rounddown2(file_len, ffs_opts->bsize); + /* Calculate fragment size needed. */ + overhead = howmany(file_len - + rounddown2(file_len, ffs_opts->bsize), ffs_opts->fsize); + + /* + * A file could have just 1 fragment with size 1/8, 1/4 or 1/2 + * of bsize. + */ + switch (overhead) { + case 0: + break; + case 1: + fsopts->size += ffs_opts->fsize; + break; + case 2: + fsopts->size += 2 * ffs_opts->fsize; + break; + case 3: + case 4: + fsopts->size += 4 * ffs_opts->fsize; + break; + default: + fsopts->size += ffs_opts->bsize; + break; + } + return; + } + + /* File does not fit into direct blocks, count indirect blocks. */ + blocks = howmany(file_len - UFS_NDADDR * (size_t)ffs_opts->bsize, + ffs_opts->bsize); + fs_nindir = (size_t)ffs_opts->bsize / ((ffs_opts->version == 1) ? + sizeof(ufs1_daddr_t) : sizeof(ufs2_daddr_t)); + + indir_level = overhead = 0; + while (blocks > 0 && indir_level < 3) { + /* One indirect block is stored in di_ib[] */ + blocks = howmany(blocks, fs_nindir) - 1; + fsopts->size += ffs_opts->bsize * blocks; + overhead += blocks + 1; + indir_level++; + } + + assert(blocks == 0); + + if ((debug & DEBUG_FS_SIZE_DIR_NODE) != 0) { + printf("ffs_size_dir: size %jd, using %d levels of indirect " + "blocks, overhead %jd blocks\n", (uintmax_t)file_len, + indir_level, (uintmax_t)overhead); + } + + /* + * If the file is big enough to use indirect blocks, + * we allocate bsize block for trailing data. + */ + fsopts->size += roundup2(file_len, ffs_opts->bsize); +} static void ffs_size_dir(fsnode *root, fsinfo_t *fsopts) @@ -624,20 +693,6 @@ ffs_size_dir(fsnode *root, fsinfo_t *fsopts) e, tmpdir.d_namlen, this, curdirsize); \ } while (0); -#define ADDSIZE(x) do { \ - if ((size_t)(x) < UFS_NDADDR * (size_t)ffs_opts->bsize) { \ - fsopts->size += roundup((x), ffs_opts->fsize); \ - } else { \ - /* Count space consumed by indirecttion blocks. */ \ - fsopts->size += ffs_opts->bsize * \ - (howmany((x), UFS_NDADDR * ffs_opts->bsize) - 1); \ - /* \ - * If the file is big enough to use indirect blocks, \ - * we allocate bsize block for trailing data. \ - */ \ - fsopts->size += roundup((x), ffs_opts->bsize); \ - } \ -} while (0); curdirsize = 0; for (node = root; node != NULL; node = node->next) { @@ -648,13 +703,13 @@ ffs_size_dir(fsnode *root, fsinfo_t *fsopts) } else if ((node->inode->flags & FI_SIZED) == 0) { /* don't count duplicate names */ node->inode->flags |= FI_SIZED; - if (debug & DEBUG_FS_SIZE_DIR_NODE) + if ((debug & DEBUG_FS_SIZE_DIR_NODE) != 0) printf("ffs_size_dir: `%s' size %lld\n", node->name, (long long)node->inode->st.st_size); fsopts->inodes++; if (node->type == S_IFREG) - ADDSIZE(node->inode->st.st_size); + ffs_add_size(fsopts, node->inode->st.st_size); if (node->type == S_IFLNK) { size_t slen; @@ -662,13 +717,16 @@ ffs_size_dir(fsnode *root, fsinfo_t *fsopts) if (slen >= (ffs_opts->version == 1 ? UFS1_MAXSYMLINKLEN : UFS2_MAXSYMLINKLEN)) - ADDSIZE(slen); + ffs_add_size(fsopts, slen); } } if (node->type == S_IFDIR) ffs_size_dir(node->child, fsopts); } - ADDSIZE(curdirsize); + ffs_add_size(fsopts, curdirsize); + + /* Round up to full block to account fragment scattering. */ + fsopts->size = roundup2(fsopts->size, ffs_opts->bsize); if (debug & DEBUG_FS_SIZE_DIR) printf("ffs_size_dir: exit: size %lld inodes %lld\n", From nobody Thu Nov 13 04:50: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 4d6SWB1zQYz6GBBW; Thu, 13 Nov 2025 04:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6SWB1k4Qz3mXc; Thu, 13 Nov 2025 04:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763009414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mCc7l5L95xVfBR9Dz8A+y5YRPXrBaJw/X0QXjt5c/uE=; b=p6CtV3hQR8d/FlbsiYO1GR1hsPDiK/Qou7FpOpx2qtaGDI6w9owJPLaya7RXLkF1lxZ3Bf xOmAsm13STIkCuj3sy7m9aUistsK0JbX9YfIvhYpUt36TH9DA0Jb32wUHKLS14cOq6TZVg o3sCQZTTdtJbi9J+PMJkXm47WyDwWEpXX0qa4zZ55uo5NVCEOpnTKPQnhTMphQjdj3PPs2 tzAXKY9j+zFFrQtb8triR+HEuIMyKKBH2sgNhpI4TPmZcJG35V9rTdDQM4yG6IueL62+R4 1N39cWnl704bo4IN+75j3kFwrjboFzUPbqX/SiTGxx4vc//oQIkMKPtbTeAhhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763009414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mCc7l5L95xVfBR9Dz8A+y5YRPXrBaJw/X0QXjt5c/uE=; b=LzMxULxdCjSwdV5CZFJyrNaY3EOukmi4VjmMdYcgm5RPI0h/rEIep1BtBWwSxF03ElVSKq u6OLDmpvgFz662DJFcahh+Km5EXxRQI9dLHfV5v+6WaANkRMHBKWkidCK5SXzXyf6FTEc9 s7ZRjd6YUDc4eWTOwjqvDkMdv/4/sW0+oMdj0neSzMAdNl8m79GHZdsQc+AjlnVaDZ1P67 OC642skbTEFxIlPlrIVefw44HxtcPl2qZSHwvBMSmkwVundDF26pfClB2PsjwxOlXzS9fq F3IjmfNe4R6FpNAihhSOmTBxqLfvfnkqD2huc/YUOo4xpnf9qo0cYvUu6sZLRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763009414; a=rsa-sha256; cv=none; b=Na7bW9oS+RReFxV9Pz6pvICcEWerwB9PZobB1iDEp3PT2ehxBvgxG4ctB973T0XeSsz5co qTlOsbpdT5zHQAKLPGTJUzhQ1Ke0fFbhJcRanWXpLcjv3PNk9G3jD6zqkJWwI3NtjOYhqX dZU+v6FnnT0csQ05EuHYRBG6RHkncAoegKv7nqxp30ABsW523B0qVqlLy4qnE18ZcvuvJv uJpiq5yYrlvIXFHm3QtcPgc/CyTlC37xzEZul/cOqanabm4WfN4VZLeX9Ng3eEzQPerGhi 9408fyWeH1A+yjooIvn/9/JZqITFYQP68670QlhIyDHvwtQHDO2eiGmRHHLeQg== 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 4d6SWB1C9Rz15bc; Thu, 13 Nov 2025 04:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AD4oEVI041518; Thu, 13 Nov 2025 04:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AD4oElZ041490; Thu, 13 Nov 2025 04:50:14 GMT (envelope-from git) Date: Thu, 13 Nov 2025 04:50:14 GMT Message-Id: <202511130450.5AD4oElZ041490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: ca36afaf671b - stable/15 - MFV: less v685. 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ca36afaf671b776ee7b6c878c7b9c94852908dd1 Auto-Submitted: auto-generated The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ca36afaf671b776ee7b6c878c7b9c94852908dd1 commit ca36afaf671b776ee7b6c878c7b9c94852908dd1 Author: Xin LI AuthorDate: 2025-11-10 08:55:06 +0000 Commit: Xin LI CommitDate: 2025-11-13 04:49:16 +0000 MFV: less v685. (cherry picked from commit d5cb458b4b58b0f0b3c058a32439f232fd5455ca) --- contrib/less/NEWS | 39 ++++++++++++++++ contrib/less/ch.c | 4 -- contrib/less/charset.c | 48 +++++++++++++++++--- contrib/less/command.c | 40 +++++++++++++++++ contrib/less/compose.uni | 4 +- contrib/less/decode.c | 11 +++-- contrib/less/edit.c | 10 +++-- contrib/less/fmt.uni | 6 +-- contrib/less/forwback.c | 2 +- contrib/less/funcs.h | 12 ++++- contrib/less/help.c | 2 +- contrib/less/input.c | 72 +++++++++++++++++------------- contrib/less/less.h | 5 ++- contrib/less/less.nro | 110 ++++++++++++++++++++++++++++++++++++---------- contrib/less/lessecho.nro | 6 +-- contrib/less/lesskey.nro | 18 +++++--- contrib/less/lglob.h | 2 +- contrib/less/line.c | 106 +++++++++++++++++++++++++++++++++++++++----- contrib/less/lsystem.c | 2 +- contrib/less/main.c | 41 ++++++++++++----- contrib/less/mkutable | 21 ++++++++- contrib/less/omit.uni | 7 +++ contrib/less/optfunc.c | 18 ++++++++ contrib/less/opttbl.c | 6 +++ contrib/less/os.c | 51 ++++++++++++++++++--- contrib/less/pattern.c | 7 ++- contrib/less/screen.c | 30 +++++++++++++ contrib/less/search.c | 12 +++-- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 14 +++++- contrib/less/wide.uni | 8 ++-- contrib/less/xbuf.c | 2 +- usr.bin/less/defines.h | 18 ++++++-- 33 files changed, 596 insertions(+), 140 deletions(-) diff --git a/contrib/less/NEWS b/contrib/less/NEWS index cdc8196a5f16..442fe21e406a 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -9,6 +9,45 @@ Report bugs, suggestions or comments at https://github.com/gwsw/less/issues. +====================================================================== + + Major changes between "less" versions 679 and 685 + +* Add --cmd option (github #624). + +* Add LESS_TERMCAP_SUSPEND and LESS_TERMCAP_RESUME (github #654). + +* Change --incsearch so that after typing each character of the pattern, + the search begins at the position where the search command was invoked, + not the current position (github #640). + +* Allow mixing of option arguments and filename arguments on the + command line unless POSIXLY_CORRECT is set (github #653). + +* Don't output U+00AD and U+200D, and fix some bugs handling emoji + modifier characters (github #637). + +* Fix hang if a search using ^S modifier matches empty string (github #634). + +* Fix bug using -g and -J (github #636). + +* Fix bug when pasting a search pattern while --incsearch is active + (github #635). + +* Fix bug in Windows build when autorepeating a search pattern (github #639). + +* Fix lesskey bug using #stop directive. + +* Fix lesskey bug using "invalid" action (github #643). + +* Fix bug causing file to appear to end prematurely if an input command + was received during a file read (github #649). + +* Fix performance issue in & filtering (github #638). Problem was introduced + in da2a9ecdf16beb642d0c030e35f0351c5f2e5a12 and released in less-673. + +* Fix some problems reported by valgrind (github #659, github #660, github #661). + ====================================================================== Major changes between "less" versions 678 and 679 diff --git a/contrib/less/ch.c b/contrib/less/ch.c index 870028c73a23..fb7572e7f88a 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -283,11 +283,7 @@ static int ch_get(void) read_again = FALSE; if (n == READ_INTR) - { - if (ch_flags & CH_CANSEEK) - ch_fsize = pos; return (EOI); - } if (n == READ_AGAIN) { read_again = TRUE; diff --git a/contrib/less/charset.c b/contrib/less/charset.c index 5e5df2a4e60f..0f62739bc88d 100644 --- a/contrib/less/charset.c +++ b/contrib/less/charset.c @@ -128,10 +128,12 @@ static struct xbuffer user_wide_array; static struct xbuffer user_ubin_array; static struct xbuffer user_compose_array; static struct xbuffer user_prt_array; +static struct xbuffer user_omit_array; static struct wchar_range_table user_wide_table; static struct wchar_range_table user_ubin_table; static struct wchar_range_table user_compose_table; static struct wchar_range_table user_prt_table; +static struct wchar_range_table user_omit_table; /* * Set a wchar_range_table to the table in an xbuffer. @@ -179,6 +181,7 @@ static void ichardef_utf(constant char *s) xbuf_init(&user_ubin_array); xbuf_init(&user_compose_array); xbuf_init(&user_prt_array); + xbuf_init(&user_omit_array); if (s != NULL) { @@ -204,6 +207,9 @@ static void ichardef_utf(constant char *s) case 'c': xbuf_add_data(&user_compose_array, (unsigned char *) &range, sizeof(range)); break; + case 'd': + xbuf_add_data(&user_omit_array, (unsigned char *) &range, sizeof(range)); + break; case 'w': xbuf_add_data(&user_wide_array, (unsigned char *) &range, sizeof(range)); xbuf_add_data(&user_prt_array, (unsigned char *) &range, sizeof(range)); @@ -225,6 +231,7 @@ static void ichardef_utf(constant char *s) wchar_range_table_set(&user_ubin_table, &user_ubin_array); wchar_range_table_set(&user_compose_table, &user_compose_array); wchar_range_table_set(&user_prt_table, &user_prt_array); + wchar_range_table_set(&user_omit_table, &user_omit_array); } /* @@ -554,7 +561,7 @@ public constant char * prutfchar(LWCHAR ch) SNPRINTF1(buf, sizeof(buf), "^%c", ((char) ch) ^ 0100); else SNPRINTF1(buf, sizeof(buf), binfmt, (char) ch); - } else if (is_ubin_char(ch)) + } else if (is_ubin_char(ch) || is_omit_char(ch)) { SNPRINTF1(buf, sizeof(buf), utfbinfmt, ch); } else @@ -827,6 +834,10 @@ DECLARE_RANGE_TABLE_START(fmt) #include "fmt.uni" DECLARE_RANGE_TABLE_END(fmt) +DECLARE_RANGE_TABLE_START(omit) +#include "omit.uni" +DECLARE_RANGE_TABLE_END(omit) + /* comb_table is special pairs, not ranges. */ static struct wchar_range comb_table[] = { {0x0644,0x0622}, {0x0644,0x0623}, {0x0644,0x0625}, {0x0644,0x0627}, @@ -856,6 +867,17 @@ static lbool is_in_table(LWCHAR ch, struct wchar_range_table *table) return FALSE; } +/* + * Is a character in none of a set of specified user tables? + */ +static lbool not_user_defined(LWCHAR ch, struct wchar_range_table *tbl1, struct wchar_range_table *tbl2, struct wchar_range_table *tbl3) +{ + if (is_in_table(ch, tbl1)) return FALSE; + if (is_in_table(ch, tbl2)) return FALSE; + if (is_in_table(ch, tbl3)) return FALSE; + return TRUE; +} + /* * Is a character a UTF-8 composing character? * If a composing character follows any char, the two combine into one glyph. @@ -864,8 +886,9 @@ public lbool is_composing_char(LWCHAR ch) { if (is_in_table(ch, &user_prt_table)) return FALSE; return is_in_table(ch, &user_compose_table) || - is_in_table(ch, &compose_table) || - (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table)); + (is_in_table(ch, &compose_table) || + (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table) && + not_user_defined(ch, &user_prt_table, &user_ubin_table, &user_omit_table))); } /* @@ -875,8 +898,9 @@ public lbool is_ubin_char(LWCHAR ch) { if (is_in_table(ch, &user_prt_table)) return FALSE; return is_in_table(ch, &user_ubin_table) || - is_in_table(ch, &ubin_table) || - (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table)); + (is_in_table(ch, &ubin_table) || + (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table) && + not_user_defined(ch, &user_prt_table, &user_compose_table, &user_omit_table))); } /* @@ -885,7 +909,18 @@ public lbool is_ubin_char(LWCHAR ch) public lbool is_wide_char(LWCHAR ch) { return is_in_table(ch, &user_wide_table) || - is_in_table(ch, &wide_table); + (is_in_table(ch, &wide_table) && + not_user_defined(ch, &user_compose_table, &user_ubin_table, &user_omit_table)); +} + +/* + * Is this an omittable character? + */ +public lbool is_omit_char(LWCHAR ch) +{ + return is_in_table(ch, &user_omit_table) || + (is_in_table(ch, &omit_table) && + not_user_defined(ch, &user_prt_table, &user_compose_table, &user_ubin_table)); } /* @@ -905,4 +940,3 @@ public lbool is_combining_char(LWCHAR ch1, LWCHAR ch2) } return FALSE; } - diff --git a/contrib/less/command.c b/contrib/less/command.c index 3ec1f9b48358..390385547385 100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@ -49,10 +49,13 @@ extern void *ml_examine; extern int wheel_lines; extern int def_search_type; extern lbool search_wrapped; +extern lbool no_poll; extern int no_paste; extern lbool pasting; extern int no_edit_warn; extern POSITION soft_eof; +extern POSITION search_incr_start; +extern char *first_cmd_at_prompt; #if SHELL_ESCAPE || PIPEC extern void *ml_shell; #endif @@ -90,6 +93,8 @@ static int save_proc_backspace; static int screen_trashed_value = 0; static lbool literal_char = FALSE; static lbool ignoring_input = FALSE; +static struct scrpos search_incr_pos = { NULL_POSITION, 0 }; +static int search_incr_hshift; #if HAVE_TIME static time_type ignoring_input_time; #endif @@ -209,6 +214,13 @@ static void mca_search1(void) static void mca_search(void) { + if (incr_search) + { + /* Remember where the incremental search started. */ + get_scrpos(&search_incr_pos, TOP); + search_incr_start = search_pos(search_type); + search_incr_hshift = hshift; + } mca_search1(); set_mlist(ml_search, 0); } @@ -747,6 +759,9 @@ static int mca_char(char c) constant char *pattern = get_cmdbuf(); if (pattern == NULL) return (MCA_MORE); + /* Defer searching if more chars of the pattern are available. */ + if (ttyin_ready()) + return (MCA_MORE); /* * Must save updown_match because mca_search * reinits it. That breaks history scrolling. @@ -758,11 +773,24 @@ static int mca_char(char c) { /* User has backspaced to an empty pattern. */ undo_search(1); + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); } else { + /* + * Suppress tty polling while searching. + * This avoids a problem where tty input + * can cause the search to be interrupted. + */ + no_poll = TRUE; if (search(st | SRCH_INCR, pattern, 1) != 0) + { /* No match, invalid pattern, etc. */ undo_search(1); + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); + } + no_poll = FALSE; } /* Redraw the search prompt and search string. */ if (is_screen_trashed() || !full_screen) @@ -795,6 +823,7 @@ static void clear_buffers(void) #if HILITE_SEARCH clr_hilite(); #endif + set_line_contig_pos(NULL_POSITION); } public void screen_trashed_num(int trashed) @@ -889,6 +918,12 @@ static void prompt(void) next_ifile(curr_ifile) == NULL_IFILE) quit(QUIT_OK); quit_if_one_screen = FALSE; /* only get one chance at this */ + if (first_cmd_at_prompt != NULL) + { + ungetsc(first_cmd_at_prompt); + first_cmd_at_prompt = NULL; + return; + } #if MSDOS_COMPILER==WIN32C /* @@ -962,6 +997,7 @@ static void prompt(void) put_line(FALSE); } clear_eol(); + resume_screen(); } /* @@ -2261,6 +2297,7 @@ public void commands(void) pos_rehead(); hshift -= (int) number; screen_trashed(); + cmd_exec(); break; case A_RSHIFT: @@ -2274,6 +2311,7 @@ public void commands(void) pos_rehead(); hshift += (int) number; screen_trashed(); + cmd_exec(); break; case A_LLSHIFT: @@ -2283,6 +2321,7 @@ public void commands(void) pos_rehead(); hshift = 0; screen_trashed(); + cmd_exec(); break; case A_RRSHIFT: @@ -2292,6 +2331,7 @@ public void commands(void) pos_rehead(); hshift = rrshift(); screen_trashed(); + cmd_exec(); break; case A_PREFIX: diff --git a/contrib/less/compose.uni b/contrib/less/compose.uni index 0875a8dceec1..6b4458efc4b4 100644 --- a/contrib/less/compose.uni +++ b/contrib/less/compose.uni @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Oct 1 18:10:07 GMT 2024 */ +/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Aug 11 0:27:25 GMT 2025 */ { 0x0300, 0x036f }, /* Mn */ { 0x0483, 0x0487 }, /* Mn */ { 0x0488, 0x0489 }, /* Me */ @@ -217,7 +217,6 @@ { 0xd7b0, 0xd7c6 }, /* Mn */ { 0xd7cb, 0xd7fb }, /* Mn */ { 0xfb1e, 0xfb1e }, /* Mn */ - { 0xfe00, 0xfe0f }, /* Mn */ { 0xfe20, 0xfe2f }, /* Mn */ { 0x101fd, 0x101fd }, /* Mn */ { 0x102e0, 0x102e0 }, /* Mn */ @@ -363,4 +362,3 @@ { 0x1e5ee, 0x1e5ef }, /* Mn */ { 0x1e8d0, 0x1e8d6 }, /* Mn */ { 0x1e944, 0x1e94a }, /* Mn */ - { 0xe0100, 0xe01ef }, /* Mn */ diff --git a/contrib/less/decode.c b/contrib/less/decode.c index 8e451d1810c9..1d80d126c207 100644 --- a/contrib/less/decode.c +++ b/contrib/less/decode.c @@ -483,12 +483,12 @@ public void add_ecmd_table(unsigned char *buf, size_t len) /* * Add an environment variable table. */ -static void add_var_table(struct tablelist **tlist, unsigned char *buf, size_t len) +static void add_var_table(struct tablelist **tlist, mutable unsigned char *buf, size_t len) { struct xbuffer xbuf; xbuf_init(&xbuf); - expand_evars((char*)buf, len, &xbuf); /*{{unsigned-issue}}*/ + expand_evars((mutable char*)buf, len, &xbuf); /*{{unsigned-issue}}*/ /* {{ We leak the table in buf. expand_evars scribbled in it so it's useless anyway. }} */ if (add_cmd_table(tlist, xbuf.data, xbuf.end) < 0) error("Warning: environment variables from lesskey file unavailable", NULL_PARG); @@ -749,7 +749,8 @@ static int cmd_search(constant char *cmd, constant unsigned char *table, constan if (match == cmdlen) /* (last chars of) cmd matches this table entry */ { action = taction; - *extra = textra; + if (extra != NULL) + *extra = textra; } else if (match > 0 && action == A_INVALID) /* cmd is a prefix of this table entry */ { action = A_PREFIX; @@ -780,13 +781,11 @@ static int cmd_decode(struct tablelist *tlist, constant char *cmd, constant char for (t = tlist; t != NULL; t = t->t_next) { constant unsigned char *tsp; - size_t mlen; + size_t mlen = match_len; int taction = cmd_search(cmd, t->t_start, t->t_end, &tsp, &mlen); if (mlen >= match_len) { match_len = mlen; - if (taction == A_UINVALID) - taction = A_INVALID; if (taction != A_INVALID) { *sp = (constant char *) tsp; diff --git a/contrib/less/edit.c b/contrib/less/edit.c index 0254584bf211..1816e6f9f9bc 100644 --- a/contrib/less/edit.c +++ b/contrib/less/edit.c @@ -113,9 +113,7 @@ public constant char * forw_textlist(struct textlist *tlist, constant char *prev s = tlist->string; else s = prev + strlen(prev); - if (s >= tlist->endstring) - return (NULL); - while (*s == '\0') + while (s < tlist->endstring && *s == '\0') s++; if (s >= tlist->endstring) return (NULL); @@ -306,7 +304,11 @@ static void close_pipe(FILE *pipefd) if (WIFSIGNALED(status)) { int sig = WTERMSIG(status); - if (sig != SIGPIPE || ch_length() != NULL_POSITION) + if ( +#ifdef SIGPIPE + sig != SIGPIPE || +#endif + ch_length() != NULL_POSITION) { parg.p_string = signal_message(sig); error("Input preprocessor terminated: %s", &parg); diff --git a/contrib/less/fmt.uni b/contrib/less/fmt.uni index 91cfc3e91e61..c861e1908360 100644 --- a/contrib/less/fmt.uni +++ b/contrib/less/fmt.uni @@ -1,5 +1,4 @@ -/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Oct 1 18:10:07 GMT 2024 */ - { 0x00ad, 0x00ad }, /* Cf */ +/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Jul 27 19:38:50 GMT 2025 */ { 0x0600, 0x0605 }, /* Cf */ { 0x061c, 0x061c }, /* Cf */ { 0x06dd, 0x06dd }, /* Cf */ @@ -7,7 +6,8 @@ { 0x0890, 0x0891 }, /* Cf */ { 0x08e2, 0x08e2 }, /* Cf */ { 0x180e, 0x180e }, /* Cf */ - { 0x200b, 0x200f }, /* Cf */ + { 0x200b, 0x200c }, /* Cf */ + { 0x200e, 0x200f }, /* Cf */ { 0x202a, 0x202e }, /* Cf */ { 0x2060, 0x2064 }, /* Cf */ { 0x2066, 0x206f }, /* Cf */ diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c index 300e669f9371..e77c0d4ce198 100644 --- a/contrib/less/forwback.c +++ b/contrib/less/forwback.c @@ -359,7 +359,7 @@ public void forw(int n, POSITION pos, lbool force, lbool only_last, lbool to_new } if (!first_line) add_forw_pos(pos, FALSE); - if (nlines == 0 && !ignore_eoi) + if (nlines == 0 && !ignore_eoi && !ABORT_SIGS()) eof_bell(); else if (do_repaint) repaint(); diff --git a/contrib/less/funcs.h b/contrib/less/funcs.h index b001a5c31902..11605acc8b3b 100644 --- a/contrib/less/funcs.h +++ b/contrib/less/funcs.h @@ -14,6 +14,8 @@ public void init_win_colors(void); public void get_term(void); public void init_mouse(void); public void deinit_mouse(void); +public void suspend_screen(void); +public void resume_screen(void); public void init(void); public void deinit(void); public int interactive(void); @@ -83,6 +85,7 @@ public LWCHAR step_char(char **pp, signed int dir, constant char *limit); public lbool is_composing_char(LWCHAR ch); public lbool is_ubin_char(LWCHAR ch); public lbool is_wide_char(LWCHAR ch); +public lbool is_omit_char(LWCHAR ch); public lbool is_combining_char(LWCHAR ch1, LWCHAR ch2); public void cmd_reset(void); public void clear_cmd(void); @@ -228,7 +231,9 @@ public void jump_loc(POSITION pos, int sline); public void init_line(void); public lbool is_ascii_char(LWCHAR ch); public POSITION line_position(void); -public void prewind(void); +public lbool is_line_contig_pos(POSITION pos); +public void set_line_contig_pos(POSITION pos); +public void prewind(lbool contig); public void plinestart(POSITION pos); public int line_pfx_width(void); public void pshift_all(void); @@ -314,6 +319,7 @@ public void opt_wheel_lines(int type, constant char *s); public void opt_linenum_width(int type, constant char *s); public void opt_status_col_width(int type, constant char *s); public void opt_filesize(int type, constant char *s); +public void opt_first_cmd_at_prompt(int type, constant char *s); public void opt_intr(int type, constant char *s); public int next_cnum(constant char **sp, constant char *printopt, constant char *errmsg, lbool *errp); public void opt_header(int type, constant char *s); @@ -343,6 +349,7 @@ public struct loption * findopt(int c); public struct loption * findopt_name(constant char **p_optname, constant char **p_oname, lbool *p_ambig); public char * findopts_name(constant char *pfx); public void init_poll(void); +public lbool ttyin_ready(void); public int supports_ctrl_x(void); public ssize_t iread(int fd, unsigned char *buf, size_t len); public int iopen(constant char *filename, int flags); @@ -403,6 +410,7 @@ public lbool is_filtered(POSITION pos); public POSITION next_unfiltered(POSITION pos); public int is_hilited_attr(POSITION pos, POSITION epos, int nohide, int *p_matches); public void chg_hilite(void); +public POSITION search_pos(int search_type); public void osc8_search(int search_type, constant char *param, int matches); public lbool osc8_click(int sindex, int col); public void osc8_open(void); @@ -439,7 +447,7 @@ public void xbuf_add_byte(struct xbuffer *xbuf, unsigned char b); public void xbuf_add_char(struct xbuffer *xbuf, char c); public void xbuf_add_data(struct xbuffer *xbuf, constant unsigned char *data, size_t len); public int xbuf_pop(struct xbuffer *buf); -public void xbuf_set(struct xbuffer *dst, struct xbuffer *src); +public void xbuf_set(struct xbuffer *dst, constant struct xbuffer *src); public constant char * xbuf_char_data(constant struct xbuffer *xbuf); public lbool help_ckd_add(void *r, uintmax a, uintmax b, int rsize, int rsigned); public lbool help_ckd_mul(void *r, uintmax a, uintmax b, int rsize, int rsigned); diff --git a/contrib/less/help.c b/contrib/less/help.c index 5d8ba9a1b0fe..ed9465ad9560 100644 --- a/contrib/less/help.c +++ b/contrib/less/help.c @@ -1,4 +1,4 @@ -/* This file was generated by mkhelp.pl from less.hlp at 19:46 on 2025/5/28 */ +/* This file was generated by mkhelp.pl from less.hlp at 18:02 on 2025/10/4 */ #include "less.h" constant char helpdata[] = { '\n', diff --git a/contrib/less/input.c b/contrib/less/input.c index c2f7a28c2c58..dda039b21a27 100644 --- a/contrib/less/input.c +++ b/contrib/less/input.c @@ -96,6 +96,8 @@ public POSITION forw_line_seg(POSITION curr_pos, lbool skipeol, lbool rscroll, l if (p_linepos != NULL) *p_linepos = NULL_POSITION; + if (p_newline != NULL) + *p_newline = TRUE; get_forw_line: if (curr_pos == NULL_POSITION) @@ -104,7 +106,7 @@ get_forw_line: return (NULL_POSITION); } #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) + if (hilite_search == OPT_ONPLUS || is_filtering() || (status_col && hilite_search != OPT_ON)) { /* * If we are ignoring EOI (command F), only prepare @@ -142,39 +144,48 @@ get_forw_line: /* * Read forward again to the position we should start at. */ - prewind(); - plinestart(base_pos); - (void) ch_seek(base_pos); - new_pos = base_pos; - while (new_pos < curr_pos) + if (is_line_contig_pos(curr_pos)) { - c = ch_forw_get(); - if (c == EOI) - { - null_line(); - return (NULL_POSITION); - } - backchars = pappend((char) c, new_pos); - new_pos++; - if (backchars > 0) + prewind(TRUE); + plinestart(base_pos); + ch_seek(curr_pos); + new_pos = curr_pos; + } else + { + prewind(FALSE); + plinestart(base_pos); + ch_seek(base_pos); + new_pos = base_pos; + while (new_pos < curr_pos) { - pshift_all(); - if (wordwrap && (c == ' ' || c == '\t')) + c = ch_forw_get(); + if (c == EOI) { - do + null_line(); + return (NULL_POSITION); + } + backchars = pappend((char) c, new_pos); + new_pos++; + if (backchars > 0) + { + pshift_all(); + if (wordwrap && (c == ' ' || c == '\t')) { - new_pos++; - c = ch_forw_get(); /* {{ what if c == EOI? }} */ - } while (c == ' ' || c == '\t'); - backchars = 1; + do + { + new_pos++; + c = ch_forw_get(); /* {{ what if c == EOI? }} */ + } while (c == ' ' || c == '\t'); + backchars = 1; + } + new_pos -= backchars; + while (--backchars >= 0) + (void) ch_back_get(); } - new_pos -= backchars; - while (--backchars >= 0) - (void) ch_back_get(); } + pshift_all(); } (void) pflushmbc(); - pshift_all(); /* * Read the first character to display. @@ -329,6 +340,7 @@ get_forw_line: *p_linepos = curr_pos; if (p_newline != NULL) *p_newline = endline; + set_line_contig_pos(endline ? NULL_POSITION : new_pos); return (new_pos); } @@ -358,6 +370,8 @@ public POSITION back_line(POSITION curr_pos, lbool *p_newline) lbool skipped_leading; get_back_line: + if (p_newline != NULL) + *p_newline = TRUE; if (curr_pos == NULL_POSITION || curr_pos <= ch_zero()) { null_line(); @@ -426,7 +440,7 @@ get_back_line: } #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) + if (hilite_search == OPT_ONPLUS || is_filtering() || (status_col && hilite_search != OPT_ON)) prep_hilite(base_pos, NULL_POSITION, 1); #endif @@ -446,10 +460,8 @@ get_back_line: return (NULL_POSITION); } endline = FALSE; - prewind(); + prewind(FALSE); plinestart(new_pos); - if (p_newline != NULL) - *p_newline = TRUE; loop: wrap_pos = NULL_POSITION; skipped_leading = FALSE; diff --git a/contrib/less/less.h b/contrib/less/less.h index 7b2d2c25bfc6..a30693a35a7a 100644 --- a/contrib/less/less.h +++ b/contrib/less/less.h @@ -216,7 +216,7 @@ void free(); * Special types and constants. */ typedef unsigned long LWCHAR; -#if defined(MINGW) || (defined(_MSC_VER) && _MSC_VER >= 1500) +#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1500) typedef long long less_off_t; /* __int64 */ typedef struct _stat64 less_stat_t; #define less_fstat _fstat64 @@ -435,6 +435,7 @@ typedef enum osc8_state { #define AT_ANSI (1 << 4) /* Content-supplied "ANSI" escape sequence */ #define AT_BINARY (1 << 5) /* LESS*BINFMT representation */ #define AT_HILITE (1 << 6) /* Internal highlights (e.g., for search) */ +#define AT_PLACEHOLDER (1 << 7) /* Placeholder for half of double-wide char */ #define AT_COLOR_SHIFT 8 #define AT_NUM_COLORS 16 @@ -554,6 +555,8 @@ typedef enum { #define ESC CONTROL('[') #define ESCS "\33" #define CSI ((unsigned char)'\233') +#define VARSEL_15 ((LWCHAR)0xFE0E) /* VARIATION SELECTOR 15 */ +#define VARSEL_16 ((LWCHAR)0xFE0F) /* VARIATION SELECTOR 16 */ #if _OSK_MWC32 #define LSIGNAL(sig,func) os9_signal(sig,func) diff --git a/contrib/less/less.nro b/contrib/less/less.nro index 25a9869a9c59..ae43e8851d0e 100644 --- a/contrib/less/less.nro +++ b/contrib/less/less.nro @@ -1,5 +1,5 @@ '\" t -.TH LESS 1 "Version 679: 28 May 2025" +.TH LESS 1 "Version 685: 04 Oct 2025" .SH NAME less \- display the contents of a file in a terminal .SH SYNOPSIS @@ -203,8 +203,11 @@ Followed by another single quote, returns to the position at which the last "large" movement command was executed. Followed by a \(ha or $, jumps to the beginning or end of the file respectively. -Marks are preserved when a new file is examined, +Marks are preserved when a new file is examined within a single invocation of +.BR less , so the \(aq command can be used to switch between input files. +The \-\-save-marks option causes marks to be preserved across different invocations of +.BR less . .IP "\(haX\(haX" Same as single quote. .IP "ESC-m" @@ -800,8 +803,9 @@ where the first integer specifies the foreground color and the second specifies the background color. Each integer is a value between 0 and 255 inclusive which selects a "CSI 38;5" color value (see -.UR https://en.wikipedia.org/wiki/ANSI_escape_code#SGR -.UE ). +.nh +https://en.wikipedia.org/wiki/ANSI_escape_code#SGR). +.hy If either integer is a "-" or is omitted, the corresponding color is set to that of normal text. .PP @@ -835,8 +839,9 @@ CHAR_INFO.Attributes .hy value, between 0 and 15 inclusive (see -.UR https://learn.microsoft.com/en-us/windows/console/char-info-str -.UE ). +.nh +https://learn.microsoft.com/en-us/windows/console/char-info-str). +.hy To avoid confusion, it is recommended that the equivalent letters rather than numbers be used after a lowercase color selector on MS-DOS/Windows. @@ -1213,8 +1218,9 @@ the name of a command compatible with .BR global (1), and that command is executed to find the tag. (See -.UR http://www.gnu.org/software/global/global.html -.UE ). +.nh +http://www.gnu.org/software/global/global.html). +.hy The \-t option may also be specified from within .B less (using the \- command) as a way of examining a new file. @@ -1328,6 +1334,16 @@ of the screen, starting with a decimal point: \&.5 is half of the screen width, \&.3 is three tenths of the screen width, and so on. If the number is specified as a fraction, the actual number of scroll positions is recalculated if the terminal window is resized. +.IP "\-\-cmd=\fIcommands\fP +The specified string is taken to be an initial command to +.BR less . +This is similar to specifying "+\fIcommands\fP", except that +commands specified by \-\-cmd are not executed if +.B less +exits immediately due to the use of the \-E or \-F option, while +commands specified by the \fB+\fP option are executed even if +.B less +exits immediately. .IP "\-\-exit-follow-on-close" When using the "F" command on a pipe, .B less @@ -1583,8 +1599,9 @@ Enables colored text in various places. The \-D option can be used to change the colors. Colored text works only if the terminal supports ANSI color escape sequences (as defined in -.UR https://www.ecma-international.org/publications-and-standards/standards/ecma-48 -.UE ). +.nh +https://www.ecma-international.org/publications-and-standards/standards/ecma-48). +.hy .IP "\-\-wheel-lines=\fIn\fP" Set the number of lines to scroll when the mouse wheel is scrolled and the \-\-mouse or \-\-MOUSE option is in effect. @@ -1598,6 +1615,9 @@ The default is to wrap at any character. A command line argument of "\-\-" marks the end of option arguments. Any arguments following this are interpreted as filenames. This can be useful when viewing a file whose name begins with a "\-" or "+". +Otherwise, option arguments and filename arguments can be intermixed; +that is, option arguments do not need to appear before filename arguments, +unless the environment variable POSIXLY_CORRECT is set. .IP + If a command line option begins with \fB+\fP, the remainder of that option is taken to be an initial command to @@ -1613,6 +1633,7 @@ If the option starts with ++, the initial command applies to every file being viewed, not just the first one. The + command described previously may also be used to set (or change) an initial command for every file. +Also see the \-\-cmd option. . .SH "LINE EDITING" When entering a command line at the bottom of the screen @@ -1913,7 +1934,7 @@ Again, in this case the dash is not considered to be part of the input pipe command. . .SH "NATIONAL CHARACTER SETS" -There are three types of characters in the input file: +There are five types of characters in the input file: .IP "normal characters" can be displayed directly to the screen. .IP "control characters" @@ -1922,6 +1943,12 @@ in ordinary text files (such as backspace and tab). .IP "binary characters" should not be displayed directly and are not expected to be found in text files. +.IP "composing characters" +are not displayed separately, but modify the display of the +preceding character. (Only when LESSCHARSET is "utf8".) +.IP "deleted characters" +are simply deleted from the input and not displayed. +(Only when LESSCHARSET is "utf8".) .PP A "character set" is simply a description of which characters are to be considered normal, control, and binary. @@ -2049,7 +2076,7 @@ of how the UTF-8 file is ill-formed. .PP When the character set is utf-8, in rare cases it may be desirable to override the Unicode definition of the type of certain characters. -For example, characters in a Private Use Area are normally treated as control +For example, characters in a Private Use Area are normally treated as binary characters, but if you are using a custom font with printable characters in that range, it may be desirable to tell .B less @@ -2076,6 +2103,8 @@ A wide (2-space) printable character. A binary (non-printable) character. .IP "c" A composing (zero width) character. +.IP "d" +A deleted character (deleted from the input and not displayed). .RE .PP For example, setting LESSUTFCHARDEF to @@ -2085,6 +2114,18 @@ For example, setting LESSUTFCHARDEF to .sp .fi would make all Private Use Area characters be treated as printable. +.PP +By default, emoji modifiers, components and variation selectors +are deleted because many terminals do not display them correctly. +If you use a terminal which does display some or all of them correctly, +you can cause to be displayed by setting LESSUTFCHARDEF +to treat them as composing characters. +For example, this sets them all to composing characters: +.nf +.sp + FE00-FE0F:c,1F3FB-1F3FF:c,1F9B0-1F9B3:c,E0100-E01EF:c +.sp +.fi .SH "PROMPTS" The \-P option allows you to tailor the prompt to your preference. The string given to the \-P option replaces the specified prompt string. @@ -2407,8 +2448,8 @@ end character in an ANSI color escape sequence (default "0123456789:;[?!"\(aq#%()*+\ "). .IP LESSANSIOSCALLOW A comma-separated list of OSC types which are output directly to the -terminal when \-R is in effect. -By default, only OSC 8 sequences are output directly. +terminal when \-R is in effect +(default "8"; that is, only OSC 8 sequences are output directly). .IP LESSANSIOSCCHARS Characters which may follow an ESC character to mark the start of an "OS Command" sequence. @@ -2480,9 +2521,7 @@ file. (Not used if "$LESSKEYIN_SYSTEM" exists.) List of characters which are considered "metacharacters" by the shell. .IP LESSMETAESCAPE Prefix which less will add before each metacharacter in a -command sent to the shell. -If LESSMETAESCAPE is an empty string, commands containing -metacharacters will not be passed to the shell. +command sent to the shell (default "\\"). .IP LESSOPEN Command line to invoke the (optional) input-preprocessor. .IP LESSSECURE @@ -2492,7 +2531,8 @@ See discussion under SECURITY. Enables individual features which are normally disabled by LESSSECURE. See discussion under SECURITY. .IP LESSSEPARATOR -String to be appended to a directory name in filename completion. +String to be appended to a directory name in filename completion +(default "\\" on MS-DOS, Windows, and OS/2; otherwise "/"). .IP LESSUTFBINFMT Format for displaying non-printable Unicode code points. .IP LESSUTFCHARDEF @@ -2550,6 +2590,24 @@ receives a SIGUSR1 signal. .IP LESS_TERMCAP_xx Where "xx" is any two characters, overrides the definition of the termcap "xx" capability for the terminal. +.IP LESS_TERMCAP_BRACKETED_PASTE_START +Overrides the standard ANSI escape sequence to enable bracketed paste. +This is used when the \-\-no-paste option is in effect. +.IP LESS_TERMCAP_BRACKETED_PASTE_END +Overrides the standard ANSI escape sequence to disable bracketed paste. +.IP LESS_TERMCAP_MOUSE_START +Overrides the standard ANSI escape sequence to enable mouse reporting. +This is used when the \-\-mouse option is in effect. +.IP LESS_TERMCAP_MOUSE_END +Overrides the standard ANSI escape sequence to disable mouse reporting. +.IP LESS_TERMCAP_SUSPEND +Defines an escape sequence to temporarily suspend screen updates. +This is sent to the terminal before clearing the screen. +This can be used to avoid screen tearing when the screen is redrawn +on certain terminals. +.IP LESS_TERMCAP_RESUME +Defines an escape sequence to resume screen updates. +This is sent to the terminal after displaying the prompt. .IP LESS_UNSUPPORT A space-separated list of command line options. These options will be ignored (with no error message) if they appear @@ -2571,6 +2629,12 @@ automatically when running in .IP PATH User's search path (used to find a lesskey file on MS-DOS, Windows, and OS/2 systems). +.IP POSIXLY_CORRECT +If set to any value, all option arguments on the command line +are expected to appear before any filename arguments. +This must be set as an actual environment variable, not in a +.B lesskey +file. .IP SHELL The shell used to execute the !\& command, as well as to expand filenames. .IP TERM @@ -2619,10 +2683,12 @@ See the GNU General Public License for more details. *** 938 LINES SKIPPED *** From nobody Thu Nov 13 04:50:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6SWK2K1Bz6GBXn; Thu, 13 Nov 2025 04:50: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 4d6SWK0gRXz3mnM; Thu, 13 Nov 2025 04:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763009421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3L3SDAQGuE3OB8aM23jNchyiAIu7nAZT0ouXnQuj5DM=; b=An9vXhwA7kPjMpgU4G3oHTr79yVrrBqEDM2JVJHbsbf769lBhtKEoPKSArsaAW/jW0uYgY vVXwO78qHiv+Zl+DRIyY8XGhxtBZ5viRxwwxRZpHLDCmN7oGVrbFJLrtVd7HfWlh73VpQp 9MnT5ap7ftzfzaiUlf2A0o8j7Rc3ub1gQEZKxBbwv66CWhkhSR5Xqhap8a4sqxBEm79paW AsNPrKbOesuQ0vHTL8g5Nz4UCeKPRaZo73400/u2V59Xosnyg77UgoN32S+9Jgd1KAg1hG lJRdEBvkNZDRTwNx1IlNfKZ7Zp4jiZNZvPnKoxRnTaVn5LQOsddy3uchPoF3lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763009421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3L3SDAQGuE3OB8aM23jNchyiAIu7nAZT0ouXnQuj5DM=; b=vZTl8zNjOkTmpxY8CkYd7Zk1s+pFXDj7O3Dis9UDmIpVexq2nkzdeFQ8r/jHnrwVm1dyNf 9+S7O2I1CbLX1ID1YPoIP6ipcsMt6xUNjrzEdEbbB4Fd46aR2JrWoqLlMWfnHJC9bOCkdW O4/E7evyAZby6i5pz9kqU9n8tmew6+Um832a/HFgZZ7RuNs75Qjrw1WR2o/KOvSNF1/pvI ZzesQuc64EiVJzKFnGU/D+aTgcyk3jd8/eNX4j1mKtAqFNLUrRE7NUavpjY73MntFiVxje JaWBmIf04vNsW2Z+x5VqtWU7u5846qVtWOLobOr8U93ckwx1WR48hgx+gz69iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763009421; a=rsa-sha256; cv=none; b=W5zyR1ICjiAF8c/Yv6rbVg2oDY9MGKCLZPqOfYJ4RzSNIKvHdNIwxfDofalg7Yn/Gfd532 bS4cfSU58N980GMpUMMS+/6X0pdxIpAM1kY4FeUligbdOZZ+7A2LvuO5PQz2KygDaVVNl6 1tJ23YdbevTGxoeLsYcQv5ZWYp7ufnpIqi4uvmswuxC7I1Z9ADmfXwQ1/69hnEsGqHzlDj uRVlONqKUm0s0isnDqzm0rH5v1J9/zSpgf7miH7zP/KJWI4Jqs6f9ZJGM14De7F0ISnwXn iZNDWlBBD/ngy2p03UrM3hnKDXPgr08+tNfkhrcLuA/TjwrNM94l4Q1cJLHNhA== 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 4d6SWK0BPNz15LY; Thu, 13 Nov 2025 04:50: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 5AD4oKsk043866; Thu, 13 Nov 2025 04:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AD4oKC8043863; Thu, 13 Nov 2025 04:50:20 GMT (envelope-from git) Date: Thu, 13 Nov 2025 04:50:20 GMT Message-Id: <202511130450.5AD4oKC8043863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 054ae5e7b465 - stable/14 - MFV: less v685. 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 054ae5e7b465a32079a5ec8a9b943150b8da3212 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=054ae5e7b465a32079a5ec8a9b943150b8da3212 commit 054ae5e7b465a32079a5ec8a9b943150b8da3212 Author: Xin LI AuthorDate: 2025-11-10 08:55:06 +0000 Commit: Xin LI CommitDate: 2025-11-13 04:49:52 +0000 MFV: less v685. (cherry picked from commit d5cb458b4b58b0f0b3c058a32439f232fd5455ca) --- contrib/less/NEWS | 39 ++++++++++++++++ contrib/less/ch.c | 4 -- contrib/less/charset.c | 48 +++++++++++++++++--- contrib/less/command.c | 40 +++++++++++++++++ contrib/less/compose.uni | 4 +- contrib/less/decode.c | 11 +++-- contrib/less/edit.c | 10 +++-- contrib/less/fmt.uni | 6 +-- contrib/less/forwback.c | 2 +- contrib/less/funcs.h | 12 ++++- contrib/less/help.c | 2 +- contrib/less/input.c | 72 +++++++++++++++++------------- contrib/less/less.h | 5 ++- contrib/less/less.nro | 110 ++++++++++++++++++++++++++++++++++++---------- contrib/less/lessecho.nro | 6 +-- contrib/less/lesskey.nro | 18 +++++--- contrib/less/lglob.h | 2 +- contrib/less/line.c | 106 +++++++++++++++++++++++++++++++++++++++----- contrib/less/lsystem.c | 2 +- contrib/less/main.c | 41 ++++++++++++----- contrib/less/mkutable | 21 ++++++++- contrib/less/omit.uni | 7 +++ contrib/less/optfunc.c | 18 ++++++++ contrib/less/opttbl.c | 6 +++ contrib/less/os.c | 51 ++++++++++++++++++--- contrib/less/pattern.c | 7 ++- contrib/less/screen.c | 30 +++++++++++++ contrib/less/search.c | 12 +++-- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 14 +++++- contrib/less/wide.uni | 8 ++-- contrib/less/xbuf.c | 2 +- usr.bin/less/defines.h | 18 ++++++-- 33 files changed, 596 insertions(+), 140 deletions(-) diff --git a/contrib/less/NEWS b/contrib/less/NEWS index cdc8196a5f16..442fe21e406a 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -9,6 +9,45 @@ Report bugs, suggestions or comments at https://github.com/gwsw/less/issues. +====================================================================== + + Major changes between "less" versions 679 and 685 + +* Add --cmd option (github #624). + +* Add LESS_TERMCAP_SUSPEND and LESS_TERMCAP_RESUME (github #654). + +* Change --incsearch so that after typing each character of the pattern, + the search begins at the position where the search command was invoked, + not the current position (github #640). + +* Allow mixing of option arguments and filename arguments on the + command line unless POSIXLY_CORRECT is set (github #653). + +* Don't output U+00AD and U+200D, and fix some bugs handling emoji + modifier characters (github #637). + +* Fix hang if a search using ^S modifier matches empty string (github #634). + +* Fix bug using -g and -J (github #636). + +* Fix bug when pasting a search pattern while --incsearch is active + (github #635). + +* Fix bug in Windows build when autorepeating a search pattern (github #639). + +* Fix lesskey bug using #stop directive. + +* Fix lesskey bug using "invalid" action (github #643). + +* Fix bug causing file to appear to end prematurely if an input command + was received during a file read (github #649). + +* Fix performance issue in & filtering (github #638). Problem was introduced + in da2a9ecdf16beb642d0c030e35f0351c5f2e5a12 and released in less-673. + +* Fix some problems reported by valgrind (github #659, github #660, github #661). + ====================================================================== Major changes between "less" versions 678 and 679 diff --git a/contrib/less/ch.c b/contrib/less/ch.c index 870028c73a23..fb7572e7f88a 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -283,11 +283,7 @@ static int ch_get(void) read_again = FALSE; if (n == READ_INTR) - { - if (ch_flags & CH_CANSEEK) - ch_fsize = pos; return (EOI); - } if (n == READ_AGAIN) { read_again = TRUE; diff --git a/contrib/less/charset.c b/contrib/less/charset.c index 5e5df2a4e60f..0f62739bc88d 100644 --- a/contrib/less/charset.c +++ b/contrib/less/charset.c @@ -128,10 +128,12 @@ static struct xbuffer user_wide_array; static struct xbuffer user_ubin_array; static struct xbuffer user_compose_array; static struct xbuffer user_prt_array; +static struct xbuffer user_omit_array; static struct wchar_range_table user_wide_table; static struct wchar_range_table user_ubin_table; static struct wchar_range_table user_compose_table; static struct wchar_range_table user_prt_table; +static struct wchar_range_table user_omit_table; /* * Set a wchar_range_table to the table in an xbuffer. @@ -179,6 +181,7 @@ static void ichardef_utf(constant char *s) xbuf_init(&user_ubin_array); xbuf_init(&user_compose_array); xbuf_init(&user_prt_array); + xbuf_init(&user_omit_array); if (s != NULL) { @@ -204,6 +207,9 @@ static void ichardef_utf(constant char *s) case 'c': xbuf_add_data(&user_compose_array, (unsigned char *) &range, sizeof(range)); break; + case 'd': + xbuf_add_data(&user_omit_array, (unsigned char *) &range, sizeof(range)); + break; case 'w': xbuf_add_data(&user_wide_array, (unsigned char *) &range, sizeof(range)); xbuf_add_data(&user_prt_array, (unsigned char *) &range, sizeof(range)); @@ -225,6 +231,7 @@ static void ichardef_utf(constant char *s) wchar_range_table_set(&user_ubin_table, &user_ubin_array); wchar_range_table_set(&user_compose_table, &user_compose_array); wchar_range_table_set(&user_prt_table, &user_prt_array); + wchar_range_table_set(&user_omit_table, &user_omit_array); } /* @@ -554,7 +561,7 @@ public constant char * prutfchar(LWCHAR ch) SNPRINTF1(buf, sizeof(buf), "^%c", ((char) ch) ^ 0100); else SNPRINTF1(buf, sizeof(buf), binfmt, (char) ch); - } else if (is_ubin_char(ch)) + } else if (is_ubin_char(ch) || is_omit_char(ch)) { SNPRINTF1(buf, sizeof(buf), utfbinfmt, ch); } else @@ -827,6 +834,10 @@ DECLARE_RANGE_TABLE_START(fmt) #include "fmt.uni" DECLARE_RANGE_TABLE_END(fmt) +DECLARE_RANGE_TABLE_START(omit) +#include "omit.uni" +DECLARE_RANGE_TABLE_END(omit) + /* comb_table is special pairs, not ranges. */ static struct wchar_range comb_table[] = { {0x0644,0x0622}, {0x0644,0x0623}, {0x0644,0x0625}, {0x0644,0x0627}, @@ -856,6 +867,17 @@ static lbool is_in_table(LWCHAR ch, struct wchar_range_table *table) return FALSE; } +/* + * Is a character in none of a set of specified user tables? + */ +static lbool not_user_defined(LWCHAR ch, struct wchar_range_table *tbl1, struct wchar_range_table *tbl2, struct wchar_range_table *tbl3) +{ + if (is_in_table(ch, tbl1)) return FALSE; + if (is_in_table(ch, tbl2)) return FALSE; + if (is_in_table(ch, tbl3)) return FALSE; + return TRUE; +} + /* * Is a character a UTF-8 composing character? * If a composing character follows any char, the two combine into one glyph. @@ -864,8 +886,9 @@ public lbool is_composing_char(LWCHAR ch) { if (is_in_table(ch, &user_prt_table)) return FALSE; return is_in_table(ch, &user_compose_table) || - is_in_table(ch, &compose_table) || - (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table)); + (is_in_table(ch, &compose_table) || + (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table) && + not_user_defined(ch, &user_prt_table, &user_ubin_table, &user_omit_table))); } /* @@ -875,8 +898,9 @@ public lbool is_ubin_char(LWCHAR ch) { if (is_in_table(ch, &user_prt_table)) return FALSE; return is_in_table(ch, &user_ubin_table) || - is_in_table(ch, &ubin_table) || - (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table)); + (is_in_table(ch, &ubin_table) || + (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table) && + not_user_defined(ch, &user_prt_table, &user_compose_table, &user_omit_table))); } /* @@ -885,7 +909,18 @@ public lbool is_ubin_char(LWCHAR ch) public lbool is_wide_char(LWCHAR ch) { return is_in_table(ch, &user_wide_table) || - is_in_table(ch, &wide_table); + (is_in_table(ch, &wide_table) && + not_user_defined(ch, &user_compose_table, &user_ubin_table, &user_omit_table)); +} + +/* + * Is this an omittable character? + */ +public lbool is_omit_char(LWCHAR ch) +{ + return is_in_table(ch, &user_omit_table) || + (is_in_table(ch, &omit_table) && + not_user_defined(ch, &user_prt_table, &user_compose_table, &user_ubin_table)); } /* @@ -905,4 +940,3 @@ public lbool is_combining_char(LWCHAR ch1, LWCHAR ch2) } return FALSE; } - diff --git a/contrib/less/command.c b/contrib/less/command.c index 3ec1f9b48358..390385547385 100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@ -49,10 +49,13 @@ extern void *ml_examine; extern int wheel_lines; extern int def_search_type; extern lbool search_wrapped; +extern lbool no_poll; extern int no_paste; extern lbool pasting; extern int no_edit_warn; extern POSITION soft_eof; +extern POSITION search_incr_start; +extern char *first_cmd_at_prompt; #if SHELL_ESCAPE || PIPEC extern void *ml_shell; #endif @@ -90,6 +93,8 @@ static int save_proc_backspace; static int screen_trashed_value = 0; static lbool literal_char = FALSE; static lbool ignoring_input = FALSE; +static struct scrpos search_incr_pos = { NULL_POSITION, 0 }; +static int search_incr_hshift; #if HAVE_TIME static time_type ignoring_input_time; #endif @@ -209,6 +214,13 @@ static void mca_search1(void) static void mca_search(void) { + if (incr_search) + { + /* Remember where the incremental search started. */ + get_scrpos(&search_incr_pos, TOP); + search_incr_start = search_pos(search_type); + search_incr_hshift = hshift; + } mca_search1(); set_mlist(ml_search, 0); } @@ -747,6 +759,9 @@ static int mca_char(char c) constant char *pattern = get_cmdbuf(); if (pattern == NULL) return (MCA_MORE); + /* Defer searching if more chars of the pattern are available. */ + if (ttyin_ready()) + return (MCA_MORE); /* * Must save updown_match because mca_search * reinits it. That breaks history scrolling. @@ -758,11 +773,24 @@ static int mca_char(char c) { /* User has backspaced to an empty pattern. */ undo_search(1); + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); } else { + /* + * Suppress tty polling while searching. + * This avoids a problem where tty input + * can cause the search to be interrupted. + */ + no_poll = TRUE; if (search(st | SRCH_INCR, pattern, 1) != 0) + { /* No match, invalid pattern, etc. */ undo_search(1); + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); + } + no_poll = FALSE; } /* Redraw the search prompt and search string. */ if (is_screen_trashed() || !full_screen) @@ -795,6 +823,7 @@ static void clear_buffers(void) #if HILITE_SEARCH clr_hilite(); #endif + set_line_contig_pos(NULL_POSITION); } public void screen_trashed_num(int trashed) @@ -889,6 +918,12 @@ static void prompt(void) next_ifile(curr_ifile) == NULL_IFILE) quit(QUIT_OK); quit_if_one_screen = FALSE; /* only get one chance at this */ + if (first_cmd_at_prompt != NULL) + { + ungetsc(first_cmd_at_prompt); + first_cmd_at_prompt = NULL; + return; + } #if MSDOS_COMPILER==WIN32C /* @@ -962,6 +997,7 @@ static void prompt(void) put_line(FALSE); } clear_eol(); + resume_screen(); } /* @@ -2261,6 +2297,7 @@ public void commands(void) pos_rehead(); hshift -= (int) number; screen_trashed(); + cmd_exec(); break; case A_RSHIFT: @@ -2274,6 +2311,7 @@ public void commands(void) pos_rehead(); hshift += (int) number; screen_trashed(); + cmd_exec(); break; case A_LLSHIFT: @@ -2283,6 +2321,7 @@ public void commands(void) pos_rehead(); hshift = 0; screen_trashed(); + cmd_exec(); break; case A_RRSHIFT: @@ -2292,6 +2331,7 @@ public void commands(void) pos_rehead(); hshift = rrshift(); screen_trashed(); + cmd_exec(); break; case A_PREFIX: diff --git a/contrib/less/compose.uni b/contrib/less/compose.uni index 0875a8dceec1..6b4458efc4b4 100644 --- a/contrib/less/compose.uni +++ b/contrib/less/compose.uni @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Oct 1 18:10:07 GMT 2024 */ +/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Aug 11 0:27:25 GMT 2025 */ { 0x0300, 0x036f }, /* Mn */ { 0x0483, 0x0487 }, /* Mn */ { 0x0488, 0x0489 }, /* Me */ @@ -217,7 +217,6 @@ { 0xd7b0, 0xd7c6 }, /* Mn */ { 0xd7cb, 0xd7fb }, /* Mn */ { 0xfb1e, 0xfb1e }, /* Mn */ - { 0xfe00, 0xfe0f }, /* Mn */ { 0xfe20, 0xfe2f }, /* Mn */ { 0x101fd, 0x101fd }, /* Mn */ { 0x102e0, 0x102e0 }, /* Mn */ @@ -363,4 +362,3 @@ { 0x1e5ee, 0x1e5ef }, /* Mn */ { 0x1e8d0, 0x1e8d6 }, /* Mn */ { 0x1e944, 0x1e94a }, /* Mn */ - { 0xe0100, 0xe01ef }, /* Mn */ diff --git a/contrib/less/decode.c b/contrib/less/decode.c index 8e451d1810c9..1d80d126c207 100644 --- a/contrib/less/decode.c +++ b/contrib/less/decode.c @@ -483,12 +483,12 @@ public void add_ecmd_table(unsigned char *buf, size_t len) /* * Add an environment variable table. */ -static void add_var_table(struct tablelist **tlist, unsigned char *buf, size_t len) +static void add_var_table(struct tablelist **tlist, mutable unsigned char *buf, size_t len) { struct xbuffer xbuf; xbuf_init(&xbuf); - expand_evars((char*)buf, len, &xbuf); /*{{unsigned-issue}}*/ + expand_evars((mutable char*)buf, len, &xbuf); /*{{unsigned-issue}}*/ /* {{ We leak the table in buf. expand_evars scribbled in it so it's useless anyway. }} */ if (add_cmd_table(tlist, xbuf.data, xbuf.end) < 0) error("Warning: environment variables from lesskey file unavailable", NULL_PARG); @@ -749,7 +749,8 @@ static int cmd_search(constant char *cmd, constant unsigned char *table, constan if (match == cmdlen) /* (last chars of) cmd matches this table entry */ { action = taction; - *extra = textra; + if (extra != NULL) + *extra = textra; } else if (match > 0 && action == A_INVALID) /* cmd is a prefix of this table entry */ { action = A_PREFIX; @@ -780,13 +781,11 @@ static int cmd_decode(struct tablelist *tlist, constant char *cmd, constant char for (t = tlist; t != NULL; t = t->t_next) { constant unsigned char *tsp; - size_t mlen; + size_t mlen = match_len; int taction = cmd_search(cmd, t->t_start, t->t_end, &tsp, &mlen); if (mlen >= match_len) { match_len = mlen; - if (taction == A_UINVALID) - taction = A_INVALID; if (taction != A_INVALID) { *sp = (constant char *) tsp; diff --git a/contrib/less/edit.c b/contrib/less/edit.c index 0254584bf211..1816e6f9f9bc 100644 --- a/contrib/less/edit.c +++ b/contrib/less/edit.c @@ -113,9 +113,7 @@ public constant char * forw_textlist(struct textlist *tlist, constant char *prev s = tlist->string; else s = prev + strlen(prev); - if (s >= tlist->endstring) - return (NULL); - while (*s == '\0') + while (s < tlist->endstring && *s == '\0') s++; if (s >= tlist->endstring) return (NULL); @@ -306,7 +304,11 @@ static void close_pipe(FILE *pipefd) if (WIFSIGNALED(status)) { int sig = WTERMSIG(status); - if (sig != SIGPIPE || ch_length() != NULL_POSITION) + if ( +#ifdef SIGPIPE + sig != SIGPIPE || +#endif + ch_length() != NULL_POSITION) { parg.p_string = signal_message(sig); error("Input preprocessor terminated: %s", &parg); diff --git a/contrib/less/fmt.uni b/contrib/less/fmt.uni index 91cfc3e91e61..c861e1908360 100644 --- a/contrib/less/fmt.uni +++ b/contrib/less/fmt.uni @@ -1,5 +1,4 @@ -/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Oct 1 18:10:07 GMT 2024 */ - { 0x00ad, 0x00ad }, /* Cf */ +/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Jul 27 19:38:50 GMT 2025 */ { 0x0600, 0x0605 }, /* Cf */ { 0x061c, 0x061c }, /* Cf */ { 0x06dd, 0x06dd }, /* Cf */ @@ -7,7 +6,8 @@ { 0x0890, 0x0891 }, /* Cf */ { 0x08e2, 0x08e2 }, /* Cf */ { 0x180e, 0x180e }, /* Cf */ - { 0x200b, 0x200f }, /* Cf */ + { 0x200b, 0x200c }, /* Cf */ + { 0x200e, 0x200f }, /* Cf */ { 0x202a, 0x202e }, /* Cf */ { 0x2060, 0x2064 }, /* Cf */ { 0x2066, 0x206f }, /* Cf */ diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c index 300e669f9371..e77c0d4ce198 100644 --- a/contrib/less/forwback.c +++ b/contrib/less/forwback.c @@ -359,7 +359,7 @@ public void forw(int n, POSITION pos, lbool force, lbool only_last, lbool to_new } if (!first_line) add_forw_pos(pos, FALSE); - if (nlines == 0 && !ignore_eoi) + if (nlines == 0 && !ignore_eoi && !ABORT_SIGS()) eof_bell(); else if (do_repaint) repaint(); diff --git a/contrib/less/funcs.h b/contrib/less/funcs.h index b001a5c31902..11605acc8b3b 100644 --- a/contrib/less/funcs.h +++ b/contrib/less/funcs.h @@ -14,6 +14,8 @@ public void init_win_colors(void); public void get_term(void); public void init_mouse(void); public void deinit_mouse(void); +public void suspend_screen(void); +public void resume_screen(void); public void init(void); public void deinit(void); public int interactive(void); @@ -83,6 +85,7 @@ public LWCHAR step_char(char **pp, signed int dir, constant char *limit); public lbool is_composing_char(LWCHAR ch); public lbool is_ubin_char(LWCHAR ch); public lbool is_wide_char(LWCHAR ch); +public lbool is_omit_char(LWCHAR ch); public lbool is_combining_char(LWCHAR ch1, LWCHAR ch2); public void cmd_reset(void); public void clear_cmd(void); @@ -228,7 +231,9 @@ public void jump_loc(POSITION pos, int sline); public void init_line(void); public lbool is_ascii_char(LWCHAR ch); public POSITION line_position(void); -public void prewind(void); +public lbool is_line_contig_pos(POSITION pos); +public void set_line_contig_pos(POSITION pos); +public void prewind(lbool contig); public void plinestart(POSITION pos); public int line_pfx_width(void); public void pshift_all(void); @@ -314,6 +319,7 @@ public void opt_wheel_lines(int type, constant char *s); public void opt_linenum_width(int type, constant char *s); public void opt_status_col_width(int type, constant char *s); public void opt_filesize(int type, constant char *s); +public void opt_first_cmd_at_prompt(int type, constant char *s); public void opt_intr(int type, constant char *s); public int next_cnum(constant char **sp, constant char *printopt, constant char *errmsg, lbool *errp); public void opt_header(int type, constant char *s); @@ -343,6 +349,7 @@ public struct loption * findopt(int c); public struct loption * findopt_name(constant char **p_optname, constant char **p_oname, lbool *p_ambig); public char * findopts_name(constant char *pfx); public void init_poll(void); +public lbool ttyin_ready(void); public int supports_ctrl_x(void); public ssize_t iread(int fd, unsigned char *buf, size_t len); public int iopen(constant char *filename, int flags); @@ -403,6 +410,7 @@ public lbool is_filtered(POSITION pos); public POSITION next_unfiltered(POSITION pos); public int is_hilited_attr(POSITION pos, POSITION epos, int nohide, int *p_matches); public void chg_hilite(void); +public POSITION search_pos(int search_type); public void osc8_search(int search_type, constant char *param, int matches); public lbool osc8_click(int sindex, int col); public void osc8_open(void); @@ -439,7 +447,7 @@ public void xbuf_add_byte(struct xbuffer *xbuf, unsigned char b); public void xbuf_add_char(struct xbuffer *xbuf, char c); public void xbuf_add_data(struct xbuffer *xbuf, constant unsigned char *data, size_t len); public int xbuf_pop(struct xbuffer *buf); -public void xbuf_set(struct xbuffer *dst, struct xbuffer *src); +public void xbuf_set(struct xbuffer *dst, constant struct xbuffer *src); public constant char * xbuf_char_data(constant struct xbuffer *xbuf); public lbool help_ckd_add(void *r, uintmax a, uintmax b, int rsize, int rsigned); public lbool help_ckd_mul(void *r, uintmax a, uintmax b, int rsize, int rsigned); diff --git a/contrib/less/help.c b/contrib/less/help.c index 5d8ba9a1b0fe..ed9465ad9560 100644 --- a/contrib/less/help.c +++ b/contrib/less/help.c @@ -1,4 +1,4 @@ -/* This file was generated by mkhelp.pl from less.hlp at 19:46 on 2025/5/28 */ +/* This file was generated by mkhelp.pl from less.hlp at 18:02 on 2025/10/4 */ #include "less.h" constant char helpdata[] = { '\n', diff --git a/contrib/less/input.c b/contrib/less/input.c index c2f7a28c2c58..dda039b21a27 100644 --- a/contrib/less/input.c +++ b/contrib/less/input.c @@ -96,6 +96,8 @@ public POSITION forw_line_seg(POSITION curr_pos, lbool skipeol, lbool rscroll, l if (p_linepos != NULL) *p_linepos = NULL_POSITION; + if (p_newline != NULL) + *p_newline = TRUE; get_forw_line: if (curr_pos == NULL_POSITION) @@ -104,7 +106,7 @@ get_forw_line: return (NULL_POSITION); } #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) + if (hilite_search == OPT_ONPLUS || is_filtering() || (status_col && hilite_search != OPT_ON)) { /* * If we are ignoring EOI (command F), only prepare @@ -142,39 +144,48 @@ get_forw_line: /* * Read forward again to the position we should start at. */ - prewind(); - plinestart(base_pos); - (void) ch_seek(base_pos); - new_pos = base_pos; - while (new_pos < curr_pos) + if (is_line_contig_pos(curr_pos)) { - c = ch_forw_get(); - if (c == EOI) - { - null_line(); - return (NULL_POSITION); - } - backchars = pappend((char) c, new_pos); - new_pos++; - if (backchars > 0) + prewind(TRUE); + plinestart(base_pos); + ch_seek(curr_pos); + new_pos = curr_pos; + } else + { + prewind(FALSE); + plinestart(base_pos); + ch_seek(base_pos); + new_pos = base_pos; + while (new_pos < curr_pos) { - pshift_all(); - if (wordwrap && (c == ' ' || c == '\t')) + c = ch_forw_get(); + if (c == EOI) { - do + null_line(); + return (NULL_POSITION); + } + backchars = pappend((char) c, new_pos); + new_pos++; + if (backchars > 0) + { + pshift_all(); + if (wordwrap && (c == ' ' || c == '\t')) { - new_pos++; - c = ch_forw_get(); /* {{ what if c == EOI? }} */ - } while (c == ' ' || c == '\t'); - backchars = 1; + do + { + new_pos++; + c = ch_forw_get(); /* {{ what if c == EOI? }} */ + } while (c == ' ' || c == '\t'); + backchars = 1; + } + new_pos -= backchars; + while (--backchars >= 0) + (void) ch_back_get(); } - new_pos -= backchars; - while (--backchars >= 0) - (void) ch_back_get(); } + pshift_all(); } (void) pflushmbc(); - pshift_all(); /* * Read the first character to display. @@ -329,6 +340,7 @@ get_forw_line: *p_linepos = curr_pos; if (p_newline != NULL) *p_newline = endline; + set_line_contig_pos(endline ? NULL_POSITION : new_pos); return (new_pos); } @@ -358,6 +370,8 @@ public POSITION back_line(POSITION curr_pos, lbool *p_newline) lbool skipped_leading; get_back_line: + if (p_newline != NULL) + *p_newline = TRUE; if (curr_pos == NULL_POSITION || curr_pos <= ch_zero()) { null_line(); @@ -426,7 +440,7 @@ get_back_line: } #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) + if (hilite_search == OPT_ONPLUS || is_filtering() || (status_col && hilite_search != OPT_ON)) prep_hilite(base_pos, NULL_POSITION, 1); #endif @@ -446,10 +460,8 @@ get_back_line: return (NULL_POSITION); } endline = FALSE; - prewind(); + prewind(FALSE); plinestart(new_pos); - if (p_newline != NULL) - *p_newline = TRUE; loop: wrap_pos = NULL_POSITION; skipped_leading = FALSE; diff --git a/contrib/less/less.h b/contrib/less/less.h index 7b2d2c25bfc6..a30693a35a7a 100644 --- a/contrib/less/less.h +++ b/contrib/less/less.h @@ -216,7 +216,7 @@ void free(); * Special types and constants. */ typedef unsigned long LWCHAR; -#if defined(MINGW) || (defined(_MSC_VER) && _MSC_VER >= 1500) +#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1500) typedef long long less_off_t; /* __int64 */ typedef struct _stat64 less_stat_t; #define less_fstat _fstat64 @@ -435,6 +435,7 @@ typedef enum osc8_state { #define AT_ANSI (1 << 4) /* Content-supplied "ANSI" escape sequence */ #define AT_BINARY (1 << 5) /* LESS*BINFMT representation */ #define AT_HILITE (1 << 6) /* Internal highlights (e.g., for search) */ +#define AT_PLACEHOLDER (1 << 7) /* Placeholder for half of double-wide char */ #define AT_COLOR_SHIFT 8 #define AT_NUM_COLORS 16 @@ -554,6 +555,8 @@ typedef enum { #define ESC CONTROL('[') #define ESCS "\33" #define CSI ((unsigned char)'\233') +#define VARSEL_15 ((LWCHAR)0xFE0E) /* VARIATION SELECTOR 15 */ +#define VARSEL_16 ((LWCHAR)0xFE0F) /* VARIATION SELECTOR 16 */ #if _OSK_MWC32 #define LSIGNAL(sig,func) os9_signal(sig,func) diff --git a/contrib/less/less.nro b/contrib/less/less.nro index 25a9869a9c59..ae43e8851d0e 100644 --- a/contrib/less/less.nro +++ b/contrib/less/less.nro @@ -1,5 +1,5 @@ '\" t -.TH LESS 1 "Version 679: 28 May 2025" +.TH LESS 1 "Version 685: 04 Oct 2025" .SH NAME less \- display the contents of a file in a terminal .SH SYNOPSIS @@ -203,8 +203,11 @@ Followed by another single quote, returns to the position at which the last "large" movement command was executed. Followed by a \(ha or $, jumps to the beginning or end of the file respectively. -Marks are preserved when a new file is examined, +Marks are preserved when a new file is examined within a single invocation of +.BR less , so the \(aq command can be used to switch between input files. +The \-\-save-marks option causes marks to be preserved across different invocations of +.BR less . .IP "\(haX\(haX" Same as single quote. .IP "ESC-m" @@ -800,8 +803,9 @@ where the first integer specifies the foreground color and the second specifies the background color. Each integer is a value between 0 and 255 inclusive which selects a "CSI 38;5" color value (see -.UR https://en.wikipedia.org/wiki/ANSI_escape_code#SGR -.UE ). +.nh +https://en.wikipedia.org/wiki/ANSI_escape_code#SGR). +.hy If either integer is a "-" or is omitted, the corresponding color is set to that of normal text. .PP @@ -835,8 +839,9 @@ CHAR_INFO.Attributes .hy value, between 0 and 15 inclusive (see -.UR https://learn.microsoft.com/en-us/windows/console/char-info-str -.UE ). +.nh +https://learn.microsoft.com/en-us/windows/console/char-info-str). +.hy To avoid confusion, it is recommended that the equivalent letters rather than numbers be used after a lowercase color selector on MS-DOS/Windows. @@ -1213,8 +1218,9 @@ the name of a command compatible with .BR global (1), and that command is executed to find the tag. (See -.UR http://www.gnu.org/software/global/global.html -.UE ). +.nh +http://www.gnu.org/software/global/global.html). +.hy The \-t option may also be specified from within .B less (using the \- command) as a way of examining a new file. @@ -1328,6 +1334,16 @@ of the screen, starting with a decimal point: \&.5 is half of the screen width, \&.3 is three tenths of the screen width, and so on. If the number is specified as a fraction, the actual number of scroll positions is recalculated if the terminal window is resized. +.IP "\-\-cmd=\fIcommands\fP +The specified string is taken to be an initial command to +.BR less . +This is similar to specifying "+\fIcommands\fP", except that +commands specified by \-\-cmd are not executed if +.B less +exits immediately due to the use of the \-E or \-F option, while +commands specified by the \fB+\fP option are executed even if +.B less +exits immediately. .IP "\-\-exit-follow-on-close" When using the "F" command on a pipe, .B less @@ -1583,8 +1599,9 @@ Enables colored text in various places. The \-D option can be used to change the colors. Colored text works only if the terminal supports ANSI color escape sequences (as defined in -.UR https://www.ecma-international.org/publications-and-standards/standards/ecma-48 -.UE ). +.nh +https://www.ecma-international.org/publications-and-standards/standards/ecma-48). +.hy .IP "\-\-wheel-lines=\fIn\fP" Set the number of lines to scroll when the mouse wheel is scrolled and the \-\-mouse or \-\-MOUSE option is in effect. @@ -1598,6 +1615,9 @@ The default is to wrap at any character. A command line argument of "\-\-" marks the end of option arguments. Any arguments following this are interpreted as filenames. This can be useful when viewing a file whose name begins with a "\-" or "+". +Otherwise, option arguments and filename arguments can be intermixed; +that is, option arguments do not need to appear before filename arguments, +unless the environment variable POSIXLY_CORRECT is set. .IP + If a command line option begins with \fB+\fP, the remainder of that option is taken to be an initial command to @@ -1613,6 +1633,7 @@ If the option starts with ++, the initial command applies to every file being viewed, not just the first one. The + command described previously may also be used to set (or change) an initial command for every file. +Also see the \-\-cmd option. . .SH "LINE EDITING" When entering a command line at the bottom of the screen @@ -1913,7 +1934,7 @@ Again, in this case the dash is not considered to be part of the input pipe command. . .SH "NATIONAL CHARACTER SETS" -There are three types of characters in the input file: +There are five types of characters in the input file: .IP "normal characters" can be displayed directly to the screen. .IP "control characters" @@ -1922,6 +1943,12 @@ in ordinary text files (such as backspace and tab). .IP "binary characters" should not be displayed directly and are not expected to be found in text files. +.IP "composing characters" +are not displayed separately, but modify the display of the +preceding character. (Only when LESSCHARSET is "utf8".) +.IP "deleted characters" +are simply deleted from the input and not displayed. +(Only when LESSCHARSET is "utf8".) .PP A "character set" is simply a description of which characters are to be considered normal, control, and binary. @@ -2049,7 +2076,7 @@ of how the UTF-8 file is ill-formed. .PP When the character set is utf-8, in rare cases it may be desirable to override the Unicode definition of the type of certain characters. -For example, characters in a Private Use Area are normally treated as control +For example, characters in a Private Use Area are normally treated as binary characters, but if you are using a custom font with printable characters in that range, it may be desirable to tell .B less @@ -2076,6 +2103,8 @@ A wide (2-space) printable character. A binary (non-printable) character. .IP "c" A composing (zero width) character. +.IP "d" +A deleted character (deleted from the input and not displayed). .RE .PP For example, setting LESSUTFCHARDEF to @@ -2085,6 +2114,18 @@ For example, setting LESSUTFCHARDEF to .sp .fi would make all Private Use Area characters be treated as printable. +.PP +By default, emoji modifiers, components and variation selectors +are deleted because many terminals do not display them correctly. +If you use a terminal which does display some or all of them correctly, +you can cause to be displayed by setting LESSUTFCHARDEF +to treat them as composing characters. +For example, this sets them all to composing characters: +.nf +.sp + FE00-FE0F:c,1F3FB-1F3FF:c,1F9B0-1F9B3:c,E0100-E01EF:c +.sp +.fi .SH "PROMPTS" The \-P option allows you to tailor the prompt to your preference. The string given to the \-P option replaces the specified prompt string. @@ -2407,8 +2448,8 @@ end character in an ANSI color escape sequence (default "0123456789:;[?!"\(aq#%()*+\ "). .IP LESSANSIOSCALLOW A comma-separated list of OSC types which are output directly to the -terminal when \-R is in effect. -By default, only OSC 8 sequences are output directly. +terminal when \-R is in effect +(default "8"; that is, only OSC 8 sequences are output directly). .IP LESSANSIOSCCHARS Characters which may follow an ESC character to mark the start of an "OS Command" sequence. @@ -2480,9 +2521,7 @@ file. (Not used if "$LESSKEYIN_SYSTEM" exists.) List of characters which are considered "metacharacters" by the shell. .IP LESSMETAESCAPE Prefix which less will add before each metacharacter in a -command sent to the shell. -If LESSMETAESCAPE is an empty string, commands containing -metacharacters will not be passed to the shell. +command sent to the shell (default "\\"). .IP LESSOPEN Command line to invoke the (optional) input-preprocessor. .IP LESSSECURE @@ -2492,7 +2531,8 @@ See discussion under SECURITY. Enables individual features which are normally disabled by LESSSECURE. See discussion under SECURITY. .IP LESSSEPARATOR -String to be appended to a directory name in filename completion. +String to be appended to a directory name in filename completion +(default "\\" on MS-DOS, Windows, and OS/2; otherwise "/"). .IP LESSUTFBINFMT Format for displaying non-printable Unicode code points. .IP LESSUTFCHARDEF @@ -2550,6 +2590,24 @@ receives a SIGUSR1 signal. .IP LESS_TERMCAP_xx Where "xx" is any two characters, overrides the definition of the termcap "xx" capability for the terminal. +.IP LESS_TERMCAP_BRACKETED_PASTE_START +Overrides the standard ANSI escape sequence to enable bracketed paste. +This is used when the \-\-no-paste option is in effect. +.IP LESS_TERMCAP_BRACKETED_PASTE_END +Overrides the standard ANSI escape sequence to disable bracketed paste. +.IP LESS_TERMCAP_MOUSE_START +Overrides the standard ANSI escape sequence to enable mouse reporting. +This is used when the \-\-mouse option is in effect. +.IP LESS_TERMCAP_MOUSE_END +Overrides the standard ANSI escape sequence to disable mouse reporting. +.IP LESS_TERMCAP_SUSPEND +Defines an escape sequence to temporarily suspend screen updates. +This is sent to the terminal before clearing the screen. +This can be used to avoid screen tearing when the screen is redrawn +on certain terminals. +.IP LESS_TERMCAP_RESUME +Defines an escape sequence to resume screen updates. +This is sent to the terminal after displaying the prompt. .IP LESS_UNSUPPORT A space-separated list of command line options. These options will be ignored (with no error message) if they appear @@ -2571,6 +2629,12 @@ automatically when running in .IP PATH User's search path (used to find a lesskey file on MS-DOS, Windows, and OS/2 systems). +.IP POSIXLY_CORRECT +If set to any value, all option arguments on the command line +are expected to appear before any filename arguments. +This must be set as an actual environment variable, not in a +.B lesskey +file. .IP SHELL The shell used to execute the !\& command, as well as to expand filenames. .IP TERM @@ -2619,10 +2683,12 @@ See the GNU General Public License for more details. *** 938 LINES SKIPPED *** From nobody Thu Nov 13 15:59:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6lMF2RqVz6H4Kh; Thu, 13 Nov 2025 15:59: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 4d6lMF1ZZHz3bDv; Thu, 13 Nov 2025 15:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763049561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjnhaBar99MLJ9nuKZtOAI8yGVtbTIfHkzwUX+VHrfI=; b=vJeG74sQTyf/y+Mj3/aaL9YgkHq+sjojH98loY+DOSc6O00mznx0LCnCokwwCYU5HI+is7 mCt0UUJ6Qc6NYy9NcXcq3eIdEVEv5L45bmcvz0aJuvLk/z31rqMiCHRDpkiedN+/6AKma3 XyeD2Y/A7D1XmFOeg9vvoxeQMql+NyXHuc4G0jXB1Lo3OMOJAxvgmIVuf2IrvfCd6HM+ue JYr1/8lqd3Ig0zwB8zsIWj8Ae7LWvZENidAgrXSQa2d9Y9rxJv6X53zADlictA4Q9SwHs6 lvcSWD2/9U2olZt1Bs7L9Xa0/ZpjJ+TkYim/fUKBxbiBEuuk9vkmujnr8njLtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763049561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjnhaBar99MLJ9nuKZtOAI8yGVtbTIfHkzwUX+VHrfI=; b=VANzvJgswJGPChPfVjq9aM97iF6QBVlw5CirT3PGAK0ODXMC2XgccOQS0H/CLhJgTeRBlN +rhmcoVQTT8P7HKZrSMkx9dqNkRhK0xCEx+5d25V/31o3bYeQS5kbDyWWspB+l/KWHFI6H oglL6KIYCU6X3AF1TsGviVU/s/NGfbi7ggBSSm/ghmRDENjGn8cHuuIcCHUk1YDf9ka+cu OFO2Su1qr7TDjiwIDp7a37M4uwYr8X1fkoValox6jFF2JTY+NQ9JuqiKng05cQkooUbGfC 8fA3zgHl8WJUa51DZfBfsyxx3mPcjHIktbJKDYhnQCXoCMTf0VkEvSQcq0U4Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763049561; a=rsa-sha256; cv=none; b=anG5CPGIV6aX3/+/YQHWI7XBcaH7upufCYkr/GvwLrf4B+QgzEwRs4YE/M2E4yh1mV5tRj jNbUb41d+PYecIdG8mIAHEcqMNv6bPq0UDMATqJpgeZXCyYFAQvqlHFYBRDM6uTJamE6V8 WhSb4WsS8d3u0XXdCq9fP2ajW7R2bMqO7AXLl+JV3+uXjraR7jT5A67kIXexltTejeRZuh zjIBRAeNdd1/0LD31ZSar6adx63hgD6fIAU5gY/mj9DymcTibynQi3JIGR/LtU27N98oGI vdiLEpJtu6EkFfsAuGHikWMGIe8Q6nrPGcRssuFTlJSec+ICE1tI0mK1D1fLuA== 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 4d6lMF0m9TzC3Z; Thu, 13 Nov 2025 15:59: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 5ADFxKl6096413; Thu, 13 Nov 2025 15:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADFxK7N096410; Thu, 13 Nov 2025 15:59:20 GMT (envelope-from git) Date: Thu, 13 Nov 2025 15:59:20 GMT Message-Id: <202511131559.5ADFxK7N096410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ae17780c7175 - stable/15 - stand: Teach the zfs loader about dynamic gang headers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae17780c717547a7b52cc593dca8867c0e14f9ef Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae17780c717547a7b52cc593dca8867c0e14f9ef commit ae17780c717547a7b52cc593dca8867c0e14f9ef Author: Mark Johnston AuthorDate: 2025-11-06 16:00:50 +0000 Commit: Mark Johnston CommitDate: 2025-11-13 13:48:59 +0000 stand: Teach the zfs loader about dynamic gang headers There is a pool feature, dynamic_gang_header, that is enabled by default in new pools. When this feature is active, gang headers may be larger than 512 bytes. The loader needs to be taught to cope with that. Try using the vdev ashift to pick the gang block header size. If the checksum fails, fall back to the old gang block header size. This is based on a patch by Paul Dagnelie, with testing, bug-fixing and some simplifications from me. PR: 289690 Co-authored by: Paul Dagnelie Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53578 (cherry picked from commit 4d6801a6b5bdd4d055a00484a743cb4ada659669) --- stand/libsa/zfs/zfsimpl.c | 67 ++++++++++++++++++++++++++++++++++++--------- sys/cddl/boot/zfs/zfsimpl.h | 15 ++-------- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index f15d9b016068..e5920004bd9d 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -128,6 +128,7 @@ static const char *features_for_read[] = { "org.open-zfs:large_blocks", "org.openzfs:blake3", "org.zfsonlinux:large_dnode", + "com.klarasystems:dynamic_gang_header", NULL }; @@ -141,6 +142,8 @@ static uint64_t dnode_cache_bn; static char *dnode_cache_buf; static int zio_read(const spa_t *spa, const blkptr_t *bp, void *buf); +static int zio_read_impl(const spa_t *spa, const blkptr_t *bp, void *buf, + bool print); static int zfs_get_root(const spa_t *spa, uint64_t *objid); static int zfs_rlookup(const spa_t *spa, uint64_t objnum, char *result); static int zap_lookup(const spa_t *spa, const dnode_phys_t *dnode, @@ -530,7 +533,7 @@ vdev_indirect_mapping_duplicate_adjacent_entries(vdev_t *vd, uint64_t offset, } static vdev_t * -vdev_lookup_top(spa_t *spa, uint64_t vdev) +vdev_lookup_top(const spa_t *spa, uint64_t vdev) { vdev_t *rvd; vdev_list_t *vlist; @@ -2270,45 +2273,77 @@ ilog2(int n) return (-1); } +static inline uint64_t +gbh_nblkptrs(uint64_t size) +{ + ASSERT(IS_P2ALIGNED(size, sizeof(blkptr_t))); + return ((size - sizeof(zio_eck_t)) / sizeof(blkptr_t)); +} + static int zio_read_gang(const spa_t *spa, const blkptr_t *bp, void *buf) { blkptr_t gbh_bp; - zio_gbh_phys_t zio_gb; + void *gbuf; char *pbuf; - int i; + uint64_t gangblocksize; + int err, i; + + gangblocksize = UINT64_MAX; + for (int dva = 0; dva < BP_GET_NDVAS(bp); dva++) { + vdev_t *vd = vdev_lookup_top(spa, + DVA_GET_VDEV(&bp->blk_dva[dva])); + gangblocksize = MIN(gangblocksize, 1ULL << vd->v_ashift); + } /* Artificial BP for gang block header. */ gbh_bp = *bp; - BP_SET_PSIZE(&gbh_bp, SPA_GANGBLOCKSIZE); - BP_SET_LSIZE(&gbh_bp, SPA_GANGBLOCKSIZE); + BP_SET_PSIZE(&gbh_bp, gangblocksize); + BP_SET_LSIZE(&gbh_bp, gangblocksize); BP_SET_CHECKSUM(&gbh_bp, ZIO_CHECKSUM_GANG_HEADER); BP_SET_COMPRESS(&gbh_bp, ZIO_COMPRESS_OFF); for (i = 0; i < SPA_DVAS_PER_BP; i++) DVA_SET_GANG(&gbh_bp.blk_dva[i], 0); + gbuf = malloc(gangblocksize); + if (gbuf == NULL) + return (ENOMEM); /* Read gang header block using the artificial BP. */ - if (zio_read(spa, &gbh_bp, &zio_gb)) + err = zio_read_impl(spa, &gbh_bp, gbuf, false); + if ((err == EIO || err == ECKSUM) && + gangblocksize > SPA_OLD_GANGBLOCKSIZE) { + /* This might be a legacy gang block header, try again. */ + gangblocksize = SPA_OLD_GANGBLOCKSIZE; + BP_SET_PSIZE(&gbh_bp, gangblocksize); + BP_SET_LSIZE(&gbh_bp, gangblocksize); + err = zio_read(spa, &gbh_bp, gbuf); + } + if (err != 0) { + free(gbuf); return (EIO); + } pbuf = buf; - for (i = 0; i < SPA_GBH_NBLKPTRS; i++) { - blkptr_t *gbp = &zio_gb.zg_blkptr[i]; + for (i = 0; i < gbh_nblkptrs(gangblocksize); i++) { + blkptr_t *gbp = &((blkptr_t *)gbuf)[i]; if (BP_IS_HOLE(gbp)) continue; - if (zio_read(spa, gbp, pbuf)) + if (zio_read(spa, gbp, pbuf)) { + free(gbuf); return (EIO); + } pbuf += BP_GET_PSIZE(gbp); } + free(gbuf); if (zio_checksum_verify(spa, bp, buf)) return (EIO); return (0); } static int -zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) +zio_read_impl(const spa_t *spa, const blkptr_t *bp, void *buf, bool print) { int cpfunc = BP_GET_COMPRESS(bp); uint64_t align, size; @@ -2340,7 +2375,7 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) size, buf, BP_GET_LSIZE(bp)); free(pbuf); } - if (error != 0) + if (error != 0 && print) printf("ZFS: i/o error - unable to decompress " "block pointer data, error %d\n", error); return (error); @@ -2394,7 +2429,7 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) BP_GET_PSIZE(bp), buf, BP_GET_LSIZE(bp)); else if (size != BP_GET_PSIZE(bp)) bcopy(pbuf, buf, BP_GET_PSIZE(bp)); - } else { + } else if (print) { printf("zio_read error: %d\n", error); } if (buf != pbuf) @@ -2402,12 +2437,18 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) if (error == 0) break; } - if (error != 0) + if (error != 0 && print) printf("ZFS: i/o error - all block copies unavailable\n"); return (error); } +static int +zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) +{ + return (zio_read_impl(spa, bp, buf, true)); +} + static int dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, size_t buflen) diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index c9de1fe4c391..d3ae3c32635d 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -94,6 +94,7 @@ typedef enum { B_FALSE, B_TRUE } boolean_t; #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) #define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) +#define IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0) /* * General-purpose 32-bit and 64-bit bitfield encodings. @@ -498,19 +499,7 @@ typedef struct zio_eck { * Gang block headers are self-checksumming and contain an array * of block pointers. */ -#define SPA_GANGBLOCKSIZE SPA_MINBLOCKSIZE -#define SPA_GBH_NBLKPTRS ((SPA_GANGBLOCKSIZE - \ - sizeof (zio_eck_t)) / sizeof (blkptr_t)) -#define SPA_GBH_FILLER ((SPA_GANGBLOCKSIZE - \ - sizeof (zio_eck_t) - \ - (SPA_GBH_NBLKPTRS * sizeof (blkptr_t))) /\ - sizeof (uint64_t)) - -typedef struct zio_gbh { - blkptr_t zg_blkptr[SPA_GBH_NBLKPTRS]; - uint64_t zg_filler[SPA_GBH_FILLER]; - zio_eck_t zg_tail; -} zio_gbh_phys_t; +#define SPA_OLD_GANGBLOCKSIZE SPA_MINBLOCKSIZE #define VDEV_RAIDZ_MAXPARITY 3 From nobody Thu Nov 13 16:28: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 4d6m0d08g7z6H66F; Thu, 13 Nov 2025 16:28: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 4d6m0c6M1xz3gcf; Thu, 13 Nov 2025 16:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763051296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qf0U+zxRiS896DtN5uTg7TIuCaXY9lDzJYG8qtuGCOg=; b=fr6KtD+YeN6q1SPod7eMiCXrKdOQfK4f8IGS9ejd2eFpgp6dQxmeiv1aXW2AYxNBWdsA65 cNqDX+vwBcKUCeFh4AZsQzOHLbSipA/WCIPVd/XJr6tnCW51gthVon/GN2S/dDdz2DE/hm bfqtLWaX3FtINNl2QwxFRAOSzm7vmx3JqcmwW2zoItI9ClIlJYsrDEIgeC/bKxhxCY6ToH c3nXqjJ0b5RhSCCTeNB6yo89vais39iyKR86ZydxV4mx7govuUVGFV1pmzjQujz04oIni2 LNLJiFNDtPNekF5WBPbRsDGRLGfgTBWVyXiUS2xMf0bmadZf7YO7BSEGQWh/ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763051296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qf0U+zxRiS896DtN5uTg7TIuCaXY9lDzJYG8qtuGCOg=; b=B0g1D1F+ojxrWFNFVaPKOrDGGLIOCy6dzENFStDFSuv698VJl1JMrcYaAVxnllswgNiXk3 C4KM0OH8WZN7o05YgmJtDkFG8Fo3qw9/Yrmln/p1aRJq0gAMi1WbXbZLCZt32UFy9KsYRb 3LXeWslsOh8jDPqUFZSxX0mEiuAKpm74pL7AV2PAExVLFYaxbTPWsSnvGt7nljEME11IF/ BjA4rvwBxY8guA06ycsPb2aDOUJLUwrOAl9/ZTKwKYsmVFE9Fp0HC61KgZs68SihExYyta X2hDCbUGCut+32tgRNNw9hP4+qX5XWTDvRqqvdY+8pvRVxFUgTyrz67zdI2woA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763051296; a=rsa-sha256; cv=none; b=qtI6tYZLmv6VoGCA5bWYAgFldHf3f3YP/8ZAb/QCrBcxofJC4ITpncYNsZ4lBQ6QXktkg2 xqXmlPeS+BJjjeaFBtgGOxs72ncpU2ltwVwohhQDwFGMtQzgm83aWj1nKl/ItZyE1fVw7W RLanuDqz39AVUS/JP153UE7h0FCjkX0/VpsDu5JlzSVulg6YGSxn1kQhaqVIdzWWEZ41Y4 QktUlQjbb596buQG71rdsp+0sbAU4z2k5dNRAxJSf/PqXq+c1upKunhszOvgRpUcsjRrUp kLMvKqN9REWOMVBOL3T6npqLSqcMki72dv4Uv8uacSWSKB+o6buoiopw1OZdXQ== 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 4d6m0c5ncqzCL2; Thu, 13 Nov 2025 16:28: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 5ADGSGD7053481; Thu, 13 Nov 2025 16:28:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADGSGJV053478; Thu, 13 Nov 2025 16:28:16 GMT (envelope-from git) Date: Thu, 13 Nov 2025 16:28:16 GMT Message-Id: <202511131628.5ADGSGJV053478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c03593716fb1 - stable/15 - uart: provide and use default rclk for JH7110 UART 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c03593716fb13a776778993a83d6385497b373e8 Auto-Submitted: auto-generated The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c03593716fb13a776778993a83d6385497b373e8 commit c03593716fb13a776778993a83d6385497b373e8 Author: Mitchell Horne AuthorDate: 2025-10-14 18:02:40 +0000 Commit: Mitchell Horne CommitDate: 2025-11-13 16:24:48 +0000 uart: provide and use default rclk for JH7110 UART A regression in the u-boot-provided JH7110 device tree leaves the uart incorrectly configured. The issue arises when a baud rate is specified ('current-speed' property), but the rclk value is not ('clock-frequency'). Previous releases, e.g. v2025.04, provided both. The alternative way to retrieve this value is to query the parent clock, but our clk framework is not available during early console probing and configuration. In this instance, we end up defaulting to DEFAULT_RCLK in ns8250_init(), which is the wrong value. The relevant uart class (uart_snps) should provide a default rclk in its definition, but it does not. Add a new variant class with the correct default rclk of 24000000. Finally, uart_cpu_fdt_probe() needs to be updated to actually query this default value when it does not find a 'clock-frequency' property. This was simply missing; the ACPI uart bus behaves identically, see uart_acpi_probe(). PR: 289978 Reported by: rdunkle@smallcatbrain.com MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53119 (cherry picked from commit 6de1c50e78a826abc08660e4c3ac10f1ddba9ba2) --- sys/dev/uart/uart_bus_fdt.c | 6 ++++++ sys/dev/uart/uart_dev_snps.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c index 431f2962adb2..e9a7e04e4e0c 100644 --- a/sys/dev/uart/uart_bus_fdt.c +++ b/sys/dev/uart/uart_bus_fdt.c @@ -238,6 +238,12 @@ uart_cpu_fdt_probe(struct uart_class **classp, bus_space_tag_t *bst, clk = 0; } + /* + * Grab the default rclk from the uart class. + */ + if (clk == 0) + clk = class->uc_rclk; + /* * Retrieve serial attributes. */ diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c index 6067920e3c2a..0372a220282b 100644 --- a/sys/dev/uart/uart_dev_snps.c +++ b/sys/dev/uart/uart_dev_snps.c @@ -113,7 +113,17 @@ struct uart_class uart_snps_class = { .uc_rclk = 0, }; +struct uart_class uart_snps_jh7110_class = { + "snps", + snps_methods, + sizeof(struct snps_softc), + .uc_ops = &uart_ns8250_ops, + .uc_range = 8, + .uc_rclk = 24000000, +}; + static struct ofw_compat_data compat_data[] = { + { "starfive,jh7110-uart", (uintptr_t)&uart_snps_jh7110_class }, { "snps,dw-apb-uart", (uintptr_t)&uart_snps_class }, { "marvell,armada-38x-uart", (uintptr_t)&uart_snps_class }, { NULL, (uintptr_t)NULL } From nobody Thu Nov 13 16:28:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6m0f2Fpjz6H66P; Thu, 13 Nov 2025 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6m0f1DwRz3gjl; Thu, 13 Nov 2025 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763051298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZqMubf93UrAxFgdRsGNuJoX+fUzVOWUH0y3rw/ivNM=; b=lmtLVzw7PHQfKtKkX+/TZvT7KlTl65rKNhFs+KhCUr3GTx6RwQ+WX4Xf1AY9VlLK3Pg75m NJrS03cT53QDRoMRnBhRbmxN/TzmnYRX7QfcBPOQev68tUspMh0zo5SlsC46ZS0fszsnO3 jPg9aX0aFeUaPSmJdI5fQHhqcP94AyVEmu93SyS0Fa3ILT5bfOMzHE//w8k0TS2M1IaSGB yuwGcBSS3uBqYJ5xXqwsVZo05L8gcxPRuafxk+IjKPxxKF9IniPGAD+FDjJX+R2nfmKu+r 8cmtR0hJtbnHg5XMcHu16JraVNfuH9RMTmqH4/+W1wDfWrn7gMU+MUA/6OHvFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763051298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZqMubf93UrAxFgdRsGNuJoX+fUzVOWUH0y3rw/ivNM=; b=l0BvkibOajiTVo+zZO4MoYhcIshVRm3JEqSQfaJ96qkXiB3PGssFATU3TOZpkyW2a+6XDG e8V9X04BoT71yDqdWcub8HyrKBMWVl6rrJobqE+1J9b503RZOC+ixq7ank1C5w7lpObNUl f4RDBxX35iZ0/E8jVqJhu2jfernNLKf2nAaxAd09CUhK7xxs5f+/pCEtTQGLtaFxZjjyam fMh5dFb3qZf5f3itZJpMlY02b5IfyhKdJf4xsu7C6wrLDDamiF5eB3HV3rpPwkmQWGP4if OPrRmHlEqerCkEsVB3oohB8OWCLbQ/TRMKg/j749krcNclY09Ygo/IAbW3Fa1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763051298; a=rsa-sha256; cv=none; b=cbTBAmd2P3JbNnp1vm/EUByxfeuXgj8LyNSGiEBQjEORAWxjKA1/9zBH388SycY9KehScA 4OXyXdPKxlxXG9mPQBmrERRQpH/AEfDcUm6NYjEe4tf3v8wRPCHNOSt/2QGmS2l7UqNUZO 55JwkGnX5W/+vAzivqo9StgliMjzWeJfFab3YKw9a9ZlyxS4edL6xK9R1zKTulvuOYgvPo GYxtu0MJGgRDRvzS+R0jroNtTwnIEPHBtt1P5uwcEP5/ijkgwNDG5x5ETufjGlksN6RVdr eo2sSgaYnp49HSjSf/5wuhIaGZg81Lj2ADX7y03bdwPBKkuIU97UqH428LMMow== 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 4d6m0f0XBWzCL3; Thu, 13 Nov 2025 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ADGSHUs053513; Thu, 13 Nov 2025 16:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADGSHN8053510; Thu, 13 Nov 2025 16:28:17 GMT (envelope-from git) Date: Thu, 13 Nov 2025 16:28:17 GMT Message-Id: <202511131628.5ADGSHN8053510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: fc22812b6685 - stable/15 - mmc_fdt: handle broken-cd property 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fc22812b66851523de41be79c9a0c1395d7a76c9 Auto-Submitted: auto-generated The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fc22812b66851523de41be79c9a0c1395d7a76c9 commit fc22812b66851523de41be79c9a0c1395d7a76c9 Author: Mitchell Horne AuthorDate: 2025-11-05 14:37:36 +0000 Commit: Mitchell Horne CommitDate: 2025-11-13 16:24:48 +0000 mmc_fdt: handle broken-cd property The documented properties [1] for card-detection are one of: - cd-gpios - non-removable - broken-cd In cd_setup() we handle the first two, but not the latter, resulting in a silently undetected card on an affected system. To work around this, force cd_disabled when broken-cd is specified, so that the card detect helper function gets to run. A more complete solution would implement some kind of polling mechanism to detect the card's presence or removal. Some variants of the Allwinner D1, such as the Lichee Rv, specify this property in the mmc0 device node. [1] sys/contrib/device-tree/Bindings/mmc/mmc-controller.yaml Reported by: Haowu Ge Tested by: Haowu Ge Reviewed by: imp, manu, mmel MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53546 (cherry picked from commit 768ee6d454821cc63247cb4ffe526c5a06accff0) --- sys/dev/mmc/mmc_fdt_helpers.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c index aed85dab55f4..980785464a00 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -159,6 +159,17 @@ cd_setup(struct mmc_helper *helper, phandle_t node) return; } + /* + * If the device has no card-detection, treat it as non-removable. + * This could be improved by polling for detection. + */ + if (helper->props & MMC_PROP_BROKEN_CD) { + helper->cd_disabled = true; + if (bootverbose) + device_printf(dev, "Broken card-detect\n"); + return; + } + /* * If there is no cd-gpios property, then presumably the hardware * PRESENT_STATE register and interrupts will reflect card state From nobody Thu Nov 13 20:12: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 4d6rzR4HbMz6G7vm; Thu, 13 Nov 2025 20:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6rzQ6j5xz46r7; Thu, 13 Nov 2025 20:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763064755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ir8RV5JRuS35PmrZW3soD9/E7LfAHsfF8FtsL1Q50uM=; b=JdYq1axymJ5u1Ejc6eJsLZ0wkFuyUnmnAbxjOALVMvubABeQWjIKyKWYTxsZP/mTN5kgNE o3J11yJ2dmYWuKzXHgrRQQ5NMisPIZ0PRCcW0clHp5KD1OZw9eRo/h2T3k1NPnpQYeqT86 iya7gSqyJuec2/Gm6C+nvzlnxnjRJPR0Im/Bo+WZYbTr2iwmGL5Zffvv5+lII11jYnwlLS xT+fGwWRYrHeUkLAh6SqTm9DH2yqu5D0/IFBJVT+N9aKuXGmK+GQZ66c/cNwYksGk3T/Re lLNiwEz3R5FNwGYC2gSsmt7hEI85rG00Lrec1d6y9Bq9nsItRXKTRqcogk7Leg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763064755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ir8RV5JRuS35PmrZW3soD9/E7LfAHsfF8FtsL1Q50uM=; b=BgOfBpT99uKMSAP329WyZkzIANtcY9xPptX+oToRPUKaAAvcl74fVvHOv8Ry7VBoNWL+sW Kj+AKJW4wWYw1h7rZk9OnB8OI9fbDWn3vClZLufXorHstnHFRZ+Ywa3tMbEsujFlXx4nSQ Ww7821TpqoxSOrM/9vfRWvXsm3RhEWABrZH/RzCL+6wcRagtYpHL0r490MrjP7KTLGDMzX ddrnywv5MGKscr6NWRFUsnTIh1AIiSOiHB+GzQBwtXCo7z57ghjfjinU0vHx+Dc0CsYTcF rhuDjXuMug7fPdnWFOZ6zWviuJtYb3bVrSDI+Mtno6XATY/CBtuYPvs/KYr77A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763064755; a=rsa-sha256; cv=none; b=wQnpfe3J+30iagIitD3oVGZrT+PJS95eWcaPRvvhIC9ngK1Rytjg5sqgfrZNAG7jPex+1U /CBHZQY9px15HI25X5wkKAgRUfRY1UyRaFgg66ns+49B+yYPmioScHVzkoDolnxVz+sS8o Ti/SLwAV0dVdq0ySvQwR6YEu+NYVpx9nTAvfkYV5Nh/k9a3nOF0n+Er6vHC5QutqKJBRxb wFWMjZ27wH7mLRDLxBaHv0QMsy6N2jtFatg9O3n/O3oAWlf9mpOrHx0n6jyFbUhHoQT9vn eIfm/9Tz1pqFrqpG/pGE7mTLa2GcU1ua1t7jwrtXr1Q96YyBILpFp9O7NlEUzQ== 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 4d6rzQ638mzc8N; Thu, 13 Nov 2025 20:12: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 5ADKCYdo083607; Thu, 13 Nov 2025 20:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADKCYbZ083604; Thu, 13 Nov 2025 20:12:34 GMT (envelope-from git) Date: Thu, 13 Nov 2025 20:12:34 GMT Message-Id: <202511132012.5ADKCYbZ083604@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: c70f6e4f4b71 - releng/15.0 - stand: Teach the zfs loader about dynamic gang headers 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c70f6e4f4b71c57984c7b0ce5bc7d04a7a0fceab Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c70f6e4f4b71c57984c7b0ce5bc7d04a7a0fceab commit c70f6e4f4b71c57984c7b0ce5bc7d04a7a0fceab Author: Mark Johnston AuthorDate: 2025-11-06 16:00:50 +0000 Commit: Colin Percival CommitDate: 2025-11-13 20:12:21 +0000 stand: Teach the zfs loader about dynamic gang headers There is a pool feature, dynamic_gang_header, that is enabled by default in new pools. When this feature is active, gang headers may be larger than 512 bytes. The loader needs to be taught to cope with that. Try using the vdev ashift to pick the gang block header size. If the checksum fails, fall back to the old gang block header size. This is based on a patch by Paul Dagnelie, with testing, bug-fixing and some simplifications from me. Approved by: re (cperciva) PR: 289690 Co-authored by: Paul Dagnelie Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53578 (cherry picked from commit 4d6801a6b5bdd4d055a00484a743cb4ada659669) (cherry picked from commit ae17780c717547a7b52cc593dca8867c0e14f9ef) --- stand/libsa/zfs/zfsimpl.c | 67 ++++++++++++++++++++++++++++++++++++--------- sys/cddl/boot/zfs/zfsimpl.h | 15 ++-------- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index f15d9b016068..e5920004bd9d 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -128,6 +128,7 @@ static const char *features_for_read[] = { "org.open-zfs:large_blocks", "org.openzfs:blake3", "org.zfsonlinux:large_dnode", + "com.klarasystems:dynamic_gang_header", NULL }; @@ -141,6 +142,8 @@ static uint64_t dnode_cache_bn; static char *dnode_cache_buf; static int zio_read(const spa_t *spa, const blkptr_t *bp, void *buf); +static int zio_read_impl(const spa_t *spa, const blkptr_t *bp, void *buf, + bool print); static int zfs_get_root(const spa_t *spa, uint64_t *objid); static int zfs_rlookup(const spa_t *spa, uint64_t objnum, char *result); static int zap_lookup(const spa_t *spa, const dnode_phys_t *dnode, @@ -530,7 +533,7 @@ vdev_indirect_mapping_duplicate_adjacent_entries(vdev_t *vd, uint64_t offset, } static vdev_t * -vdev_lookup_top(spa_t *spa, uint64_t vdev) +vdev_lookup_top(const spa_t *spa, uint64_t vdev) { vdev_t *rvd; vdev_list_t *vlist; @@ -2270,45 +2273,77 @@ ilog2(int n) return (-1); } +static inline uint64_t +gbh_nblkptrs(uint64_t size) +{ + ASSERT(IS_P2ALIGNED(size, sizeof(blkptr_t))); + return ((size - sizeof(zio_eck_t)) / sizeof(blkptr_t)); +} + static int zio_read_gang(const spa_t *spa, const blkptr_t *bp, void *buf) { blkptr_t gbh_bp; - zio_gbh_phys_t zio_gb; + void *gbuf; char *pbuf; - int i; + uint64_t gangblocksize; + int err, i; + + gangblocksize = UINT64_MAX; + for (int dva = 0; dva < BP_GET_NDVAS(bp); dva++) { + vdev_t *vd = vdev_lookup_top(spa, + DVA_GET_VDEV(&bp->blk_dva[dva])); + gangblocksize = MIN(gangblocksize, 1ULL << vd->v_ashift); + } /* Artificial BP for gang block header. */ gbh_bp = *bp; - BP_SET_PSIZE(&gbh_bp, SPA_GANGBLOCKSIZE); - BP_SET_LSIZE(&gbh_bp, SPA_GANGBLOCKSIZE); + BP_SET_PSIZE(&gbh_bp, gangblocksize); + BP_SET_LSIZE(&gbh_bp, gangblocksize); BP_SET_CHECKSUM(&gbh_bp, ZIO_CHECKSUM_GANG_HEADER); BP_SET_COMPRESS(&gbh_bp, ZIO_COMPRESS_OFF); for (i = 0; i < SPA_DVAS_PER_BP; i++) DVA_SET_GANG(&gbh_bp.blk_dva[i], 0); + gbuf = malloc(gangblocksize); + if (gbuf == NULL) + return (ENOMEM); /* Read gang header block using the artificial BP. */ - if (zio_read(spa, &gbh_bp, &zio_gb)) + err = zio_read_impl(spa, &gbh_bp, gbuf, false); + if ((err == EIO || err == ECKSUM) && + gangblocksize > SPA_OLD_GANGBLOCKSIZE) { + /* This might be a legacy gang block header, try again. */ + gangblocksize = SPA_OLD_GANGBLOCKSIZE; + BP_SET_PSIZE(&gbh_bp, gangblocksize); + BP_SET_LSIZE(&gbh_bp, gangblocksize); + err = zio_read(spa, &gbh_bp, gbuf); + } + if (err != 0) { + free(gbuf); return (EIO); + } pbuf = buf; - for (i = 0; i < SPA_GBH_NBLKPTRS; i++) { - blkptr_t *gbp = &zio_gb.zg_blkptr[i]; + for (i = 0; i < gbh_nblkptrs(gangblocksize); i++) { + blkptr_t *gbp = &((blkptr_t *)gbuf)[i]; if (BP_IS_HOLE(gbp)) continue; - if (zio_read(spa, gbp, pbuf)) + if (zio_read(spa, gbp, pbuf)) { + free(gbuf); return (EIO); + } pbuf += BP_GET_PSIZE(gbp); } + free(gbuf); if (zio_checksum_verify(spa, bp, buf)) return (EIO); return (0); } static int -zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) +zio_read_impl(const spa_t *spa, const blkptr_t *bp, void *buf, bool print) { int cpfunc = BP_GET_COMPRESS(bp); uint64_t align, size; @@ -2340,7 +2375,7 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) size, buf, BP_GET_LSIZE(bp)); free(pbuf); } - if (error != 0) + if (error != 0 && print) printf("ZFS: i/o error - unable to decompress " "block pointer data, error %d\n", error); return (error); @@ -2394,7 +2429,7 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) BP_GET_PSIZE(bp), buf, BP_GET_LSIZE(bp)); else if (size != BP_GET_PSIZE(bp)) bcopy(pbuf, buf, BP_GET_PSIZE(bp)); - } else { + } else if (print) { printf("zio_read error: %d\n", error); } if (buf != pbuf) @@ -2402,12 +2437,18 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) if (error == 0) break; } - if (error != 0) + if (error != 0 && print) printf("ZFS: i/o error - all block copies unavailable\n"); return (error); } +static int +zio_read(const spa_t *spa, const blkptr_t *bp, void *buf) +{ + return (zio_read_impl(spa, bp, buf, true)); +} + static int dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, size_t buflen) diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index c9de1fe4c391..d3ae3c32635d 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -94,6 +94,7 @@ typedef enum { B_FALSE, B_TRUE } boolean_t; #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) #define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) +#define IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0) /* * General-purpose 32-bit and 64-bit bitfield encodings. @@ -498,19 +499,7 @@ typedef struct zio_eck { * Gang block headers are self-checksumming and contain an array * of block pointers. */ -#define SPA_GANGBLOCKSIZE SPA_MINBLOCKSIZE -#define SPA_GBH_NBLKPTRS ((SPA_GANGBLOCKSIZE - \ - sizeof (zio_eck_t)) / sizeof (blkptr_t)) -#define SPA_GBH_FILLER ((SPA_GANGBLOCKSIZE - \ - sizeof (zio_eck_t) - \ - (SPA_GBH_NBLKPTRS * sizeof (blkptr_t))) /\ - sizeof (uint64_t)) - -typedef struct zio_gbh { - blkptr_t zg_blkptr[SPA_GBH_NBLKPTRS]; - uint64_t zg_filler[SPA_GBH_FILLER]; - zio_eck_t zg_tail; -} zio_gbh_phys_t; +#define SPA_OLD_GANGBLOCKSIZE SPA_MINBLOCKSIZE #define VDEV_RAIDZ_MAXPARITY 3 From nobody Fri Nov 14 00:15: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 4d6yMZ2p0wz6GVDB; Fri, 14 Nov 2025 00:15: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 4d6yMZ22wqz3YjZ; Fri, 14 Nov 2025 00:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucu4l9XcI9kQTfsSpoCsuYxgW4dijCQz/lm56VdaR2M=; b=UcukZlOPdrD3wLlpnHSfP5IkpiNG966i3jzvAuWD6O/1yU4ixPvvO/CWzFeFZgPX4Ny+zm EL1QqHq1IYzE/+VamMZZEk0/D1f+FG3S2NElPv0f4QYevKmtzo59RA7f1+Fzl0rFoCL3CF TZf0A75t+JVxi+xRbVADA/87ctIzIoNszzlkcNGtW+DjHZdcEgsT+EZDkQOUZdECjgENSG d8vH75XtenxdnznCL6+kKuQL/kH9+G6rZzqq6jzBiSjHCdI/+ikaO5M+ZkDorQFlLhkmmP Aip0m/3zXBHLGkOQElLb2twwxGqIVbzySI3AmqWe+chK1M2bTmdfoWY7il4M3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucu4l9XcI9kQTfsSpoCsuYxgW4dijCQz/lm56VdaR2M=; b=bmXKvaLv45kCs8ud3ZM3GAOqSjdUmivq6g68phTvh7mQ1t4Tr3AcVgXOuRfGT8LVzVytAE 8wsTxzhpmfgoE8dNvHMgNIq1/XaHI3BhHq7DjVo4nWja8zPAG3JC0Ndcy5jWQjJG1RzX8p +7mnX0+sGg2Be3GYBuFIM0+1EDePR+i5E4p6/2OM9K35jgt4mOy8QxVevGKdMZpXfK++Ne z+ptIYd9Z7RNv4Rg3wa8rxRAYrAsDJdrNtGK0nWbpooBWvWazkejUoOlBw0hku75tF3vd+ MHok4RBFdqL3/CJaYABF0K+WT/Nli+fqIrmAhDqK2Y17dvecbYQbj/0Wir47IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079322; a=rsa-sha256; cv=none; b=HWB4czg5tpWAKsr8hpshONenTyw6me1byScbAORt/z8WxhBiwKRg7g8C0aeaDhbgFpGo8U qMsgnpaRE3xyEn3ei5g5QvBHFF8u46/FrW7CEuh5rURODvwWmggL0LaBSI59dWciCMMeAu rSjCd6rxJ0XStRloJEAbWsZXcZiBBWaV5Z2BMTg7HzAckBBucwysm+RP83aRHxk4YIIRYZ 9LOhb/UUgpn/RAHnjww6gDg0aBaeUGtJ7BJY1wN1DgqpWDIx06a28ntYgAzQGRNk5kWmBu gX/H6g46RfZu1FRPVhHQBXDrvNSfsM08wLdszZBCcnQ0TaF73se3forGuo54qQ== 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 4d6yMZ1fnKzkXJ; Fri, 14 Nov 2025 00:15: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 5AE0FMBV037037; Fri, 14 Nov 2025 00:15:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FMEA037034; Fri, 14 Nov 2025 00:15:22 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:22 GMT Message-Id: <202511140015.5AE0FMEA037034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 00008dae2042 - stable/15 - mpr.4: Add Broadcom LSI 3808 to HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 00008dae2042e63195d3ce92c386c9b232d48a11 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=00008dae2042e63195d3ce92c386c9b232d48a11 commit 00008dae2042e63195d3ce92c386c9b232d48a11 Author: Jiacong Fang AuthorDate: 2025-09-28 04:03:57 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:09:50 +0000 mpr.4: Add Broadcom LSI 3808 to HARDWARE The product brief "MegaRAID 9500 PCIe Gen 4.0 Tri-Mode Storage Adapters" confirms that the LSI 3808 are supported in FreeBSD. https://docs.broadcom.com/doc/MegaRAID-9500-Tri-Mode-Storage-Adapters MFC after: 3 days (squashed with fixup commit) Reviewed by: imp, ziaee Differential Revision: https://reviews.freebsd.org/D52760 (cherry picked from commit 744c8d55445300074fc1906ad50aa6f394c1b8cf) (cherry picked from commit 8caf467784ba9f502c52fb67d968e21b0ee5f9e0) --- share/man/man4/mpr.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/mpr.4 b/share/man/man4/mpr.4 index cce21113e5c2..a88b99ae007b 100644 --- a/share/man/man4/mpr.4 +++ b/share/man/man4/mpr.4 @@ -37,7 +37,7 @@ .\" .\" $Id$ .\" -.Dd June 1, 2019 +.Dd September 28, 2025 .Dt MPR 4 .Os .Sh NAME @@ -99,6 +99,8 @@ Broadcom Ltd./Avago Tech (LSI) SAS 3708 (8 Port SAS/PCIe) .It Broadcom Ltd./Avago Tech (LSI) SAS 3716 (16 Port SAS/PCIe) .It +Broadcom Ltd./Avago Tech (LSI) SAS 3808 (8 Port SAS/PCIe) +.It Broadcom Ltd./Avago Tech (LSI) SAS 3816 (16 Port SAS/PCIe) .It Broadcom Ltd./Avago Tech (LSI) SAS 3916 (16 Port SAS/PCIe) From nobody Fri Nov 14 00:15: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 4d6yMb5cNlz6GVdM; Fri, 14 Nov 2025 00:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6yMb3GlXz3YXs; Fri, 14 Nov 2025 00:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+hW5xJvnjdv0Hes+bMUma4zEFiEWFKh55WiLc+NLWc=; b=JsGpcqqXtDju0mK9GReRUYkLhaxTO2i+d8bDXO7lJiiCvJSSIR46+FX6QrAIweODFRi2j2 RwKxBHtMoN+/8cOYarHeMxDrhWrvP77qqNZu9piaUvswdYphYEm43XlQk8/vKcMqwtyGsY K6nnJeJTwU8iU7BViVKB9OlheitpyEJM+A/vc+nk8k0rVc/cECHYNlfvWBogklC9Ve2D+B NiYMOLVAkKAmN0w5nH8O/smxx0FeyJRdROc7pZ9O0Qps1YdXifPKSgpquGdj8pdDbywXfn QY/WBRlZuccX9lho0L3lPiqRqBFgoVv6hRhnAfw4uj1r7EUYw/+GOJMD18pqBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+hW5xJvnjdv0Hes+bMUma4zEFiEWFKh55WiLc+NLWc=; b=l2f09GNTnf08z1/iwlyXYpkST9lo//SYbhGyj/ZJDuuGUcvjf6ZLYDqLu3oVuNoyX7nCA5 ARqUhTvIlM1mIj9IjEAC+TUMqcow+X93Beuh2hQgOb3B6CAXBrt6ZwPymReAzqitIZ7dDg 3VqiPJy4Kxp5lHb535DMgMVmPzNeZoB6nNt9o4DilYc62ePuE1EMSJBIxhWPymJ/1gS4XA yrn0LDrWbg6nQ5JLcKbgejM0P4MPseP5KfES1fMg1pz5eRL/hpVUIxuCtWFHZAkO86WaoE wruDWXLijmtjQHPdUHc81cFQoZWvVTKMK+IMCsckRUTHbYEI5VlTqfvvhXEjyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079323; a=rsa-sha256; cv=none; b=UJ3768u5qGl8HXdLl70mLgVbGdmG5wD2IBUvTeJ9UU6iXt1UL9yLIVo9PMcgwqo4hTy/+9 x2PdmkcBbmqk/1Y67aFvSO41ecSLxXR1Fk5TEhTZwavopFKrzGS3vEOU20Ui5a8Snr8Rro 1u+eveU4Ey6IDRY1y6udfZ//DVHd95jy2n63f4XEYDCUY4SZmwQxK8OcbgsVdUDnb0Nu2K RN+ROZuHKk3YGCvroLM2tT0n+3lFKiOzpTKUlmfCXBPlm8WfLzjPUrrwunx779N0Iwnmvx 1EW75cCM4D8jQ8sZm+MW08IoMIYpIyzabFOCjQKKlU8HA4uvlzpUeoHqOmkzrA== 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 4d6yMb2c9YzkXK; Fri, 14 Nov 2025 00:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE0FNk0037070; Fri, 14 Nov 2025 00:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FNta037067; Fri, 14 Nov 2025 00:15:23 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:23 GMT Message-Id: <202511140015.5AE0FNta037067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 5d7cd576d99b - stable/15 - jail.8: Add creating a jail from distribution set List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5d7cd576d99b99f460263d93929828d584d8f80c Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=5d7cd576d99b99f460263d93929828d584d8f80c commit 5d7cd576d99b99f460263d93929828d584d8f80c Author: Alexander Ziaee AuthorDate: 2025-11-07 18:38:54 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:10:14 +0000 jail.8: Add creating a jail from distribution set PR: 200803 MFC after: 3 days Reviewed by: jamie Differential Revision: https://reviews.freebsd.org/D53631 (cherry picked from commit d59903481dbaef9ef7e91ea4945d2355ae17c53a) --- usr.sbin/jail/jail.8 | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index d44b7f66a64e..e27f9e3d1630 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2000, 2003 Robert N. M. Watson .\" Copyright (c) 2008-2012 James Gritton .\" All rights reserved. @@ -23,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 15, 2025 +.Dd November 6, 2025 .Dt JAIL 8 .Os .Sh NAME @@ -1119,7 +1122,7 @@ process. This manual page documents the configuration steps necessary to support either of these steps, although the configuration steps may need to be refined based on local requirements. -.Ss "Setting up a Jail Directory Tree" +.Ss Setting up a Jail Directory Tree From Source To set up a jail directory tree containing an entire .Fx distribution, the following @@ -1132,8 +1135,19 @@ mkdir -p $D make world DESTDIR=$D make distribution DESTDIR=$D .Ed +.Ss Setting up a Jail Directory Tree from Distribution Files +To set up a jail directory tree containing an entire +.Fx +distribution, the following +.Xr sh 1 +command script can be used: +.Bd -literal -offset indent +D=/here/is/the/jail +mkdir -p $D +tar -xf /usr/freebsd-dist/base.txz -C $D --unlink +.Ed .Pp -In many cases this example would put far more in the jail than needed. +In many cases these examples would put far more in the jail than needed. In the other extreme case a jail might contain only one file: the executable to be run in the jail. .Pp From nobody Fri Nov 14 00:15: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 4d6yMc5Nc3z6GVJB; Fri, 14 Nov 2025 00:15: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 4d6yMc47Hbz3YXx; Fri, 14 Nov 2025 00:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aoxW1pOlnxYrAwGwWy45SKHMZs3vf3iurGoelO5wSF4=; b=NiJ6/PeJjbszy4NDY5D3+Vi9Dfq3EafCrh2Pk2fEqyxgryeQnVZbdo8qQswRyMz0ZRf/nz acfAqnsTTyN/giC//8JmJZKII8l8K3YPLHPxWhV1XZI2Bt/B1gkbozezDnpgYex3cLR2p4 pG/2JjNCxS2xF9C9iGP633bxiBK+uKXNTumUgjkXOAhM7txM4Lfm97m9Cpco/eqX9cWiF7 3zcAVT2jU+az2GR6BEgny3vffSpKKG+ITvA9/ZR7autz0wO1vNv3Y0fyemNpcavOlgGaDs m4Ixxz4EhIg3U/gFzLWE1ke/IvXQ442yE6RKU55y8EZ8Vk23R+if+g8tD7Y/jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aoxW1pOlnxYrAwGwWy45SKHMZs3vf3iurGoelO5wSF4=; b=Wve7n/NvupeFRe/qUAvEUtqnxd0BpDKLh9A/2ZP+y+VLCj76k/fvuu48mPdd/IIQCpR7on fdfUUeVrS++yVUOs2VSbmv2lRNQwzYZ3UM5kLnPKf+oDvQiV2yWV0Jc8ResQok9i0ENIFc jUqAZ5gG/QFZ2rneL9vcUS8rt9TONAW/e41Y7M1PuvPIzT+LNBlRlLrZw349UFOdySHKjW S+tip9izLEEBNF9IPdBkEIsfgMWcfzEGpXNp3WxqWi2//NHZDyopy0/WqByAgadFDJ8AhK GoVMHyl1Bnaq/IOdlB3VQ1VCkBoQoIum5rI5asAlOOGS1/d8xTrv4Z7JuiDlJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079324; a=rsa-sha256; cv=none; b=MCUWbLdCUdlxBkjBxD28MjxwydOWW4ysBL8g9gLofzGxvLGRAAFLHO0Q52AhbtpGrLyinZ 7GLRZEoU3BMZqBfKyG8BEKja6w6ePzlUSkhmDvvhzJMH1HSYIkZRiVZKmGbN3vJX9+PtCQ gzYrepDqgy8iP6xk3BFX6NJBHeDjLmsYg+8P/vvJJOtvAlWfEEfVTtfvzf4LfTHEt62FLJ HP0UlvrCfZTqNPNEUI43GV0eOHzbIiXWR7o7z5xAT+ZzGj2/+aixEtXDNfZcOQGuEH7EOb /VhvYlA+Y5Ypjboqcup90MbKi/VS4vZIJ32mgmIwOnZQxFPJm/XyvP0cOc0qyg== 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 4d6yMc3T0YzkRL; Fri, 14 Nov 2025 00:15: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 5AE0FODP037103; Fri, 14 Nov 2025 00:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FOEk037100; Fri, 14 Nov 2025 00:15:24 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:24 GMT Message-Id: <202511140015.5AE0FOEk037100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1a1e30b3552a - stable/15 - ix.4: Add E610 to HARDWARE section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1a1e30b3552a99f9137ccc334d950768315d4f33 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1a1e30b3552a99f9137ccc334d950768315d4f33 commit 1a1e30b3552a99f9137ccc334d950768315d4f33 Author: Yogesh Bhosale AuthorDate: 2025-11-10 19:23:46 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:10:15 +0000 ix.4: Add E610 to HARDWARE section MFC after: 3 days Reviewed by: ziaee Fixes: dea5f973d0c8 (new Intel Ethernet E610 family) Differential Revision: https://reviews.freebsd.org/D52990 (cherry picked from commit abd53b16c03f77c12bb8b77d9e2e4cf392745361) --- share/man/man4/ix.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ix.4 b/share/man/man4/ix.4 index 418b6e1188ab..e6f4276e1a77 100644 --- a/share/man/man4/ix.4 +++ b/share/man/man4/ix.4 @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd October 26, 2024 +.Dd November 10, 2025 .Dt IX 4 .Os .Sh NAME @@ -78,6 +78,8 @@ including: .Pp .Bl -bullet -compact .It +Intel(R) Ethernet E610 +.It Intel(R) Ethernet X553 .It Intel(R) Ethernet X552 From nobody Fri Nov 14 00:15: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 4d6yMd6X1vz6GVPG; Fri, 14 Nov 2025 00:15: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 4d6yMd4hnBz3YbJ; Fri, 14 Nov 2025 00:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtFt7zBbEAFyRf/bc/h9o/k1fzcItmCvcw+Qj1L6+Ow=; b=C2vCXGlDY4xauRlueA+C7SaZn6wYkfIHne/a2RYqysce3wk/cmBZ31UhI7qV3t/AOEX1sT JPfbh4yL7QaJ0aSFJfJbZk3MzZR18+1OtuEJCu5v3NE0LKccC48g8ariZEQd9veNFYOXoL QODVmo7YnycED2xbUDshIzeQjfCu7FlHag8yznJtGcYIZbc4nFNELVTonBtkpTm12FKnC2 /bn6PEiT46mmBeAiK56tT9hz4YAwvPTh+G21m+xSmT7kST5qZspMF/UaqndgITD4MbWkDu gH47qpe7WRHRiolyuCO6yAX1MLXy+yGHYSLXT31IFeWKSazwXBGYO9wKE71G7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtFt7zBbEAFyRf/bc/h9o/k1fzcItmCvcw+Qj1L6+Ow=; b=lCr/yDGPbhns0potMqWpMg7tWwSdfx9XZkiyc4ckAPYoPAHBAyAffNMv5b17ILXKra2PGx KyDXDcgX8c4OLUY//Ahf7DzDloiJI3u7nuwIDvVbZPEXrQiQCXNJpWK/3DSnfnpbDVEbp5 1hpXgVEG3WcCgY2kbhTBE//80Z0nx2WOFdECVXK8tbZiT3NRlqpNdDZUd+1lQasYe+Zi7/ x3bEJ2FZQFYpE5YtJj2JN6/zT56Z3DP1wRGwxXDYYg97itZ+QIgSgXxHQ/Z3TxIuHJDLpM fsExxQXfPkc7kikPWFUA4i3hyBbq0vukHjASpR6Afa3/rJxosUBTppEfXzeu3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079325; a=rsa-sha256; cv=none; b=MwE5yAP0I6ZWSdGB6OP35w0/JWwRaOBi9K0Z4hp27HKJHs6lORZ4NZ4p3GqKFwHSWgXdby 72Zbg4ZSNpPB3OPlRxW7suviAJiGKH4oWSpUNAxc2mvyUs0CgQpl2cbqkqTYWEIrWbzb4C 2851zfwv5jIjRwkDXxXI+oDprIgHLBMVkpX0toHh9tcrdYk8KtESJujs01srDjPxNypeSD LrIuFQ+rzWUT3H/F3W9LpDN0DKEUAlXlunyF64Tx5KowBKwy1eIICSKs+bBFnJEWz51p+7 WiBzHdM8Xwn957/vgh0eu9CUAw6IWMrPoOPSyKg/yYHd39SuTOlK0gbCxoZAXw== 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 4d6yMd491wzkKR; Fri, 14 Nov 2025 00:15: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 5AE0FPlm037142; Fri, 14 Nov 2025 00:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FPCO037139; Fri, 14 Nov 2025 00:15:25 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:25 GMT Message-Id: <202511140015.5AE0FPCO037139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: ccf4b4fc4288 - stable/15 - sbp.4: Add a hardware section, fix markup nits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ccf4b4fc42882652b8bb347bb5afed1e89258310 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=ccf4b4fc42882652b8bb347bb5afed1e89258310 commit ccf4b4fc42882652b8bb347bb5afed1e89258310 Author: Alexander Ziaee AuthorDate: 2025-11-11 18:38:04 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:10:15 +0000 sbp.4: Add a hardware section, fix markup nits + tag SPDX + add sysctl to apropos database + fix markup of examples and reflow a overly long line + add a hardware section for hw relnotes MFC after: 3 days (cherry picked from commit dee8e38f52266d9b2fa837607ff3a78f240a806d) --- share/man/man4/sbp.4 | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4 index 2255fa2993ae..1daffd104a2c 100644 --- a/share/man/man4/sbp.4 +++ b/share/man/man4/sbp.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-4-Clause +.\" .\" Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa .\" All rights reserved. .\" @@ -29,7 +32,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 2012 +.Dd November 11, 2025 .Dt SBP 4 .Os .Sh NAME @@ -62,19 +65,27 @@ might wonder why the device is not detached at the CAM layer when the device is unplugged. It is detached only if the device has not been plugged again during several bus resets. -This is for preventing to detach an active file system -even when the device cannot be probed correctly for some reason after a bus reset +This is for preventing to detach an active file system even when the +device cannot be probed correctly for some reason after a bus reset or when the device is temporary disconnected because the user changes the bus topology. If you want to force to detach the device, run -.Dq Nm fwcontrol Fl r -several times or set hw.firewire.hold_count=0 by +.Ql fwcontrol -r +several times or set +.Va hw.firewire.hold_count=0 +by .Xr sysctl 8 . .Pp Some (broken) HDDs do not work well with tagged queuing. If you have problems with such drives, try -.Dq Nm camcontrol [device id] tags -N 1 +.Ql camcontrol [device id] tags -N 1 to disable tagged queuing. +.Sh HARDWARE +The +.Nm +driver supports FireWire Serial Bus Protocol 2 +.Pq SBP-2 +storage devices. .Sh SEE ALSO .Xr cam 4 , .Xr firewire 4 , From nobody Fri Nov 14 00:15: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 4d6yMg0P9zz6GVJF; Fri, 14 Nov 2025 00:15: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 4d6yMf5V5Rz3YkF; Fri, 14 Nov 2025 00:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiMNrHet9CYzZTtNrBWlRGemhgZi3nvWxT+DqCGTl6k=; b=HWH2hOg6WJEU4TPm9vND/jNb5+f3U6iXOyJhznnFUHqqXmPUYLYiOKzoKFgt5r4y/vz32b xp+dNFOZfmZzG6OFaFg0/Nz5sFirtmug4fSWbmWp/A+fufvXO3w7Pl0p2HICupxGuBV95d 6LWeM2NTZj2s2YY+iKvvFfl7cEekW2AVZxr4H+Q0PIo4I3EDCp99SZ6x+7YZzod0PRzHV6 B8tsL9sTGyvV7c5B/5Vmckuq0UcV4leUwBBGKBxnewV1IWalohzCArO2xO718k+DTgd36J yr0XuIsjvF2IDfl+DHZOOMv9sMlqsYiqUkK6P0IlL4ptk9DlRnawwVsFZJE4kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiMNrHet9CYzZTtNrBWlRGemhgZi3nvWxT+DqCGTl6k=; b=nRi6baB8tV01vH7gJ3ybeN5AS5ldcosltmacGQY2yQ0gaPt4QnAleSls2LcL8rI3LPRbmE fKOcgkGJdXtgCGsFGTDLXgPFhIoNWgyho4mI7ZjTbY4e1z3iNmTshYARLsy/kWNk1Fg4K/ QHFD8w5NJ2lrjvWXfRDOMTsERSmK4qskCM5UkvF9DLdHuGbR7nhO3yPWmQQg+hdrk9NYDy H+51cMKqh5eD651vh/wdQJcwMHJ3GEF8NMoLjhJXjDbd1QQqKKqqhsiet9BVNIayt3kFrQ AZYDDp0l7gjmlXhJz56x4yWI7z4Q2gygjXGLgsGs6MtL2O6/F9XFik+E6R0NUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079326; a=rsa-sha256; cv=none; b=QC5eBwW3Z99hgj7LOz0bepDpFX0ffxBt0tf8loENTm+DtVcDkSIA2MuRlHhbiXR3Gaa1P9 54lYUMDTIBpSBSUW6J2EDY/4YONCKGSLIzIzM2EYwUOhsPqrmLIs2P/k4UK+1ce7zfPXT8 LExJoG2A76Slr4DbMMs1llBvq90BsGGFn/61RxcwwzbDlKkLzEV5BnMXEaZjbN0G9gPk5H tHm/OX6eMxKuLKIMJHv5OpMcRzz1HUaRFq4fKm3j3PDJ5P2W1ZQjL6GXmCNwBzfvai27UK wX/rICWYcRfCZ/uBHRJycVJOeD6m/8TxRZo2f16eq23AQJ2WCHkLCypnzMKvNQ== 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 4d6yMf51TVzkFM; Fri, 14 Nov 2025 00:15: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 5AE0FQ8L037176; Fri, 14 Nov 2025 00:15:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FQmr037173; Fri, 14 Nov 2025 00:15:26 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:26 GMT Message-Id: <202511140015.5AE0FQmr037173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: bf2345bce51d - stable/15 - mx25l.4: Add n25q64 to hardware list List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bf2345bce51da46c985fff7434f309604ceafad0 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2345bce51da46c985fff7434f309604ceafad0 commit bf2345bce51da46c985fff7434f309604ceafad0 Author: Alexander Ziaee AuthorDate: 2025-11-11 18:58:19 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:10:15 +0000 mx25l.4: Add n25q64 to hardware list MFC after: 3 days Fixes: 76735c74398923a (flash: Add "n25q64" to mx25l driver) (cherry picked from commit 595fcd71a89e8c2d9039528d58b073f5ca712b68) --- share/man/man4/mx25l.4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man4/mx25l.4 b/share/man/man4/mx25l.4 index 5dffdebcf43e..02f3aacff3a0 100644 --- a/share/man/man4/mx25l.4 +++ b/share/man/man4/mx25l.4 @@ -99,6 +99,8 @@ MX25LL32 .It MX25LL64 .It +N25Q64 +.It S25FL032 .It S25FL064 From nobody Fri Nov 14 00:15: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 4d6yMg6tDhz6GVGN; Fri, 14 Nov 2025 00:15: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 4d6yMg6Mtlz3YvC; Fri, 14 Nov 2025 00:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Pqk13xT7OTmjzoPmaDBnXKvA19i6e8DXI6SBrYCsu8=; b=kHO7M84cmPdz9Br9wbUNcIYIWwiI+3KC/YhJiLkNoW6iDnq3kLBOlnu6N4wX+TQtHkhqv4 iw5OO0UMAcyzptGUxCxmzrWmOX1uMVhVWVxJdwSDkNbOcjqXxIpjU4ThhNHd5VLhxMO8z1 aR652VhE1LkzS23CfU1aMoG/fPhHPan5myap9s10abRzlxKmZb/45YPSiGW1uFlO5L/FyE 8YLweLy5f/ahmCa4jS8k3Q8u8/DTdbnn1ZQ56np5LWpzt6x+3lDCQdXSkbUzNxX10pMGUh PsSkYy2WszNEThtNEXNoUqgBj2+Cisu0E5SfhpInf2QClMuKfFIBeXIPKPrOQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Pqk13xT7OTmjzoPmaDBnXKvA19i6e8DXI6SBrYCsu8=; b=Tpxzs81SQVB7tIq95hwlFIPWef6oah9yux2WYI9Lx5n30zddH2G05WpXV/EmTfR+rRtoNz xtMvE8uy9KhuzEj7elUhnGFy/IFh/lxS8Qw2Zf3J2/qnjWPg7EPXMtTVNXM9KsspFAxlal VFdaRhlfGpnT+8EUjEnf5c7P4BbChZ51LbEPAFhA3/fckX03TC11CONSlJAtaH7PRH8v3p 75CbbI2VGcya3JGOr+bIsZO2njsYbIKmzqFPLtJ6GohZ9e4T+CkrssNvGtzZaAGcJpxQ/M gIOmYyuWklSmJsIC2uqjPOX0ThVlBuj17dLEOqF3GSYJ7Tk1R9XPgTAKjaFfCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079327; a=rsa-sha256; cv=none; b=NliLh4qnOCc4eAs59D+6xkRbAnDjoo8/lN+i9D6HcXxSyA7g616wgSeYZRR4UglAtFCC/2 9CI+4f3GMQ1CcSeZTuHP2tqaOz99wQYGqBP4YqXEoeG8KBn2WiLHNEB3nahjdoMU9MqDCJ jxykoiikaJWWzUOU04gyR1BIEEvYb5bs42GMYJdFTbMgN7dWT7iHxC4A9ibYeX5Y80eVju SRWPa3PlKvXfb+fFHSUH8vRE1yC/J9Q9A8FrSNNWISLDcYZ9/58JAKauF9uUWSCd0Y8UF4 28s3IOxY+E8b9Jn06gTW6ImL0pENuSuzIKb4fzAQ2xpzSickWfLJQMI8sDIwhw== 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 4d6yMg5ygpzkRM; Fri, 14 Nov 2025 00:15: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 5AE0FRKv037209; Fri, 14 Nov 2025 00:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FRl3037206; Fri, 14 Nov 2025 00:15:27 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:27 GMT Message-Id: <202511140015.5AE0FRl3037206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 9b00b95b2149 - stable/15 - mx25l.4: Describe better and tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b00b95b2149bbc0403bc79059928cd21cc8adc9 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9b00b95b2149bbc0403bc79059928cd21cc8adc9 commit 9b00b95b2149bbc0403bc79059928cd21cc8adc9 Author: Alexander Ziaee AuthorDate: 2025-11-11 18:56:40 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:10:15 +0000 mx25l.4: Describe better and tag spdx MFC after: 3 days (cherry picked from commit 6f73950475ce6b56974b7cd08cdf0ea771165c50) --- share/man/man4/mx25l.4 | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/share/man/man4/mx25l.4 b/share/man/man4/mx25l.4 index 02f3aacff3a0..a48b153e91ec 100644 --- a/share/man/man4/mx25l.4 +++ b/share/man/man4/mx25l.4 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2019 Ian Lepore .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,26 +24,18 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 11, 2024 +.Dd November 11, 2025 .Dt MX25L 4 .Os .Sh NAME .Nm mx25l -.Nd driver for SpiFlash(tm) compatible non-volatile storage devices +.Nd SpiFlash compatible non-volatile storage devices driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following line in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device mx25l" -.Ed +.Cd device mx25l .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -mx25l_load="YES" -.Ed +.Cd mx25l_load="YES" .Sh DESCRIPTION The .Nm @@ -67,7 +61,7 @@ modules as with any disk device. .Sh HARDWARE The .Nm -driver provides support for the following devices: +driver supports the following spi flash memory devices: .Pp .Bl -bullet -compact .It From nobody Fri Nov 14 00:15: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 4d6yMj23wXz6GVDG; Fri, 14 Nov 2025 00:15: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 4d6yMj0TWPz3Z3m; Fri, 14 Nov 2025 00:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHMPJ6ePZlHbkA4LMTHRlEV4qIjbyFqENzLuMxozmUg=; b=bn+MGeVN2/+uUYUllso09DQcEJbDY9cxodl95IbrhreK52JDCw5MJgc6kj0vvPxdsZWlvX CHWFMUvnXiqhYyKIqQqS4Y/9TlMd1boFb68nTHmoR8ftcgbyErv3D8dlEwX3WeGmnQZEyy mBpTNvREc6QJ02G8cjS495sZtulz8i2ktPUEQOLjaUJ6ZHhpxicZyv0A1Hz0DsWbq9S2Vp G/Vr6GLjDpYzl2Z1Lk3UOWfHRO8iIiTXkPLwUXxwv7k2b89fMyTyJSZe8sbIl7t/hdjhsa ONYpPNfj8Jm61kk4OXygW9RUzwCvPFPtWvQva2JsjWMaJo4Kl24JmP7WMVgCVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHMPJ6ePZlHbkA4LMTHRlEV4qIjbyFqENzLuMxozmUg=; b=jYCqHLylQ1pKXWtP01hEUzTgR09ZIxy57oUHd9g8bQvPIvh2R6W0ak2u/uw3g9Zw2bHU31 fESm86UVQazivqXNqy4pR1uEi++rWWdA2GCnTwZ8w9aVKvQEV5KQ4TfQdUNUKzh7gU3X/U kkbUVIEUM+PG0+n0efahbJ7vDoYK8jUIqpzrhwlSL6X3bdHK4jbAQY3TNc23q5BL52qq26 DbN/3567O2gs1o6OS9WdX7OnA9NWCZ2tuBXHMqUFYG68186JtVfH+aSNcIJ/6leO1+Fx56 w+Y8rnpl2DsBmy3wshYub6x1Ju7Tidow5dmN9HTZQDUMKPytx8SRIPMIBZ8CJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079329; a=rsa-sha256; cv=none; b=S9cfq2GPIEGyD5kM4K/SUUozFowPrzaKRpyNWLZ2VFdIFokzPzn/Pz0Nl2HUqnpzzDcHs6 MQExAuzpa56DjRPIpummgtQbhhNzgnL8ZtQ0C+RRiBeN4QdDMFvXSnRcMEB7W/KS6L0tVP aNWoVH9lYFsFSzPxWCC3473LlVuepCGOTCFXd2tqQuvCgRCPpnqGBXxr/P7enXSQ694naC P/3UdO8w0x1Y9vjmVZH3rHz/DJIFRW+RsRwsRfTOo1Lra6Pr5AHNanH+ZJ+NdekdstOu3n 5gWXkgDXA3o1XKJ6nTs9hik1KwKfwiDXlpg4htDFvO+bFWLypUYBzUTXHl/qcQ== 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 4d6yMh75SPzkXL; Fri, 14 Nov 2025 00:15: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 5AE0FSaT037242; Fri, 14 Nov 2025 00:15:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FSLL037239; Fri, 14 Nov 2025 00:15:28 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:28 GMT Message-Id: <202511140015.5AE0FSLL037239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: feb8971db4b1 - stable/15 - pcic.4: Remove stale manual List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: feb8971db4b179d90b7cd006c43421fdaf4dbf7f Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=feb8971db4b179d90b7cd006c43421fdaf4dbf7f commit feb8971db4b179d90b7cd006c43421fdaf4dbf7f Author: Muhammad Moinur Rahman AuthorDate: 2025-11-12 17:33:05 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:10:16 +0000 pcic.4: Remove stale manual MFC after: 2 days (squashed with fixup commit) Reviewed by: ziaee Fixes: 31b35400c (pccard: Remove more of the PC Card) Discussed with: bsdimp, emaste, jhb Extracted from: https://reviews.freebsd.org/D53434 (cherry picked from commit 1d9f2db7c0b981bf5d45e3ef17dda13b953e1c97) (cherry picked from commit 6aaf184dc4e294779db7133629b7ae953b4da285) --- ObsoleteFiles.inc | 4 ++ share/man/man4/Makefile | 1 - share/man/man4/ath.4 | 1 - share/man/man4/exca.4 | 3 +- share/man/man4/pcic.4 | 100 ------------------------------------------------ 5 files changed, 5 insertions(+), 104 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 34b72c9c88ed..d9ef4033911e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20251112: Remove pccard(4) and related +OLD_FILES+=share/man/man4/pccard.4.gz +OLD_FILES+=share/man/man4/pcic.4.gz + # 20251006: Remove libnss_tacplus.a (it never should have been installed) OLD_FILES+=usr/lib/libnss_tacplus.a diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index dee2a2671ad9..ddc7f377b08f 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -467,7 +467,6 @@ MAN= aac.4 \ ${_pchtherm.4} \ pci.4 \ pcib.4 \ - pcic.4 \ pcm.4 \ ${_pf.4} \ ${_pflog.4} \ diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 index e731277e4e75..b40ccbd16f09 100644 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -258,7 +258,6 @@ This should not happen. .Xr ath_hal 4 , .Xr cardbus 4 , .Xr intro 4 , -.Xr pcic 4 , .Xr wlan 4 , .Xr wlan_ccmp 4 , .Xr wlan_tkip 4 , diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4 index 555e459b7db4..d43d359bfb25 100644 --- a/share/man/man4/exca.4 +++ b/share/man/man4/exca.4 @@ -33,5 +33,4 @@ The module is used to implement the Intel ExCA interface to PC Cards. .Sh SEE ALSO -.Xr pccbb 4 , -.Xr pcic 4 +.Xr pccbb 4 diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4 deleted file mode 100644 index 1c5b0fc35554..000000000000 --- a/share/man/man4/pcic.4 +++ /dev/null @@ -1,100 +0,0 @@ -.\" -.\" Copyright (c) 2001-2002 M. Warner Losh -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd July 9, 2002 -.Dt PCIC 4 -.Os -.Sh NAME -.Nm pcic -.Nd PC Card bridge driver -.Sh SYNOPSIS -.Cd device pcic -.Cd device pccard -.Sh DESCRIPTION -The -.Nm -driver provides support for older ISA and non-Yenta PCI PC Card bridges. -The -.Nm -driver supports most -.Tn ExCA -devices attached to the -.Tn ISA -bus or -.Tn PCI -devices that do not conform to the Yenta specification. -.Pp -The following -.Tn ISA -devices, or true clones, are supported in the current code. -.Pp -.Bl -tag -width "Intel i82365SL Step A" -compact -.It Intel i82365SL Step A -.It Intel i82365SL Step B -.It Intel i82365SL Step C -.Tn Intel Ns 's -original 16-bit PC Card controller. -.It Intel i82365SL-DF -.Tn Intel Ns 's -last version of this device. -3.3V support was added. -.It VLSI 82C146 -An older VLSI part with some issues on some machines. -.It Cirrus Logic PD-6710 -.It Cirrus Logic PD-6720 -.It Cirrus Logic PD-6722 -Cirrus Logic's pcic controller. -Compatible with the i82365SL Step C with the addition of a different -3.3V control. -.It Ricoh RF5C296 -.It Ricoh RF5C396 -Ricoh's PC Card bridge chips. -These are compatible with the i82365SL Step C, but with yet another -different 3.3V control. -.It Vadem 365 -.It Vadem 465 -Compatible with i82365SL Step C. -.It Vadem 468 -.It Vadem 469 -Like the earlier Vadem models, but with Vadem's own, incompatible, 3.3V -control system. -.It IBM PCIC -.Tn IBM -clone of the original i82365SL part, with its own ID register value. -Has no 3.3V ability. -.El -.Pp -Many other vendors made parts in this arena, but most of them were -compatible with one of the above chipsets. -.Pp -The following PCI pcmcia bridges are supported: -.Pp -.Bl -tag -width "Intel i82365SL Step A" -compact -.It Cirrus Logic PD6729 -.It Cirrus Logic PD6730 -.Pp -.It O2micro OZ6729 -.It O2micro OZ6730 -.El -.Sh BUGS -This does not work at all at the moment. From nobody Fri Nov 14 00:15:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6yMk2PK7z6GVGT; Fri, 14 Nov 2025 00:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6yMk1Jdxz3Ymp; Fri, 14 Nov 2025 00:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPSmIsxJi4TsZejLnCL/j7R5DJ3pFpW9txgktzq6T00=; b=vogtMIoUJPFATCiZJ8E8elY1eOLAOy3gWTQPYRnovRpDuOrvI2zYNzGvGV7Nt5aGpK1j7+ 7BxNWtYghxDetNrlxKr8NlpcDPmJEvzXDjCH1O8CUnV9EAszSft92Yy9WAqp96cPSL3km6 2SgkBz4tmFeABSKkX/Jf6Qfg2wN+js9QAKZAh2FHTh6UwZKf86lW6KHScJwUpQkCNdHaGI pi/FI1Dd5xrdvrKRXa5ptgVz72IWaXkymAIRoOOcqJ5YJGV9czfv74OlGBQGhDmSKel6EX BEtsesBod8gp6mWecu9eQ5JkzAdLy7FKt6oTSS/snIww/3aEkAG4l2cwcHYSNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPSmIsxJi4TsZejLnCL/j7R5DJ3pFpW9txgktzq6T00=; b=EQafFfcSIRo1d5EOVz1G1tDp0YK+RpLx3yYWyH6ZsE2XRDmyguk9bMDkJkXcnv9m7r1Csn 12jTLyGsi1BRoboBQv051iUrrNC2QusP9yClxBD0bAgjG5s1XuOXXgcWDGyPqvZyKA7xZQ rzOTVKjKCVFiodeSxxXj9cspA2wg6hY1rB6u86hKI3qwWxuqcnmcKkM64TNQqhic2fLwNu kBySGy8TybIoXYHKLBCBUl8rqmVVszVNcVCmrk5r6OgckQpCuj8s2kcEy4kSijQPTVQI/E mgzM6+3lXIjksXFmFCkrnOfh39lqV+sY5JwfrsTtgdJ6JKklhavaNxn7lZODXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079330; a=rsa-sha256; cv=none; b=YGiT0Rh0yjM/MRTPpubSLECJgIcfx1LhKsJGVq9xd/bP8mofAMfaliOA5tdXDjgxr0zaar Mmixs5LIiPS4BQD/embpDhjAHiau8n9nVANUVRYrwD1C4ithDimlwro9qkHsWOmqb7WhEm cZ4qK3YO5vst1dd2SV+JtlaHgdvf7F7Lz2z+zjrYujuudW8v40RWG1y7N6h9+eSfXu6rUn uFzbGf+jRBeTslKh6qreof7P/v/1esf8GE7V0EkauhJ9u5bM9jFB7+E8Srd7PUTGtTxoUc I2aZvq9Pxq+6ZfzR+clQf16ggbupdp7PCnMfkd6Kq2nayOWKfURV1I5eD5jLlQ== 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 4d6yMk0wcFzkRN; Fri, 14 Nov 2025 00:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE0FUXF037278; Fri, 14 Nov 2025 00:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FUxJ037275; Fri, 14 Nov 2025 00:15:30 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:30 GMT Message-Id: <202511140015.5AE0FUxJ037275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 31e7ee6bd524 - stable/15 - hgame.4: Polish List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 31e7ee6bd524813aa2623fb9dc2afcf6be34397e Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=31e7ee6bd524813aa2623fb9dc2afcf6be34397e commit 31e7ee6bd524813aa2623fb9dc2afcf6be34397e Author: Alexander Ziaee AuthorDate: 2025-11-13 21:13:45 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:11:46 +0000 hgame.4: Polish Explain driver loading and application access in the body of the manual. Crossreference other game controller driver manuals, and devfs.rules to hint about how to configure application access. Add a common dongle to supported hardware. Add evdev a few places to make it really clear how it works. MFC after: immediately for inclusion in 15.0R Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D53290 (cherry picked from commit c0c8d812b560a3e89656c026022a44631f88e233) --- share/man/man4/hgame.4 | 90 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/share/man/man4/hgame.4 b/share/man/man4/hgame.4 index 3309833c1720..f816d2a442d0 100644 --- a/share/man/man4/hgame.4 +++ b/share/man/man4/hgame.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2020 Vladimir Kondratyev .\" .\" Redistribution and use in source and binary forms, with or without @@ -21,45 +24,62 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 14, 2020 +.Dd November 12, 2025 .Dt HGAME 4 .Os .Sh NAME .Nm hgame -.Nd Generic HID game controller (joystick/gamepad) driver +.Nd generic HID gamepad, joystick, and controller evdev driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device hgame" -.Cd "device hid" -.Cd "device hidbus" -.Cd "device hidmap" -.Cd "device evdev" -.Ed +.Cd device hgame +.Cd device hid +.Cd device hidbus +.Cd device hidmap +.Cd device evdev +.Pp +In +.Xr sysctl.conf 5 : +.Cd dev.hgame.X.debug .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -hgame_load="YES" -.Ed +.Cd hw.hid.hgame.debug +.Cd hgame_load .Sh DESCRIPTION The .Nm -driver provides support for generic game controllers (joysticks/gamepads) -that attach to the HID transport backend. -See -.Xr iichid 4 -or -.Xr usbhid 4 . +driver supports generic game controllers +that attach to the HID transport backend, +and presents them to applications over the +.Sy evdev +interface. .Pp -The +If the appropriate hardware is detected, +the driver will be loaded automatically by +.Xr devmatch 8 . +To load the driver manually at boot time, set the +.Va hgame_load +variable to +.Ar YES +at the +.Xr loader 8 +prompt, or add it to +.Xr loader.conf 5 . +.Pp +To give user applications access to the game controllers, +allow user access to the .Pa /dev/input/event* -device presents the game controller as a -.Ar evdev -type device. +nodes with +.Xr devfs.rules 5 . +.Sh HARDWARE +The +.Nm +driver supports HID gamepads, joysticks, and controllers such as: +.Pp +.Bl -bullet -compact +.It +8bitdo USB Wireless Adapter 2 +.El .Sh SYSCTL VARIABLES The following variable is available as both .Xr sysctl 8 @@ -68,8 +88,9 @@ variable and tunable: .Bl -tag -width indent .It Va dev.hgame.X.debug -Debug output level, where 0 is debugging disabled and larger values increase -debug message verbosity. +Debug output level, +where 0 is debugging disabled and +larger values increase debug message verbosity. Default is 0. .El .Pp @@ -80,13 +101,18 @@ tunable: .It Va hw.hid.hgame.debug .El .Sh FILES -.Bl -tag -width /dev/input/event* -compact +.Bl -tag -width "/dev/input/event*" -compact .It Pa /dev/input/event* -input event device node. +input event device +.Pq Sy evdev +node .El .Sh SEE ALSO .Xr iichid 4 , -.Xr usbhid 4 +.Xr ps4dshock 4 , +.Xr usbhid 4 , +.Xr xb360gp 4 , +.Xr devfs.rules 5 .Sh HISTORY The .Nm From nobody Fri Nov 14 00:15: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 4d6yMl4bjvz6GVPQ; Fri, 14 Nov 2025 00:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6yMl2LTdz3YsZ; Fri, 14 Nov 2025 00:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jF5CdxM6MqczD+Bn7Si1+wSTo8/A7gRQ6nSPRw3+Uik=; b=vfo0DVNK1xYhPs2YJCPDATMpUwlcNzNroG/Ej4Bp7JTJiDYauzPvtXzR+DOmhEQmZXwva1 n+lQvKf09QxChCxyUoJaFiPetyu4FuhdsAVgwXHR3EvOIHMlYF4o7XfZPVcW3B2+SlFsZj L9oddseLLLCZMrD4aTWE85MnzRcjX0xuoXEfF2+/k+a99Zku1isuZ+2kUZKth3Z4ANkULt fINzfkcS0itXOjwYehccUNDn0eS6ZIp3XycylaCUudMtkQqZq/hW6f4WDIGrOOdkWkw9WK HzdU0gsCv6tFLKU/dVXpn2tkam6BOHz7DwAssCUByGBvpWRR+mnD1bNVd8K8sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763079331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jF5CdxM6MqczD+Bn7Si1+wSTo8/A7gRQ6nSPRw3+Uik=; b=V/jndvkrEUa3H277I9Cs6M8XUBNemZUNSXwpZ/qo56JvlmdDvIURDZV/DFIqxT+UTtFi80 ZxahIl87Feuji26fHm4uhMpBrSn8X6f3V+z36HJ9Lv99NSmWFGFdMwkVBfgDQGi8AZ9oAW qBA0wzconfXyAOcTvlLrQK04pqx76aEVySPCKjoumvf4jeOD42dF/3gz9KAfN5r89CVYcH 926yC/UvMYBtEPpAkwkxC/66xYQ3EC7DlZzIKIw7B7ezeennT8/aBHDZ1wAd0/ephzR5AK sNAQSZdu/zw3DR+F0GM11+1Jgd5RyGZZJZHocAmH6gs7xHMBrAukCFJXtTPAKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763079331; a=rsa-sha256; cv=none; b=LZDKvdakFtdcd6hpH9E/EnyPLG4fEpflsr9Nv2FGM5qLrNtxvGwkxr1TCLJ8R1whPIFEaJ 1BZ81jtT02baDoCsoP1EPHW9eWLHFGu8anXFyxPrZFUmAvEaI4gaqu/yObiqQGG7ETIks9 5/MGQRqkUrr5xviDFk0op8bFzLhAIMnwkOa7WK5ntwXrK+sB1IQ7f0ynUPDYvKowkEnZmC BYKo/A/26+ZsklqB6m1cG8BRGzNXsqNiMUXXLBtVVzgPdBM5MovB1EvSIG5xMsvqWjlKcW AYO5/ygjQWqbd30j2fgX8ylNmNkcEwkT9ElS2+1NvHCkoV5GcImqDK8BoWASRQ== 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 4d6yMl1dlMzkXM; Fri, 14 Nov 2025 00:15: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 5AE0FV35037315; Fri, 14 Nov 2025 00:15:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0FVVx037312; Fri, 14 Nov 2025 00:15:31 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:15:31 GMT Message-Id: <202511140015.5AE0FVVx037312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: f467eb078f51 - stable/15 - jail.8: Add creating a jail from package base List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f467eb078f51a4fdcf72125c7c9d84086318071d Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f467eb078f51a4fdcf72125c7c9d84086318071d commit f467eb078f51a4fdcf72125c7c9d84086318071d Author: Alexander Ziaee AuthorDate: 2025-11-13 21:25:06 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-14 00:11:55 +0000 jail.8: Add creating a jail from package base MFC after: immediately for inclusion in 15.0R Reported by: ivy Differential Revision: https://reviews.freebsd.org/D53745 (cherry picked from commit 477799750abd5702a02f7f8065e6235d7db75188) --- usr.sbin/jail/jail.8 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index e27f9e3d1630..3cefc60b2632 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 6, 2025 +.Dd November 13, 2025 .Dt JAIL 8 .Os .Sh NAME @@ -1146,6 +1146,13 @@ D=/here/is/the/jail mkdir -p $D tar -xf /usr/freebsd-dist/base.txz -C $D --unlink .Ed +.Ss Setting up a Jail Directory Tree from System Packages +To set up a jail directory tree containing an selectable +.Fx +distribution with the packages tech preview, +the following command can be used: +.Pp +.Dl bsdinstall jail /here/is/the/jail .Pp In many cases these examples would put far more in the jail than needed. In the other extreme case a jail might contain only one file: From nobody Fri Nov 14 01:03: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 4d6zRX58SBz6GZNt; Fri, 14 Nov 2025 01:03: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 4d6zRX4Mhsz3kdY; Fri, 14 Nov 2025 01:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7uSE6FGiR6AlbF29WpSpPheMwfUesN57CxnQVWF5GN8=; b=Xpo6ZbSM8Ng5oW6TMxpDsJyUHgjRh91ecwNHvpFpiaYRFJIcdwq/eFBisZXvbCo4eZPPaQ KCtUH/CWtPFxtRIvrswS41+6kyzK4i6b/uDkMjYW2qW4yfipf8GfVbeN7afsGdcHwHqAGA q7T4oZdA0hEzmD/1e0ch2fBhgWmogQobW2eZ/nlAMbyDXIKvaaCC1i+C8/gqefWVRc4CVQ tSJy7RQQMkJ45dwtaJPf4n8gIRdCKAxtpZrlVV1T3jXu17CxRAngWfId9fyg/7CYvB/Xhh A1vsjJ7bS9+bCn/s8GrVecb5X3R+rv8VYGVmOkPWskBWg/MUcVtYq1+Rmj41Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7uSE6FGiR6AlbF29WpSpPheMwfUesN57CxnQVWF5GN8=; b=ZejYLXEzB7zFf9MlrzqXldzU8hznlFcgRNtJKrdW6crxtJxUjijDIBADTFc0fRb3c45m+H fXh5RogQTVKWL98pt6c9AOEayGgxcCUYlMg+ATFrZHq2lDDSVYqMxAp2q8BsOijbviC1s6 eIbYfLPLMcHaxFTsITV6VfszRNV4WlgMmXGoiiNKeD6s0Lh419B6dhOtLuP2+b/77lvw3Z laFC9rtXvHkLq64+puz0CeFAduALpNsHIb3Ag205wAz/6icNuf5yt5bOqjW3BqUuHADNGR jDzjx3q656TeGTiMmF4NHB+xRT2IcugYrODhyWQrLISqr2ToPBtlArshA7KUuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763082232; a=rsa-sha256; cv=none; b=cjPSll9pZ1kEr2oJkZFbGFXFB8iwOGXLlNPCVXk2u6IQKnM9kc9hCNCzmNUZ+06UXx7iFd RDf/djGugMtLRB/+we4yLbMO04m/18gNNEjOAU5O4WzTRMuBCOHb8buk8llnKk5amEJG9R qBhQvXs6W6n3Y7IFjKHZY450NSTf2GKyLmPiXFTqKWq0U+ri5xolem2utIGt8qWHVEftI9 66c0AR1CZekuvKjg88KdCfXWvHDPFptKbknuX7LytOij3vW0tsdH/FNlWcvdkBIqsibN3f XHRnzHZX7fnhKPj9MaFMiJoZsSxMYhDThynvvPjFXCTJmCgJb3LzpjFPRAt57A== 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 4d6zRX3kbSzllQ; Fri, 14 Nov 2025 01:03: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 5AE13qv0030430; Fri, 14 Nov 2025 01:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE13qxm030427; Fri, 14 Nov 2025 01:03:52 GMT (envelope-from git) Date: Fri, 14 Nov 2025 01:03:52 GMT Message-Id: <202511140103.5AE13qxm030427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ea26fd52a949 - stable/15 - aio: fix alignment of struct (o)aiocb32 on non-amd64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea26fd52a949116d03f59066d364eee2af6c9f51 Auto-Submitted: auto-generated The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ea26fd52a949116d03f59066d364eee2af6c9f51 commit ea26fd52a949116d03f59066d364eee2af6c9f51 Author: Robert Clausecker AuthorDate: 2025-11-14 00:55:59 +0000 Commit: Robert Clausecker CommitDate: 2025-11-14 01:03:44 +0000 aio: fix alignment of struct (o)aiocb32 on non-amd64 Only i386 has a four-byte alignment for uint64_t, others have eight-byte alignment. This causes the structure to mismatch on armv7 binaries running under aarch64, breaking the aio interface. Fixes: 3858a1f4f501d00000447309aae14029f8133946 Approved by: markj (mentor) Reported by: Mark Millard Discussed with: jrtc27 PR: 290962 MFC after: immediately (for 15.0) --- sys/kern/vfs_aio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 60916a9fbd32..65d7ffc9b742 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2752,7 +2752,11 @@ struct __aiocb_private32 { #ifdef COMPAT_FREEBSD6 typedef struct oaiocb32 { int aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O */ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ struct osigevent32 aio_sigevent; /* Signal to deliver */ @@ -2764,7 +2768,11 @@ typedef struct oaiocb32 { typedef struct aiocb32 { int32_t aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O*/ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ int __spare__[2]; From nobody Fri Nov 14 01:05:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6zSv4KNWz6GZ6h; Fri, 14 Nov 2025 01:05: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 4d6zSv3gT1z3l78; Fri, 14 Nov 2025 01:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2KNp2Y4neDizhomOHk6/s8DCXIa3BqmCzAUUYaTLkw=; b=QCTJBfzcX2CZHSO8WSiqtpiUS9+KR2YjxDCCOBqgkiweHKDZhWQaTFo6XDl2Bd5TCOh48h pEIr1b+TN09rTPvkxujaQDH408/sV1/oxswYvRcWX0XnApNxWQlVoIKf2oZnVWvO6aDsH+ seZ9t6s8Qkt7IZMnlkSJEJsePEJiWypVuhV1OrJ2EVzXmjvbf7/GwzhKVjFGgMkR5zx4ht I4deb79zpqfXJ+fbRmo6nWFnde/Vu++FNYFBpHua7wAOOUXIzj8WRLgI70gp7lfU1usVuY H268ilaoc3pPJDZQn4HvVIckVgWrBE2aLhW9zfkBZlyARYc+pa1Lfpy1SfwmCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2KNp2Y4neDizhomOHk6/s8DCXIa3BqmCzAUUYaTLkw=; b=ahig/1J8FShkYBgLOWY3u0VdLCFJszK2BeEhHpE8G3EUFL23PJSi9azTmwBx0xM5bGVwVF aIwMUpi/++vYAPTd2yGjTClTrjNcmG6hiG8CYNy6Sj1FVZ+xR2I3z6q/GnjiNCitQcTmRz VmdRSqV7Ln6mHTYU46cUd+b3gjsLIfvtce9clGxjxDMYa64Fp92o2MhygBj97UgR5ak8Nj dIWB0fXCcWbcEA8EE4kye70H3EU3iu4eXo7e2lCyUqTnPzGtH6PHzePwgfSi38VpB4vYoD W4+YsaPaDHnCbC5fIc7RTiC8p/zyG6RY1aL5af+jDmx81Gs12hflEpGBX/D9xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763082303; a=rsa-sha256; cv=none; b=RAjKNj3BovJ+1r0ymiio1/88P8MIxyVXXYQy9IQ/jWufTrFkN2x8fbZ4xy6BidiBm8nOsU cJwDxxNuWPQt9WzvezhmMewBOx78QQGaKpbH+BUSWy3piwV/zNgzhK0VyjmMWdYxcjh+9d 3gJrbVVn9fQ38tSu+pjX/YdQZnaUSY3miXc9fUbg54DVgfKmjIO6Eyf/LCgTuuDB7t4gdQ VWqS6lIIGZYWAJ8L2xGmlUkFWn0SUc4NzrQoUgtYX8KUQks41itrGcgaVsbvrrdJ5IL8sc Z6qrC5zO/c1D/1+HFSWHkisvqqS9ZlD9oZBnoYtaTtDm04i68F5eKqOnSo6D3g== 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 4d6zSv33mFzllS; Fri, 14 Nov 2025 01:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE153xJ030908; Fri, 14 Nov 2025 01:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE153tj030905; Fri, 14 Nov 2025 01:05:03 GMT (envelope-from git) Date: Fri, 14 Nov 2025 01:05:03 GMT Message-Id: <202511140105.5AE153tj030905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 498a4c7f48a3 - stable/14 - aio: fix alignment of struct (o)aiocb32 on non-amd64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 498a4c7f48a33c60b1768b8a6daf519bad84e18d Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=498a4c7f48a33c60b1768b8a6daf519bad84e18d commit 498a4c7f48a33c60b1768b8a6daf519bad84e18d Author: Robert Clausecker AuthorDate: 2025-11-14 00:55:59 +0000 Commit: Robert Clausecker CommitDate: 2025-11-14 01:04:53 +0000 aio: fix alignment of struct (o)aiocb32 on non-amd64 Only i386 has a four-byte alignment for uint64_t, others have eight-byte alignment. This causes the structure to mismatch on armv7 binaries running under aarch64, breaking the aio interface. Fixes: 3858a1f4f501d00000447309aae14029f8133946 Approved by: markj (mentor) Reported by: Mark Millard Discussed with: jrtc27 PR: 290962 MFC after: immediately (for 15.0) (cherry picked from commit f0af21824331648a41b4e5d3323bea9216bcb7e2) --- sys/kern/vfs_aio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 8842d8409e01..75a6a7355eed 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2778,7 +2778,11 @@ struct __aiocb_private32 { #ifdef COMPAT_FREEBSD6 typedef struct oaiocb32 { int aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O */ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ struct osigevent32 aio_sigevent; /* Signal to deliver */ @@ -2790,7 +2794,11 @@ typedef struct oaiocb32 { typedef struct aiocb32 { int32_t aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O*/ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ int __spare__[2]; From nobody Fri Nov 14 02:30:10 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 4d71M70gkbz6Ghj5; Fri, 14 Nov 2025 02:30: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 4d71M674S3z3sX3; Fri, 14 Nov 2025 02:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qNBeP4vd1eTvl7ke3UIIs50oM7z1yuRgl/MhdRImf4Y=; b=IB9gAblK5ypw1iBO7nSspg3s/4sIsYx527VK31KF7oVXGA/tjiGlGXCzyoHs0Ud6lYX6Tq U7SDTpngTICntuUElB9Yl1HOSpjpX3TRqfqEBhV5MOGeABYF+XWkPrRb53LKzyxWWelTYW zJqom0TCtWa211b6Mr9GqUgHesXOZ4a0FQ24WU3NKJMftmcm6wuQvRz5MyEhORMX+t0ynl nSMyJT1hGAegFWCqqdFh0lb0z92mX41JLOmtlnYaWvpmRFvHB+MRLBMySdbZ9LtdDXXhKx SJXvRuIKiQXZBMiteksoY5VfJuOYOs3Bq7BEDF3QHaRPi4gZZHOOoRAPeJ0bRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qNBeP4vd1eTvl7ke3UIIs50oM7z1yuRgl/MhdRImf4Y=; b=L1LdRhi1hqTOUkng908UYKTOoRC9O/J7MLFvlSXD6F8drB1kmZuZUVQd/Vy0av8V3cy2Yx 4fZEvpXhMSMJLrOrkPJMkt6wellRP/b6wJMt2K1G6bDLcG/V8cBcbOUZCJGA7t9hNm4OLj YJdK7aQwi+qweUaxUB1lQlTDiPJpvCEEr8PmMhWXaZG5+owjGx/PBveDmq9g5CSh9lH9aS DufCr/vfRko+/lJ5M0QHfq11RvlL6xv+KZWYjhxDmIGBoqPurgIrfZ5tsT6kxhgNI82666 7IyT9+TdFPlZlD3miVJxNE/mHWoXObai78rNSjDes69u10NJf96QZ+KifSe1vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087411; a=rsa-sha256; cv=none; b=qjOaIWTAC1+Ig1Mq24w9W1DXM1OcAxu0+vSbADkgyJ0c1kOkklJluKSF/n4/2/ZIXbGrGC Zm67zt2fe8xJmm0OdaOzj/bqDcUMMSgdQVFCFAHzTVqoQ901URroeznFVCUcYNsSsOG6yA cf5t7VP7JhRZRgkAMA97Jcxpr88n6xtBT1o4xTrgCr+bonC4dzwOz5fUutaTyvVNToNqlI szne3ywK8904CcHygfolJbNI3Fg8qw1gnqDlRyzMLMjMA2gkJWPzD0DZKvgqXeIh8bnIW2 oW2qvpq2HmEANZFXzsuJWQ/bDxYCMut+Vxcl1rIgaLwCvH2nrIQO7B3hSiSYOw== 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 4d71M66Ttjznb4; Fri, 14 Nov 2025 02:30:10 +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 5AE2UAGZ086417; Fri, 14 Nov 2025 02:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2UA1e086408; Fri, 14 Nov 2025 02:30:10 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:30:10 GMT Message-Id: <202511140230.5AE2UA1e086408@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: cb9075718bc6 - releng/15.0 - aio: fix alignment of struct (o)aiocb32 on non-amd64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: cb9075718bc66844c6d25fed1df18de61af5267b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cb9075718bc66844c6d25fed1df18de61af5267b commit cb9075718bc66844c6d25fed1df18de61af5267b Author: Robert Clausecker AuthorDate: 2025-11-14 00:55:59 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:27:28 +0000 aio: fix alignment of struct (o)aiocb32 on non-amd64 Only i386 has a four-byte alignment for uint64_t, others have eight-byte alignment. This causes the structure to mismatch on armv7 binaries running under aarch64, breaking the aio interface. Approved by: re (cperciva) Fixes: 3858a1f4f501d00000447309aae14029f8133946 Approved by: markj (mentor) Reported by: Mark Millard Discussed with: jrtc27 PR: 290962 MFC after: immediately (for 15.0) (cherry picked from commit ea26fd52a949116d03f59066d364eee2af6c9f51) --- sys/kern/vfs_aio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index e63fa4c01434..a81aafb2ecc4 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2750,7 +2750,11 @@ struct __aiocb_private32 { #ifdef COMPAT_FREEBSD6 typedef struct oaiocb32 { int aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O */ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ struct osigevent32 aio_sigevent; /* Signal to deliver */ @@ -2762,7 +2766,11 @@ typedef struct oaiocb32 { typedef struct aiocb32 { int32_t aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O*/ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ int __spare__[2]; From nobody Fri Nov 14 02:35: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 4d71Sz2JJDz6GjQ4; Fri, 14 Nov 2025 02:35:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d71Sz1gvxz3tH3; Fri, 14 Nov 2025 02:35:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCK2alsgZlxZERsUnkiBYOX/08GpyQ7HMvLRX9Mgp60=; b=VtHw6aQS/XazG6S4oezZSzYrLXLWMKIpRhb8Hv56lmI4hm0swpanqyXrm6sIkDodQE2uR4 YzdXtA4QERwVxNuACSWPWa5YwR4bBxSHgQkeasfzGbE6EfmJ1nKp3fkxM74U4agOYbRbGZ fQzIj9bGCOFO9yZsZNe9bqYgazNpLy7zlEffzLrcKR3Foag6Yewo7e5qR20mVlwhKePnBF CCTFvaTh3gY8TFB0iLEububa+QrA4RstYDBKaPtPjFBPYYIvu2UNmyBkjGJXJEmPC982Oo aMBQ+fyE9jRH0/FFosecem1DzprBXxhSvymaZsFcwcKPxg2OQW6Z+Lamzn5ZmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCK2alsgZlxZERsUnkiBYOX/08GpyQ7HMvLRX9Mgp60=; b=HCMTYM8+0L2PMDsKU7U4OOLeFnLyq2v2nWkfbfqCk4MM0oGgWyS0rAm+nKaOkRzJdHBLIE My65gOGuzYbhGBiRXznYCR7bGIZ89OnTw8tYhfhMjejiXnEGaQ99oIJ+BcausGVZBvtoVI U8Zr2/PlQNDbMBDU4SuhyeM+IhrbItgJoNjxxtEMKAvYMnA2RK4UI/N6vGjBUX5quG8yTf vDP3pkhxN3mmLNyLwMq2sFkBtt/txPCwGqoxLC+Xq3XsqO8VzIKAAuOjpcvZ06f3GvD0+a jgVcNOipQ4fN0h/VPwH7fC60yIrE2WSB1rr5ZuCntDj1yjrvpBLPrjJx7vS+/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087715; a=rsa-sha256; cv=none; b=updSbgUYlmhyzMecNozhTNvYujKAbaJijk15UL+5D/c6nOelSX3oB80p2qVo0j2Pa7ach4 Z+XvXToY5iI/jB5IM2rWIietC39ZbsHnamHu8tHTEBLK+TudLMSk36425FwADsLDfQZQvk r5UXliuo5Ya/CYpnOiYPlX7swPK/O55lh7s6T07XD0YPZBWT0KYpt12t9Z5sgtoP+Y69lB 4Eb3RSghDanxw5w6LWW+Mjwn+Qrha05UFpUUaV2RmXxFr5VfxhzqZLV0jlpJffpXTcOn0r x6qiw1kVAIt8BMKWmCEsljGE9H6kCTbiMBHYVXsi0aGVgz/njQnRUEf1pjn6Kw== 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 4d71Sz1GHZznc0; Fri, 14 Nov 2025 02:35: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 5AE2ZFhY000178; Fri, 14 Nov 2025 02:35:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZFQr000175; Fri, 14 Nov 2025 02:35:15 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:15 GMT Message-Id: <202511140235.5AE2ZFQr000175@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: 16d599da7bfa - releng/15.0 - jail.8: Add creating a jail from distribution set 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 16d599da7bfad78894844d1eea164c5ba0ef9f4a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=16d599da7bfad78894844d1eea164c5ba0ef9f4a commit 16d599da7bfad78894844d1eea164c5ba0ef9f4a Author: Alexander Ziaee AuthorDate: 2025-11-07 18:38:54 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:34:41 +0000 jail.8: Add creating a jail from distribution set Approved by: re (cperciva) PR: 200803 MFC after: 3 days Reviewed by: jamie Differential Revision: https://reviews.freebsd.org/D53631 (cherry picked from commit d59903481dbaef9ef7e91ea4945d2355ae17c53a) (cherry picked from commit 5d7cd576d99b99f460263d93929828d584d8f80c) --- usr.sbin/jail/jail.8 | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index d44b7f66a64e..e27f9e3d1630 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2000, 2003 Robert N. M. Watson .\" Copyright (c) 2008-2012 James Gritton .\" All rights reserved. @@ -23,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 15, 2025 +.Dd November 6, 2025 .Dt JAIL 8 .Os .Sh NAME @@ -1119,7 +1122,7 @@ process. This manual page documents the configuration steps necessary to support either of these steps, although the configuration steps may need to be refined based on local requirements. -.Ss "Setting up a Jail Directory Tree" +.Ss Setting up a Jail Directory Tree From Source To set up a jail directory tree containing an entire .Fx distribution, the following @@ -1132,8 +1135,19 @@ mkdir -p $D make world DESTDIR=$D make distribution DESTDIR=$D .Ed +.Ss Setting up a Jail Directory Tree from Distribution Files +To set up a jail directory tree containing an entire +.Fx +distribution, the following +.Xr sh 1 +command script can be used: +.Bd -literal -offset indent +D=/here/is/the/jail +mkdir -p $D +tar -xf /usr/freebsd-dist/base.txz -C $D --unlink +.Ed .Pp -In many cases this example would put far more in the jail than needed. +In many cases these examples would put far more in the jail than needed. In the other extreme case a jail might contain only one file: the executable to be run in the jail. .Pp From nobody Fri Nov 14 02:35: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 4d71T10dw7z6GjHR; Fri, 14 Nov 2025 02:35: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 4d71T03kNZz3tWM; Fri, 14 Nov 2025 02:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05p1sHwg3lVajFBG536+66K00AbxaSKnXA+iUIB+blI=; b=VPj477DwQsjEDG0KYA5RRMouc/kTRLhuK/oVEtvGWcjsITkrH70JzX5Q2q+nnfrVen2YVZ g/8mKBRm/7RNm/FvG8xpDDFOuG/XaYsYjAx19KXky5NFuckXzs4aW9WwoUB2r0ezfdG2aW 1NIbmCUONJzVjnIAHSjqtnM342aQ1vLa2EvA1KP9r5r8O4z4PP0UNfQ1tTzPJlO4Czrc// gc1Y7EaFckzMOoB1w59QhcskxV3e4aghClw7tea+1QvGM/TTXgMqfDRjbADuWin9RxBzUp c5uq1rNZU7lCGy5kLnFoYAnGq701RJcxkrRMIiBvMd1ERk1NGEEaNWopMtUbjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05p1sHwg3lVajFBG536+66K00AbxaSKnXA+iUIB+blI=; b=MZqgUEXjnjn3MX+apwPc0mPLI5upIrexsZQ3ry1Vou/6uB7s7BVSaUTv57UIgTLsHvgbq7 e/rJSLYR/9db1+q45tPt1YuEUxFZNIOUwdxc6eDDl42+WDiqPjr166y8328wYme+3w1SFY wOcCK5LAvCNKHG8M3FjmDg0NW9ibIVPsG1H0K8AjkNj4nf5//U/su+lUtG5ZezMFPmjOhs 8izpre60DcaXIGkxAVl/N8Yh4b8aDWSx1eYaxJYA0nCqJD1lgAUcr9lLZ9q5U73eSvm/Dk VDIbONYEDiBRHs1cFlJPPAPXyHRPmOKp5xCXFaRoK8/02BVo//xVB2QeCrjI5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087716; a=rsa-sha256; cv=none; b=xLMsmAS3M2vR4KskATIoLaYDTnYDo+K2hWLWBJpwjqvyNOA4Fcr3S6qZBwNPhR5s+mq1CE q6u8tdAnP7jfowxs54kiejiLQaxCGZzBPDAU3VmKa8bUUhEEeicRd2PsZrQuH/wljet/7C YB8jfIYa5VWNAe0SeXk68dOepACXfuz64BE2mqWDCb3VKJpXPbPyRSdpnVs51Hf65KHmjQ 5WbjEksYhNCeakmjhoSA5EMWMGiButuSRZjjJ/CQp5oIsI5zbRPI5fze2qlAJVn/nk58Ro GToRbYPz5a/+OKUwKm/YKLSiEan48zYZKwzEv8RP44I8x6TcmbwiOH5guVGW5Q== 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 4d71T01wRLznc1; Fri, 14 Nov 2025 02:35: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 5AE2ZGMk000210; Fri, 14 Nov 2025 02:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZG3a000207; Fri, 14 Nov 2025 02:35:16 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:16 GMT Message-Id: <202511140235.5AE2ZG3a000207@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: 14ada82543f8 - releng/15.0 - jail.8: Add creating a jail from package base 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 14ada82543f86ab1f5b8853473546b261f7b297e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=14ada82543f86ab1f5b8853473546b261f7b297e commit 14ada82543f86ab1f5b8853473546b261f7b297e Author: Alexander Ziaee AuthorDate: 2025-11-13 21:25:06 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:34:46 +0000 jail.8: Add creating a jail from package base Approved by: re (cperciva) MFC after: immediately for inclusion in 15.0R Reported by: ivy Differential Revision: https://reviews.freebsd.org/D53745 (cherry picked from commit 477799750abd5702a02f7f8065e6235d7db75188) (cherry picked from commit f467eb078f51a4fdcf72125c7c9d84086318071d) --- usr.sbin/jail/jail.8 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index e27f9e3d1630..3cefc60b2632 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 6, 2025 +.Dd November 13, 2025 .Dt JAIL 8 .Os .Sh NAME @@ -1146,6 +1146,13 @@ D=/here/is/the/jail mkdir -p $D tar -xf /usr/freebsd-dist/base.txz -C $D --unlink .Ed +.Ss Setting up a Jail Directory Tree from System Packages +To set up a jail directory tree containing an selectable +.Fx +distribution with the packages tech preview, +the following command can be used: +.Pp +.Dl bsdinstall jail /here/is/the/jail .Pp In many cases these examples would put far more in the jail than needed. In the other extreme case a jail might contain only one file: From nobody Fri Nov 14 02:35: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 4d71T16HZqz6Gj3D; Fri, 14 Nov 2025 02:35: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 4d71T13R4mz3tHP; Fri, 14 Nov 2025 02:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ycyWdbKagLtWFY1mdUmvF+nn3WHFUA1duLVAoqYFpOI=; b=tGCIMVxpPNyPKQF2ttqxiII7+N/xxa4453T2bcbKvkOi5AwypMqnocBVzHf/j7+eI+Dmxs 24F3RBa5lSTOAkoFXYwdzp3Ozq2mP3QMgA61lF2GNe4Do0h622gfMeE79qIYo7O9y6kBNd SEOqWcjbJazumTpWyl2F7h8SJ0PBIzHbrh0RbtLpjsvi2nPLmdL+h8srfoIX5sR/bPbWta r+ZkMfl+cLvG64tiEZjNymBXcSIfsbCCvFcumUqOVgvQ3d/SoSYecffh/dC66DyucZZURr 5pXdzo97y46RFRcHIDPocO0W6Ifgif8N4m2zYrh2IVus09jfaWgOKzh2nytuQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ycyWdbKagLtWFY1mdUmvF+nn3WHFUA1duLVAoqYFpOI=; b=aBeWMhjQ/IZjLDeomP1jYyfyQhO4qGcEO20JyBEWghOiHZ23BtxKjgAwBPobNWp0QgV0Fk m+38aVsiCvw/J4BRCqHn9ut9VMYnqehgecTmn2NhtEKSJBZYLhWOOodYA46gI7RQnb5eu4 AbG9iM6yvypmUs2LqX+cYFfi7bQrLo7akSaiSZKFuETp+9qs8zG3/k+rKU5jv16ec3NTIJ W+9AHDb2VRF7wUpaZToNJex/AZyxMz4lWcxwqvjfGnBnSl5DYPdncaIaXEdK6PUD56ybAh NidAbcBZyb1I4WXds/DERDL4ugMKTUD3llSKhMwEcW7JsbTf63yEj9JTPJgz4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087717; a=rsa-sha256; cv=none; b=bA9aHyQPaUSyNBcFYYQfq8iBJAtLD7Rx+VknFw0enZiogrJhhDb5vYuAHki4jWOMKmRVzp fBrCdlxvpD8jL0ir/CYErPNBfVFqLNqqQ4bwOQtPmuYJ54+d1xVqedAy2RSrp0ut7pa5fx aYW4lIrfWNdwZ+XpxzgQe33m9J5DlqRY2fMsSK06numGaUuwNg6gQ1IIyBwtYcZ7RJemxc DTmaEUYjdAMh/0Vus/pCwY8C1YuW9sf3SilRk/o2yT09w9Bk8b9eLn4Bmj76J3nYPgvOhe MFy8p8K62BaejQH9rHtvJcYFSef1NRT3ONq/rDcoaTLzjwWyKeA69nat9yk3Vw== 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 4d71T12bxqzp3y; Fri, 14 Nov 2025 02:35: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 5AE2ZHnG000242; Fri, 14 Nov 2025 02:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZHUd000239; Fri, 14 Nov 2025 02:35:17 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:17 GMT Message-Id: <202511140235.5AE2ZHUd000239@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: 893e5b702077 - releng/15.0 - hgame.4: Polish 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 893e5b702077f2130451a868bd3ca24cdd6acbae Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=893e5b702077f2130451a868bd3ca24cdd6acbae commit 893e5b702077f2130451a868bd3ca24cdd6acbae Author: Alexander Ziaee AuthorDate: 2025-11-13 21:13:45 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:34:48 +0000 hgame.4: Polish Explain driver loading and application access in the body of the manual. Crossreference other game controller driver manuals, and devfs.rules to hint about how to configure application access. Add a common dongle to supported hardware. Add evdev a few places to make it really clear how it works. Approved by: re (cperciva) MFC after: immediately for inclusion in 15.0R Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D53290 (cherry picked from commit c0c8d812b560a3e89656c026022a44631f88e233) (cherry picked from commit 31e7ee6bd524813aa2623fb9dc2afcf6be34397e) --- share/man/man4/hgame.4 | 90 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/share/man/man4/hgame.4 b/share/man/man4/hgame.4 index 3309833c1720..f816d2a442d0 100644 --- a/share/man/man4/hgame.4 +++ b/share/man/man4/hgame.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2020 Vladimir Kondratyev .\" .\" Redistribution and use in source and binary forms, with or without @@ -21,45 +24,62 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 14, 2020 +.Dd November 12, 2025 .Dt HGAME 4 .Os .Sh NAME .Nm hgame -.Nd Generic HID game controller (joystick/gamepad) driver +.Nd generic HID gamepad, joystick, and controller evdev driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device hgame" -.Cd "device hid" -.Cd "device hidbus" -.Cd "device hidmap" -.Cd "device evdev" -.Ed +.Cd device hgame +.Cd device hid +.Cd device hidbus +.Cd device hidmap +.Cd device evdev +.Pp +In +.Xr sysctl.conf 5 : +.Cd dev.hgame.X.debug .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -hgame_load="YES" -.Ed +.Cd hw.hid.hgame.debug +.Cd hgame_load .Sh DESCRIPTION The .Nm -driver provides support for generic game controllers (joysticks/gamepads) -that attach to the HID transport backend. -See -.Xr iichid 4 -or -.Xr usbhid 4 . +driver supports generic game controllers +that attach to the HID transport backend, +and presents them to applications over the +.Sy evdev +interface. .Pp -The +If the appropriate hardware is detected, +the driver will be loaded automatically by +.Xr devmatch 8 . +To load the driver manually at boot time, set the +.Va hgame_load +variable to +.Ar YES +at the +.Xr loader 8 +prompt, or add it to +.Xr loader.conf 5 . +.Pp +To give user applications access to the game controllers, +allow user access to the .Pa /dev/input/event* -device presents the game controller as a -.Ar evdev -type device. +nodes with +.Xr devfs.rules 5 . +.Sh HARDWARE +The +.Nm +driver supports HID gamepads, joysticks, and controllers such as: +.Pp +.Bl -bullet -compact +.It +8bitdo USB Wireless Adapter 2 +.El .Sh SYSCTL VARIABLES The following variable is available as both .Xr sysctl 8 @@ -68,8 +88,9 @@ variable and tunable: .Bl -tag -width indent .It Va dev.hgame.X.debug -Debug output level, where 0 is debugging disabled and larger values increase -debug message verbosity. +Debug output level, +where 0 is debugging disabled and +larger values increase debug message verbosity. Default is 0. .El .Pp @@ -80,13 +101,18 @@ tunable: .It Va hw.hid.hgame.debug .El .Sh FILES -.Bl -tag -width /dev/input/event* -compact +.Bl -tag -width "/dev/input/event*" -compact .It Pa /dev/input/event* -input event device node. +input event device +.Pq Sy evdev +node .El .Sh SEE ALSO .Xr iichid 4 , -.Xr usbhid 4 +.Xr ps4dshock 4 , +.Xr usbhid 4 , +.Xr xb360gp 4 , +.Xr devfs.rules 5 .Sh HISTORY The .Nm From nobody Fri Nov 14 02:35: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 4d71T309tGz6GjHY; Fri, 14 Nov 2025 02:35: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 4d71T25ZRXz3tTS; Fri, 14 Nov 2025 02:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0dI9QSElup9z4xbsxSfs06xRmAgczn4cRm4AUKfwh0=; b=n7EppJKCPteOvqWUcIPnTVqnJz7Q3P8Artrjmbqm5hKQ8iKb79dHIl0roVdlpwXKZb8Aj4 SK/qBDklfBryX6SFxGBBacUXZo/AwhZZErC4q7eMaT4MLAGJyeYe/JXRzwtF1NKOcHsqTm spDU+3LOxvIcyXP70Zve2TI1rjVo9WprQpTjUvbGgvrjvWQeACkHxQiFkjjYJ3l5cZJ17P JydL76rpzWMeeiojzIFS0RMQxI/5UdR20yecnPJ1E4tmSAzL/pVGpMfFTLDZyLOWx7TNez Xz+uGAK2EJQQ/deILbojLWvfuPN1qDRBXFwrdu69XMoUn1r7umKapOcr/8p1Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0dI9QSElup9z4xbsxSfs06xRmAgczn4cRm4AUKfwh0=; b=Uo9Tl+otypLUuq12pAT/EKJd1bGDCjE2sxwf883VNs7vLAxrU4fI3gs4i+vi6BNcHc1H+P SrHg3lBXkI+EPcIT9vbofMwb0/hkIKeijZ93zR7qUMxZKIw/u08kyq4k1Fi4Ch7yL6ORqw app4k2sogvUUu7/ykpesuOTRlLMGMatgrpKLl0Z7OPI+Sa0/KT2LHNn+Pw3wNazYADLm2X 9QqJYP8s3730qLhscjIFfWAKXNzs6TowYMyEDPmsbLfUNtSTwo4PiRpQ5fjWjtG+VkBzxf CbHMjlnjXjwmL6mk2M1qv4DGc7VaCJi/07v/mPRl7oILncYl9nLe53BT4Cyknw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087718; a=rsa-sha256; cv=none; b=q7xIFcgrF1yTWU93LS4hiZIDFEhQtXYeFZhtu2MHWQwDhz7Rvbj+UOKEqrktMlDoIHUBO6 YPgzoJxBz5lTzftgVVloiKJNpWb+X+RgsFzsvcPMtobInLah34lx2aFRwvSAP8b2dSp8Ve GGFQLtSQBgxfklsH6vX1QhT/bq9I+96BbgiDpHYm5wN8LsMcNtochFey5Zs9Dqe03VxaFU p/CFTzGK/+w6iWkrerfkCuhu5nx+JHKNlTwomgnxECHcBJVfFs/7F2BN8v5Bk6FlVxWY9F 5cIRQDafp+HfG9QAL6vuaB5EV0LMkMb881g9jfnne0vYHv82yQAJdz5T3MpJXg== 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 4d71T23vqhznXL; Fri, 14 Nov 2025 02:35: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 5AE2ZIV7000274; Fri, 14 Nov 2025 02:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZIdm000271; Fri, 14 Nov 2025 02:35:18 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:18 GMT Message-Id: <202511140235.5AE2ZIdm000271@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: 95fcade81713 - releng/15.0 - pcic.4: Remove stale manual 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 95fcade81713ace6cdaf5fab29b07b558d7761ba Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=95fcade81713ace6cdaf5fab29b07b558d7761ba commit 95fcade81713ace6cdaf5fab29b07b558d7761ba Author: Muhammad Moinur Rahman AuthorDate: 2025-11-12 17:33:05 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:34:51 +0000 pcic.4: Remove stale manual Approved by: re (cperciva) MFC after: 2 days (squashed with fixup commit) Reviewed by: ziaee Fixes: 31b35400c (pccard: Remove more of the PC Card) Discussed with: bsdimp, emaste, jhb Extracted from: https://reviews.freebsd.org/D53434 (cherry picked from commit 1d9f2db7c0b981bf5d45e3ef17dda13b953e1c97) (cherry picked from commit 6aaf184dc4e294779db7133629b7ae953b4da285) (cherry picked from commit feb8971db4b179d90b7cd006c43421fdaf4dbf7f) --- ObsoleteFiles.inc | 4 ++ share/man/man4/Makefile | 1 - share/man/man4/ath.4 | 1 - share/man/man4/exca.4 | 3 +- share/man/man4/pcic.4 | 100 ------------------------------------------------ 5 files changed, 5 insertions(+), 104 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 32b3a2607150..6cbec0879b70 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20251112: Remove pccard(4) and related +OLD_FILES+=share/man/man4/pccard.4.gz +OLD_FILES+=share/man/man4/pcic.4.gz + # 20251006: Remove libnss_tacplus.a (it never should have been installed) OLD_FILES+=usr/lib/libnss_tacplus.a diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index f5d7a0e081fc..d8fc2c65782f 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -461,7 +461,6 @@ MAN= aac.4 \ ${_pchtherm.4} \ pci.4 \ pcib.4 \ - pcic.4 \ pcm.4 \ ${_pf.4} \ ${_pflog.4} \ diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 index e731277e4e75..b40ccbd16f09 100644 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -258,7 +258,6 @@ This should not happen. .Xr ath_hal 4 , .Xr cardbus 4 , .Xr intro 4 , -.Xr pcic 4 , .Xr wlan 4 , .Xr wlan_ccmp 4 , .Xr wlan_tkip 4 , diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4 index 555e459b7db4..d43d359bfb25 100644 --- a/share/man/man4/exca.4 +++ b/share/man/man4/exca.4 @@ -33,5 +33,4 @@ The module is used to implement the Intel ExCA interface to PC Cards. .Sh SEE ALSO -.Xr pccbb 4 , -.Xr pcic 4 +.Xr pccbb 4 diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4 deleted file mode 100644 index 1c5b0fc35554..000000000000 --- a/share/man/man4/pcic.4 +++ /dev/null @@ -1,100 +0,0 @@ -.\" -.\" Copyright (c) 2001-2002 M. Warner Losh -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd July 9, 2002 -.Dt PCIC 4 -.Os -.Sh NAME -.Nm pcic -.Nd PC Card bridge driver -.Sh SYNOPSIS -.Cd device pcic -.Cd device pccard -.Sh DESCRIPTION -The -.Nm -driver provides support for older ISA and non-Yenta PCI PC Card bridges. -The -.Nm -driver supports most -.Tn ExCA -devices attached to the -.Tn ISA -bus or -.Tn PCI -devices that do not conform to the Yenta specification. -.Pp -The following -.Tn ISA -devices, or true clones, are supported in the current code. -.Pp -.Bl -tag -width "Intel i82365SL Step A" -compact -.It Intel i82365SL Step A -.It Intel i82365SL Step B -.It Intel i82365SL Step C -.Tn Intel Ns 's -original 16-bit PC Card controller. -.It Intel i82365SL-DF -.Tn Intel Ns 's -last version of this device. -3.3V support was added. -.It VLSI 82C146 -An older VLSI part with some issues on some machines. -.It Cirrus Logic PD-6710 -.It Cirrus Logic PD-6720 -.It Cirrus Logic PD-6722 -Cirrus Logic's pcic controller. -Compatible with the i82365SL Step C with the addition of a different -3.3V control. -.It Ricoh RF5C296 -.It Ricoh RF5C396 -Ricoh's PC Card bridge chips. -These are compatible with the i82365SL Step C, but with yet another -different 3.3V control. -.It Vadem 365 -.It Vadem 465 -Compatible with i82365SL Step C. -.It Vadem 468 -.It Vadem 469 -Like the earlier Vadem models, but with Vadem's own, incompatible, 3.3V -control system. -.It IBM PCIC -.Tn IBM -clone of the original i82365SL part, with its own ID register value. -Has no 3.3V ability. -.El -.Pp -Many other vendors made parts in this arena, but most of them were -compatible with one of the above chipsets. -.Pp -The following PCI pcmcia bridges are supported: -.Pp -.Bl -tag -width "Intel i82365SL Step A" -compact -.It Cirrus Logic PD6729 -.It Cirrus Logic PD6730 -.Pp -.It O2micro OZ6729 -.It O2micro OZ6730 -.El -.Sh BUGS -This does not work at all at the moment. From nobody Fri Nov 14 02:35: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 4d71T431VVz6GjSG; Fri, 14 Nov 2025 02:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d71T372Kmz3tlL; Fri, 14 Nov 2025 02:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BcJAjPkVJip4fkZlToYuAlMHQR+p99lRDijQ82XBMH8=; b=uFMSgE1nMFpbMcWVw1ymMF3n6ydvMiiIRJnzCPZMRmiKspEAEP3DD0Nlcm6govPwUQAFHc qdMFGUPRqQTec19SXiF62fhMadvxQNOgc/ih9MGzdPABU6LgLJpwm0+39VnmJim3SlQf9/ bKEh+vXUG5CpUzxkQQu9kLwtSvCbRm+Lwqadb9r0HQFx7j6oxdeM6H3O4V04mE+qRzQelw uwOgvaWnL4FKqqpP0OiB4lbxGR/NPLUS0zGd3KR/btqxgjmbQlo4mncauSjB30GtixwieU vykFRnflTAUilYZQR9mwCQzYQvjmEhmkKnub56zgv+w3KPpNezOvGxW4SZe6eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BcJAjPkVJip4fkZlToYuAlMHQR+p99lRDijQ82XBMH8=; b=gg3lrZruNJTL+m7zrWGAqQlTd/AinslhxARUlSf07W01OQ9svjJvY2vPLmupBUpq3x2EhS f78vLRrLcrJqI9iU80CnHMjsqYPL79FWvQd6Ue07OQ9uLt2Oz6EtpqXISgQuXUU2eo0+R+ wFP4wHO7xSUxdgHt7rqwqGqAVenkOn+7P/1cm34re5X5M/QmkyXcGDvDQqYvgU95afRIFa s4l+RzoBrcb5UPK7qpVyepxEvMmLAIS5vM7MweqkMhw88GrLDpu/afXM3UfWr7Lz+trA7I GLmLSNc5Qb8HpFk9hZrbN5UbqpOMMnE9WXHYMJoaa+XFGl1IjD8U/VnFNEOS4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087720; a=rsa-sha256; cv=none; b=gsMYf2IarMzp/0HmReVYgSvwm9RjMqqBvB57Matqgyjq+jFZolKvIuNNx8ai5LXRcsITzZ 4MPxvnvwQKt9rFTeppA0scr7Cf29nal/z5TDc3XDuw+TCXHDETa+MfnfEyR71Nll91fUXQ Gpi9sfGfDcsdR9/R9+sOjdO8FmitRQmmhtPMgXN9EYha5NJQbRG7VDTcsEwB0I/CI8s6cs lJjwYOzT+Q/3YN88z/99Yg2Zj6jfxBIWVo+UVgmZmyulk3vyT6uNev8UM+kwJkU73aivQ8 PHOydU1HHl/YCL0PHz8vcjjWZrGCT3ddnasZr0ZkurZzp94qlCjf8IyK9wBC6A== 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 4d71T34r7Qzp40; Fri, 14 Nov 2025 02:35: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 5AE2ZJCc000312; Fri, 14 Nov 2025 02:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZJA4000309; Fri, 14 Nov 2025 02:35:19 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:19 GMT Message-Id: <202511140235.5AE2ZJA4000309@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: 480f0a1d0f6e - releng/15.0 - mx25l.4: Describe better and tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 480f0a1d0f6e44b23372b9ef6b5339e478b587bb Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=480f0a1d0f6e44b23372b9ef6b5339e478b587bb commit 480f0a1d0f6e44b23372b9ef6b5339e478b587bb Author: Alexander Ziaee AuthorDate: 2025-11-11 18:56:40 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:34:53 +0000 mx25l.4: Describe better and tag spdx Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 6f73950475ce6b56974b7cd08cdf0ea771165c50) (cherry picked from commit 9b00b95b2149bbc0403bc79059928cd21cc8adc9) --- share/man/man4/mx25l.4 | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/share/man/man4/mx25l.4 b/share/man/man4/mx25l.4 index 5dffdebcf43e..bbfc9846c5d8 100644 --- a/share/man/man4/mx25l.4 +++ b/share/man/man4/mx25l.4 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2019 Ian Lepore .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,26 +24,18 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 11, 2024 +.Dd November 11, 2025 .Dt MX25L 4 .Os .Sh NAME .Nm mx25l -.Nd driver for SpiFlash(tm) compatible non-volatile storage devices +.Nd SpiFlash compatible non-volatile storage devices driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following line in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device mx25l" -.Ed +.Cd device mx25l .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -mx25l_load="YES" -.Ed +.Cd mx25l_load="YES" .Sh DESCRIPTION The .Nm @@ -67,7 +61,7 @@ modules as with any disk device. .Sh HARDWARE The .Nm -driver provides support for the following devices: +driver supports the following spi flash memory devices: .Pp .Bl -bullet -compact .It From nobody Fri Nov 14 02:35: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 4d71T62QTzz6GjSL; Fri, 14 Nov 2025 02:35: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 4d71T56wn3z3v2X; Fri, 14 Nov 2025 02:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rG/hA08nLw0yjD8FW9acIgBtNrZ0f2WGOKFi9PRYxww=; b=ToVbOHqpIcQDrOXHElKrxKRbAYqY8b4igoQr3ACeaCvN/DwCq1AmdvsAV31aGgPZ3tVIR0 gQVSOXLW6QfjNEMyD633THiCQ78hX3bk5lKF3peAq781hLsY90uFjMNKaY+DlhvAhqz+Zv 3ou86Kb6umKaAwEQGBS/Kg4Qu6wFgLoGUW8I4CWcduequgxWBCdvaBSL/GbywWZOHMpM/I o6sMQc2QVato3W63YMmP8b8wWWkiPN8Wem/pRMbNpIgrwCPhySuKzBlrN/Bfp7kmtRhvRx r1nA75TabcC8L1zcQfAbSRxJD9Bvlg0Ohcney/jhn1/j1A9hHh0DP57i/EhnWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rG/hA08nLw0yjD8FW9acIgBtNrZ0f2WGOKFi9PRYxww=; b=q5/rOantiw7SH1RHdizV2hjKEWbAYtsapPbDQ4y64JNdNziATU7Kv4hNyueRCpegpQ+pRa A6IKs/fvIAyYxtZqeaSC0eTlPiPalEkJZoWGxr5e+FDbv9WTXgLeAYLdXQ5yHce+9p8d24 IYctBt6bSB8Ss75DK/GtxTxw9DxLkNCVinfXVA9jbDwHfBFRwyWpQaf530JNFgEMQTvE5D HXDzHKnJP5kJ4FH1f15Zvw6l13tkJwTTHr+aWrYiJaGWVDqu1i8Zw68mXahAvCy9/VQ2vi OkAxqni55x1g7RqKcVENrCodzP+943YxGQ4rraNq1Wi3Uehf5YJyQdcMRTAyfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087722; a=rsa-sha256; cv=none; b=YRuZEP8M1Xf+iiyAKsU251ptfPThDeHIIjE4USRAZHLoh6Qj6zvMyBLEwqpAM+ItEGEfe7 Hbhd5k8NE3tDa2Gnf6MfTFsHt0vrdqP4JjcXgUyMu3XkaiMyqg8C86j6vY5BcJPUy6C1nH TyQrNgppL7FfZ4figcqaPyvIDfxEPwRFpUleF4WaZT8VX1bx7r9/naFk839IB67Tv3sLv5 mXBEfknbC7jeAZ0zQpj9GuQV5O4/wLVmjzSDREoKAY3Hb/gdAk4cFP5RPFYE6me+YB7/64 6COndNwSb0mbCkZf6AuUzQN4rmnsN57/MYFj7OXhJo/zQFtIq/6pdg6O+EFl/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d71T56McgznXM; Fri, 14 Nov 2025 02:35: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 5AE2ZLmc000382; Fri, 14 Nov 2025 02:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZLiP000379; Fri, 14 Nov 2025 02:35:21 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:21 GMT Message-Id: <202511140235.5AE2ZLiP000379@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: 9465b903fbbb - releng/15.0 - sbp.4: Add a hardware section, fix markup nits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 9465b903fbbb888a385018c0379901b2b3e3a85d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9465b903fbbb888a385018c0379901b2b3e3a85d commit 9465b903fbbb888a385018c0379901b2b3e3a85d Author: Alexander Ziaee AuthorDate: 2025-11-11 18:38:04 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:35:00 +0000 sbp.4: Add a hardware section, fix markup nits + tag SPDX + add sysctl to apropos database + fix markup of examples and reflow a overly long line + add a hardware section for hw relnotes Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit dee8e38f52266d9b2fa837607ff3a78f240a806d) (cherry picked from commit ccf4b4fc42882652b8bb347bb5afed1e89258310) --- share/man/man4/sbp.4 | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4 index 2255fa2993ae..1daffd104a2c 100644 --- a/share/man/man4/sbp.4 +++ b/share/man/man4/sbp.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-4-Clause +.\" .\" Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa .\" All rights reserved. .\" @@ -29,7 +32,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 2012 +.Dd November 11, 2025 .Dt SBP 4 .Os .Sh NAME @@ -62,19 +65,27 @@ might wonder why the device is not detached at the CAM layer when the device is unplugged. It is detached only if the device has not been plugged again during several bus resets. -This is for preventing to detach an active file system -even when the device cannot be probed correctly for some reason after a bus reset +This is for preventing to detach an active file system even when the +device cannot be probed correctly for some reason after a bus reset or when the device is temporary disconnected because the user changes the bus topology. If you want to force to detach the device, run -.Dq Nm fwcontrol Fl r -several times or set hw.firewire.hold_count=0 by +.Ql fwcontrol -r +several times or set +.Va hw.firewire.hold_count=0 +by .Xr sysctl 8 . .Pp Some (broken) HDDs do not work well with tagged queuing. If you have problems with such drives, try -.Dq Nm camcontrol [device id] tags -N 1 +.Ql camcontrol [device id] tags -N 1 to disable tagged queuing. +.Sh HARDWARE +The +.Nm +driver supports FireWire Serial Bus Protocol 2 +.Pq SBP-2 +storage devices. .Sh SEE ALSO .Xr cam 4 , .Xr firewire 4 , From nobody Fri Nov 14 02:35:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d71T50tDnz6Gj3F; Fri, 14 Nov 2025 02:35: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 4d71T45X1cz3tR8; Fri, 14 Nov 2025 02:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0JO8yaziRpU/F2TMQ6VgXTjw8b4RKEjAby6diGXBy8=; b=YFrqHeWLQDdWgfD+23BiAaILUp5VkzTufg27nChcqefnTlioaI/tfld4jpjnyfcwtTJM9w WnSBp5QiQvrJwkLJe57oPMNFI1CLWIIQ+NEKVlpPHmacH+FSvfjVs2IqVwe1daMASrWEyG qMOP/zCjFomtE3uP7FcB7iUbETVFHbOXruA0a24QoqHOiasBJ7UhiUEtoBekFPXDLC+EOv 8vE3aNh/gZ8jHSTSOGMcOy7ItpwacFXFI8hsCuBcqzv1PXOZzGnIP76PQO5+N6y7h4lTX0 Bx22zsOpFNey6hj64J9znsynoNlN+Ys4bq+71OJ/hIEfWK8mX59b5AVptBfpnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0JO8yaziRpU/F2TMQ6VgXTjw8b4RKEjAby6diGXBy8=; b=sIeQMGckbImgXqrp8BTje5TPyTU9IYuOFTer8VXI0KNJ0Q96DB0tP9CNR6ud7+qzSn/bVR WRSiAAgIqBCEMTpaxRgXjrXs2AGxl1nlyZ0LNWpSShvtz7vX2aCFdgsDbte9d+LCODwhYs zW23qz0RFxFD6478EeaaNjuXD4LMR5BUQCYq4J4GOsXnFMSxjg+8gM+DNYjNzOaZv6DpLo dew7LCvUbKJZ5viB4ocuO5QglM8Qv46QO0oLHaes7AD4mhhlXLq0NU++XcbNkCZZRjIqCv zwoJL7XgDdfIJWZhGHcL4Leg514e+WxhUScjHx3jbokaKEHrc3QPRsuEk3A9LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087720; a=rsa-sha256; cv=none; b=ACiLrnicu7cDcEXTg1eZ6nk/VaYPeGt7aSYc1Kgi7o3gkcZ8kvcuHlUVL3IzhyYBJSuSHM uPYxnVIU7t6hwbgwjJZRDE9QJI9lEUqmooVEjA95Gs4tHWejJVw3yyz6mLGZk6UWbu+ZfO A8PfmrLfa78gn0I7BbE83OKMnua+QS9c9vdjlZid+JTI+fgtF/pvZePYkhZZToM1AMUi21 i/xlrVQAFG9wISJe0YyggG8Iqgh4aFinYr5Ib3+ff0STYX7RhJCzjXSt4XvhqtMp0bKAdt jBAqcfXCtXDUziIW0PCJec9d62XaixHyxQXmzcTIpxpNwnPgS3dT04CKerka0Q== 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 4d71T453lNzp41; Fri, 14 Nov 2025 02:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE2ZK9E000349; Fri, 14 Nov 2025 02:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZKHk000344; Fri, 14 Nov 2025 02:35:20 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:20 GMT Message-Id: <202511140235.5AE2ZKHk000344@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: 1eebc3a3725e - releng/15.0 - mx25l.4: Add n25q64 to hardware list 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1eebc3a3725e20d4454a300b9a5dfb05d22cfbb0 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1eebc3a3725e20d4454a300b9a5dfb05d22cfbb0 commit 1eebc3a3725e20d4454a300b9a5dfb05d22cfbb0 Author: Alexander Ziaee AuthorDate: 2025-11-11 18:58:19 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:34:56 +0000 mx25l.4: Add n25q64 to hardware list Approved by: re (cperciva) MFC after: 3 days Fixes: 76735c74398923a (flash: Add "n25q64" to mx25l driver) (cherry picked from commit 595fcd71a89e8c2d9039528d58b073f5ca712b68) (cherry picked from commit bf2345bce51da46c985fff7434f309604ceafad0) --- share/man/man4/mx25l.4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man4/mx25l.4 b/share/man/man4/mx25l.4 index bbfc9846c5d8..a48b153e91ec 100644 --- a/share/man/man4/mx25l.4 +++ b/share/man/man4/mx25l.4 @@ -93,6 +93,8 @@ MX25LL32 .It MX25LL64 .It +N25Q64 +.It S25FL032 .It S25FL064 From nobody Fri Nov 14 02:35: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 4d71T73306z6GjQC; Fri, 14 Nov 2025 02:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d71T70qbPz3twh; Fri, 14 Nov 2025 02:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KlTP1bbSe9ykRZ4Dfswg0Drty0reF9Knri2RajJoWeA=; b=rvqN9AlQMDxMpFCPo47UWwapsnoJTr1QEqLno4z3TEVYsk8sUpuuCmEZZh61gziCVdYN0q 5woa6Q+3VelMzRk+KscKIydz5d2FTuDGir62ddU5xnN71j80NZCQR6YR4HpGPgRCp6m6Ff ZImaAl+EfscIJIRXtNEiTrbJkC9mk50EvjwsV3tGyjzj9wANFJv46NJi4/djO7jY0NX3A6 b9vTQrmSbBoXz9cAzHsva8LdCIUbPEHCwYC44bVaYhPhmpXc1TFEpwy4z9GUbpA7cC75Tp gYfHnJILY2ZfO0PB9cMgKgtLoBvf3vZKN9UfpMejunp3bwu8SVSfmHeVl60OGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KlTP1bbSe9ykRZ4Dfswg0Drty0reF9Knri2RajJoWeA=; b=yrkKJbR0YmTmqcrzgsTiVvGB+eR1BPd07qv9OQrpYQlsaYemWDy1lPybaxT784NbqvvWhP +lPrNAaYK9/tZllM5bY3LUlx6/L1ppaqsb4mvGtbquNO7NbPbxcqokKWzEAuFdaSUXQ1Zv CeZ+nBVEUgD7Ap6NPJA9iw9uKMmL/GvvSuqOxQFb2zCDQcN25RjTo2i7yEFTmz86RG43SX fkE65Q/f4keTL8JnAr16QVGxLro5b2ZWOIZHnmITOLCXvT85crCOq9rfiQAQOdge3hx365 OiZrduIe8o1f4S/I3g5KgsUmlllalWP+jdlwxx+BLWy3L4OP/Allxctf5KOTGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087723; a=rsa-sha256; cv=none; b=VQ+nG1ofCHQnFn1f4hsYgaRbuUwqlvCc/8vYykj/ru784IR4JpKdZT6e9IuYNboXRXEj9x qZaEhMgYZ6GyD1Bs2riDH1X81fF7ywn09HlZLPMCySU2OfdE30aBrqumEUuEODmYubw5JQ YPX63677U9JR9ZEO0D7lAieOSM94ObSdofUpCr8DB1ukpI/6+AsPwPDlYO6njNnRLkYolk SyyNHz9LrFAkoxvh2BoKxnx2NbI7CjC4eDG/Kx4AmNQwd5O0EAMevLF3yD5+MZD0+CANHQ D/tuTKgPwhg1nkAdJ7JxfYMWws90XYlMdTIWo78yXr4a9WoccdMnEZhHCG87Yg== 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 4d71T70BrPznMf; Fri, 14 Nov 2025 02:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE2ZMES000415; Fri, 14 Nov 2025 02:35:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZM8v000412; Fri, 14 Nov 2025 02:35:22 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:22 GMT Message-Id: <202511140235.5AE2ZM8v000412@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: 9ca96ef84f62 - releng/15.0 - ix.4: Add E610 to HARDWARE section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 9ca96ef84f62e33b1b26d8d6c1067619303a7797 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9ca96ef84f62e33b1b26d8d6c1067619303a7797 commit 9ca96ef84f62e33b1b26d8d6c1067619303a7797 Author: Yogesh Bhosale AuthorDate: 2025-11-10 19:23:46 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:35:03 +0000 ix.4: Add E610 to HARDWARE section Approved by: re (cperciva) MFC after: 3 days Reviewed by: ziaee Fixes: dea5f973d0c8 (new Intel Ethernet E610 family) Differential Revision: https://reviews.freebsd.org/D52990 (cherry picked from commit abd53b16c03f77c12bb8b77d9e2e4cf392745361) (cherry picked from commit 1a1e30b3552a99f9137ccc334d950768315d4f33) --- share/man/man4/ix.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ix.4 b/share/man/man4/ix.4 index 418b6e1188ab..e6f4276e1a77 100644 --- a/share/man/man4/ix.4 +++ b/share/man/man4/ix.4 @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd October 26, 2024 +.Dd November 10, 2025 .Dt IX 4 .Os .Sh NAME @@ -78,6 +78,8 @@ including: .Pp .Bl -bullet -compact .It +Intel(R) Ethernet E610 +.It Intel(R) Ethernet X553 .It Intel(R) Ethernet X552 From nobody Fri Nov 14 02:35: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 4d71T84Xbpz6GjKc; Fri, 14 Nov 2025 02:35: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 4d71T81Hkkz3tmP; Fri, 14 Nov 2025 02:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qkgyvPG6K8pJeZRflVz444P8Fn34LNYsInUjuv3wvWI=; b=tm+6iUvqvkLwhv1pdq1rmpUcShhbTFmhILNNnVv9pGmkZav5g74EjLD6Ck9HDEaFyO2pjT WFaEXDZ6D7Uy1retu2Cp+3abAl9pf1Rfvf5uwGO0pv9CI9yIi322jaIZIETyOEB+YzL+wC P7j6i0pSrLuxOB5lCwuA/jNdAT+SJ9YxL2dqQhGhkmL3H+mn19FLpKPufHz2kJf+b/UURi 26xNtV54iK2FZ6Q0z891dYEe/ezPA5yJqZFJNA3flYScT6i1NArkEgUP9QgtbA8KP8kVPj n80hPQ5zt8cEjsbUldU116KxCaFaR/p699Ni+MJq1h+4CBCyikAghtnCvoYVlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qkgyvPG6K8pJeZRflVz444P8Fn34LNYsInUjuv3wvWI=; b=Eyz9QPJNocp98gCSMCK72FAGOVAfqOmsI7WRf0RL4/H6a6ukT/frNx34pYW6mGzK75T1T3 G4hAfJRT8pAf8x2aJqdZyr8DAQvn1K4F2nIjqyaFuAMH4yLgK8nxU+Fe+zMwTqXVkD0E6Q jkjaebHHDEMMCCWZTrHpMXXQMpcCq+s8k+qJun5i7SSUQcDtHHpF+VaWQzy19NDjDcR7lW PqzXs+OpR6IibWouY8uMJhBWWoYq5Hx6G1CKUcnFZOxrpgJKiDqjNAV+7FTEd8fWLdDdT6 jwYi7NDOFPkPwnL4Clm1Kq//fZBjgFj+FaAabSjLBa1BKRruIawHWzclX5K+ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087724; a=rsa-sha256; cv=none; b=jDrMjYnfQ2SV71clYmgobYXH0ijbAYohW2uQXKzK2HXfriXhscdNKJ9E3VQHtpvrypLebV gR10GLWFzmpIeZAgc2Oo0qLgJ4kN7ko+IFH1E+j40t1BpVTuPiCDdtzX7a9NqIGXwv+Kqq 3Kq8e8sLmi1OiBEbYDg0HdOO1iGW5IPiA8D0QrGzYDP6kLPGmJyeI3y6qrudIefvV5o04Y j8f48iewRgHUEzezH7CJBYGZtJdmL5dNWqJtglgfzdmyozKTSqzVf0WbERfn+LpzB78fRy qAo+ns80+t/9s/hNCG89DslFzBZGhSsfDg61TsRSSE9XSVTrtqVXeEYRfQot1Q== 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 4d71T80mM9znXN; Fri, 14 Nov 2025 02:35: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 5AE2ZOXT000448; Fri, 14 Nov 2025 02:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2ZOip000445; Fri, 14 Nov 2025 02:35:24 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:35:24 GMT Message-Id: <202511140235.5AE2ZOip000445@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: f1d3ed77c9d1 - releng/15.0 - mpr.4: Add Broadcom LSI 3808 to HARDWARE 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f1d3ed77c9d15c9d18d942779d01a7f3f5a07ef5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f1d3ed77c9d15c9d18d942779d01a7f3f5a07ef5 commit f1d3ed77c9d15c9d18d942779d01a7f3f5a07ef5 Author: Jiacong Fang AuthorDate: 2025-09-28 04:03:57 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:35:05 +0000 mpr.4: Add Broadcom LSI 3808 to HARDWARE The product brief "MegaRAID 9500 PCIe Gen 4.0 Tri-Mode Storage Adapters" confirms that the LSI 3808 are supported in FreeBSD. https://docs.broadcom.com/doc/MegaRAID-9500-Tri-Mode-Storage-Adapters Approved by: re (cperciva) MFC after: 3 days (squashed with fixup commit) Reviewed by: imp, ziaee Differential Revision: https://reviews.freebsd.org/D52760 (cherry picked from commit 744c8d55445300074fc1906ad50aa6f394c1b8cf) (cherry picked from commit 8caf467784ba9f502c52fb67d968e21b0ee5f9e0) (cherry picked from commit 00008dae2042e63195d3ce92c386c9b232d48a11) --- share/man/man4/mpr.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/mpr.4 b/share/man/man4/mpr.4 index cce21113e5c2..a88b99ae007b 100644 --- a/share/man/man4/mpr.4 +++ b/share/man/man4/mpr.4 @@ -37,7 +37,7 @@ .\" .\" $Id$ .\" -.Dd June 1, 2019 +.Dd September 28, 2025 .Dt MPR 4 .Os .Sh NAME @@ -99,6 +99,8 @@ Broadcom Ltd./Avago Tech (LSI) SAS 3708 (8 Port SAS/PCIe) .It Broadcom Ltd./Avago Tech (LSI) SAS 3716 (16 Port SAS/PCIe) .It +Broadcom Ltd./Avago Tech (LSI) SAS 3808 (8 Port SAS/PCIe) +.It Broadcom Ltd./Avago Tech (LSI) SAS 3816 (16 Port SAS/PCIe) .It Broadcom Ltd./Avago Tech (LSI) SAS 3916 (16 Port SAS/PCIe) From nobody Fri Nov 14 03:26: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 4d72bq6rGbz6Gmnc; Fri, 14 Nov 2025 03:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d72bq5bxvz458s; Fri, 14 Nov 2025 03:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763090775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrCVEhgOnLyz6k9TVS+FgEejxv46hxOlNY+maSHOqOk=; b=Q/Yf9qeEyyKQdAp/smGtm/wexvK3qs0A60GVSeSG7Ey2irDsHcIuKrGqfT63ZjIgBIP+l/ IsRqz668sLnEU+vBaGmW/EN0i7UKjIFd/gzBETBDtVlgEz/Idi9yHwfN4z7nfKpjOOIki2 nE/9Iq8XI+OyFlx54K+M+ompmtbKnKa50QqKab8w9lEQYL7uzAMvNaYw0Jpj+imGqSVbC+ Wke22EeAWabKmCuYIti4b0srM9AfPixUQs1ekg+/A6OZQFV0s4/qJ3b/o6oWuR9O/76s1y FIPa3n1SM6bzxM1GHkhYZXewkVEJpthUAzg7pzdal/aWhPk/0YNk3pVIHtXUYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763090775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrCVEhgOnLyz6k9TVS+FgEejxv46hxOlNY+maSHOqOk=; b=Sw522aGqhAJqFh41rEkBgui2OMZu0LByoiU14xwnfqN6gk5hadQHMab62QaKBlftsONvnN jkmRVHoBs5QianTkJesUyd0KziS+v4vS+zBaTFjiBjJZeVjbz4XM/X/d1zNvyXBdJxzasj HEL1E8YStPwWNUMGpYAIIPYpWPKYY/+sNlJmF3z0SJwjNY3YagDq+Fs2XLQxEVJ+4Q/gTl ELAhbiF97dxg88wXRGZKG+qI4U7INBhQoqWxG+IRWV7FttPGAaeIfJYjBX9UT/JgHz+0Ui 2RFok1K7Z4rYEDcPnVFbOdqRVVxPxaVUUItYJlHBAKMa8E8UgYL9xIoldrDILw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763090775; a=rsa-sha256; cv=none; b=Q+qRbBFmaWLylEcBQ1lOynBaxj11Dc5kxBpQM1wk0yVKUv4x3jh0UV5Cw8Tx5Po19RJKFe ZEm200IfSbK5Cbq+pTn9NnBI13UTTJKDFNI1wnJ4UWW94EdWyy+dJb2OlfKILxZ9J58X5K /yfqrNz78Er7Ev588NO6R+k/ikhQsSBT9IeRfl9il0KaZCITqRfDOrxtkSXPYhLefQHwSc tRERatI7PlOdXSbYMGZocNoVDoeM7NBOu0Bmg5WeeoWiUCvmwT0KQqqs7bOyEAPZqGb7bR XLREag4/VZe0r6VrAneTdfyG/D/WRcZkSyf0OrvEX07rqVkYLfUxXbgcJ33WnA== 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 4d72bq52nSzq0M; Fri, 14 Nov 2025 03:26: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 5AE3QF5K096711; Fri, 14 Nov 2025 03:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE3QFGj096708; Fri, 14 Nov 2025 03:26:15 GMT (envelope-from git) Date: Fri, 14 Nov 2025 03:26:15 GMT Message-Id: <202511140326.5AE3QFGj096708@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: 8bafd2f05232 - stable/15 - Retire pccard(4) 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/15 X-Git-Reftype: branch X-Git-Commit: 8bafd2f0523209ec4c5eb2a64c90b3013cb6b45c Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8bafd2f0523209ec4c5eb2a64c90b3013cb6b45c commit 8bafd2f0523209ec4c5eb2a64c90b3013cb6b45c Author: Muhammad Moinur Rahman AuthorDate: 2025-11-12 17:01:18 +0000 Commit: Ed Maste CommitDate: 2025-11-14 03:23:54 +0000 Retire pccard(4) pccard has been declared obsolete for a long time and also the support has been removed but the man page still exists. It mentions being scheduled to be removed before 13.0 but it still exists in the tree. [Extracted from review D53434] Reviewed by: emaste Fixes: 31b35400c ("pccard: Remove more of the PC Card infrastructure") (cherry picked from commit 5b9fba1cb0d84ee297908ec4d575c33cf1f68ad5) --- share/man/man4/Makefile | 1 - share/man/man4/cardbus.4 | 1 - share/man/man4/pccard.4 | 78 ------------------------------------- share/man/man4/pccbb.4 | 3 +- share/man/man4/xl.4 | 1 - share/man/man9/DEVICE_DETACH.9 | 5 +-- share/man/man9/bus_alloc_resource.9 | 5 --- usr.sbin/dumpcis/dumpcis.8 | 3 +- 8 files changed, 3 insertions(+), 94 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ddc7f377b08f..35cc6bbb8da8 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -459,7 +459,6 @@ MAN= aac.4 \ p9fs.4 \ pass.4 \ pca954x.4 \ - pccard.4 \ pccbb.4 \ pcf.4 \ pcf8574.4 \ diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4 index 3b422b44c464..fa4bce65e095 100644 --- a/share/man/man4/cardbus.4 +++ b/share/man/man4/cardbus.4 @@ -52,5 +52,4 @@ Non-zero value causes the CIS parsing of the 32-bit CardBus card to be much more verbose and include a complete CIS dump. .El .Sh SEE ALSO -.Xr pccard 4 , .Xr pccbb 4 diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4 deleted file mode 100644 index cec07b2336cb..000000000000 --- a/share/man/man4/pccard.4 +++ /dev/null @@ -1,78 +0,0 @@ -.\" -.\" Copyright (c) 2002 M. Warner Losh -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd August 18, 2020 -.Dt PCCARD 4 -.Os -.Sh NAME -.Nm pccard -.Nd PC Card bus driver -.Sh SYNOPSIS -.Cd device pccard -.Sh DEPRECATION NOTICE -This driver is scheduled for removal prior to the release of -.Fx 13.0 . -.Sh DESCRIPTION -The -.Nm -driver implements the PC Card bus. -The -.Nm -driver supports all PC Card bridges in the system. -.Sh TUNABLES -The driver supports the following tunable parameters, which may be -added to -.Pa /boot/loader.conf -or set via the -.Xr sysctl 8 -command: -.Bl -tag -width ".Cm hw.pccard.cis_debug" -compact -.It Cm hw.pccard.debug -Non-zero values cause more verbose information to be printed when a -16-bit PC Card is inserted or removed. -.It Cm hw.pccard.cis_debug -Non-zero value causes the CIS parsing of the 16-bit PC Card to be much -more verbose and include a complete CIS dump. -.El -.Sh FILES -.Bl -tag -width ".Pa /dev/pccard0.cis" -compact -.It Pa /dev/pccard0.cis -This exclusive-use device will report all the CIS chains present in a -PC Card, if a 16-bit PC Card is inserted in the slot. -Only one user at a time may access the CIS. -The CIS is presented as the relevant byte stream from the PC Card. -For CIS tuples in Attribute Memory (the default), only the even -locations are presented (the ODD locations are undefined per the -standard). -For CIS tuples in Common Memory, every byte is presented to the user. -Decoding of the CIS tuples is done via a userland program. -All tuples are presented to the user. -.El -.Sh SEE ALSO -.Xr cardbus 4 , -.\" .Xr mecia 4 , -.Xr pccbb 4 -.\" .Xr tcic 4 -.Rs -.%T "PC Card Standard, Release 8" -.Re diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4 index 3200e8b2d2e2..1c6cb2045033 100644 --- a/share/man/man4/pccbb.4 +++ b/share/man/man4/pccbb.4 @@ -176,5 +176,4 @@ debugging problems with the bridge chipset. .El .Sh SEE ALSO .Xr cardbus 4 , -.Xr exca 4 , -.Xr pccard 4 +.Xr exca 4 diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4 index 309434154f4e..591703ac93cb 100644 --- a/share/man/man4/xl.4 +++ b/share/man/man4/xl.4 @@ -253,7 +253,6 @@ It is probably safe to ignore them. .Xr miibus 4 , .Xr netintro 4 , .Xr ng_ether 4 , -.Xr pccard 4 , .Xr polling 4 , .Xr ifconfig 8 .Sh HISTORY diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9 index 5f1bf7a3295f..856c6138ed4c 100644 --- a/share/man/man9/DEVICE_DETACH.9 +++ b/share/man/man9/DEVICE_DETACH.9 @@ -41,9 +41,7 @@ Detach a device. This can be called if the user is replacing the driver software or if a device is about to be physically removed from -the system (e.g.\& for -.Xr pccard 4 -devices). +the system. .Pp The method should deallocate any system resources allocated during the .Xr DEVICE_ATTACH 9 @@ -52,7 +50,6 @@ etc.) .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO -.Xr pccard 4 , .Xr device 9 , .Xr DEVICE_ATTACH 9 , .Xr DEVICE_IDENTIFY 9 , diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9 index 84a4c9c530c9..27c64c608c70 100644 --- a/share/man/man9/bus_alloc_resource.9 +++ b/share/man/man9/bus_alloc_resource.9 @@ -159,11 +159,6 @@ resource permits contemporaneous sharing. It should always be set unless you know that the resource cannot be shared. It is the bus driver's task to filter out the flag if the bus does not support sharing. -For example, -.Xr pccard 4 -cannot share IRQs while -.Xr cardbus 4 -can. .It Dv RF_UNMAPPED do not establish implicit mapping when activated via .Xr bus_activate_resource 9 . diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8 index c40e5fe75d40..9da5ed9f3bdf 100644 --- a/usr.sbin/dumpcis/dumpcis.8 +++ b/usr.sbin/dumpcis/dumpcis.8 @@ -38,8 +38,7 @@ The utility translates a raw CIS stream into human readable form. .Sh SEE ALSO .Xr cardbus 4 , -.Xr cbb 4 , -.Xr pccard 4 +.Xr cbb 4 .Sh AUTHORS The original version was written by .An Warner Losh Aq Mt imp@FreeBSD.org . From nobody Fri Nov 14 04:10: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 4d73Zw2CZdz6GrJX; Fri, 14 Nov 2025 04:10: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 4d73Zw1Wp2z3DW5; Fri, 14 Nov 2025 04:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OC2eLExi6xj1KOe7qiV7s/OXfSmnpdcT6wOJ93v2mQc=; b=n9TLuwNe/MEBk2b8MsqtRghIblsMvnak9Ne0AVEgp8vusd2Sz+KWgOqTOjjS0rn3S5g9/D 8qjhhoxXOg3Oci/aYzXx9nCk2IDr32GSl1FLEi94+tdF/LxCYykYF0CqLFlNHS8gk4TKWk hVhNbtdOWh9d8xVcTSOkuw+xI25p7J3os/gROLfbyvaeSULBAkUQ5Z87lhbfO70m1FSrnc pEk638zLlg/uvRATHOOmwIVvOWmwnYeGmDI9oyBdYWXS28JLD2Ah4BKk1Jr7eSrncEnuDG 6CGCD6XE0LfKTkUFShBz+2iigNvPpQ4+BfUIfue4LS9f3O0V3Y0+aLJLFPGr/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OC2eLExi6xj1KOe7qiV7s/OXfSmnpdcT6wOJ93v2mQc=; b=b0qgnCU7dN16ZESRRTrIrhuKG9TVIZztfNZJxECiy/UTHXveVU1+78mmNPndjnJnzd3CHq UrCce8bBez3jbXGUfIl7e0NNCICMxIvt+Cjwm//6KEyL5E/EM2DDRSlN+vfWxFrrOjvJHi Q97RdgLqbXl0hnZLknbE04cozadBi6IF1knnhtfkgpNT9Ms1abVDgLVY0/rx64QVj1heAn Z46ISCUgjwUodYs9iUccgWk/+OqfQlCuaIgfCm3/VN5Oh60/pMvSe52fxSQmNZED1Ylx4y 58Mj6yAgD1i0VH69WBIr0JRGSIYmRuLNcxQ/mF0VlwocVZ8yA+AxLmmvqiPsOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093432; a=rsa-sha256; cv=none; b=b7p6+TtiJoT5qz45NZRgCwUIxIXHNeeqg02byU4vK424vkWK5FUF2cqgkXjASMuEs1wXGu QUbARWQAog2CMIfW3EU1XwqicvVWAZhj4ObHDP/ty43SbATFaEVi7W5SYC9DdGyvWoGETx VaLgpvSKzL8dhyAJOJDGn7DbG3hH3Pe69lWCH+x/3gnadMR8NcNSShQFP/uPke6QXSp6yK EHge6vIbhsuQB0rZZIsLzxrnzWiE+7YfSCCWhyqXlT+dw4mdO+GGCmyymIaLx8BihLpZHv GVqzGBp0QBW7dxBWvZj7iF25/RTjrXjMmI4ebz4IKoqd9DyAyeKKErnxRg0vjg== 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 4d73Zw0mlpzrX8; Fri, 14 Nov 2025 04:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE4AV5i082025; Fri, 14 Nov 2025 04:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4AVVG082022; Fri, 14 Nov 2025 04:10:31 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:10:31 GMT Message-Id: <202511140410.5AE4AVVG082022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 7051ddc5c703 - stable/15 - ipfilter: Calculate the number of elements in ipf_errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7051ddc5c7032b68226e9b3484c1a3d132e096eb Auto-Submitted: auto-generated The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7051ddc5c7032b68226e9b3484c1a3d132e096eb commit 7051ddc5c7032b68226e9b3484c1a3d132e096eb Author: Cy Schubert AuthorDate: 2025-10-23 02:11:20 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:10:21 +0000 ipfilter: Calculate the number of elements in ipf_errors It serves no purpose to manually manage the IPF_NUM_ERRORS count. Calculate it instead. Reviewed by: emaste, markj Differential revision: https://reviews.freebsd.org/D53308 (cherry picked from commit ab3c9853285b4907dac147ce2f818e3fb44df5a3) --- sbin/ipf/libipf/interror.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index 981823ca6bb9..cbfb210c85d3 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -17,7 +17,7 @@ typedef struct { static ipf_error_entry_t *find_error(int); -#define IPF_NUM_ERRORS 477 +#define IPF_NUM_ERRORS sizeof(ipf_errors) / sizeof(ipf_error_entry_t) /* * NO REUSE OF NUMBERS! @@ -25,7 +25,7 @@ static ipf_error_entry_t *find_error(int); * IF YOU WANT TO ADD AN ERROR TO THIS TABLE, _ADD_ A NEW NUMBER. * DO _NOT_ USE AN EMPTY NUMBER OR FILL IN A GAP. */ -static ipf_error_entry_t ipf_errors[IPF_NUM_ERRORS] = { +static ipf_error_entry_t ipf_errors[] = { { 1, "auth table locked/full" }, { 2, "" }, { 3, "copyinptr received bad address" }, From nobody Fri Nov 14 04:10: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 4d73Zx3Xj1z6Gr8C; Fri, 14 Nov 2025 04:10: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 4d73Zx1k7Bz3DKr; Fri, 14 Nov 2025 04:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bae9ECVWQP+muPDbEIEAbJOomSi4+bB9CeUoCRNunlI=; b=BPaoMwwCYo9nVb6NLnN2fkDbI8FcMjQhz95pGnLb+qWPb9LfITX4UaH+hxo54PjGpk5hsG A7R3HwmqHuQoaFxdyBTVzFzL68B+SNsMn23yh7193lHVifCeB9JHJRWqUcDpwLb/+/yyIX Lxea6LLym7IYfROqhnWzx7vs+dAp7lbdfHhCXS2PHbMsbveLBgk1XfciEcD6lnF4a/0Y+P X3OnuqB7ARQRIusgq+h9tFj1TVWDmCeurWuAylperJS7qY8kgaXvglRM6AQE44+474FX/f OXIlqNH6NFJRSNv3Hvsn+c4Rn3zgjfceo+6XEgErpFM/w1H/bqmnU7+/7OAttA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bae9ECVWQP+muPDbEIEAbJOomSi4+bB9CeUoCRNunlI=; b=EgM7FoG3EGmZJD1ZmxTrUOgRWUt0gUSGs//tXQf4gO6mvX04/FtwH+ujHQCF2LmucuPlNi jovDws/Hcujr06VUAHQSZ4qI1VO5QIafemE9B558mOIwFDGT0tvso2Ax6M+JzWHXgLC/ZY ruWfkyQZYBRXWtovd+bBbAJnpV0j0O3HO7H2Nv4BpzvLlqbBdmoVvYEDA6nn4mi7pbfEit 6KwEQ078Y08BmQ1DQw4xQ8vEqCX1FUimFJW3aN5MR9U/Pp0rNvTa+fAvUt7yKzzEPXZPYE cxyULelcEdBjq4VIYyFLRehbM92TB8OWt4UfvxngIvJy4uyJ22l+siAt8+YiIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093433; a=rsa-sha256; cv=none; b=dfv6nhjxPcUGqYXv/uZW9+6jSOH1cC41BlfH2banbrLeJSkzZ7xG+/RskKHKjf3ImuZnqi pEByjRg29FXJowFx0jdPwxFgV1GcGXysEMTEuIxjnFW1A4osdb1+a2tLPW+J5HrrY3KAS5 LsiWzacXCZ9HtdP6dd7kwYPudfbBLvExjEbjJ5Iv7pdp27rN3mMcmjyM4FtwzoJRyiMp/w Sjh2xFwsbb6XPMiq+luQUu6aV5fusqOtdLW83wk0LByZn2I5wtmshim4gPUxGTfRG+hlvV BCNhFBFoKX/VMuJTWZeuPFOBzBTMm2GZgosTXd6q6Z4exy8LP5SGHD/A6mfeSg== 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 4d73Zx19DNzr0l; Fri, 14 Nov 2025 04:10: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 5AE4AXa5082060; Fri, 14 Nov 2025 04:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4AXjT082057; Fri, 14 Nov 2025 04:10:33 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:10:33 GMT Message-Id: <202511140410.5AE4AXjT082057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 3e9e5177af1f - stable/15 - ipfilter: Add htable (hash table) tunable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e9e5177af1f2ffba234e2fdeef444198271d103 Auto-Submitted: auto-generated The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9e5177af1f2ffba234e2fdeef444198271d103 commit 3e9e5177af1f2ffba234e2fdeef444198271d103 Author: Cy Schubert AuthorDate: 2025-10-22 22:51:43 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:10:21 +0000 ipfilter: Add htable (hash table) tunable This is in preparation for addition of a hash table max size. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53283 (cherry picked from commit c57262716b08717b6a9c5533941d4e0a2d180d46) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 3f765cfab947..9680017eb399 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -96,6 +96,7 @@ typedef struct ipf_htable_softc_s { u_long ipf_nhtnodes[LOOKUP_POOL_SZ]; iphtable_t *ipf_htables[LOOKUP_POOL_SZ]; iphtent_t *ipf_node_explist; + ipftuneable_t *ipf_htable_tune; } ipf_htable_softc_t; ipf_lookup_t ipf_htable_backend = { @@ -122,6 +123,14 @@ ipf_lookup_t ipf_htable_backend = { }; +static ipftuneable_t ipf_htable_tuneables[] = { + { { NULL }, + NULL, 0, 0, + 0, + 0, NULL, NULL } +}; + + /* ------------------------------------------------------------------------ */ /* Function: ipf_htable_soft_create */ /* Returns: void * - NULL = failure, else pointer to local context */ @@ -142,6 +151,18 @@ ipf_htable_soft_create(ipf_main_softc_t *softc) bzero((char *)softh, sizeof(*softh)); + softh->ipf_htable_tune = ipf_tune_array_copy(softh, + sizeof(ipf_htable_tuneables), + ipf_htable_tuneables); + if (softh->ipf_htable_tune == NULL) { + ipf_htable_soft_destroy(softc, softh); + return (NULL); + } + if (ipf_tune_array_link(softc, softh->ipf_htable_tune) == -1) { + ipf_htable_soft_destroy(softc, softh); + return (NULL); + } + return (softh); } @@ -160,6 +181,12 @@ ipf_htable_soft_destroy(ipf_main_softc_t *softc, void *arg) { ipf_htable_softc_t *softh = arg; + if (softh->ipf_htable_tune != NULL) { + ipf_tune_array_unlink(softc, softh->ipf_htable_tune); + KFREES(softh->ipf_htable_tune, sizeof(ipf_htable_tuneables)); + softh->ipf_htable_tune = NULL; + } + KFREE(softh); } From nobody Fri Nov 14 04:10: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 4d73Zz0mMWz6GrJZ; Fri, 14 Nov 2025 04:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73Zy2vNrz3Dsr; Fri, 14 Nov 2025 04:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WZUoQiR9IMbwBXz28eq5pOxr1avzn8AXeOR9FeuKto=; b=bVqjJiROA7RFNRHNzuXVtwDDnVhBSs8RlbfZjIaqAahahtoDUp6CTWiOmOL/2jgp2yveNJ mRpOlVP9ssA8BMmuS3eS3CWUsubyCHU0jvj0VNIqlUsyr2x4uczmlwT1DsTXoK6t4YatWJ 8QmMPmLSD8DSKibEKj8ImYaAwghPMpLaGG0LCDOXMkohOpZABKPXxG6Be5f8/yEFJ4sNJY Niuw7JZtirRGsanKMvBCN03s+ufCycPe+c1Mw1SeGllAqqmEaXtOgFREs2Nrziqm+FcOmn X2JSTHS3mKkXRjgAQ5WEJh1d66Uc/6oaCVARZYt5aWzB+ePPtFeBV6VVJpYBtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WZUoQiR9IMbwBXz28eq5pOxr1avzn8AXeOR9FeuKto=; b=HbF9llJlKGXWRWUK+iPqCdB9UEkBXt0tXmOYEhqWFX8oc2qxAqet+nTYk8PAeAIgQI2uTC qN8IawEIJCGA/XCY9H10DENTI8kQEQtpwfHfRzGHfViLnG2C0+Bz/rpvG/CoJL+G1bJO3w CBs0k31HeL0OCFNG4ZXMuS2M3VhDY5Bo6UvnZvkabFdXgOHgSoXWIYlxNpzffk0FajdMr9 LJGUtzrCoLTE6lZQ6QqpDk2FeEQxY1OYXgL0MNcSE6wRFu0oVBO9YUyc2dEdYWqVikbAuY GoHkIjoIqL4mCWg1nJYdU/OhWYgEKaODWAjeZuIPy2YQDcSs45xyRfoulIX5qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093434; a=rsa-sha256; cv=none; b=AKPhL/436wMH5BFJ6H5xeQBUU910dItjnfQXZY+1IlCg4yjQ5aSnQy3IENf5wcKzprXjqP y72TecfZeDggNXiTJ+uEjYKLcFkMNN9oRbz90n2n8qEvJ1ZXZiTyhsHkuzLDc32REPYRUr 6D44WyYuNnIO1IWRgxp3BFszt9dJXBXQIaY75SEBitGkt9tNwhFa4VHJ80v8v5UzER6pDw W4sWK04MnhLuBZzds9LX6rD//GffY42J70DcwdvbW2cpO7Vp4SCAJgijhAcmnO3TN9Y9/E IR8KbAdRuLpfYVl5fdhRyoh+ETphcFJDA795NM3aFAzJiqkQm12VHwPGVB5rOA== 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 4d73Zy28TCzr5Y; Fri, 14 Nov 2025 04:10: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 5AE4AYoQ082094; Fri, 14 Nov 2025 04:10:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4AYHg082092; Fri, 14 Nov 2025 04:10:34 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:10:34 GMT Message-Id: <202511140410.5AE4AYHg082092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: fe38c4fcb826 - stable/15 - ipfilter: Add an htable max size tuneable. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fe38c4fcb826eaefbeefa2d4d6724b856f24fccf Auto-Submitted: auto-generated The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fe38c4fcb826eaefbeefa2d4d6724b856f24fccf commit fe38c4fcb826eaefbeefa2d4d6724b856f24fccf Author: Cy Schubert AuthorDate: 2025-10-22 22:56:50 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:10:21 +0000 ipfilter: Add an htable max size tuneable. Add an ipfilter runtime option (ipf -T) to adjust the default maximum hash table size. Default it to 1024 entries. It will be used by a subsequent commit to limit any damage due to excessively large hash table input by the user. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53284 (cherry picked from commit f3b94f47f55c502e8983f9bd294e963e75b2963a) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 7 +++++++ sys/netpfil/ipfilter/netinet/ip_htable.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 9680017eb399..39777508731f 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -97,6 +97,7 @@ typedef struct ipf_htable_softc_s { iphtable_t *ipf_htables[LOOKUP_POOL_SZ]; iphtent_t *ipf_node_explist; ipftuneable_t *ipf_htable_tune; + u_int ipf_htable_size_max; } ipf_htable_softc_t; ipf_lookup_t ipf_htable_backend = { @@ -124,6 +125,10 @@ ipf_lookup_t ipf_htable_backend = { static ipftuneable_t ipf_htable_tuneables[] = { + { { (void *)offsetof(ipf_htable_softc_t, ipf_htable_size_max) }, + "htable_size_max", 1, 0x7fffffff, + stsizeof(ipf_htable_softc_t, ipf_htable_size_max), + 0, NULL, NULL }, { { NULL }, NULL, 0, 0, 0, @@ -206,6 +211,8 @@ ipf_htable_soft_init(ipf_main_softc_t *softc, void *arg) bzero((char *)softh, sizeof(*softh)); + softh->ipf_htable_size_max = IPHTABLE_MAX_SIZE; + return (0); } diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.h b/sys/netpfil/ipfilter/netinet/ip_htable.h index 55c289e57ff6..3a8782ccd4b2 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.h +++ b/sys/netpfil/ipfilter/netinet/ip_htable.h @@ -55,6 +55,8 @@ typedef struct iphtable_s { char iph_name[FR_GROUPLEN]; /* hash table number */ } iphtable_t; +#define IPHTABLE_MAX_SIZE 1024 + /* iph_type */ #define IPHASH_LOOKUP 0 #define IPHASH_GROUPMAP 1 From nobody Fri Nov 14 04:10:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d73Zz4hxRz6Gr5K; Fri, 14 Nov 2025 04:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73Zz3jR9z3DYt; Fri, 14 Nov 2025 04:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucn1Iq9cexHvIBq+txE8aIzOKjsk1TIRQGIVP1Mxz6o=; b=gylW2RF23rupDsMrLbKleRo4dA+UXKFyfL1Kyzgf2SHl+zTQIP6YaQdsQbGmzJzFdH3XO+ 1OsBjJ/9VmRAl06ikoACrGBwx1QaWLk9qKfoN4uosqCKBoFQ2P8gnKWq8giS6z+mzClzMK 5gHUgPW+FimPXmifqQXh6BdiqjvyTaC0sKoIBzBZhiDt3qXfwlN+iwVBIEoxGMBOOH6mgg sQZ6/o1iLYAnPu+pixPGOrp7/6PA0iuWovzExwq3kN6XxfF+SL+dsmcs9r9O+WT4HYHD+L vsIsiXMZ5burK9/SSbSLEpy6ca2wg7nj+97uLUT3sn2npPRO6Bk3gAI7/fKHDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucn1Iq9cexHvIBq+txE8aIzOKjsk1TIRQGIVP1Mxz6o=; b=pAr6ai2YO+2+Y7TfDt8axKwhY8d7IYNCkRL5ahXs9SFTAuJfYXRkBPiddAslEZVtADX7H7 hEonoBQzOaD6xpEh0fr+DwS3+I3s/SYPrf9c8p41BushYiJd1Lb9R9NIyld1hQcgYqZNXo TKqPMNL9ap37MqBMksSXuxIqyJ8ydk8V6NXI0iVdNVZuRYsHFWHGVDR83FZxJQVE6p9pwa WRWXWYxIIIWfEPGEqNLejIldgzKT3ZLpQ6Go2XIZl2x3jz3Tk54M/8R0QhjP9BhuIgz4kb JfB47pVUBhTbhABR+XvLrKGNM7PbHJ110wIhyGQcwRTCSKs6pk+ZKoyEX5Bt9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093435; a=rsa-sha256; cv=none; b=xhmS3d3UDs019iP7M2aXyav7vcF/ZPRaDjExv5++CiwVkNy4X7/WAO1AToqsSE2gVc8k03 zlzJVswV8WKY/8+8kobs1gEJB66vWyQKYpKbEduEGTM0lmmvMALVZTus/uIa6YwBmuBh4e qtA4A0FNV05qP83GUESHBapdgLNQJqDtrp+zLtHwYkelwcRViXKcSClA0kgPHgwrGttri7 WzX0uUdngWhneIOBZZdEmVsj2yIa3TO5a2KMKeYulQGamNwgBN1KbfYKqnL1SSUXsDCPlc 7teAxx4n1F3jjR0JoHLOGHSdgJfJL66xBej+rxFZCJ8C9in0TylbVEnKZpYBFQ== 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 4d73Zz2yHbzr0m; Fri, 14 Nov 2025 04:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE4AZbE082128; Fri, 14 Nov 2025 04:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4AZdD082125; Fri, 14 Nov 2025 04:10:35 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:10:35 GMT Message-Id: <202511140410.5AE4AZdD082125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4fa6c0b831ba - stable/15 - ipfilter: Don't trust userland supplied iph_size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4fa6c0b831ba80a2f32eca273ca1116095ed4190 Auto-Submitted: auto-generated The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4fa6c0b831ba80a2f32eca273ca1116095ed4190 commit 4fa6c0b831ba80a2f32eca273ca1116095ed4190 Author: Cy Schubert AuthorDate: 2025-10-22 23:19:54 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:10:22 +0000 ipfilter: Don't trust userland supplied iph_size ipf_htable_create() trusts a user-supplied iph_size from iphtable_t and computes the allocation size as iph->iph_size * sizeof(*iph->iph_table) without checking for integer overflow. A sufficiently large iph_size causes the multiplication to wrap, resulting in an under-sized allocation for the table pointer array. Subsequent code (e.g., in ipf_htent_insert()) can then write past the end of the allocated buffer, corrupting kernel memory and causing DoS or potential privilege escalation. This is not typically a problem when using the ipfilter provided userland tools as calculate the correct lengths. This mitigates a rogue actor calling ipfilter ioctls directly. Reported by: Ilja Van Sprundel Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53286 (cherry picked from commit df381bec2d2b73697a3d163177df042dd272022d) --- sbin/ipf/libipf/interror.c | 2 ++ sys/netpfil/ipfilter/netinet/ip_htable.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index cbfb210c85d3..a8dc3be2d5d1 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -228,6 +228,8 @@ static ipf_error_entry_t ipf_errors[] = { { 30024, "object size incorrect for hash table" }, { 30025, "hash table size must be at least 1"}, { 30026, "cannot allocate memory for hash table context" }, + { 30027, "hash table larger than maximum allowed" }, + { 30028, "hash table multiplication overflow" }, /* -------------------------------------------------------------------------- */ { 40001, "invalid minor device number for log read" }, { 40002, "read size too small" }, diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 39777508731f..5f5c04732d69 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -361,6 +361,15 @@ ipf_htable_create(ipf_main_softc_t *softc, void *arg, iplookupop_t *op) iph->iph_name[sizeof(iph->iph_name) - 1] = '\0'; } + if ((iph->iph_size == 0) || + (iph->iph_size > softh->ipf_htable_size_max)) { + IPFERROR(30027); + return (EINVAL); + } + if (iph->iph_size > ( SIZE_MAX / sizeof(*iph->iph_table))) { + IPFERROR(30028); + return (EINVAL); + } KMALLOCS(iph->iph_table, iphtent_t **, iph->iph_size * sizeof(*iph->iph_table)); if (iph->iph_table == NULL) { From nobody Fri Nov 14 04:11: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 4d73c34hWGz6GrfJ; Fri, 14 Nov 2025 04:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73c345mzz3Fv5; Fri, 14 Nov 2025 04:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRMjTYwNQGyigOh05vkM0DSjGrfloHkt17BLaoOIjU0=; b=l+AGCwl9nDMcgM4hkBA8nBzwf/cT+xYKnGLyGhNUI2grSM92KF0XI2qT+htEWtix9c5kOj yY7/ZOzlMDE95WD82L4mbTsy+JYIK7hUI/qz7gtaz3jskXQNcX5D2FJVhu8Q+jtE9ALtnR GUrTdLQcfYUkU5SShuqRDKN4prP2s9+ti497660NKpzZxoYgIlm7ozRRY7ZTm/3AGwGbM8 vFMTwBlZBn/NPsistNMl57SNirYUuB4zpnkQfGJ1elqeeye9bh8tsJETDhcmY9RMI87QJ5 GTPDiHphR09szGPGeunn+PrjkuX262EaFo6R1snqTk+k/FNmo1DkIduSgYifeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRMjTYwNQGyigOh05vkM0DSjGrfloHkt17BLaoOIjU0=; b=RqqmqovsoRobfzKVEu+mrrSOb4SrD5zOKkg6gfkLVQ0qMiZ8Rd4ms61DviMNNq+v+HwTno VP74lWacTB+rlSYXPjUPmx7GjzjEiUl0jFYZ9WzojKZOPKtWhiriqJghZSn1Ye7uh8ORVS CaKIF/22e+2BL5/+NtrZn6h1dGNIVzE2Pq3he9kY+ifirjPqn3oMq984y6yLMY1ektAPCl fcnYSqJO2zr5HQh0WOx8+Ujfsc8Pnk215P4TlOPWkLXjfdvaauVeIethDKq93lT/RQrzQX b/VKC6j+Vp1up7D7xFGawFvPoq0HaagDAuPP7UBnObcsz0llpQI/X8fWFPl6fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093491; a=rsa-sha256; cv=none; b=wAyDB4EBoAtrHZXm7deAtuCTWanz6xX8CSbzkavZO0NF/E6PZH6E2cZcXQFGMvpco57gdC QGR2X08p4L6S/oi8lh8al9u7WWeMjfMIntXr+4VtZdH2Fy2WfsxP18ZE3WTiE8Uhqcpf7F TLRDrgYiJ1YcfYb3vpFU9TguLOyIgn34WGeyUUW+q87ejCYqoGI39B40j6m3tYvFI9Tekt Ef7TPIkbnie0hJagOmDKS2gFqL9eE1RS06pguN8DN71KJM7Vrp3QwO6e4E7FqMS7tsm+8K /k6IuEV6dxz0xr3k+LuXHfoK9wUz9HoBrhe5EF+9D2iBEgi44VvdvaSCeaZ4KA== 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 4d73c33jgmzr5m; Fri, 14 Nov 2025 04:11: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 5AE4BVY7083609; Fri, 14 Nov 2025 04:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4BV5A083606; Fri, 14 Nov 2025 04:11:31 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:11:31 GMT Message-Id: <202511140411.5AE4BV5A083606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e73527950d5d - stable/14 - ipfilter: Calculate the number of elements in ipf_errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e73527950d5d18568ea0d5f668e63d6058702cca Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e73527950d5d18568ea0d5f668e63d6058702cca commit e73527950d5d18568ea0d5f668e63d6058702cca Author: Cy Schubert AuthorDate: 2025-10-23 02:11:20 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:11:15 +0000 ipfilter: Calculate the number of elements in ipf_errors It serves no purpose to manually manage the IPF_NUM_ERRORS count. Calculate it instead. Reviewed by: emaste, markj Differential revision: https://reviews.freebsd.org/D53308 (cherry picked from commit ab3c9853285b4907dac147ce2f818e3fb44df5a3) --- sbin/ipf/libipf/interror.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index f59f4f633070..04fc53c863fe 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -17,7 +17,7 @@ typedef struct { static ipf_error_entry_t *find_error(int); -#define IPF_NUM_ERRORS 477 +#define IPF_NUM_ERRORS sizeof(ipf_errors) / sizeof(ipf_error_entry_t) /* * NO REUSE OF NUMBERS! @@ -25,7 +25,7 @@ static ipf_error_entry_t *find_error(int); * IF YOU WANT TO ADD AN ERROR TO THIS TABLE, _ADD_ A NEW NUMBER. * DO _NOT_ USE AN EMPTY NUMBER OR FILL IN A GAP. */ -static ipf_error_entry_t ipf_errors[IPF_NUM_ERRORS] = { +static ipf_error_entry_t ipf_errors[] = { { 1, "auth table locked/full" }, { 2, "" }, { 3, "copyinptr received bad address" }, From nobody Fri Nov 14 04:11:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d73c46LdDz6GrRk; Fri, 14 Nov 2025 04:11: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 4d73c45W7Rz3G6f; Fri, 14 Nov 2025 04:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UBeGZEp0UYVhFxMptUe5vfr+++i4R+1Cqmh8yAohSNo=; b=kIAoy4S+36l+SSItuIEoCms89a41xm/grsXL+JSgNyYFiYY5U+0+q5D8kjANTWO1iuAL0e Y2ac/+Yrh4PXmFPumcOIAy35w+cdw2iTYfFkBIa7ZvUJuTyN6zB+0MqTuMkKxc7QZW0hgx Yuns577Z+JyjpIkEaLQM0mqr9rbdrdJ994LH4IYZ5Z54/fE86dqYlft1gANqk1wBj9i1lJ mtQ4d8Kl3VoO3aDKdoZvz3j1n6tCHPXQUgYSuTrEauIwbrlFOBc0+esbEa77ADbqOcEk8I eVhFu0NHfKXsrTwJyBUbhANw3sVWHM4zOx4HKP9L2GrHp9nszyc2hcnFn1d6Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UBeGZEp0UYVhFxMptUe5vfr+++i4R+1Cqmh8yAohSNo=; b=rqeXIOZQqcuk3gfCWv3+SouOROpOJcc5rvKyqIckZEhjybflwJNgylpMLnfbhBGx7yNk5p 1iy9MdMzhTJlmxZ7qZphKnJD996hp41FLpRB3ngTNVvjyUMEZKBq4dTfQJZE9OU+lqlSFV F5Qu5DzaxKUHI7tcUOWrhCrxhebEKLHBYUA8pWgq+okybliITH0GvOlhbOu8La/W1GLVF7 gYa4DeXqcgrNluk+nOdvVkhIRq6OHW5Im/axh7Ak1W+NVAnuPiAaHl2oKINbApNpKU8A9/ 7kDlmBY6hjNm/yjJAoO9q7/w//CWBy5/h1oGMSWcM6r34oa8ztMfTnleVyZzLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093492; a=rsa-sha256; cv=none; b=spDXW+jtzZqBLvFeRLrQyXsLsZfsScLlh3zGczzvPHq+ROTseWXnMa2GKsd6MoV066q+eI AA6i5ztRpC0+uu7rKXYKt4/vVMHZrxxapVsYVkfdq8kfpGwnBrJJPN4eeclI74UDHqPgtV x1/lD/SHCpcWTcEb7mot8cfP19h0NUHf73h0MKRWE4+yyxSaeEj3wMsOiuW9iEp+LVOU64 o6hh8OSSUYz5OqJTUvgH0tUKXqYhOzImt9Vuc+Z/cNiMjPExRnPiXa3QpHaYU3bmWkzVWS g6MHrGDLna0W8w9tT6s8UBcsJfPjcajREN5EGv349ZYAsQe2/KSNJ6oJzuM5Jw== 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 4d73c44zK7zrXR; Fri, 14 Nov 2025 04:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE4BWsw083643; Fri, 14 Nov 2025 04:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4BWuW083640; Fri, 14 Nov 2025 04:11:32 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:11:32 GMT Message-Id: <202511140411.5AE4BWuW083640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 3b38b65cd03a - stable/14 - ipfilter: Add htable (hash table) tunable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b38b65cd03afafb9e34a1e92af62eb6727efeac Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3b38b65cd03afafb9e34a1e92af62eb6727efeac commit 3b38b65cd03afafb9e34a1e92af62eb6727efeac Author: Cy Schubert AuthorDate: 2025-10-22 22:51:43 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:11:15 +0000 ipfilter: Add htable (hash table) tunable This is in preparation for addition of a hash table max size. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53283 (cherry picked from commit c57262716b08717b6a9c5533941d4e0a2d180d46) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index be5b71d9f6d4..4c191cf71b18 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -99,6 +99,7 @@ typedef struct ipf_htable_softc_s { u_long ipf_nhtnodes[LOOKUP_POOL_SZ]; iphtable_t *ipf_htables[LOOKUP_POOL_SZ]; iphtent_t *ipf_node_explist; + ipftuneable_t *ipf_htable_tune; } ipf_htable_softc_t; ipf_lookup_t ipf_htable_backend = { @@ -125,6 +126,14 @@ ipf_lookup_t ipf_htable_backend = { }; +static ipftuneable_t ipf_htable_tuneables[] = { + { { NULL }, + NULL, 0, 0, + 0, + 0, NULL, NULL } +}; + + /* ------------------------------------------------------------------------ */ /* Function: ipf_htable_soft_create */ /* Returns: void * - NULL = failure, else pointer to local context */ @@ -145,6 +154,18 @@ ipf_htable_soft_create(ipf_main_softc_t *softc) bzero((char *)softh, sizeof(*softh)); + softh->ipf_htable_tune = ipf_tune_array_copy(softh, + sizeof(ipf_htable_tuneables), + ipf_htable_tuneables); + if (softh->ipf_htable_tune == NULL) { + ipf_htable_soft_destroy(softc, softh); + return (NULL); + } + if (ipf_tune_array_link(softc, softh->ipf_htable_tune) == -1) { + ipf_htable_soft_destroy(softc, softh); + return (NULL); + } + return (softh); } @@ -163,6 +184,12 @@ ipf_htable_soft_destroy(ipf_main_softc_t *softc, void *arg) { ipf_htable_softc_t *softh = arg; + if (softh->ipf_htable_tune != NULL) { + ipf_tune_array_unlink(softc, softh->ipf_htable_tune); + KFREES(softh->ipf_htable_tune, sizeof(ipf_htable_tuneables)); + softh->ipf_htable_tune = NULL; + } + KFREE(softh); } From nobody Fri Nov 14 04:11: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 4d73c61VKFz6GrfP; Fri, 14 Nov 2025 04:11: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 4d73c56PBgz3Fx5; Fri, 14 Nov 2025 04:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1QEiX5yL60cnzUc/7fMWO8sPJcQEUlW8yOA9GFGBU0I=; b=sinwmBo0gLP2S6NxkpN83IzAxs+CVKo4MaJsid3erBzffFC6hughwWfsy8QIILcC694ICn F7SWzUh56QXAUjApiTNpEilG4OcrJAKrOGpDb7vhPpdkG5VBwIoE8hSuqnJdgh668HVtIh uQFFQWqjrXdnwNwU3ARySoKGOcOQJMmYd1ToO5EYQSICugAGs6Xz2ovp0Xo51pkBLqHhZ9 FT6k1nG6qrb3Cz3eJ8ZvWJE649qLRCJ4iwKZRj30WBsoXWuG2aumeh86U9So76J9mxFQEG +OfY1PVAXoqOvkYmfo73lBRyrjetoFBW5Jwa4Ju6EjsC32FT2O8UJ1COt6TMBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1QEiX5yL60cnzUc/7fMWO8sPJcQEUlW8yOA9GFGBU0I=; b=kuZ5stbPpssB6DSBNXUKoPz9vR+fEJoiQMP9WRy2e7BC+e+gC6NqUBGFcjX4qwKw4d/JKF WIQ15y/OEuy1468pXjLL9dOcCdytzrPGhkoCOrxNpJ9rpL9sZ+8jIGFhKXB/LmzHPrKPuB LbVHwstXNnui3sj87AimSXN9rBN86+Mmqr6Dvhkd3K3veuUfiAxShpnC3gxUl/4pHMyuhg xHx/E2EPB0azUX5djDvWjxNoEYZa+O6K7gufb/GM5qj8kft960wDPLlzJ9G5BTARsrTo8w cVYZ3kwBDw3sq5F2AnPPQASiQDcN1L6auzPYFeSsrjB13bA0tSgbesMT3s9LsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093493; a=rsa-sha256; cv=none; b=Jixtboajn+VAE5TURqgJOYI8sZu2jQdR4X5l7chSS0otbdfuUT0t1vBnq9xB0gvapLN5xH vHd+VcSE3M03vUQTDvgYxhKPBbKCIJJN+bZ/Of6m3lez8MohNAt1KlAsA9vtIvbV3jOezR AuFDFlFwUFnW+TCGM3rf6jOvFtrFJLlYbh3CIbna7ffDgjs86/S1jpT1l1Y8i7JwM8Ssbx 6jHWucaSu8Y5+/HE943RaBRRw/5pwP8dpS/cdREvRJlS6tJDDed+zvV17pLiG0d96zy/EA wFbAqk8Sa3SSZguh2y23/Nmd2QQhCX1jE0Qi3OH//5FgFxVET/0H+ulH9NkQ3Q== 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 4d73c55vtWzrJL; Fri, 14 Nov 2025 04:11: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 5AE4BXkh083679; Fri, 14 Nov 2025 04:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4BXJ1083676; Fri, 14 Nov 2025 04:11:33 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:11:33 GMT Message-Id: <202511140411.5AE4BXJ1083676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2d71662b74b0 - stable/14 - ipfilter: Add an htable max size tuneable. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d71662b74b062bd61da91b9fbd471a7a2b6a677 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2d71662b74b062bd61da91b9fbd471a7a2b6a677 commit 2d71662b74b062bd61da91b9fbd471a7a2b6a677 Author: Cy Schubert AuthorDate: 2025-10-22 22:56:50 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:11:15 +0000 ipfilter: Add an htable max size tuneable. Add an ipfilter runtime option (ipf -T) to adjust the default maximum hash table size. Default it to 1024 entries. It will be used by a subsequent commit to limit any damage due to excessively large hash table input by the user. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53284 (cherry picked from commit f3b94f47f55c502e8983f9bd294e963e75b2963a) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 7 +++++++ sys/netpfil/ipfilter/netinet/ip_htable.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 4c191cf71b18..94741d589601 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -100,6 +100,7 @@ typedef struct ipf_htable_softc_s { iphtable_t *ipf_htables[LOOKUP_POOL_SZ]; iphtent_t *ipf_node_explist; ipftuneable_t *ipf_htable_tune; + u_int ipf_htable_size_max; } ipf_htable_softc_t; ipf_lookup_t ipf_htable_backend = { @@ -127,6 +128,10 @@ ipf_lookup_t ipf_htable_backend = { static ipftuneable_t ipf_htable_tuneables[] = { + { { (void *)offsetof(ipf_htable_softc_t, ipf_htable_size_max) }, + "htable_size_max", 1, 0x7fffffff, + stsizeof(ipf_htable_softc_t, ipf_htable_size_max), + 0, NULL, NULL }, { { NULL }, NULL, 0, 0, 0, @@ -209,6 +214,8 @@ ipf_htable_soft_init(ipf_main_softc_t *softc, void *arg) bzero((char *)softh, sizeof(*softh)); + softh->ipf_htable_size_max = IPHTABLE_MAX_SIZE; + return (0); } diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.h b/sys/netpfil/ipfilter/netinet/ip_htable.h index 55c289e57ff6..3a8782ccd4b2 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.h +++ b/sys/netpfil/ipfilter/netinet/ip_htable.h @@ -55,6 +55,8 @@ typedef struct iphtable_s { char iph_name[FR_GROUPLEN]; /* hash table number */ } iphtable_t; +#define IPHTABLE_MAX_SIZE 1024 + /* iph_type */ #define IPHASH_LOOKUP 0 #define IPHASH_GROUPMAP 1 From nobody Fri Nov 14 04:11: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 4d73c727xlz6Grdb; Fri, 14 Nov 2025 04:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73c70gwSz3G26; Fri, 14 Nov 2025 04:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nq7rXjfO+9FjGKnv3F5dg2U0RcbHhyUHRlQix7eYx0Y=; b=mcxFkH8JtLNtaWQOgB52PIxa3w70idlP+YkMm9tw5OnHjtk80Zu35VrJwF6rjNMy5D9RCD 5JhAFd+iez942U3w/mGv1u2B5eJwwm+L+0wM12+sMDXOX67HdBiihwapDyxyDiw5UhWeWz gQ9xuE86LC+qXc+kWNLnBSsyf/65IH/J/VVdzGFNMKZ4GhaecfhC4PUk9blrZLEV+bXxL5 /SjmZ8R00ur7gvqrMxbt3rPf6WSMxIMO9mLi2xZp2ImkQiTwq/c7ZbDXfhTK1M+WNC9DOD DhF1bHh2MdONqeYAeg/QlI0auKArhwIJHVLJjE8W91Mx9hcUolgMh2LyWbJNag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nq7rXjfO+9FjGKnv3F5dg2U0RcbHhyUHRlQix7eYx0Y=; b=lgebbr9nRdnCxJXm4IS9q7ej68ZaA652mOwp9xyBSdf/5mvX3TYxX1WxaAiob0Dm8KsIAC b28V3pNM7pRhS6mpbQ3+A/0uyLtI4+HAsiytwVGBywN6ToQZo3MY9pXGZI4V1CqCCVUOrg 8tMlU0hmYONlyxygyN4nl15W3EYNboyPkuRnjX5FpbF4J73s7IZJ2reu6bmRFVVecyFmRZ Q74mWhAlhZT0M8fiJsoDTAxWZdWO7l9TbDCcDsT3B3Kmm65rc8qFW7NBhg5XVT3gU5e9Mw 5BESWEOUUj86E2H+sy08Mfo2mJitVS0r/H1Q6Yk9C0OGKpb8+LQVt8UyBHXNmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093495; a=rsa-sha256; cv=none; b=vetEeudW9J4xD7xLItb5Aups2syz+S7UPMTePDU0a+SDLPKfJLhbmgqq8wA7aERJh524DS 4q4KpnAraS7pZuJeVKJ13bhzlLVsmIByZCisgkAPuKU2QciL8V05fCH4VmQ48DQ/4nbiek 7vAX2+pjACBb2GvpcF5Ile0l397BLuNMzlNPIKESDGDaHE3pTP7UiQU6Wm9PA5Fvb1Nn/t 8auH+cM+T1R3ALcu0dT+Ii0KrIMomnbwZNVL9LV2jxDIlZP2ssWUaY0cXugovUONs8uiPL VCeYXA2bUkbEV17oYJyRYuu4GyS5QElZL89zLj3NfBcxxwWBQYRmXLY7NxVV1g== 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 4d73c66rVlzrXS; Fri, 14 Nov 2025 04:11: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 5AE4BY5Q083715; Fri, 14 Nov 2025 04:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4BYXQ083712; Fri, 14 Nov 2025 04:11:34 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:11:34 GMT Message-Id: <202511140411.5AE4BYXQ083712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 794a904b454b - stable/14 - ipfilter: Don't trust userland supplied iph_size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 794a904b454b22c27cea04d209a5fc74972b0fa6 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=794a904b454b22c27cea04d209a5fc74972b0fa6 commit 794a904b454b22c27cea04d209a5fc74972b0fa6 Author: Cy Schubert AuthorDate: 2025-10-22 23:19:54 +0000 Commit: Cy Schubert CommitDate: 2025-11-14 04:11:16 +0000 ipfilter: Don't trust userland supplied iph_size ipf_htable_create() trusts a user-supplied iph_size from iphtable_t and computes the allocation size as iph->iph_size * sizeof(*iph->iph_table) without checking for integer overflow. A sufficiently large iph_size causes the multiplication to wrap, resulting in an under-sized allocation for the table pointer array. Subsequent code (e.g., in ipf_htent_insert()) can then write past the end of the allocated buffer, corrupting kernel memory and causing DoS or potential privilege escalation. This is not typically a problem when using the ipfilter provided userland tools as calculate the correct lengths. This mitigates a rogue actor calling ipfilter ioctls directly. Reported by: Ilja Van Sprundel Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53286 (cherry picked from commit df381bec2d2b73697a3d163177df042dd272022d) --- sbin/ipf/libipf/interror.c | 2 ++ sys/netpfil/ipfilter/netinet/ip_htable.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index 04fc53c863fe..5b3836f36d60 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -228,6 +228,8 @@ static ipf_error_entry_t ipf_errors[] = { { 30024, "object size incorrect for hash table" }, { 30025, "hash table size must be at least 1"}, { 30026, "cannot allocate memory for hash table context" }, + { 30027, "hash table larger than maximum allowed" }, + { 30028, "hash table multiplication overflow" }, /* -------------------------------------------------------------------------- */ { 40001, "invalid minor device number for log read" }, { 40002, "read size too small" }, diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 94741d589601..ca9e96698245 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -364,6 +364,15 @@ ipf_htable_create(ipf_main_softc_t *softc, void *arg, iplookupop_t *op) iph->iph_name[sizeof(iph->iph_name) - 1] = '\0'; } + if ((iph->iph_size == 0) || + (iph->iph_size > softh->ipf_htable_size_max)) { + IPFERROR(30027); + return (EINVAL); + } + if (iph->iph_size > ( SIZE_MAX / sizeof(*iph->iph_table))) { + IPFERROR(30028); + return (EINVAL); + } KMALLOCS(iph->iph_table, iphtent_t **, iph->iph_size * sizeof(*iph->iph_table)); if (iph->iph_table == NULL) { From nobody Fri Nov 14 04:12: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 4d73cs3Bg1z6GrKB; Fri, 14 Nov 2025 04:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73cs06WSz3Gww; Fri, 14 Nov 2025 04:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFkuvm4ASQLb76F5ypKtwqPztY0M/qizJnhi2Jt4bDM=; b=ZmiYrmQrB/wkWRS8lSf2yGnq3cdv9ulfnkuTaa4eqYoBohoFW6CBLPkQtxu9RjkZhDtRBs xFc4Pb8ZKeiaDHMbxlkqZXEj0fMT2FNq8bZlJIAIM278tPRJ3GEq2hRNUfnS0eUmJ+x3zs yaLnx0IDCvFgs2zSizMIRDWlaJBbNhDdxAiwx/6IKu9MVcw8gijiISGzYStHDySIHsRucm Lv2jMRfk4a4joYxrlPJBV6ZLgqFv8cwVk+QB6d+7YXuHLoyzPEAo7kAKg2xodbKlIAtVV3 WDpdEn9mqBz5q7+FGgfQtf5bQQOjAHCWHDCIxnFosDfR1mT225SrCbsi1DXRcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFkuvm4ASQLb76F5ypKtwqPztY0M/qizJnhi2Jt4bDM=; b=LS1GZxU4dM2MGHebve9hD1h/wQBzoGfLWKuieciPxtEW/PkKVHZ8pfSLFWyLB5mLsC4i+S ugsAWao3j3RjXYjfuurqZhu0FggRSOax/xi3dL1NJwFHRHiziIFnfpE0t0hw+Kot8mymc/ h5+lFKZ+L+R2L8Tj/5M5pRTJ9SWS5RkHlD1uCL749iiJSAsU8Ce5qoFB1IuwVv7m/18CSU llWU/ZPLlWavdmMhz3VLWsVnxlchLuNqr91H5I2vogYkc0FJM3OlVESU6RQxgZNykWnabf o2FcD1Ym1ZG/+lwmcbE+QPAyf16FABfkz5f2TItleND16fq+DqQIg2H/aSImxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093533; a=rsa-sha256; cv=none; b=fwyOz68rcapqEfS6Vcv1p3H7WU8Xzlejy14JhnSjQ1EpH2gZyDUvW7Hh6fxwwjzvkDOy8m HsxJov1Rtb2pLSZvCysK9BAQswWSi23YE6+rqgPqhIqjpdWc1l/eMha+I857GKg1pe/8Od dLP3nqXItM7DqPs3MSOv6I9OEw4BOumSoqo6OUm1p750Q+bnIX+mrdGj/Lu2s76Cq9PM7G X+BiPY+bGI6h58levh6kl/8v+zJ3UP2UPiwpyJc+qBij5CxwyVh/99sjKvyPT4liyMXkmR 4Yi4Hi298j5nbeD6vu4Co5e5camwBdjqrSB75ZuDEoZOefm4K1Zt5jNyBkXXDw== 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 4d73cr6Xnbzrm2; Fri, 14 Nov 2025 04:12: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 5AE4CCH0086296; Fri, 14 Nov 2025 04:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4CCps086293; Fri, 14 Nov 2025 04:12:12 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:12:12 GMT Message-Id: <202511140412.5AE4CCps086293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: eb411cd796fe - stable/13 - ipfilter: Calculate the number of elements in ipf_errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb411cd796fecdff37a9728b158fdda8f545a785 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=eb411cd796fecdff37a9728b158fdda8f545a785 commit eb411cd796fecdff37a9728b158fdda8f545a785 Author: Cy Schubert AuthorDate: 2025-10-23 02:11:20 +0000 Commit: Cy Schubert CommitDate: 2025-11-12 04:02:31 +0000 ipfilter: Calculate the number of elements in ipf_errors It serves no purpose to manually manage the IPF_NUM_ERRORS count. Calculate it instead. Reviewed by: emaste, markj Differential revision: https://reviews.freebsd.org/D53308 (cherry picked from commit ab3c9853285b4907dac147ce2f818e3fb44df5a3) --- sbin/ipf/libipf/interror.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index 994fb9d2b320..c2a0fa269149 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -17,7 +17,7 @@ typedef struct { static ipf_error_entry_t *find_error(int); -#define IPF_NUM_ERRORS 477 +#define IPF_NUM_ERRORS sizeof(ipf_errors) / sizeof(ipf_error_entry_t) /* * NO REUSE OF NUMBERS! @@ -25,7 +25,7 @@ static ipf_error_entry_t *find_error(int); * IF YOU WANT TO ADD AN ERROR TO THIS TABLE, _ADD_ A NEW NUMBER. * DO _NOT_ USE AN EMPTY NUMBER OR FILL IN A GAP. */ -static ipf_error_entry_t ipf_errors[IPF_NUM_ERRORS] = { +static ipf_error_entry_t ipf_errors[] = { { 1, "auth table locked/full" }, { 2, "" }, { 3, "copyinptr received bad address" }, From nobody Fri Nov 14 04:12:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d73ct4Wyhz6GrhK; Fri, 14 Nov 2025 04:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73ct0SdXz3H6g; Fri, 14 Nov 2025 04:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=es1saJ8znXbVo5Z0Yi4+Bwua/Ld3DaMA3kkV2F8GCuY=; b=cdRKbKKpuGO/5NYgCXinq5IHhCZUaQiDSmqhnQCQspDrxTjlTA0070o2VP4eLnNNDvQ5P+ uJyBHI/V51gS3grCrwgJ/D7HaoJUigPYq9YkjalxjC+9o9JILPg/U91VZOwnSHI6NCR7OK ERVh3uTWIl2WHLbWjBMh8XFmWHgvjWguCUmA662PHFN6hEjlPrk+E+c5f5dKAvt2KsI9wm l+4QxQItgBmVFgzI3wWjn6EhyC6LkvdNm5PBxWgSDBrI4M+LnSJuxw+vB3zfhpjvxU+lm2 h8cjcDfL2StM4+9iWek3VuSA4YR//onMYj1fZj8pdafIVPm1WKS9rtmZgHozeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=es1saJ8znXbVo5Z0Yi4+Bwua/Ld3DaMA3kkV2F8GCuY=; b=qb8oWtAOoP/mL0hmzPj7av+hiNxJQh9v782P21pVQG6nRUdCflHU/unL1E75AUiyjIyLnp 7m1tQCfxuC1bhlybMt3wqRg+5l0RRLWRwkkXedw62ExY6wdvrs1E1fC+yQHC+I7iizHPmX d7nyG/CT8abaFfCgxg5oTQeYH7uM1BW5QhqdhDTk9+Tj7KLbaqKLgAG17q88zzskDt0upF 6FI88Go/owh9bLnTnH+LfTWoKh/OlO8pnvSbjpEDsWf3uXAaCKEN42EuHG0OiplTlmAUX/ q53fnVeh5uFWlER6f+9OuaGuLBXt5w5OnmmV116tDWNem6AOR4NyX6zAfIRDAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093534; a=rsa-sha256; cv=none; b=kzGyISDnLG93lMBq3Yboc3idsWH03HM5QAAWSNzcFqgw2xP/5G3DDD7b1DwNIjXMim/Hps 09AAL7/tsO5dZay7c4n7BUp+OFHxpdy+1wQTh1xyQDb5vjCaF7SF9gpD7Y8Q0FpdN/0KNq LFW6oElK2Fmj/XQOjUU6Tlq+AQJuP300NJKq0+Q88XA6rnXic8lmYa8iUB6vS2hSAs05Fq xg5iA7K3Sw1Zk+Epeqv3Y+aRXNcp9cZ0oDQKe2Y9wJAEmC63m3DmHdhwyYlDLhl6HMCuZ2 34DoRF4e0/vnZtmcK0sQ1z7oopCyEevP/YHkuvXq9iuAIvDJmsgCi5my61HSFQ== 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 4d73ct00q9zrm3; Fri, 14 Nov 2025 04:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE4CD4v086941; Fri, 14 Nov 2025 04:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4CDWn086923; Fri, 14 Nov 2025 04:12:13 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:12:13 GMT Message-Id: <202511140412.5AE4CDWn086923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2e1364183020 - stable/13 - ipfilter: Add htable (hash table) tunable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e13641830206eeddcf3547094d5da7ce47e0a87 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2e13641830206eeddcf3547094d5da7ce47e0a87 commit 2e13641830206eeddcf3547094d5da7ce47e0a87 Author: Cy Schubert AuthorDate: 2025-10-22 22:51:43 +0000 Commit: Cy Schubert CommitDate: 2025-11-12 04:02:31 +0000 ipfilter: Add htable (hash table) tunable This is in preparation for addition of a hash table max size. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53283 (cherry picked from commit c57262716b08717b6a9c5533941d4e0a2d180d46) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index b56909a02bc3..80f916b6e509 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -99,6 +99,7 @@ typedef struct ipf_htable_softc_s { u_long ipf_nhtnodes[LOOKUP_POOL_SZ]; iphtable_t *ipf_htables[LOOKUP_POOL_SZ]; iphtent_t *ipf_node_explist; + ipftuneable_t *ipf_htable_tune; } ipf_htable_softc_t; ipf_lookup_t ipf_htable_backend = { @@ -125,6 +126,14 @@ ipf_lookup_t ipf_htable_backend = { }; +static ipftuneable_t ipf_htable_tuneables[] = { + { { NULL }, + NULL, 0, 0, + 0, + 0, NULL, NULL } +}; + + /* ------------------------------------------------------------------------ */ /* Function: ipf_htable_soft_create */ /* Returns: void * - NULL = failure, else pointer to local context */ @@ -145,6 +154,18 @@ ipf_htable_soft_create(ipf_main_softc_t *softc) bzero((char *)softh, sizeof(*softh)); + softh->ipf_htable_tune = ipf_tune_array_copy(softh, + sizeof(ipf_htable_tuneables), + ipf_htable_tuneables); + if (softh->ipf_htable_tune == NULL) { + ipf_htable_soft_destroy(softc, softh); + return (NULL); + } + if (ipf_tune_array_link(softc, softh->ipf_htable_tune) == -1) { + ipf_htable_soft_destroy(softc, softh); + return (NULL); + } + return (softh); } @@ -163,6 +184,12 @@ ipf_htable_soft_destroy(ipf_main_softc_t *softc, void *arg) { ipf_htable_softc_t *softh = arg; + if (softh->ipf_htable_tune != NULL) { + ipf_tune_array_unlink(softc, softh->ipf_htable_tune); + KFREES(softh->ipf_htable_tune, sizeof(ipf_htable_tuneables)); + softh->ipf_htable_tune = NULL; + } + KFREE(softh); } From nobody Fri Nov 14 04:12: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 4d73cv3T1Lz6Grfh; Fri, 14 Nov 2025 04:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d73cv16x5z3HLK; Fri, 14 Nov 2025 04:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C/PBdIk0ZemNu477kGMiRwMF0u7QsguStG6Cl9J5vzM=; b=uaPE4QIXLe0IfpLGMp2gjrk5IviC2dGvI1y0k4ZXkIv5RfrGe/tYZRPQ0aJPaewYaFQxyP eJokHKgyGsocDR/YS54MAzoQVfMt6GacP0Pr32HrUYpq9X1hBxIukm/rlhbQvUxpBymwv/ M07Xn249xcOFBFsQXUscMKTHLIk7d6QvwjPNA5wLdyw4b/WkV8bXiZ7sCUi6apIPgxuq8/ hP+hT9gxF0ymYBcxi6tD9ywqR8gpO42PqKHJpKnpLRwCynGNB8zQpF9onbW1tPyYUnhwUd ASuAAns8ZkQWN6xBEq/G4jNL7wuHCu1aL+WtkveYcpWkHQY/VF+kTM1cXVZveQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C/PBdIk0ZemNu477kGMiRwMF0u7QsguStG6Cl9J5vzM=; b=cR2NtMbEEeH1Kq/naPU20Jp+3wwTnRdZWqsaMibDBnZbwsqhkgCUUJJyGezcMbJZqrHXSS CYUFMx34RlTNCmwcALUHLLa32pMyUd/4an7nYNBs7m2CJ/DojBSOa8dts4HkeIWxJZjTOy 20o5ISG4bzbr89A96TKjKMBTHdzHSh9npgU6jJlOBUPwznHEDmxAtRQPYfWzzVXsGFig7O kfo8y+xU+e3fJt+qR1BJD4w83f/bpx+k87JKlHLvpaQ3pj0jZ4vLTOicDpcjIalXxNPxGS SU6sMxXyKodtSXYHuS1bkmsTsJF4hKRipMUP6E9F2lhaRgALhW8EkkEJVINKow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093535; a=rsa-sha256; cv=none; b=kXR/kCobqmLat2AOKsldMDif0EkKjNy8SRLKJxnKy2/1UpLV6yFBmZoRycfVQxUCjs5huT vIfO/70HQk/iy+5t1IUm4YuCCUkPYHAQ/K2+qos8hpTS23vzkH/IBSHyxkHVBmU7++FbqS e/NC0H2KlHDq8i4GAmou9wIrGMfQLpOCioJeuYef5l9b8owmma7RcBxjFgDIiIMcTdYTpy xiwzGp4OieBKc9JLfZh5/vbei/nTLY42G3dC2Sx4kSRh1i7vaOAFGq5QXCWW3IXtEH1v8n wqVkqgOAnuU7lepZvN3l9jbfvBqyq7m2ZekTKHv/9az2U31aqcNXLq8qtlp9GQ== 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 4d73cv0kQCzrl2; Fri, 14 Nov 2025 04:12: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 5AE4CEpv087239; Fri, 14 Nov 2025 04:12:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4CEjA087236; Fri, 14 Nov 2025 04:12:14 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:12:14 GMT Message-Id: <202511140412.5AE4CEjA087236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e82f63c7257e - stable/13 - ipfilter: Add an htable max size tuneable. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e82f63c7257e561a1b2b826b2712cec32eb9c787 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e82f63c7257e561a1b2b826b2712cec32eb9c787 commit e82f63c7257e561a1b2b826b2712cec32eb9c787 Author: Cy Schubert AuthorDate: 2025-10-22 22:56:50 +0000 Commit: Cy Schubert CommitDate: 2025-11-12 04:02:31 +0000 ipfilter: Add an htable max size tuneable. Add an ipfilter runtime option (ipf -T) to adjust the default maximum hash table size. Default it to 1024 entries. It will be used by a subsequent commit to limit any damage due to excessively large hash table input by the user. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53284 (cherry picked from commit f3b94f47f55c502e8983f9bd294e963e75b2963a) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 7 +++++++ sys/netpfil/ipfilter/netinet/ip_htable.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 80f916b6e509..28b3e7e82cec 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -100,6 +100,7 @@ typedef struct ipf_htable_softc_s { iphtable_t *ipf_htables[LOOKUP_POOL_SZ]; iphtent_t *ipf_node_explist; ipftuneable_t *ipf_htable_tune; + u_int ipf_htable_size_max; } ipf_htable_softc_t; ipf_lookup_t ipf_htable_backend = { @@ -127,6 +128,10 @@ ipf_lookup_t ipf_htable_backend = { static ipftuneable_t ipf_htable_tuneables[] = { + { { (void *)offsetof(ipf_htable_softc_t, ipf_htable_size_max) }, + "htable_size_max", 1, 0x7fffffff, + stsizeof(ipf_htable_softc_t, ipf_htable_size_max), + 0, NULL, NULL }, { { NULL }, NULL, 0, 0, 0, @@ -211,6 +216,8 @@ ipf_htable_soft_init(softc, arg) bzero((char *)softh, sizeof(*softh)); + softh->ipf_htable_size_max = IPHTABLE_MAX_SIZE; + return (0); } diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.h b/sys/netpfil/ipfilter/netinet/ip_htable.h index 55c289e57ff6..3a8782ccd4b2 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.h +++ b/sys/netpfil/ipfilter/netinet/ip_htable.h @@ -55,6 +55,8 @@ typedef struct iphtable_s { char iph_name[FR_GROUPLEN]; /* hash table number */ } iphtable_t; +#define IPHTABLE_MAX_SIZE 1024 + /* iph_type */ #define IPHASH_LOOKUP 0 #define IPHASH_GROUPMAP 1 From nobody Fri Nov 14 04:12: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 4d73cw2rxNz6GrKJ; Fri, 14 Nov 2025 04:12: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 4d73cw1nSXz3HJD; Fri, 14 Nov 2025 04:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6zEAZb3jErawdcyU2s2xY5LGj7+twuDb2GnW4gDOka0=; b=fW49XyoWwHlg9oPWh/LQnapWdoUm7G359LdZG21t87qXylaoSPB3pwc89IECmkP/q1JS9T 0IDEHIiOXJmcDPetZBs8y7a6UxYr5YPq6jjVoMCHmC8XG/Bp7p/X9XT7dyjSetqm1KmOKg zVDY5n+rxelUPNvTMYFo9aP7E4ezLnPl6a/RQsFQDLmx31LC1gYkjgaDVMyHMmswkDN0oo 4Cbum4HbVsZRjdEQxSPgkF/hjrxOO8MVV1APklVhHkUJQrcZCcdYNnJgnm+l8RXDei9Gh5 4iXoN4Aal4473Q1o5fAeqMeQfSyYq1SQXg7k4BglrOUey4+qWwMuZncxm58HuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6zEAZb3jErawdcyU2s2xY5LGj7+twuDb2GnW4gDOka0=; b=WUgZxqQY+mL4HliHWPzlu4CXMkTAcr6MRBs4fjp0ABY+WKYOsxdzh2d+XF/4yrPpoHEY5z /IO7tEf+M9lYGa940W93R/Io1aqCVJzLV9zdpiKh+slZLWrgT9kk400xTMQI98ZcKtWzT1 pOHlp2JO4W9bbxjGc5PzrsEYW0m+AlIQmqG7gaP2Au0aUJtcsqR4qjh1RsDV/Nlv2p/SHt IZg5ZhzdqCttebOttSb04fEW9C95IjDY92/AYBUX0flrVS+xraTA8ZLFReinFe6efmj0hd Hdr/vgF8KmHKvbGb8cDuqeqsTkWEzdMOneAzMjyg2EOO3bRdZZ0xwlzMNYlwoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093536; a=rsa-sha256; cv=none; b=SDb9TrZyWooGYSjl4o9iLtEykaaOu1K1DzcT7PkYS6xYe29sKYDAAKf6xdg9OyuFREG8oi VmTp/e1rXZvraSNkkhe2SO/uIk5uaVhFGGQd9YSw/eUX6jgKTZYzMuj5rgn8ht9BRzGl1f HqhhAkbdLyHS8mmU5c8TlcDbKABVx28LIBNf556AtlWUwjZg/5S771knuhLdWAtvWNu3dU 9IcW/WpsuIBvywRFVMLociQT/OCEY8bq6Jpp419EHtDYgd4T6aovDUO9TxEhhBncpMAV4X BQAkyj+GbhYDbXz5cd6E12WEB6kBrmrA5nwlol8NDz71NYU9mF8nyAZv4AXvew== 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 4d73cw1LSVzrJr; Fri, 14 Nov 2025 04:12: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 5AE4CGmm087277; Fri, 14 Nov 2025 04:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4CGZ1087274; Fri, 14 Nov 2025 04:12:16 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:12:16 GMT Message-Id: <202511140412.5AE4CGZ1087274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: dbe0b2c986cb - stable/13 - ipfilter: Don't trust userland supplied iph_size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dbe0b2c986cbd4c01d5ba5a3b367aba9740c137b Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe0b2c986cbd4c01d5ba5a3b367aba9740c137b commit dbe0b2c986cbd4c01d5ba5a3b367aba9740c137b Author: Cy Schubert AuthorDate: 2025-10-22 23:19:54 +0000 Commit: Cy Schubert CommitDate: 2025-11-12 04:02:31 +0000 ipfilter: Don't trust userland supplied iph_size ipf_htable_create() trusts a user-supplied iph_size from iphtable_t and computes the allocation size as iph->iph_size * sizeof(*iph->iph_table) without checking for integer overflow. A sufficiently large iph_size causes the multiplication to wrap, resulting in an under-sized allocation for the table pointer array. Subsequent code (e.g., in ipf_htent_insert()) can then write past the end of the allocated buffer, corrupting kernel memory and causing DoS or potential privilege escalation. This is not typically a problem when using the ipfilter provided userland tools as calculate the correct lengths. This mitigates a rogue actor calling ipfilter ioctls directly. Reported by: Ilja Van Sprundel Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53286 (cherry picked from commit df381bec2d2b73697a3d163177df042dd272022d) --- sbin/ipf/libipf/interror.c | 2 ++ sys/netpfil/ipfilter/netinet/ip_htable.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index c2a0fa269149..6d8c313ceb8b 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -228,6 +228,8 @@ static ipf_error_entry_t ipf_errors[] = { { 30024, "object size incorrect for hash table" }, { 30025, "hash table size must be at least 1"}, { 30026, "cannot allocate memory for hash table context" }, + { 30027, "hash table larger than maximum allowed" }, + { 30028, "hash table multiplication overflow" }, /* -------------------------------------------------------------------------- */ { 40001, "invalid minor device numebr for log read" }, { 40002, "read size too small" }, diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 28b3e7e82cec..fc0044651c70 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -366,6 +366,15 @@ ipf_htable_create(ipf_main_softc_t *softc, void *arg, iplookupop_t *op) iph->iph_name[sizeof(iph->iph_name) - 1] = '\0'; } + if ((iph->iph_size == 0) || + (iph->iph_size > softh->ipf_htable_size_max)) { + IPFERROR(30027); + return (EINVAL); + } + if (iph->iph_size > ( SIZE_MAX / sizeof(*iph->iph_table))) { + IPFERROR(30028); + return (EINVAL); + } KMALLOCS(iph->iph_table, iphtent_t **, iph->iph_size * sizeof(*iph->iph_table)); if (iph->iph_table == NULL) { From nobody Fri Nov 14 14:27: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 4d7KGK0xK9z6GWFr; Fri, 14 Nov 2025 14:27: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 4d7KGK0MCkz3Q6W; Fri, 14 Nov 2025 14:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763130425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLdXKhwVaxdGlzSaGEwTHhacHqywfb4UzCkXyt2PMBA=; b=h0VhbyxtpFU1Rj2uCXp2tOys07a+aMfvWtUlGG0bbsZ2TvziOsT+YKrBaRLVRCB0i974Gb W0ICcM1sga5KS6nJoISFedBbP3Z6ttgbyCfasXMhTgSTJ96RtS77Yi1jK8KxJPWFU2c905 jSOfTwkS/jFaOOWVDIq/DLEYRp4UANz1uiaZZOyD/RiYFOCO14uGe1lkCz9QfRIz+VBViK ACdRlQpCLYvKT+6IcclwYeR+JHfisssGFcZ4zdPSMZ/T2mjKtoU8iiYv0PHBK0oogc5Q6X 1ntllWISJ8/va3cGXCzPz8iGkHPYT08mswxM/9QtLmMHLVuhdfTddz+coLik1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763130425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLdXKhwVaxdGlzSaGEwTHhacHqywfb4UzCkXyt2PMBA=; b=OYwY4pENz3bY++hJf+9VRNAuDDyZJqqpjjOC9azoamU4UP58yFo6orZkfkMZduWyR2Unsv 1T1mpv/NySwzZ3Qh0UJLBBzqf9dkYmTRilX3i5v/0Ojo26DQmZu/qofA//yHNyI8+DHM8H PA3LaMQ4TyuxsQxWBLsdMlApnAaFOBIW7VulmLU9DN8D0DC5naY/Bj0PYpALm4RKlfnB0g 3gJj15a1lZcwanouw0SZ/EUlkcmPJEZO7Tplsux8I5HiiHXh9maJWLS1XfNHU4FU9L0yUT fjyh/0arqbtykkbSO0F4S7ryAI+WuSalFIHoBKXS9lCnP5Mizh3k1cmYcdSrQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763130425; a=rsa-sha256; cv=none; b=UGu4TOINflKF9sp0uS10OCWhBChRrqzCeQyF6m4xLpAzE1QTS9y4QVKPvU1ccqWBxwWKsj AmXH1ieXAIHEE+Uti3VpHOTTJcgOOYTGDGsfttj/aCj84j1+5766oI4dis699udUQ0L6/F mueSEh+wjU1Jzw6GZwH498y5qhkEfiEu1OBSb9mmwqOJs1W82ALLhw3u6VcOiGWhJA68oP Z1TuchlCF/dM5zj+xblcNzB6NQV2/w4IwYOYfxe2F3il/+LUgj5Qubg2pXWsmKJyQEmW3U Uo3s1JQGTqUcI4RuAxKKgna3bIQkjHrAfoFEaaRJsyXt34tzF+z06i+QzRB3ng== 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 4d7KGJ6znJz198J; Fri, 14 Nov 2025 14:27: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 5AEER4mB038199; Fri, 14 Nov 2025 14:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEER489038196; Fri, 14 Nov 2025 14:27:04 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:27:04 GMT Message-Id: <202511141427.5AEER489038196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2bce3c9fcd57 - stable/15 - dtrace_io.4: Use bio_length instead of bio_bcount in examples 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2bce3c9fcd574654681a81a23e31eca991815686 Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bce3c9fcd574654681a81a23e31eca991815686 commit 2bce3c9fcd574654681a81a23e31eca991815686 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-26 16:52:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-14 14:27:01 +0000 dtrace_io.4: Use bio_length instead of bio_bcount in examples Tracing bio_bcount makes little sense for some devices like for example md(4), as it is set to "0" instead of to the actual I/O length. markj@ suggested the following DTrace one-liner to identify some cases where bio_length is set but bio_bcount is not: dtrace -n 'io:::start /args[0]->bio_length != args[0]->bio_bcount/{printf("%d %d", args[0]->bio_length, args[0]->bio_bcount); stack();}' For future reference in the context of bio_length vs bio_bcount, phk@ mentioned in the code review that: > the original intent was to get rid of of bio_bcount Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53365 (cherry picked from commit db25448ab9ffa8bfe52d852674cc466494b849d1) --- share/man/man4/dtrace_io.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/dtrace_io.4 b/share/man/man4/dtrace_io.4 index 30ec44768fbf..1699cebab8e9 100644 --- a/share/man/man4/dtrace_io.4 +++ b/share/man/man4/dtrace_io.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2015 +.Dd October 26, 2025 .Dt DTRACE_IO 4 .Os .Sh NAME @@ -84,7 +84,7 @@ The following script shows a per-process breakdown of total I/O by disk device: io:::start { - @[args[1]->device_name, execname, pid] = sum(args[0]->bio_bcount); + @[args[1]->device_name, execname, pid] = sum(args[0]->bio_length); } END From nobody Fri Nov 14 14:27: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 4d7KGf25f7z6GWCr; Fri, 14 Nov 2025 14:27: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 4d7KGf1cqYz3QQs; Fri, 14 Nov 2025 14:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763130442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxZ8OzUDm3zcD9BpK7krw21wduUu90iiRisg2zR2GhA=; b=v5NNWTTIzPiJFDRn+6GtOxJ6lrznTLVXZsfkVQArRBGVFSfr7ohKckXeG4rMQHce8iigNm nga4ya5Bk5eOf1kqeNJslpSUJKik/6HxQV2QS42aJCx/4D6zhJ+EIZtxgwIeripiRSiL6H RRHlJAkn+/LoPhfMJpJn/qrercf50hdFJqzEFk7BHPUmZfmM5JhNgwfmS7Tu58HQ4uOKOo eHthub940jMi/yQa4cUlCrtd10SnIm0RVIQ604gqd8RsPUX69KlwB3VhXNmFI4HlZzNpHv 5FOYTktRZw8gKK3PFPsgvNu/Mxu/JaNr1sdoAA0RPaS1Axuj9yRc8ZGIOp/9DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763130442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxZ8OzUDm3zcD9BpK7krw21wduUu90iiRisg2zR2GhA=; b=WHBGm77+FTdP2vTdyW0Bi6gA/5GZRd7dtHevF9qEIsv0kbCP+vJvZrzYtKRn0TVLK+L4eD UwGKeL5YeIbSSYbClJShziC3jJ2wb5xWUasbafCcN+17inpCtPL1snEJyfv0Q4b6htmAQl 8iL9dJl5fWRmWZ3EW8aNsvsEc9FbD5yguYpqwutJ1khqpNFl38YkeqcQqjSr1kgDxdjNod xnGsFj3+2xlaDloZW5wjUDMY4pZQoR7vfX/ih02QdcnuIwPohXpuuBHDa8uqYLP8SEEega mfTtHD3n+i1FoHoF+NcaoNt9rDPgf058zSNH6qxkBL7+163ZAids2Q8hWI2adQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763130442; a=rsa-sha256; cv=none; b=HndQGhiI2rgqmFhje7yUcK7Gsyi96L6vpmDjvkq7QaBdKCXRgUa0xX9uS6eF/j7w0He2Mn /i/dsUK4RMtqOfQ82Q7IkACVJta11t7AtU4i0TIwHVFIthMa+HF6DFNwnZmuAAfOghitkU Ki7/QaSPiJpMnEgWhPKbY2boV3GUu7rfgFsNgAfub+g5lVmlJuzUtsgjoUCLH2Vc+mBSfF uY3fXrOxZockymlnK+WvtLwsjGBmNe/tUPJfUYEAjPMtK0fH+pcut2oQh1Q8B6C10X4BYs XUjD+4tqwUR/9xZ44mKeMxwMiGwWmJMNmFZfSpyxTo6ZpmY7OZ49McRZ1mPXVw== 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 4d7KGf19tZz18Y7; Fri, 14 Nov 2025 14:27: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 5AEERMAG038404; Fri, 14 Nov 2025 14:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEERM5Y038402; Fri, 14 Nov 2025 14:27:22 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:27:22 GMT Message-Id: <202511141427.5AEERM5Y038402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3078279c3336 - stable/14 - dtrace_io.4: Use bio_length instead of bio_bcount in examples 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3078279c33369c81b5391410936572b70715fcd8 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3078279c33369c81b5391410936572b70715fcd8 commit 3078279c33369c81b5391410936572b70715fcd8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-26 16:52:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-14 14:27:17 +0000 dtrace_io.4: Use bio_length instead of bio_bcount in examples Tracing bio_bcount makes little sense for some devices like for example md(4), as it is set to "0" instead of to the actual I/O length. markj@ suggested the following DTrace one-liner to identify some cases where bio_length is set but bio_bcount is not: dtrace -n 'io:::start /args[0]->bio_length != args[0]->bio_bcount/{printf("%d %d", args[0]->bio_length, args[0]->bio_bcount); stack();}' For future reference in the context of bio_length vs bio_bcount, phk@ mentioned in the code review that: > the original intent was to get rid of of bio_bcount Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53365 (cherry picked from commit db25448ab9ffa8bfe52d852674cc466494b849d1) --- share/man/man4/dtrace_io.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/dtrace_io.4 b/share/man/man4/dtrace_io.4 index 30ec44768fbf..1699cebab8e9 100644 --- a/share/man/man4/dtrace_io.4 +++ b/share/man/man4/dtrace_io.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2015 +.Dd October 26, 2025 .Dt DTRACE_IO 4 .Os .Sh NAME @@ -84,7 +84,7 @@ The following script shows a per-process breakdown of total I/O by disk device: io:::start { - @[args[1]->device_name, execname, pid] = sum(args[0]->bio_bcount); + @[args[1]->device_name, execname, pid] = sum(args[0]->bio_length); } END From nobody Fri Nov 14 14:43:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d7KdH0hf8z6GXSk; Fri, 14 Nov 2025 14:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7KdH03mQz3Vhn; Fri, 14 Nov 2025 14:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQlozGYXjHyg5uGJWP33AICwtALiALW+OOJQNj66KIY=; b=FjCQldrAeozAxusgR9KkkvwuJxxLf0E/RQM0vGOtnPyom5+q5DXgxfkJaX+1jzRCHCLdwM Mm44YevBOojkzM2729s2Z0K2wwk2OMUte54VxEMNM89UGtk5FWE1JtM8OuDHBCs+UzIX1y aK9mlZz8a/rzU2sJeLPPjk2u5bS/5vBRUwZv8JMtjmgXXH0jy9xRLfQs99nUSfcg0DevJF QrEOlqoqL0uuoAIE16xxg+WJ4FLkfHTYAPG+KjhDBK2RII3FLjqYp3k1CMQMFD0BjYCpn0 7+zwOKBHgvrvzyWASJMHVZXE673qrxMwJ7SJ4srJa6UKO3fB+L/1XO+Dw5c9gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQlozGYXjHyg5uGJWP33AICwtALiALW+OOJQNj66KIY=; b=uXyWhAws40jb1UYqlFGi6q9aiWCq34bljJDksixm4vItXG992flGoZ3WWIxyafg3x1v5KJ BKuV1vXQVbyFhKx4+pvAqhxBc07n6I7djW1afBdl4HRXCuzKMF+I94yln1+NoLFQKXc4rJ EYcOSxWS+9CKPmWYDu97f6BpqqiiuZOpv2wM/LjkqgwhkLHHfUX272Z0JWbLC+vzMz3+R8 EMmI+Zs87Katlk0g33fsFMXBun2hmPokVeI5vgrw5kmHUSlvNMUznvnOGEkT6Qzw74qArp VOuPv+/PoTjPla7cLp+POkJI+2cr+q/dU5T6q/1yBFXXNzYSVXK+9reU7h0HFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763131411; a=rsa-sha256; cv=none; b=Qeflx5WvpdLNfRGOwohrq77Ke3k7Q8IUWx8jUw6cKoiK5o7bb9iJ7zOEa+sLBKomZ86tlc etxnpJxRAv3Tmj+EuFtVbr3iBLYpSr6pbRf1gpzDhSe9BNPyG6M+iSrpxTzmLAH+yao5W1 HO9K4oSLgheS8RVyTv/S1nvak6HqiIM3l7H5wWv2x3nUY+salVK6uswcq2cpaR8tnD52vY z+kYQV/ajhai8QZYSaMdx0pmRthfYMmZzM49ZO8pHkHFmqc4XHC5lwNNZr73fbeDX0CcMk ZY/yg2XXrfxojnTlZuqO4O+/fY9pFXHQ+Q78vR8XUNH4CZMzKqVsnivSX1frQQ== 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 4d7KdG6nFHz19Bb; Fri, 14 Nov 2025 14:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AEEhUJR075637; Fri, 14 Nov 2025 14:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEEhU7m075634; Fri, 14 Nov 2025 14:43:30 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:43:30 GMT Message-Id: <202511141443.5AEEhU7m075634@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: 1b51ad67cd0a - stable/15 - cd9660: Unbreak symbolic links 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/15 X-Git-Reftype: branch X-Git-Commit: 1b51ad67cd0a85aea8351f86c6a724037eadc1fd Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1b51ad67cd0a85aea8351f86c6a724037eadc1fd commit 1b51ad67cd0a85aea8351f86c6a724037eadc1fd Author: Dag-Erling Smørgrav AuthorDate: 2025-11-10 13:58:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-14 14:43:26 +0000 cd9660: Unbreak symbolic links Since the introduction of permission masks, cd9660_getattr() returns a size of zero for all symbolic links, because the code to retrieve the length of the link target (as required by POSIX) is dead, since we strip away the type bits before we try to use them to identify the file as a link. Address this by checking the vnode type instead. PR: 290556 MFC after: 3 days Fixes: 82f2275b73e5 ("cd9660: Add support for mask,dirmask,uid,gid options") Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D53598 (cherry picked from commit 978aaa72f3196f5489630052762cac5a7863e774) --- sys/fs/cd9660/cd9660_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 4a2b80a7ccdd..92ea6d2b4501 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -193,8 +193,8 @@ cd9660_getattr(struct vop_getattr_args *ap) vap->va_ctime = ip->inode.iso_ctime; vap->va_rdev = VN_ISDEV(vp) ? ip->inode.iso_rdev : NODEV; - vap->va_size = (u_quad_t) ip->i_size; - if (ip->i_size == 0 && (vap->va_mode & S_IFMT) == S_IFLNK) { + vap->va_size = ip->i_size; + if (ip->i_size == 0 && vp->v_type == VLNK) { struct vop_readlink_args rdlnk; struct iovec aiov; struct uio auio; From nobody Fri Nov 14 14:43: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 4d7KdY6yzHz6GXhl; Fri, 14 Nov 2025 14:43: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 4d7KdY4KjZz3Vn4; Fri, 14 Nov 2025 14:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mKWv7wGjseZUhd2l1QaWWntf8b+dEO0V4TwK3/2sM9o=; b=A9J92uNNPPVzxKrTRCUsf/7aeov550zySSf15L4fwdfBhxyqHf4fz9BU0p2Kv2DyIZMSrW wtsOYKhcLvkppA+SF38w5KeFI1Fnj812DRdM+JYapLhmumhlGtX0tKch6Y+ZuG8pNTxtCH LRjDCO0QKDICFpm0Yy1ES7jf0hUtkv/y5P0XBSlLDsPdDAsRy/wBxl2Wl7u+MgSdOW/Y1e /1ISy9WbLHX/4KnnXNPsb/xlAGEzmAhJKFp1872BvsG765wsvlocmnfbYbgEVZCb8gdPDi ofHeM2fFMVjxEvrijEt79+An/WWnX3V2i4CwZjXyQO/U9W2aZAilsBk81E1uGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mKWv7wGjseZUhd2l1QaWWntf8b+dEO0V4TwK3/2sM9o=; b=I7RQmJy5zwLBCmDs64QQBkTK8zECCkM16RfWc9aS6BIbAzbMXtFUUQSTp2U50q2F+QiNlS yFwrrYOumXpg7b0zxGahHgNBEtC/PREkDplD2XZQLjAcKnz0M/r74tBOTcfohNhaMLjVTm CSyF+3X8edEoZ3UPLnqzdA5OmXwWzi5gXfoJxlQQvZFttmPbo5Fc/8fcF8Sl5sDiPBs7O6 t1oHspAtZg+tvmbFBFDu/FNNe51nhMyz7wpYrfWhH9wKE9uTFXo1A17f85mHhgAuvplseX Mo/S3MkwkRIBKfb98RsPzRYj6dLotrjaRcap5pbt9zYwJx4Hmt1Cw8+r0CFBxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763131425; a=rsa-sha256; cv=none; b=RwoOY3bDmJkU+nhArzGyXUx4YYertgtBINocZmMAG39FoBfoEDwHmKwAmdJTRAFvmdr0I2 hhL/EwZE4TbuE1j1JqFGPvA+/FrJJIs0hRulQfbOkX8LiZqobdrE+7FifpshlMEMI20Yt3 JlkgCWF0/6lGSLfafpQDvpdy+ne3ww+llWd1GOSGQC0tKI9Qh9VMH98MQyO4Y0H3BM5ijd gvRCze7PWIRe509bFnv7U5MQFvzFK0BlxKBKmLBXDvFq8Ffbn9DPvequddbFI4L8Vnq4t3 aiDIqdfHsuWjf1AIWD6+7Y78RQV6ZooD/Z7iSt1BIJ51X/VofHEH5W5jYwFLVw== 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 4d7KdY3wZCz19Nr; Fri, 14 Nov 2025 14:43: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 5AEEhjA9075859; Fri, 14 Nov 2025 14:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEEhjXE075856; Fri, 14 Nov 2025 14:43:45 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:43:45 GMT Message-Id: <202511141443.5AEEhjXE075856@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: 0f910af01969 - stable/14 - cd9660: Unbreak symbolic links 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: 0f910af019691bb829ebc8aef868e1d97c379462 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0f910af019691bb829ebc8aef868e1d97c379462 commit 0f910af019691bb829ebc8aef868e1d97c379462 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-10 13:58:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-14 14:43:38 +0000 cd9660: Unbreak symbolic links Since the introduction of permission masks, cd9660_getattr() returns a size of zero for all symbolic links, because the code to retrieve the length of the link target (as required by POSIX) is dead, since we strip away the type bits before we try to use them to identify the file as a link. Address this by checking the vnode type instead. PR: 290556 MFC after: 3 days Fixes: 82f2275b73e5 ("cd9660: Add support for mask,dirmask,uid,gid options") Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D53598 (cherry picked from commit 978aaa72f3196f5489630052762cac5a7863e774) --- sys/fs/cd9660/cd9660_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 4554f844104d..7f7468487b26 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -196,8 +196,8 @@ cd9660_getattr(struct vop_getattr_args *ap) vap->va_ctime = ip->inode.iso_ctime; vap->va_rdev = VN_ISDEV(vp) ? ip->inode.iso_rdev : NODEV; - vap->va_size = (u_quad_t) ip->i_size; - if (ip->i_size == 0 && (vap->va_mode & S_IFMT) == S_IFLNK) { + vap->va_size = ip->i_size; + if (ip->i_size == 0 && vp->v_type == VLNK) { struct vop_readlink_args rdlnk; struct iovec aiov; struct uio auio; From nobody Fri Nov 14 14:44: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 4d7Kf50Ptlz6GXLW; Fri, 14 Nov 2025 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7Kf45h5Kz3W5Z; Fri, 14 Nov 2025 14:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RDVSwqSIzhTlseMjfbusa1Lz5c/2WUCBRDisP4nOZ8=; b=wHoYxdD7yM72Wlrf5ya88D3PqBmnOVhXPPKYcmsLPImcYM+Y8HWW2X6gf233gkRIZyVV8g ZvdmL+NHuxpkU8S59sTH+Vml7J1O7p+0Jo5c0lzco1y4+EjcCMFmQiRCzj2JCWKpP6GTKi PXfExFppfzSJqidXyUQ0HvGxHDj/ZizyipA+nJrjeGbaxRjBonxjk6uALT3FTZ3TABn+E1 phlmH1vINQ4k93IPaUMoS8TPEVY71A2VhtK/0NMyKCtFwy+16K1UOHzPn2aexwpdNZ6n0W FK8QYCiWKAlGvP8EiDfe+75pI5Wa4+AnZJSFDOqM+VBwUp0ORuSHib6on8I/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RDVSwqSIzhTlseMjfbusa1Lz5c/2WUCBRDisP4nOZ8=; b=FRVfAfU/xwMUdFRxJ82bEx4Pvtd1MrBxxkoQFGsWMvfVUOTfjR+jkJg8b7lDeZJP2wh774 znf2nLrpLNihFJIMSk57+3N/bMOcODtpJQBez/B+CQ3pCDgRbxe4SbFLRSqMu8pgO1AY/T CCsI+Gbw2eGE6HVsGcvtq7P77YjzWfQSw8wU1LkJhcYl884LWXX7z+a14alNM+3Bm5oz7w 1ciVhQNdaroqJ/h+CYzp+kCs2KQ2XMP7Fte0phajkpIYgF0AwnJc0BBNlht9xwaWfb9Kub uk+ruxZOga1Q8hgq1wMujc9NnirkCXbgcyqh0RlICW4gY1UMnwilL3ef9MGMsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763131452; a=rsa-sha256; cv=none; b=W06ZdeA3LqIuEDKB866taOEsDkjf4u4ez4sam+ZjB135dEmUGjpWNaLNLc67N5jhD/sk8F +vqnJDIA3zCjIhRK5VtF48hqzcxXp7gZji6NU8ZNX8xyLkHmvEC0hBke3YOkjXtNsH9rYH skb19+ObwhjCqh84McuGFzdMbaevCaU1LV248mN1T2k/ffQ2SGl59Wyw7ikez97HUO+h1a Q3LvjLvLsG6qiw2+nVc4TBFIkGReLhvWTfRYDDq/wo020BhB95SoykeT14LQqypfDL0Kwd 7cOf3vyt+fNKhLASEFvJy0kLfq0ReRiwOZ1nXvVLQZvMLzTa1bX8J77K6NPoKg== 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 4d7Kf45HKXz19Bd; Fri, 14 Nov 2025 14:44: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 5AEEiCY8076162; Fri, 14 Nov 2025 14:44:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEEiCiG076159; Fri, 14 Nov 2025 14:44:12 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:44:12 GMT Message-Id: <202511141444.5AEEiCiG076159@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: 3e8d5f360824 - stable/13 - cd9660: Unbreak symbolic links 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: 3e8d5f36082414373462743d775db005daf07339 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8d5f36082414373462743d775db005daf07339 commit 3e8d5f36082414373462743d775db005daf07339 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-10 13:58:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-14 14:43:53 +0000 cd9660: Unbreak symbolic links Since the introduction of permission masks, cd9660_getattr() returns a size of zero for all symbolic links, because the code to retrieve the length of the link target (as required by POSIX) is dead, since we strip away the type bits before we try to use them to identify the file as a link. Address this by checking the vnode type instead. PR: 290556 MFC after: 3 days Fixes: 82f2275b73e5 ("cd9660: Add support for mask,dirmask,uid,gid options") Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D53598 (cherry picked from commit 978aaa72f3196f5489630052762cac5a7863e774) --- sys/fs/cd9660/cd9660_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 60b33fa9a493..a645c893524b 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -220,8 +220,8 @@ cd9660_getattr(ap) vap->va_ctime = ip->inode.iso_ctime; vap->va_rdev = ip->inode.iso_rdev; - vap->va_size = (u_quad_t) ip->i_size; - if (ip->i_size == 0 && (vap->va_mode & S_IFMT) == S_IFLNK) { + vap->va_size = ip->i_size; + if (ip->i_size == 0 && vp->v_type == VLNK) { struct vop_readlink_args rdlnk; struct iovec aiov; struct uio auio; From nobody Sat Nov 15 00:27: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 4d7ZbR3RZ4z6Ggvb; Sat, 15 Nov 2025 00:27: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 4d7ZbR2qVmz3mrb; Sat, 15 Nov 2025 00:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763166467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU35kqq40h2p8aPKFAf6rfOd8hM0iiKfGOFyF4fqN60=; b=uvddlkJDih+6/i0chdW7r6qMFjBPqWW9jU+211V2HCfw8XllAVBtjqU3hM8Il25KE845PL 4ad5Bpq4W9+zt5EFoIq5tHauGZsHqZTuIm9XnzVS5dZmlJ1pMPao9adZKJ7GmouPZWeUIZ narViIHYC+qK+n2v9ahpJmyaCwiTZ8k20t9hIs1UkWoUwLnR64eeTxHN7ufCy6gqljeO7s IiYYcXS9hkUFCQOPZfrExHq+CwpURP2Ohc29hBM/R2Lngj8DfDJonuaXlRtlMtel0HnD/3 QE45r5JP+6/YjpEvoXnCzqlCHZOa/Lza3O+1jzYhUkrGw0k0ZZGOln8On/XNZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763166467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU35kqq40h2p8aPKFAf6rfOd8hM0iiKfGOFyF4fqN60=; b=GNh7IuPOv67qm95NpfeOEDfHSRjf/cUqCdZrYM0CfoSzJXLVn4iE50phSRyAw4pTk2yJ23 hD8/RpYu6f3mrbfQu+IP2ZACyWrwKlvp9MOIa2Gq2D6k8H+a+P5pyKx9gOsRvBGyM5MbLJ i9a5mZrvNzpnNlgG52V6qYejXxuzrKFSYQs8rpW75ceyTFFYDecqCExc7FDN8pddfUowEF ZtNdFgR92CVSLgP/ijufFFXzRgLu7H8vSgnGGHFC+GoNOVRQCi0ad7hBFMOlaD8LKJtpWU Ii/Wgwg9F8Tj+Ss9i6PMBBlZw/06H4BvO6LqJDi9JcemYyM9mFS62PTR+lmPVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763166467; a=rsa-sha256; cv=none; b=B56ibH/Q6HGLHcB8PLgBsPWLxxluy/KCiANI+gg333nY2WEk0tGdEIBLDkL9phWyHfXpO8 haDV7QcIbagsF6DFW2lTUCy4UIq2Pon5tEZ2ndclCIl8QMpN97Ak/mvmNh15rGBL6jHMZh aMVb1xu3kW+TTbbgKPoo+xW/yNcmw5Iy3U28uNLhhObKUcLbHzFgd9j48V3VlKJ0Lp73PY zHhqGAhE3UGJ/7YRo1Pi0acy6dCD3JGcxGcEqpnl+/jxizHO16c+Kz5+35IFqpZhWRgWEk ZvR5hpiTolrrjCu1Z5nja+WY3sY9bvii3g7I8N+MZpd3qZeb7NDJFyhl8zfJ8w== 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 4d7ZbR259vzDLd; Sat, 15 Nov 2025 00:27: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 5AF0Rlqx066224; Sat, 15 Nov 2025 00:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF0RlAT066221; Sat, 15 Nov 2025 00:27:47 GMT (envelope-from git) Date: Sat, 15 Nov 2025 00:27:47 GMT Message-Id: <202511150027.5AF0RlAT066221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 1d678ba57569 - stable/15 - lam: fix using stdin more than once List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d678ba5756978240140beb5c1ebd38bb778ed66 Auto-Submitted: auto-generated The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1d678ba5756978240140beb5c1ebd38bb778ed66 commit 1d678ba5756978240140beb5c1ebd38bb778ed66 Author: Kyle Evans AuthorDate: 2025-11-14 14:36:20 +0000 Commit: Kyle Evans CommitDate: 2025-11-15 00:27:09 +0000 lam: fix using stdin more than once Historically, lam(1) closes stdin once we've hit EOF the first time, which would stop it from doing anything else on subsequent gatherline() calls with another openfile. However, this doesn't seem to be strictly necessary- the EOF flag on FILEs is quite sticky, so we can assume that a subsequent fgetc(stdin) will flag EOF properly. This 'fixes' the below-referenced commit in the sense that it surfaced this problem as a fatal error, but the issue was pre-existing. If we do `lam - -`, then one gatherline() will fclose(stdin) and set `ip->eof` for *that* openfile, while the next one will then observe that STDIN_FILENO has been closed and turn it into an EBADF. Add a few tests that were easy to snipe while I'm here, but I haven't aimed for anything close to exhaustive because I think re@ would prefer this fix go in sooner rather than later to land in 15.0. Minor style adjustment for the previous commit while we're here. Reported by: cperciva Discussed with: jrtc27 Reviewed by: des, jlduran Fixes: 4472fd66d006 ("lam: fail on I/O errors") Sponsored by: Klara, Inc. (cherry picked from commit 6a9452c8378a1aa767708ad2d235f847c880a21c) --- etc/mtree/BSD.tests.dist | 2 ++ usr.bin/lam/Makefile | 5 ++++ usr.bin/lam/lam.c | 5 +--- usr.bin/lam/tests/Makefile | 5 ++++ usr.bin/lam/tests/lam_test.sh | 59 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 4 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 520b41c8b88f..41151d35e518 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1163,6 +1163,8 @@ .. jot .. + lam + .. lastcomm .. limits diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile index e47ea0a98eaa..faad910f2202 100644 --- a/usr.bin/lam/Makefile +++ b/usr.bin/lam/Makefile @@ -1,3 +1,8 @@ +.include + PROG= lam +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c index 2194ae7ab596..c1221ca92d0e 100644 --- a/usr.bin/lam/lam.c +++ b/usr.bin/lam/lam.c @@ -213,11 +213,8 @@ gatherline(struct openfile *ip) *p = '\0'; if (c == EOF) { ip->eof = 1; - if (ferror(ip->fp)) { + if (ferror(ip->fp)) err(EX_IOERR, NULL); - } - if (ip->fp == stdin) - fclose(stdin); morefiles--; return (pad(ip)); } diff --git a/usr.bin/lam/tests/Makefile b/usr.bin/lam/tests/Makefile new file mode 100644 index 000000000000..8d41af5e6e09 --- /dev/null +++ b/usr.bin/lam/tests/Makefile @@ -0,0 +1,5 @@ +PACKAGE= tests + +ATF_TESTS_SH= lam_test + +.include diff --git a/usr.bin/lam/tests/lam_test.sh b/usr.bin/lam/tests/lam_test.sh new file mode 100755 index 000000000000..bf3998a42d11 --- /dev/null +++ b/usr.bin/lam/tests/lam_test.sh @@ -0,0 +1,59 @@ +# +# Copyright (c) 2025 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case basic +basic_head() +{ + atf_set "descr" "Test basic lam(1) functionality" +} +basic_body() +{ + printf '1\n2\n3\n' > a + printf '4\n5\n6\n' > b + + atf_check -o inline:"14\n25\n36\n" lam a b +} + +atf_test_case sep +sep_head() +{ + atf_set "descr" "Test lam(1) -s and -S options" +} +sep_body() +{ + printf "1\n" > a + printf "0\n" > b + + atf_check -o inline:"x1x0\n" lam -S x a b + atf_check -o inline:"1x0\n" lam a -S x b + atf_check -o inline:"x10\n" lam -S x a -s '' b + + atf_check -o inline:"x10\n" lam -s x a b + atf_check -o inline:"x1y0\n" lam -s x a -s y b + atf_check -o inline:"1x0\n" lam a -s x b +} + +atf_test_case stdin +stdin_head() +{ + atf_set "descr" "Test lam(1) using stdin" +} +stdin_body() +{ + printf '1\n2\n3\n4\n' > a + + atf_check -o inline:"11\n22\n33\n44\n" lam a - < a + atf_check -o inline:"11\n22\n33\n44\n" lam - a < a + + atf_check -o inline:"12\n34\n" lam - - < a +} + +atf_init_test_cases() +{ + atf_add_test_case basic + atf_add_test_case sep + atf_add_test_case stdin +} From nobody Sat Nov 15 07:18: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 4d7ljF392zz6HGb1; Sat, 15 Nov 2025 07:18: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 4d7ljF2b6Gz3JNw; Sat, 15 Nov 2025 07:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763191105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mD1Mb/LIqQV8gKHb5AG3DnLWWTyzmES43cc1kzp3ID0=; b=DdxJL7ks223Axe/7EeY1utSB3W9heXtSsRW+211TZeWE3J0Aa+Z4+33w829Vv6IRtyC0s7 LqzD0SbIQ/lSvvEhKA5+Ovz6qdFWtbmQxMP8goJwL0dESWsGI8XMhTK3NeispMiZsWhtfY rbUn88DA9ORYmJkMcOoWX6PJY+rZjdJD83efCWfx0vivKDEAWcukDLBhudiNMLMHLO7PD3 k+GTeerek5WDUhcunslmH86vFrMqvfQsm7ijbSuSsalFkL1nAy3rOLKb7aDC9exEuq2dBa tY2gD+da2jvC78VVA15MEV5AgOc/GcTdVYj6WZmXZoGEngJw723Pqraq1tWTqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763191105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mD1Mb/LIqQV8gKHb5AG3DnLWWTyzmES43cc1kzp3ID0=; b=fdr5lS5Umi1xENEafN6JPTPT1SiqtONs0h8Q6wKTdKGWheoxwN7bvJ/KtmiqJibIoDoeXq wpkJwPiv2sSaROcjnWuv8ptkPM3gq/PkezDqDxwmgNQ9e1V5qmo0QwRsFdMt+lL7Dsg63Y frCYZ2/+mk8TfJGZNhvk5ILTeC23AHvginkCHEEkfCG0gXNb1B/Xlw4vkHvOmdh9G/Gm0k GuJ3Qr3sqJjwc4bsFpbJTX6/LBuHS7z/ceieIx2PlRvbBAkZVboM9h7A3OuliYku52F+S1 P1INIGMt3beylLO21oCx8cgDvaL7/ZUjgSve3Zot+W9wvGgP0Gequ1yh/xW+cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763191105; a=rsa-sha256; cv=none; b=f/l4augyUGCs+peyHZE4NjjoAGlBUnaUnVKdQvoBvWForvZeJvGnR3f+fdx/2iJ60djKbk ODSTk3pgL6FChOdz3DlfKLqcLAqPEOknd336qyVYSt+1R31auLtQnOJZ3k3GCVRsFHLsIF V9V2sLmJ1v9x35Lp/pxyvVdmQxtqgUuZMCqaL80Xle/twYB7r0XfMrwZR0t2Nl7ljSN4FM R9n4Y+vWEZCQKmIo0eshd3lsdD05w2BgXV0I3LVnW/TiCB+qFPDoFPx73JlxS78StqsO1d rFoQpMIvNLaKDQzABuG3qHLXTzpZChwcThLt4XfPhXbx6N/ralo8S5Mrwe6vjg== 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 4d7ljF1Svgzjc0; Sat, 15 Nov 2025 07:18: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 5AF7IPMa038374; Sat, 15 Nov 2025 07:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7IP36038371; Sat, 15 Nov 2025 07:18:25 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:18:25 GMT Message-Id: <202511150718.5AF7IP36038371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c35cdf78f88d - stable/15 - dtrace.1: Document DTRACE_DEBUG 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c35cdf78f88d16892d68e71c28459d7e331c8275 Auto-Submitted: auto-generated The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=c35cdf78f88d16892d68e71c28459d7e331c8275 commit c35cdf78f88d16892d68e71c28459d7e331c8275 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 22:41:44 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-15 07:18:17 +0000 dtrace.1: Document DTRACE_DEBUG Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53627 (cherry picked from commit f811c0a555546e4154dfa159e8f56b3ba1c70d0d) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index a4c4fc52b165..2e7eeeadb86b 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2025 +.Dd November 8, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -1252,6 +1252,14 @@ command line to define a set of macro variables and so forth). The additional arguments can be used in D programs specified using the .Fl s option or on the command line. +.Sh ENVIRONMENT +.Bl -tag -width 'DTRACE_DEBUG' +.It Ev DTRACE_DEBUG +When defined, +.Nm +will output debug log messages to +.Xr stderr 4 . +.El .Sh FILES .Bl -tag -width /boot/dtrace.dof -compact .It Pa /boot/dtrace.dof From nobody Sat Nov 15 07:18: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 4d7ljq4vg6z6HGrn; Sat, 15 Nov 2025 07:18: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 4d7ljq4612z3Jhn; Sat, 15 Nov 2025 07:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763191135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFJbiKZTh+LTFaimuMUukq22qPhllbkXJ0Qrn2D36Z8=; b=NEg8zBFSt4IXkTWUto1qiTgf7/ovJYNTjP3dCy12XM3B4Tmo3NM2ru4p5xEtRdMQzCmzfK ETmhJFwi2+nwPXhDT1H02E5PpMdYR4H51Bj5NIOCX4QHP7UaGkwTjYPF8/FqxIE5pmTX3r uUrhcLBTkNShZ6uoOnvTvmjcpgpMdg9UxqJFDu1tqnseIFRimIco4xuY6rmr9YKR4akJex iqlJOSuvbLJRmKyHKsdXmbiCoFR+gL4uusUEHQKj6qjhyOw5MWro/RvGv1sjmV7vcsJ4iT pV7jwEKnWzQwtE47OSgXTy5hnorpp1ZFoC+xNxAYnbSD+RrbYKw95v6Z3sQLSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763191135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFJbiKZTh+LTFaimuMUukq22qPhllbkXJ0Qrn2D36Z8=; b=yUx/YhfPU2mxFyXqhjx/glI7VOpOwQrJqcLrvPiB2pZdZZNupzwKahevPwITcb/rnQyCMp ZgSOnPHAGCpQLyZVIbU99oJzx08o6xszzyf/uaj+G3JawmMvhDorv2ubG9JfNuyuXzjeTm mIy4HHrLjIDk9p8zQ1WXbpfDaAH6YfAAL3a2sZq5RZqDHwp+mPPN9Ks6gliVzmcO9pD9vz d0XdEpo/0M0q6eZiAftSFATidutA5WghutfQaxcZSDGv4cy0tnBeqg4559wGv0jq/eHgWG oSv39aeHXK6cWPZi3AfTqqmcuoG0TvKAW/qNkW9ES17iSN5ZW388FnM6zXasYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763191135; a=rsa-sha256; cv=none; b=JEXCTVMDbVrYfOT78evnK1awyUlJZIX0co0zEyhOEmkvk9kGcZnCd7TqNBWlegSZxNkYHK 04a/rQpVnxHIOTR/SLnjz3Khs5RDkATwAYYf7CBsZ+YU3dOGarv0/HYbWxzzBHg7LV+dGX eJ2xbeD6mb2Z4JYgEufG8QgmMXNmkdJXWAhyeE0duYW4QgKQkuR+KUhWDpnMyxiUv+sY86 2bV95e004cJy8BbqLT/6uy8Ds1S935HekpV1LkOVSYPTM+jvRGnRPzjYQcl0CZAIBAla8r RprHC5XGFO9//Z1zgQYy9S5Ur4lHAK2ZPRv0WkdId6XP4G1V5bLCKVoWBnmiww== 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 4d7ljq3hkJzj2g; Sat, 15 Nov 2025 07:18: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 5AF7Iteh038653; Sat, 15 Nov 2025 07:18:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7ItiG038648; Sat, 15 Nov 2025 07:18:55 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:18:55 GMT Message-Id: <202511150718.5AF7ItiG038648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: dc8adef23944 - stable/14 - dtrace.1: Document DTRACE_DEBUG 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dc8adef239445fe84acda2b0671f086e3dfb030b Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=dc8adef239445fe84acda2b0671f086e3dfb030b commit dc8adef239445fe84acda2b0671f086e3dfb030b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 22:41:44 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-15 07:18:51 +0000 dtrace.1: Document DTRACE_DEBUG Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53627 (cherry picked from commit f811c0a555546e4154dfa159e8f56b3ba1c70d0d) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index c2443bc86491..68b3a7f5f9bc 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2025 +.Dd November 8, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -1252,6 +1252,14 @@ command line to define a set of macro variables and so forth). The additional arguments can be used in D programs specified using the .Fl s option or on the command line. +.Sh ENVIRONMENT +.Bl -tag -width 'DTRACE_DEBUG' +.It Ev DTRACE_DEBUG +When defined, +.Nm +will output debug log messages to +.Xr stderr 4 . +.El .Sh FILES .Bl -tag -width /boot/dtrace.dof -compact .It Pa /boot/dtrace.dof From nobody Sat Nov 15 07:19:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d7lkX5TSnz6HGf1; Sat, 15 Nov 2025 07:19: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 4d7lkX3WqWz3Jrh; Sat, 15 Nov 2025 07:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763191172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWYUR/CdE4eXgNvz4RkYkRNA/41mrKZsnb8i63CmFbc=; b=F7Mfqz7j76gt0QhKkRgcIdm290ayrVXct4fxpZn/sOcOtxQ8V5jAVl6qWgwKyzwU5F/Ff/ s0Vz4yt9NJPehioyXMtQN3hUjQgz8wK8tnpR+Q2yIefGkl4/hHrwpvAd8YJuH6Z3gaHzT3 GTX+6mwNmJyIzYgUoE+/jrY4HRezfKimtsuSDKsRhAPSl1/rWIGVy1iMQYGJQbWcrN+D6u rvxXNiPQ9qDH7h0wzDuZt0U0X5sP9AaYrgz5RRHaBCVT4v10+SegqOlGU1mPdx8NQGbAPs OQK3y8uispVnzroTLiG+T24VJzEWLkgdoUTzXstVhYWt1dKBR51k4uCVeFnEig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763191172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWYUR/CdE4eXgNvz4RkYkRNA/41mrKZsnb8i63CmFbc=; b=Ngb4nuUvtFWJvuSJmCcEC48lKRdTgZTywZoZ8RGLoxeE9Ff98nnnOHy9hsMu0Jv6Izyzs3 OzyLUdxN6YI4P3siaVBvrhIyq7KmbrfFA4OpF3KcK88bCvXDE+WZ5fGzaShkZcCNNOo+3R EfcEgAmjcjzehbDj1NRndUXey/3+yYj3rKpZ9XC3D/UVXqU9VzWnlzbYt4WpzQOZzHpey3 NoF7eKH+8rTLOaZwblrZ3lvbgaUl4g/gX9cEo8+vfb1Jv+RizNlMgzgqrkJeZPJEiosf6O 3anlWR6Xq4boEPByHs1cggSJx0AbsanqrVysuXJ48mK8O4YqhUwo3thLztDRsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763191172; a=rsa-sha256; cv=none; b=DIwM+tELqLBEqR9NUDMh4aoBv/i7FjWao4p9AzHF/fqFCHeh7sk7fOwcemRcIqnJFjQlJU FVK+oNyU5M818zz+FOgklKCBO0IKz6TC6SUNQMa12N8HST8pBj2pTcDkxXB6gmcVZklcso tKONNBGZ9FakXidiEuPhb8htKnyL/E2xbObhecEh4Bn+i776qUmOSgdLwS2hjG/qSV6C1i LL4Mg8Ven8WAI+lSkk1HM46qGTbwuq6zZLF2lE/ejRkLjTmv0QVJKh25mTr2T7IvrDc75V hWlv475kMXzY/ni34z3rb7d9/td01uPKmOW+QXLSeUeIafWBl9WRBQUnnFvEsg== 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 4d7lkX2vbKzjc2; Sat, 15 Nov 2025 07:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AF7JW0C038954; Sat, 15 Nov 2025 07:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7JWwI038952; Sat, 15 Nov 2025 07:19:32 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:19:32 GMT Message-Id: <202511150719.5AF7JWwI038952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3d0e2327e983 - stable/13 - dtrace.1: Document DTRACE_DEBUG 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d0e2327e983ac76098da7572fe210c193e755c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d0e2327e983ac76098da7572fe210c193e755c5 commit 3d0e2327e983ac76098da7572fe210c193e755c5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-06 22:41:44 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-15 07:19:26 +0000 dtrace.1: Document DTRACE_DEBUG Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53627 (cherry picked from commit f811c0a555546e4154dfa159e8f56b3ba1c70d0d) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 121c87323eba..b36f71d17bbb 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2025 +.Dd November 8, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -836,6 +836,14 @@ command line to define a set of macro variables and so forth). The additional arguments can be used in D programs specified using the .Fl s option or on the command line. +.Sh ENVIRONMENT +.Bl -tag -width 'DTRACE_DEBUG' +.It Ev DTRACE_DEBUG +When defined, +.Nm +will output debug log messages to +.Xr stderr 4 . +.El .Sh FILES .Bl -tag -width /boot/dtrace.dof -compact .It Pa /boot/dtrace.dof From nobody Sat Nov 15 09:16: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 4d7pKm5Hsmz6HQm3; Sat, 15 Nov 2025 09:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7pKm4XJQz3WyX; Sat, 15 Nov 2025 09:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763198204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0mauLHFYL2HKSt5ZFM42w4ePfg8NAFkDFhbLqZr4w8=; b=YtDtQCsvOr/xwx/nV+cSBi2w+vBJ/XS8ZyYB9Z1X+mCSWgvRDp8X8xrsgl+0TvElSJPu/Q hrXSBt1fIxJ1ojlXLYBMfL0zknDvIh4EYsaRxXNo0mLnv2+3JUQ7mQ/uGVx4UA+N+sdZY3 Y8T929sC/15o3eGUm/kG+2HvOUbv89UpkKZAdS2xRMIAxuYuKq4qe4pimFCwwtxGxC1HzJ HIVy7+qHXgLtGayGQ5sUJ+oBmkR9d8IrhFhD6t4DqS10DnIAx2Xz3cYmNRK2Zuzz2mMEjK hra+/xC0ZJK2GznvLLSluoi7i7AgYjCSw6e9n1tVeaxvRYOTV8waIaA21WOT0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763198204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0mauLHFYL2HKSt5ZFM42w4ePfg8NAFkDFhbLqZr4w8=; b=EOL+sdjjkQhJmVBSL0K5KLJyoFQZ8SDMR3r5TB7HeIgTRISIDo5F3qYIAa/YGxajg8XdiU IuXZ8p2LUa2en1cBCxfkKWk5pBw0uOPCo9P6m7Sl8YIY62HpksZZn2wN2JHSKnHDLBdznN YSr2xyLifwa49lYfhuyVPY2BfwfR+skdlOQfIn+70Zn0ALBI5ggrKzFpzEdcep5M5x2AOB EeVEmyKE13RMMhtJOvKI1cL1jVPECspMYZe/0Bb+tsN52bZGElFRw0ZKoBcyGihZz6Y4Ce LbqgUgJeXxaoIgRZHLJ1HEaGIChwiV+QqUe/Q6M+woVjvrzAkngEsSp6XWCYUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763198204; a=rsa-sha256; cv=none; b=BpEUCbBIKtrgfJe+kTeJJFKvmPOrLPC/LxDHM4T/rgIfkZLAIEILNbLsY4krU7GfqQh2YW hPFoK05tuOWMZbIQD8K79iT50b7ip5D+KTVum2JC3VJiHl3Iyo7NjN/SjoyV+T3019cmyB qI1yGO9ld0T+UzLVjXYu7BxbFZLbiH0eTSVbOvpWbygZNIkJHb09b/hLHTB7xp70j6qJWm X6sirY/V9qORkR5MItGm4Am8+098z23u8LrWsrgGGM9VUaJqs+VmlJ0N/JvkiyOOn1gCOb xVOvix4qH47J83akCxlfzXuL1yrMT/55vJ3a/BrYRIVGS2FV/Hp24l6o2zBakQ== 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 4d7pKm3dzrzmx6; Sat, 15 Nov 2025 09:16: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 5AF9Giqi063748; Sat, 15 Nov 2025 09:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF9GibO063745; Sat, 15 Nov 2025 09:16:44 GMT (envelope-from git) Date: Sat, 15 Nov 2025 09:16:44 GMT Message-Id: <202511150916.5AF9GibO063745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 5c889c6522a4 - stable/15 - inetd.8: Remove the enumeration of examples 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5c889c6522a48a31b68e55963cc238cab9ab7a04 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5c889c6522a48a31b68e55963cc238cab9ab7a04 commit 5c889c6522a48a31b68e55963cc238cab9ab7a04 Author: Lexi Winter AuthorDate: 2025-11-05 23:51:05 +0000 Commit: Lexi Winter CommitDate: 2025-11-15 08:34:48 +0000 inetd.8: Remove the enumeration of examples The user can trivially see the list of examples in /etc/inetd.conf by looking at the file, so there's no need to include an entire paragraph in the manual enumerating the examples which are provided. MFC after: 3 days Reviewed by: 0mp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52740 --- usr.sbin/inetd/inetd.8 | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8 index d2a4331bb79c..189415caa711 100644 --- a/usr.sbin/inetd/inetd.8 +++ b/usr.sbin/inetd/inetd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 25, 2025 +.Dd November 5, 2025 .Dt INETD 8 .Os .Sh NAME @@ -787,44 +787,6 @@ the pid of the currently running .Sh "EXAMPLES" Examples for a variety of services are available in .Pa /etc/inetd.conf . -.Pp -It includes examples for -.Nm bootpd , -.Nm comsat , -.Nm cvs , -.Nm date , -.Nm fingerd , -.Nm ftpd , -.Nm imapd , -.Nm nc , -.Nm nmbd , -.Nm nntpd , -.Nm rlogind , -.Nm rpc.rquotad , -.Nm rpc.rusersd , -.Nm rpc.rwalld , -.Nm rpc.statd , -.Nm rpc.sprayd , -.Nm rshd , -.Nm prometheus_sysctl_exporter , -.Nm smtpd , -.Nm smbd , -.Nm swat -.Nm talkd , -.Nm telnetd , -.Nm tftpd , -.Nm uucpd . -.Pp -The internal services provided by -.Nm -for daytime, time, echo, discard and chargen are also -included, as well as chargen for -.Nm ipsec -Authentication Headers -.Pp -Examples for handling auth requests via -.Nm identd , -are similarly included. .Sh "ERROR MESSAGES" The .Nm From nobody Sat Nov 15 09:16:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d7pKn62q7z6HQfq; Sat, 15 Nov 2025 09:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7pKn4bPcz3X9Q; Sat, 15 Nov 2025 09:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763198205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qoPwYWth8oolCkikcoMNz51mgBTQjo2fHPz1ju/wQFI=; b=dojolLi2zpJW87Dk/yTPLnwwALBqzEZLN/FnYZDwXVxupUTVXo6g2XnjduS7IX0gLpBCOj lF93HDEHszaeCuEe8nQKYbOYGu1GUmCMv30JdZz+Rq9bcWNv2bvwghUEpRYtwQhVhP2sbt mHMQDOLgQysBmhXRTRhb/Zo2m5SqgIkYQc1Dvbg2EjDc6lh3xIkhcTR0DMe5gDNhvsEfQ4 8L6yxYCZhUGvOsMSUTGDYqjr1mR8pr5m3e0gn2nIGsi093XQgk05o+wBKb6f2ebbYl7Lnz Nol3ojWFxZptTo4Jcf71D+guu964XbI/08MP5rqtpPHNRxUi7vY+5AiEpV6+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763198205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qoPwYWth8oolCkikcoMNz51mgBTQjo2fHPz1ju/wQFI=; b=WxQNlQL4HX6bEMrB73JFm91eHds3qiAiNqlJnyt/ioGOFYAdh7XKyeoQMvEYICTh2JRNLV YWj6YNqY1pc65OuzgB94a3xeb/uH5yOSIQjLLakQA9GSYLhl8mGW4acDghJeDTHQ2RRFSz HN2SN3AI1FxyKr4MjatgHs+ByXm1PTu18IrZhM86V8M4x6LLOPdkD2D1Gvz/Lr2P4MVyIz z8agv57vrYKG3z5HamK7rvyBWjVM9/97D1z3tMJypZ9sci8mj+Qabo9y317ZfZz21euxGO CUGUE2+CGmKabSR05nrH/F1VI538sl6qX5g4SkubxINYAYI++Zz7wiHE/YDukw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763198205; a=rsa-sha256; cv=none; b=tP22lR13h2SncdiaXlOlcvZYtszp+GhOdz6silbStAOnW76rIaE9Lh5Q9c/o0kBRIsFJsj FkB80Q7EImAjjjZedtNq9KrV8+uh0ZwK2lFpGAWKPmI153amYC4ja8mFp6qZlfGwtC3CCm pvEuj4blsSLW7yahYErGFOnOIVLhq39N3Lk9z0wh0/lO0yaUAv+/vJ57CXmw7Lr0KVZEb6 mD8NgANt3q1jTpbJW6eWwcSgWBRhepQGhVfgamUHfFKAvG1z2Xizemujio1vkc1Q4nKkXp P9AsBKRFSwmjTmUv6nz6QDzZupVT3ME6WngUjEvwHwkz0FPvxzIzHt3QH+y6uw== 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 4d7pKn41L7zmbr; Sat, 15 Nov 2025 09:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AF9GjVa063790; Sat, 15 Nov 2025 09:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF9Gjxo063787; Sat, 15 Nov 2025 09:16:45 GMT (envelope-from git) Date: Sat, 15 Nov 2025 09:16:45 GMT Message-Id: <202511150916.5AF9Gjxo063787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: b1972bd9a033 - stable/15 - libpam: Don't put man8 in the dev package 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b1972bd9a03331f97823b93c3d1be74e7373b07a Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b1972bd9a03331f97823b93c3d1be74e7373b07a commit b1972bd9a03331f97823b93c3d1be74e7373b07a Author: Lexi Winter AuthorDate: 2025-11-10 10:14:42 +0000 Commit: Lexi Winter CommitDate: 2025-11-15 08:35:03 +0000 libpam: Don't put man8 in the dev package These are user-facing manpages, but were installed in the runtime-dev package since the PAM modules use bsd.lib.mk. Use MANNODEV instead of MAN to put them in the base runtime package instead. Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53601 --- lib/libpam/modules/pam_chroot/Makefile | 2 +- lib/libpam/modules/pam_deny/Makefile | 6 +++--- lib/libpam/modules/pam_echo/Makefile | 6 +++--- lib/libpam/modules/pam_exec/Makefile | 6 +++--- lib/libpam/modules/pam_ftpusers/Makefile | 6 +++--- lib/libpam/modules/pam_group/Makefile | 2 +- lib/libpam/modules/pam_guest/Makefile | 2 +- lib/libpam/modules/pam_krb5/Makefile | 10 +++++----- lib/libpam/modules/pam_ksu/Makefile | 7 ++++--- lib/libpam/modules/pam_lastlog/Makefile | 6 +++--- lib/libpam/modules/pam_login_access/Makefile | 6 +++--- lib/libpam/modules/pam_nologin/Makefile | 6 +++--- lib/libpam/modules/pam_passwdqc/Makefile | 6 +++--- lib/libpam/modules/pam_permit/Makefile | 6 +++--- lib/libpam/modules/pam_radius/Makefile | 7 ++++--- lib/libpam/modules/pam_rhosts/Makefile | 6 +++--- lib/libpam/modules/pam_rootok/Makefile | 6 +++--- lib/libpam/modules/pam_securetty/Makefile | 6 +++--- lib/libpam/modules/pam_self/Makefile | 6 +++--- lib/libpam/modules/pam_ssh/Makefile | 7 ++++--- lib/libpam/modules/pam_tacplus/Makefile | 6 +++--- lib/libpam/modules/pam_unix/Makefile | 6 +++--- lib/libpam/modules/pam_xdg/Makefile | 6 +++--- 23 files changed, 68 insertions(+), 65 deletions(-) diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile index 206f8fa40a09..fcec5bd04473 100644 --- a/lib/libpam/modules/pam_chroot/Makefile +++ b/lib/libpam/modules/pam_chroot/Makefile @@ -1,5 +1,5 @@ LIB= pam_chroot SRCS= pam_chroot.c -MAN= pam_chroot.8 +MANNODEV= pam_chroot.8 .include diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile index 862d1859d0d6..8ff2bfcee869 100644 --- a/lib/libpam/modules/pam_deny/Makefile +++ b/lib/libpam/modules/pam_deny/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_deny -SRCS= pam_deny.c -MAN= pam_deny.8 +LIB= pam_deny +SRCS= pam_deny.c +MANNODEV= pam_deny.8 .include diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile index 532d0a51b58e..9ea51b392e31 100644 --- a/lib/libpam/modules/pam_echo/Makefile +++ b/lib/libpam/modules/pam_echo/Makefile @@ -1,5 +1,5 @@ -LIB= pam_echo -SRCS= pam_echo.c -MAN= pam_echo.8 +LIB= pam_echo +SRCS= pam_echo.c +MANNODEV= pam_echo.8 .include diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile index c2327a2860cd..a3e9948ab69b 100644 --- a/lib/libpam/modules/pam_exec/Makefile +++ b/lib/libpam/modules/pam_exec/Makefile @@ -1,6 +1,6 @@ -LIB= pam_exec -SRCS= pam_exec.c -MAN= pam_exec.8 +LIB= pam_exec +SRCS= pam_exec.c +MANNODEV= pam_exec.8 WARNS?= 1 diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile index 07d37c8b17a8..e2326312426d 100644 --- a/lib/libpam/modules/pam_ftpusers/Makefile +++ b/lib/libpam/modules/pam_ftpusers/Makefile @@ -1,5 +1,5 @@ -LIB= pam_ftpusers -SRCS= pam_ftpusers.c -MAN= pam_ftpusers.8 +LIB= pam_ftpusers +SRCS= pam_ftpusers.c +MANNODEV= pam_ftpusers.8 .include diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile index 0395b3a8f355..cbf902026d66 100644 --- a/lib/libpam/modules/pam_group/Makefile +++ b/lib/libpam/modules/pam_group/Makefile @@ -1,5 +1,5 @@ LIB= pam_group SRCS= pam_group.c -MAN= pam_group.8 +MANNODEV= pam_group.8 .include diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile index 7128b513afbc..04eb249e4a79 100644 --- a/lib/libpam/modules/pam_guest/Makefile +++ b/lib/libpam/modules/pam_guest/Makefile @@ -1,5 +1,5 @@ LIB= pam_guest SRCS= pam_guest.c -MAN= pam_guest.8 +MANNODEV= pam_guest.8 .include diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 7634930a7202..0c933f8f7e57 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -57,8 +57,8 @@ SRCS= account.c \ support.c \ vector.c -MAN= pam-krb5.8 -MLINKS= pam-krb5.8 pam_krb5.8 +MANNODEV= pam-krb5.8 +MANNODEVLINKS= pam-krb5.8 pam_krb5.8 CFLAGS= -I${SRCDIR} \ -I${.CURDIR} \ @@ -77,9 +77,9 @@ module_options.c: .PHONY .else PACKAGE= kerberos -LIB= pam_krb5 -SRCS= pam_krb5.c -MAN= pam_krb5.8 +LIB= pam_krb5 +SRCS= pam_krb5.c +MANNODEV= pam_krb5.8 .if defined(_FREEFALL_CONFIG) CFLAGS+=-D_FREEFALL_CONFIG WARNS?= 3 diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile index 953ca23d1416..8b695384c13c 100644 --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -27,9 +27,10 @@ PACKAGE= kerberos .include -LIB= pam_ksu -SRCS= pam_ksu.c -MAN= pam_ksu.8 +LIB= pam_ksu +SRCS= pam_ksu.c +MANNODEV= pam_ksu.8 + WARNS?= 3 LIBADD+= krb5 diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile index 1abf6f2b6304..ecaf013c504a 100644 --- a/lib/libpam/modules/pam_lastlog/Makefile +++ b/lib/libpam/modules/pam_lastlog/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_lastlog -SRCS= pam_lastlog.c -MAN= pam_lastlog.8 +LIB= pam_lastlog +SRCS= pam_lastlog.c +MANNODEV= pam_lastlog.8 .include diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile index 43c025336354..41bc32212351 100644 --- a/lib/libpam/modules/pam_login_access/Makefile +++ b/lib/libpam/modules/pam_login_access/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_login_access -SRCS= pam_login_access.c login_access.c -MAN= login.access.5 pam_login_access.8 +LIB= pam_login_access +SRCS= pam_login_access.c login_access.c +MANNODEV= login.access.5 pam_login_access.8 .include diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile index e4c3c5a35c1e..c4ccc27b8958 100644 --- a/lib/libpam/modules/pam_nologin/Makefile +++ b/lib/libpam/modules/pam_nologin/Makefile @@ -25,9 +25,9 @@ PACKAGE= runtime -LIB= pam_nologin -SRCS= pam_nologin.c -MAN= pam_nologin.8 +LIB= pam_nologin +SRCS= pam_nologin.c +MANNODEV= pam_nologin.8 LIBADD+= util diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile index 91ce72928a66..9f2091d5403e 100644 --- a/lib/libpam/modules/pam_passwdqc/Makefile +++ b/lib/libpam/modules/pam_passwdqc/Makefile @@ -1,9 +1,9 @@ SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} -LIB= pam_passwdqc -SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c -MAN= pam_passwdqc.8 +LIB= pam_passwdqc +SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c +MANNODEV= pam_passwdqc.8 WARNS?= 2 CFLAGS+= -I${SRCDIR} diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile index 5606fe1cf75a..cc3d9ca210f2 100644 --- a/lib/libpam/modules/pam_permit/Makefile +++ b/lib/libpam/modules/pam_permit/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_permit -SRCS= pam_permit.c -MAN= pam_permit.8 +LIB= pam_permit +SRCS= pam_permit.c +MANNODEV= pam_permit.8 .include diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile index ab39fedcee04..d1180af62324 100644 --- a/lib/libpam/modules/pam_radius/Makefile +++ b/lib/libpam/modules/pam_radius/Makefile @@ -23,9 +23,10 @@ # SUCH DAMAGE. # -LIB= pam_radius -SRCS= pam_radius.c -MAN= pam_radius.8 +LIB= pam_radius +SRCS= pam_radius.c +MANNODEV= pam_radius.8 + WARNS?= 3 LIBADD+= radius diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile index 4cd25fe5dfa5..3aaefc9ca89b 100644 --- a/lib/libpam/modules/pam_rhosts/Makefile +++ b/lib/libpam/modules/pam_rhosts/Makefile @@ -1,5 +1,5 @@ -LIB= pam_rhosts -SRCS= pam_rhosts.c -MAN= pam_rhosts.8 +LIB= pam_rhosts +SRCS= pam_rhosts.c +MANNODEV= pam_rhosts.8 .include diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile index 668eeef7f7d9..bb5889139c16 100644 --- a/lib/libpam/modules/pam_rootok/Makefile +++ b/lib/libpam/modules/pam_rootok/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_rootok -SRCS= pam_rootok.c -MAN= pam_rootok.8 +LIB= pam_rootok +SRCS= pam_rootok.c +MANNODEV= pam_rootok.8 .include diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile index 3a36a37b543c..6e5e7d929b7d 100644 --- a/lib/libpam/modules/pam_securetty/Makefile +++ b/lib/libpam/modules/pam_securetty/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_securetty -SRCS= pam_securetty.c -MAN= pam_securetty.8 +LIB= pam_securetty +SRCS= pam_securetty.c +MANNODEV= pam_securetty.8 .include diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile index 0a58728fea52..ecf85b8de70a 100644 --- a/lib/libpam/modules/pam_self/Makefile +++ b/lib/libpam/modules/pam_self/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_self -SRCS= pam_self.c -MAN= pam_self.8 +LIB= pam_self +SRCS= pam_self.c +MANNODEV= pam_self.8 .include diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 6652244a84af..eb817b559331 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -2,11 +2,12 @@ SSHDIR= ${SRCTOP}/crypto/openssh -LIB= pam_ssh -MAN= pam_ssh.8 -SRCS= pam_ssh.c PACKAGE= ssh +LIB= pam_ssh +MANNODEV= pam_ssh.8 +SRCS= pam_ssh.c + WARNS?= 5 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile index 2b558d9f72b3..a29185f9bc23 100644 --- a/lib/libpam/modules/pam_tacplus/Makefile +++ b/lib/libpam/modules/pam_tacplus/Makefile @@ -23,9 +23,9 @@ # SUCH DAMAGE. # -LIB= pam_tacplus -SRCS= pam_tacplus.c -MAN= pam_tacplus.8 +LIB= pam_tacplus +SRCS= pam_tacplus.c +MANNODEV= pam_tacplus.8 LIBADD+= tacplus diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index 2e76f054c502..1bb1e6f2c71a 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -38,9 +38,9 @@ PACKAGE= runtime -LIB= pam_unix -SRCS= pam_unix.c -MAN= pam_unix.8 +LIB= pam_unix +SRCS= pam_unix.c +MANNODEV= pam_unix.8 LIBADD+= util crypt diff --git a/lib/libpam/modules/pam_xdg/Makefile b/lib/libpam/modules/pam_xdg/Makefile index df3948987da6..e119354d1297 100644 --- a/lib/libpam/modules/pam_xdg/Makefile +++ b/lib/libpam/modules/pam_xdg/Makefile @@ -1,5 +1,5 @@ -LIB= pam_xdg -SRCS= pam_xdg.c -MAN= pam_xdg.8 +LIB= pam_xdg +SRCS= pam_xdg.c +MANNODEV= pam_xdg.8 .include From nobody Sat Nov 15 14:43: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 4d7xZf5wnzz6GPp6; Sat, 15 Nov 2025 14:43: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 4d7xZf4kjWz3CP3; Sat, 15 Nov 2025 14:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763217802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6r0Iy5YF7ZJp2lQhZVA1sxxM1jtUiMMmKBCrfpzghI=; b=RCbf2YlqRY18yczsIMm+LhdxGM/O/6vpscJWNBVHj+8H6MLkevKT/Ah356UwQVXU7hFoAl uSlDvkHyM1zoWPSiENl/dtIaEX0aMnb+ddpnhdwrWCy9FdXgj8PF7C9EyiokKNBVx0AuXj 9DugrBB0OF9HuLeU065HozFXFLF2hVn9oLVFvr9KEpwa1mOd94lDkk5Z5KVd/zF29/nT2D Sn3YTS83BrGtWckYQYKC6wN3kxqqVKiRr6TOt7O5fPAYQG35cWiHrwEFu1Miwk4AY7NRWC WUuburjumAS7RpxW2AMxzn732hB/lGx/mB6HVm0LMlaia11jDQIsMlYJTfGt9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763217802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6r0Iy5YF7ZJp2lQhZVA1sxxM1jtUiMMmKBCrfpzghI=; b=vGPFXVbO8Qg6WvDqzxRt6/NgDU7WyqNjDuNriRvKq2URV7rM1EnpFaYKlAKQjZSCPb4knv oGlN4nKIYWkEfFkAvM/5cJnkLWvS+mwPfOET8t31vcGOHkupwi0VuA90oA1MNLwAdWqhvF p9ii+t5IXJbgGxU1EgHKU2eqgy1eojd/YNUVz036+Hxy8P2gHs1xikdCdPp16UsddH23C0 etYRON9YmKBIAHfnWi9kPNyGnS5czH+Xpp3tZKjVV1jF2zKMQniSEAxVmUy+G39anpyTJs F10KWyl8eLwjTJM8oTZSbXuDj3EdxhayCs0YuiXFmn4HmtNi87NWK19w3BJFGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763217802; a=rsa-sha256; cv=none; b=h5mEk/QbI9WgGWuEW0TjDZhImrdYrmnwNMUslNTrgE9zIN7VaAzy5RfO5JmRcsNtOXjh13 jqdh80TDD+PG4dHFOVef/J9RtsPzpUMUzySd+d75cdtDxaeOOL209Sh+HNL7I4sVyWxiDf ydZAqs9UoZMN4xTsTidgljezrKtK+Pe7iaZO3xQ45R9Vv/3WRQ2qFx1fJ4MONWPYNzeNbU tbp/ApCxXRESqghMFqbZEgN0rlgL9QXfgNp8D8VDbcuA0IsDxVMQwBqVnk5MubcNP5p9An TA+Mka5IEa7uCKYTWIxmG7hjwg6Sl7ZnB6L3O/ra77vpwx3PO9Qr0m9sWWQiZQ== 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 4d7xZf4BxKzxFD; Sat, 15 Nov 2025 14:43: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 5AFEhMep083116; Sat, 15 Nov 2025 14:43:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFEhM1Q083113; Sat, 15 Nov 2025 14:43:22 GMT (envelope-from git) Date: Sat, 15 Nov 2025 14:43:22 GMT Message-Id: <202511151443.5AFEhM1Q083113@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: 279213eb62ae - releng/15.0 - Retire pccard(4) 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 279213eb62ae239daa025e3d3d64170109fee7f7 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=279213eb62ae239daa025e3d3d64170109fee7f7 commit 279213eb62ae239daa025e3d3d64170109fee7f7 Author: Muhammad Moinur Rahman AuthorDate: 2025-11-12 17:01:18 +0000 Commit: Colin Percival CommitDate: 2025-11-15 14:42:56 +0000 Retire pccard(4) pccard has been declared obsolete for a long time and also the support has been removed but the man page still exists. It mentions being scheduled to be removed before 13.0 but it still exists in the tree. [Extracted from review D53434] Approved by: re (cperciva) Reviewed by: emaste Fixes: 31b35400c ("pccard: Remove more of the PC Card infrastructure") (cherry picked from commit 5b9fba1cb0d84ee297908ec4d575c33cf1f68ad5) (cherry picked from commit 8bafd2f0523209ec4c5eb2a64c90b3013cb6b45c) --- share/man/man4/Makefile | 1 - share/man/man4/cardbus.4 | 1 - share/man/man4/pccard.4 | 78 ------------------------------------- share/man/man4/pccbb.4 | 3 +- share/man/man4/xl.4 | 1 - share/man/man9/DEVICE_DETACH.9 | 5 +-- share/man/man9/bus_alloc_resource.9 | 5 --- usr.sbin/dumpcis/dumpcis.8 | 3 +- 8 files changed, 3 insertions(+), 94 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index d8fc2c65782f..65e59368a8e1 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -453,7 +453,6 @@ MAN= aac.4 \ p9fs.4 \ pass.4 \ pca954x.4 \ - pccard.4 \ pccbb.4 \ pcf.4 \ pcf8574.4 \ diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4 index 3b422b44c464..fa4bce65e095 100644 --- a/share/man/man4/cardbus.4 +++ b/share/man/man4/cardbus.4 @@ -52,5 +52,4 @@ Non-zero value causes the CIS parsing of the 32-bit CardBus card to be much more verbose and include a complete CIS dump. .El .Sh SEE ALSO -.Xr pccard 4 , .Xr pccbb 4 diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4 deleted file mode 100644 index cec07b2336cb..000000000000 --- a/share/man/man4/pccard.4 +++ /dev/null @@ -1,78 +0,0 @@ -.\" -.\" Copyright (c) 2002 M. Warner Losh -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd August 18, 2020 -.Dt PCCARD 4 -.Os -.Sh NAME -.Nm pccard -.Nd PC Card bus driver -.Sh SYNOPSIS -.Cd device pccard -.Sh DEPRECATION NOTICE -This driver is scheduled for removal prior to the release of -.Fx 13.0 . -.Sh DESCRIPTION -The -.Nm -driver implements the PC Card bus. -The -.Nm -driver supports all PC Card bridges in the system. -.Sh TUNABLES -The driver supports the following tunable parameters, which may be -added to -.Pa /boot/loader.conf -or set via the -.Xr sysctl 8 -command: -.Bl -tag -width ".Cm hw.pccard.cis_debug" -compact -.It Cm hw.pccard.debug -Non-zero values cause more verbose information to be printed when a -16-bit PC Card is inserted or removed. -.It Cm hw.pccard.cis_debug -Non-zero value causes the CIS parsing of the 16-bit PC Card to be much -more verbose and include a complete CIS dump. -.El -.Sh FILES -.Bl -tag -width ".Pa /dev/pccard0.cis" -compact -.It Pa /dev/pccard0.cis -This exclusive-use device will report all the CIS chains present in a -PC Card, if a 16-bit PC Card is inserted in the slot. -Only one user at a time may access the CIS. -The CIS is presented as the relevant byte stream from the PC Card. -For CIS tuples in Attribute Memory (the default), only the even -locations are presented (the ODD locations are undefined per the -standard). -For CIS tuples in Common Memory, every byte is presented to the user. -Decoding of the CIS tuples is done via a userland program. -All tuples are presented to the user. -.El -.Sh SEE ALSO -.Xr cardbus 4 , -.\" .Xr mecia 4 , -.Xr pccbb 4 -.\" .Xr tcic 4 -.Rs -.%T "PC Card Standard, Release 8" -.Re diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4 index 3200e8b2d2e2..1c6cb2045033 100644 --- a/share/man/man4/pccbb.4 +++ b/share/man/man4/pccbb.4 @@ -176,5 +176,4 @@ debugging problems with the bridge chipset. .El .Sh SEE ALSO .Xr cardbus 4 , -.Xr exca 4 , -.Xr pccard 4 +.Xr exca 4 diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4 index 309434154f4e..591703ac93cb 100644 --- a/share/man/man4/xl.4 +++ b/share/man/man4/xl.4 @@ -253,7 +253,6 @@ It is probably safe to ignore them. .Xr miibus 4 , .Xr netintro 4 , .Xr ng_ether 4 , -.Xr pccard 4 , .Xr polling 4 , .Xr ifconfig 8 .Sh HISTORY diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9 index 5f1bf7a3295f..856c6138ed4c 100644 --- a/share/man/man9/DEVICE_DETACH.9 +++ b/share/man/man9/DEVICE_DETACH.9 @@ -41,9 +41,7 @@ Detach a device. This can be called if the user is replacing the driver software or if a device is about to be physically removed from -the system (e.g.\& for -.Xr pccard 4 -devices). +the system. .Pp The method should deallocate any system resources allocated during the .Xr DEVICE_ATTACH 9 @@ -52,7 +50,6 @@ etc.) .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO -.Xr pccard 4 , .Xr device 9 , .Xr DEVICE_ATTACH 9 , .Xr DEVICE_IDENTIFY 9 , diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9 index 84a4c9c530c9..27c64c608c70 100644 --- a/share/man/man9/bus_alloc_resource.9 +++ b/share/man/man9/bus_alloc_resource.9 @@ -159,11 +159,6 @@ resource permits contemporaneous sharing. It should always be set unless you know that the resource cannot be shared. It is the bus driver's task to filter out the flag if the bus does not support sharing. -For example, -.Xr pccard 4 -cannot share IRQs while -.Xr cardbus 4 -can. .It Dv RF_UNMAPPED do not establish implicit mapping when activated via .Xr bus_activate_resource 9 . diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8 index c40e5fe75d40..9da5ed9f3bdf 100644 --- a/usr.sbin/dumpcis/dumpcis.8 +++ b/usr.sbin/dumpcis/dumpcis.8 @@ -38,8 +38,7 @@ The utility translates a raw CIS stream into human readable form. .Sh SEE ALSO .Xr cardbus 4 , -.Xr cbb 4 , -.Xr pccard 4 +.Xr cbb 4 .Sh AUTHORS The original version was written by .An Warner Losh Aq Mt imp@FreeBSD.org . From nobody Sat Nov 15 14:43: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 4d7xZh0BgNz6GQPs; Sat, 15 Nov 2025 14:43: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 4d7xZg5gHTz3CY8; Sat, 15 Nov 2025 14:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763217803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCenzzmFr77FYqJEODI9v+H/b8QuT70an2t2TFm3zzM=; b=s5JMWsKX81wunaM5t3I8irPI48obaamIeJaS3j46qdxnTboeF4MC/t09M8K+blilIwMsg6 EsY/dZOvll5BCua4bqWkzE5JBkhppAtbqq2WjlwEPXG66u5QF7XVsnDwvN49jZv/Bv68SV BcHPNf0O+NI/miL4le2PyQUg5h6EhoLruPQHoX75Vu5p4vrcabvZrlzFsSJoQqBbQnEC/G qHGVYyiLfkXk9hqNbCm04OZQExsKwuX/Y4dfjWOdldBdztvi+DGvWtYEKUt4k4lI+3qFIm I7vYA119Q3Wd9dLvZCEevB6gsS0crisIzwrWoEMgasCwjIarVWXIbTrDFuIOHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763217803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCenzzmFr77FYqJEODI9v+H/b8QuT70an2t2TFm3zzM=; b=eB3jsvHa6K+3lXN/3DpLjIy3GWX1WNQrp78T99HzjCurL6bHUvEp5N6g6v2z1eP24nAfOA 4MYVz0R4qywvXkr2QVr0kE65WH96RfLGqEg+R4IEU/5gUIBEdxXduQY6335jhJivHryEas XUXtUZeuqAUVzbPI899aoS5+AnsJRJeUl/AyeIj6y8e57XKZhI2kHmE4Qp/cLI5whuy5kY 9EnLbJekbreBLsNYKruQktqSXULsWWhdA7UzYaN+lzWJBedbO36iHlb0MEGgnBCWghY6Ri Rf+HQUs1X7XAJxhtBQeyw8qzx3fYCzgDbFHKvr3i2/8s7JYFIfktQiqyTKsEGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763217803; a=rsa-sha256; cv=none; b=Qj96j5NftAElYE8WLnF10Z8xsP0onC9t6uppH5R5brdt//GxTCMYvp62zyrUUkFz9sxKej 7XdE3zuxqSrBO0gVSG68O+s+zq4ScinU1xYwc96Ckz/+ZqlbAA79Fo9Y+qkZQgUODuu3JY QOAXa5t5QFXQr1cayWVsbZ9k3kygPrl7fLI4Co2Or/gnjK7SXUeONrF9UO80EdUUfRpo/v cc0lzhEP0JY6bVfWthz0IfRZfUHcklbBlL5FNcUjqCAVvearHBE3StzFAn5zQVqgEd08pp c47OJwYOI/uw/i21O4ERoq4bywQMAV4c+2uPSKeZIWMqmHR3O7nrTayhpyiYwA== 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 4d7xZg538gzxM2; Sat, 15 Nov 2025 14:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AFEhNdJ083152; Sat, 15 Nov 2025 14:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFEhNQH083149; Sat, 15 Nov 2025 14:43:23 GMT (envelope-from git) Date: Sat, 15 Nov 2025 14:43:23 GMT Message-Id: <202511151443.5AFEhNQH083149@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: 81f61990b28e - releng/15.0 - lam: fix using stdin more than once 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 81f61990b28e63b80007727be5a31db2226bb2c2 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=81f61990b28e63b80007727be5a31db2226bb2c2 commit 81f61990b28e63b80007727be5a31db2226bb2c2 Author: Kyle Evans AuthorDate: 2025-11-14 14:36:20 +0000 Commit: Colin Percival CommitDate: 2025-11-15 14:43:05 +0000 lam: fix using stdin more than once Historically, lam(1) closes stdin once we've hit EOF the first time, which would stop it from doing anything else on subsequent gatherline() calls with another openfile. However, this doesn't seem to be strictly necessary- the EOF flag on FILEs is quite sticky, so we can assume that a subsequent fgetc(stdin) will flag EOF properly. This 'fixes' the below-referenced commit in the sense that it surfaced this problem as a fatal error, but the issue was pre-existing. If we do `lam - -`, then one gatherline() will fclose(stdin) and set `ip->eof` for *that* openfile, while the next one will then observe that STDIN_FILENO has been closed and turn it into an EBADF. Add a few tests that were easy to snipe while I'm here, but I haven't aimed for anything close to exhaustive because I think re@ would prefer this fix go in sooner rather than later to land in 15.0. Minor style adjustment for the previous commit while we're here. Approved by: re (cperciva) Reported by: cperciva Discussed with: jrtc27 Reviewed by: des, jlduran Fixes: 4472fd66d006 ("lam: fail on I/O errors") Sponsored by: Klara, Inc. (cherry picked from commit 6a9452c8378a1aa767708ad2d235f847c880a21c) (cherry picked from commit 1d678ba5756978240140beb5c1ebd38bb778ed66) --- etc/mtree/BSD.tests.dist | 2 ++ usr.bin/lam/Makefile | 5 ++++ usr.bin/lam/lam.c | 5 +--- usr.bin/lam/tests/Makefile | 5 ++++ usr.bin/lam/tests/lam_test.sh | 59 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 4 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 520b41c8b88f..41151d35e518 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1163,6 +1163,8 @@ .. jot .. + lam + .. lastcomm .. limits diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile index e47ea0a98eaa..faad910f2202 100644 --- a/usr.bin/lam/Makefile +++ b/usr.bin/lam/Makefile @@ -1,3 +1,8 @@ +.include + PROG= lam +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c index 2194ae7ab596..c1221ca92d0e 100644 --- a/usr.bin/lam/lam.c +++ b/usr.bin/lam/lam.c @@ -213,11 +213,8 @@ gatherline(struct openfile *ip) *p = '\0'; if (c == EOF) { ip->eof = 1; - if (ferror(ip->fp)) { + if (ferror(ip->fp)) err(EX_IOERR, NULL); - } - if (ip->fp == stdin) - fclose(stdin); morefiles--; return (pad(ip)); } diff --git a/usr.bin/lam/tests/Makefile b/usr.bin/lam/tests/Makefile new file mode 100644 index 000000000000..8d41af5e6e09 --- /dev/null +++ b/usr.bin/lam/tests/Makefile @@ -0,0 +1,5 @@ +PACKAGE= tests + +ATF_TESTS_SH= lam_test + +.include diff --git a/usr.bin/lam/tests/lam_test.sh b/usr.bin/lam/tests/lam_test.sh new file mode 100755 index 000000000000..bf3998a42d11 --- /dev/null +++ b/usr.bin/lam/tests/lam_test.sh @@ -0,0 +1,59 @@ +# +# Copyright (c) 2025 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case basic +basic_head() +{ + atf_set "descr" "Test basic lam(1) functionality" +} +basic_body() +{ + printf '1\n2\n3\n' > a + printf '4\n5\n6\n' > b + + atf_check -o inline:"14\n25\n36\n" lam a b +} + +atf_test_case sep +sep_head() +{ + atf_set "descr" "Test lam(1) -s and -S options" +} +sep_body() +{ + printf "1\n" > a + printf "0\n" > b + + atf_check -o inline:"x1x0\n" lam -S x a b + atf_check -o inline:"1x0\n" lam a -S x b + atf_check -o inline:"x10\n" lam -S x a -s '' b + + atf_check -o inline:"x10\n" lam -s x a b + atf_check -o inline:"x1y0\n" lam -s x a -s y b + atf_check -o inline:"1x0\n" lam a -s x b +} + +atf_test_case stdin +stdin_head() +{ + atf_set "descr" "Test lam(1) using stdin" +} +stdin_body() +{ + printf '1\n2\n3\n4\n' > a + + atf_check -o inline:"11\n22\n33\n44\n" lam a - < a + atf_check -o inline:"11\n22\n33\n44\n" lam - a < a + + atf_check -o inline:"12\n34\n" lam - - < a +} + +atf_init_test_cases() +{ + atf_add_test_case basic + atf_add_test_case sep + atf_add_test_case stdin +} From nobody Sat Nov 15 14:43: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 4d7xZj1pTLz6GPp7; Sat, 15 Nov 2025 14:43: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 4d7xZh6RS8z3C7S; Sat, 15 Nov 2025 14:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763217804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fdsmrYIp5yxI77AjVWJ21xPITozdtFwxJaosAn9QBVw=; b=HYMtYSEGSHFExXdNvyaKp4QrLbez3NwCW6grlEKT+ttb1tMJeVgSuUaDYKQUF1f0mvd0q/ GCV04BVaOxIxW4msRiJsRu6IS8Am+h1sZ+OeuCyz/WQ5g4T9rV0YvvV5xL6acpbTEMe/Tu kxbrOifnq5zwFS5sCWRPEtLoVCFNpYmaL+yJ/rdLMrs/4e2CvoQH/1INmfwmaV9oRKO5rz yXdP9/sRDC57dWqMCKOQVmvfDieKbqyKUr2tdyJ+dKL1C3b2yRdDKCueN78jQ03sKx8pxn FjQs5YxCDfsHC0HSAVRssMXJABesahXCNAHcnECC1wsr78nc0M2W1vZNmx+GIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763217804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fdsmrYIp5yxI77AjVWJ21xPITozdtFwxJaosAn9QBVw=; b=leRCenNroUdqvwzxpOJz04uyr+2qh2pj5klTmrexEKJPJAA41vlKOw6qO8RDaPlyIGSgzB xRRDjUC4km8WlQYLedAkFgG++5SqwmOT+o0jcpAMABiZ/DIMMtvkRp+30luDZFdSszf6Mp Pu9L/vsK5bXXU2U5P9UaQSo0kf/Qe+Nf61BdsAySI8pAok491YPjZyNhgy0FQTbaug59pg 4f5RBGwEFQ2IWj0e3hDXkXCWXmsZda6Z8b+ga3n9S4eGKH6MvMeuOsgZn50J3IsT/ZyoQv Nf2dzFGQQOpn59yADO2AOK9xueSfs0Z/S8hCmaSb4LMQ5FmFkhwVTjDKHmcQOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763217804; a=rsa-sha256; cv=none; b=KGewAI2YqBTV4Bgsn/eqjk25OhNfx5OPhUos5WruqFN6uU+D/z7WJiS8eeAl4P5hNnrE0P 8z1LozhrmaPSrmZzvuI53nycjkZHBaJjiqdcwStXQNSftkAomFr6WLRqPSxwmBsZPW6/qp 3UopcY+Kzkffl5LbcM6eLonEMlBFoT8MHSCn0DxoIR/ToA9wHZY7Vt5I4LwJOTvJYVfGRn PN0Yak4luyc74RiA1Vth0YWOzYIlZqmGZ+oxJJbKMdFh227f0AdbdrdKJfN9Tc2dAYgIrk 3ba9Ud7jmtKe2cfgUClnycUEW8o12VwZo7evLRuMENmo0YGBC/LinmElswH5Ow== 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 4d7xZh60PrzxS9; Sat, 15 Nov 2025 14:43: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 5AFEhOt8083191; Sat, 15 Nov 2025 14:43:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFEhODN083188; Sat, 15 Nov 2025 14:43:24 GMT (envelope-from git) Date: Sat, 15 Nov 2025 14:43:24 GMT Message-Id: <202511151443.5AFEhODN083188@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: e13fa6418fba - releng/15.0 - libpam: Don't put man8 in the dev package 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e13fa6418fba8acac92a9eae1dd54ce73086f3c3 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e13fa6418fba8acac92a9eae1dd54ce73086f3c3 commit e13fa6418fba8acac92a9eae1dd54ce73086f3c3 Author: Lexi Winter AuthorDate: 2025-11-10 10:14:42 +0000 Commit: Colin Percival CommitDate: 2025-11-15 14:43:09 +0000 libpam: Don't put man8 in the dev package These are user-facing manpages, but were installed in the runtime-dev package since the PAM modules use bsd.lib.mk. Use MANNODEV instead of MAN to put them in the base runtime package instead. Approved by: re (cperciva) Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53601 (cherry picked from commit b1972bd9a03331f97823b93c3d1be74e7373b07a) --- lib/libpam/modules/pam_chroot/Makefile | 2 +- lib/libpam/modules/pam_deny/Makefile | 6 +++--- lib/libpam/modules/pam_echo/Makefile | 6 +++--- lib/libpam/modules/pam_exec/Makefile | 6 +++--- lib/libpam/modules/pam_ftpusers/Makefile | 6 +++--- lib/libpam/modules/pam_group/Makefile | 2 +- lib/libpam/modules/pam_guest/Makefile | 2 +- lib/libpam/modules/pam_krb5/Makefile | 10 +++++----- lib/libpam/modules/pam_ksu/Makefile | 7 ++++--- lib/libpam/modules/pam_lastlog/Makefile | 6 +++--- lib/libpam/modules/pam_login_access/Makefile | 6 +++--- lib/libpam/modules/pam_nologin/Makefile | 6 +++--- lib/libpam/modules/pam_passwdqc/Makefile | 6 +++--- lib/libpam/modules/pam_permit/Makefile | 6 +++--- lib/libpam/modules/pam_radius/Makefile | 7 ++++--- lib/libpam/modules/pam_rhosts/Makefile | 6 +++--- lib/libpam/modules/pam_rootok/Makefile | 6 +++--- lib/libpam/modules/pam_securetty/Makefile | 6 +++--- lib/libpam/modules/pam_self/Makefile | 6 +++--- lib/libpam/modules/pam_ssh/Makefile | 7 ++++--- lib/libpam/modules/pam_tacplus/Makefile | 6 +++--- lib/libpam/modules/pam_unix/Makefile | 6 +++--- lib/libpam/modules/pam_xdg/Makefile | 6 +++--- 23 files changed, 68 insertions(+), 65 deletions(-) diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile index 206f8fa40a09..fcec5bd04473 100644 --- a/lib/libpam/modules/pam_chroot/Makefile +++ b/lib/libpam/modules/pam_chroot/Makefile @@ -1,5 +1,5 @@ LIB= pam_chroot SRCS= pam_chroot.c -MAN= pam_chroot.8 +MANNODEV= pam_chroot.8 .include diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile index 862d1859d0d6..8ff2bfcee869 100644 --- a/lib/libpam/modules/pam_deny/Makefile +++ b/lib/libpam/modules/pam_deny/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_deny -SRCS= pam_deny.c -MAN= pam_deny.8 +LIB= pam_deny +SRCS= pam_deny.c +MANNODEV= pam_deny.8 .include diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile index 532d0a51b58e..9ea51b392e31 100644 --- a/lib/libpam/modules/pam_echo/Makefile +++ b/lib/libpam/modules/pam_echo/Makefile @@ -1,5 +1,5 @@ -LIB= pam_echo -SRCS= pam_echo.c -MAN= pam_echo.8 +LIB= pam_echo +SRCS= pam_echo.c +MANNODEV= pam_echo.8 .include diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile index c2327a2860cd..a3e9948ab69b 100644 --- a/lib/libpam/modules/pam_exec/Makefile +++ b/lib/libpam/modules/pam_exec/Makefile @@ -1,6 +1,6 @@ -LIB= pam_exec -SRCS= pam_exec.c -MAN= pam_exec.8 +LIB= pam_exec +SRCS= pam_exec.c +MANNODEV= pam_exec.8 WARNS?= 1 diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile index 07d37c8b17a8..e2326312426d 100644 --- a/lib/libpam/modules/pam_ftpusers/Makefile +++ b/lib/libpam/modules/pam_ftpusers/Makefile @@ -1,5 +1,5 @@ -LIB= pam_ftpusers -SRCS= pam_ftpusers.c -MAN= pam_ftpusers.8 +LIB= pam_ftpusers +SRCS= pam_ftpusers.c +MANNODEV= pam_ftpusers.8 .include diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile index 0395b3a8f355..cbf902026d66 100644 --- a/lib/libpam/modules/pam_group/Makefile +++ b/lib/libpam/modules/pam_group/Makefile @@ -1,5 +1,5 @@ LIB= pam_group SRCS= pam_group.c -MAN= pam_group.8 +MANNODEV= pam_group.8 .include diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile index 7128b513afbc..04eb249e4a79 100644 --- a/lib/libpam/modules/pam_guest/Makefile +++ b/lib/libpam/modules/pam_guest/Makefile @@ -1,5 +1,5 @@ LIB= pam_guest SRCS= pam_guest.c -MAN= pam_guest.8 +MANNODEV= pam_guest.8 .include diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 7634930a7202..0c933f8f7e57 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -57,8 +57,8 @@ SRCS= account.c \ support.c \ vector.c -MAN= pam-krb5.8 -MLINKS= pam-krb5.8 pam_krb5.8 +MANNODEV= pam-krb5.8 +MANNODEVLINKS= pam-krb5.8 pam_krb5.8 CFLAGS= -I${SRCDIR} \ -I${.CURDIR} \ @@ -77,9 +77,9 @@ module_options.c: .PHONY .else PACKAGE= kerberos -LIB= pam_krb5 -SRCS= pam_krb5.c -MAN= pam_krb5.8 +LIB= pam_krb5 +SRCS= pam_krb5.c +MANNODEV= pam_krb5.8 .if defined(_FREEFALL_CONFIG) CFLAGS+=-D_FREEFALL_CONFIG WARNS?= 3 diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile index 953ca23d1416..8b695384c13c 100644 --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -27,9 +27,10 @@ PACKAGE= kerberos .include -LIB= pam_ksu -SRCS= pam_ksu.c -MAN= pam_ksu.8 +LIB= pam_ksu +SRCS= pam_ksu.c +MANNODEV= pam_ksu.8 + WARNS?= 3 LIBADD+= krb5 diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile index 1abf6f2b6304..ecaf013c504a 100644 --- a/lib/libpam/modules/pam_lastlog/Makefile +++ b/lib/libpam/modules/pam_lastlog/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_lastlog -SRCS= pam_lastlog.c -MAN= pam_lastlog.8 +LIB= pam_lastlog +SRCS= pam_lastlog.c +MANNODEV= pam_lastlog.8 .include diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile index 43c025336354..41bc32212351 100644 --- a/lib/libpam/modules/pam_login_access/Makefile +++ b/lib/libpam/modules/pam_login_access/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_login_access -SRCS= pam_login_access.c login_access.c -MAN= login.access.5 pam_login_access.8 +LIB= pam_login_access +SRCS= pam_login_access.c login_access.c +MANNODEV= login.access.5 pam_login_access.8 .include diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile index e4c3c5a35c1e..c4ccc27b8958 100644 --- a/lib/libpam/modules/pam_nologin/Makefile +++ b/lib/libpam/modules/pam_nologin/Makefile @@ -25,9 +25,9 @@ PACKAGE= runtime -LIB= pam_nologin -SRCS= pam_nologin.c -MAN= pam_nologin.8 +LIB= pam_nologin +SRCS= pam_nologin.c +MANNODEV= pam_nologin.8 LIBADD+= util diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile index 91ce72928a66..9f2091d5403e 100644 --- a/lib/libpam/modules/pam_passwdqc/Makefile +++ b/lib/libpam/modules/pam_passwdqc/Makefile @@ -1,9 +1,9 @@ SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} -LIB= pam_passwdqc -SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c -MAN= pam_passwdqc.8 +LIB= pam_passwdqc +SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c +MANNODEV= pam_passwdqc.8 WARNS?= 2 CFLAGS+= -I${SRCDIR} diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile index 5606fe1cf75a..cc3d9ca210f2 100644 --- a/lib/libpam/modules/pam_permit/Makefile +++ b/lib/libpam/modules/pam_permit/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_permit -SRCS= pam_permit.c -MAN= pam_permit.8 +LIB= pam_permit +SRCS= pam_permit.c +MANNODEV= pam_permit.8 .include diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile index ab39fedcee04..d1180af62324 100644 --- a/lib/libpam/modules/pam_radius/Makefile +++ b/lib/libpam/modules/pam_radius/Makefile @@ -23,9 +23,10 @@ # SUCH DAMAGE. # -LIB= pam_radius -SRCS= pam_radius.c -MAN= pam_radius.8 +LIB= pam_radius +SRCS= pam_radius.c +MANNODEV= pam_radius.8 + WARNS?= 3 LIBADD+= radius diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile index 4cd25fe5dfa5..3aaefc9ca89b 100644 --- a/lib/libpam/modules/pam_rhosts/Makefile +++ b/lib/libpam/modules/pam_rhosts/Makefile @@ -1,5 +1,5 @@ -LIB= pam_rhosts -SRCS= pam_rhosts.c -MAN= pam_rhosts.8 +LIB= pam_rhosts +SRCS= pam_rhosts.c +MANNODEV= pam_rhosts.8 .include diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile index 668eeef7f7d9..bb5889139c16 100644 --- a/lib/libpam/modules/pam_rootok/Makefile +++ b/lib/libpam/modules/pam_rootok/Makefile @@ -23,8 +23,8 @@ # SUCH DAMAGE. # -LIB= pam_rootok -SRCS= pam_rootok.c -MAN= pam_rootok.8 +LIB= pam_rootok +SRCS= pam_rootok.c +MANNODEV= pam_rootok.8 .include diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile index 3a36a37b543c..6e5e7d929b7d 100644 --- a/lib/libpam/modules/pam_securetty/Makefile +++ b/lib/libpam/modules/pam_securetty/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_securetty -SRCS= pam_securetty.c -MAN= pam_securetty.8 +LIB= pam_securetty +SRCS= pam_securetty.c +MANNODEV= pam_securetty.8 .include diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile index 0a58728fea52..ecf85b8de70a 100644 --- a/lib/libpam/modules/pam_self/Makefile +++ b/lib/libpam/modules/pam_self/Makefile @@ -25,8 +25,8 @@ PACKAGE= runtime -LIB= pam_self -SRCS= pam_self.c -MAN= pam_self.8 +LIB= pam_self +SRCS= pam_self.c +MANNODEV= pam_self.8 .include diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 6652244a84af..eb817b559331 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -2,11 +2,12 @@ SSHDIR= ${SRCTOP}/crypto/openssh -LIB= pam_ssh -MAN= pam_ssh.8 -SRCS= pam_ssh.c PACKAGE= ssh +LIB= pam_ssh +MANNODEV= pam_ssh.8 +SRCS= pam_ssh.c + WARNS?= 5 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile index 2b558d9f72b3..a29185f9bc23 100644 --- a/lib/libpam/modules/pam_tacplus/Makefile +++ b/lib/libpam/modules/pam_tacplus/Makefile @@ -23,9 +23,9 @@ # SUCH DAMAGE. # -LIB= pam_tacplus -SRCS= pam_tacplus.c -MAN= pam_tacplus.8 +LIB= pam_tacplus +SRCS= pam_tacplus.c +MANNODEV= pam_tacplus.8 LIBADD+= tacplus diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index 2e76f054c502..1bb1e6f2c71a 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -38,9 +38,9 @@ PACKAGE= runtime -LIB= pam_unix -SRCS= pam_unix.c -MAN= pam_unix.8 +LIB= pam_unix +SRCS= pam_unix.c +MANNODEV= pam_unix.8 LIBADD+= util crypt diff --git a/lib/libpam/modules/pam_xdg/Makefile b/lib/libpam/modules/pam_xdg/Makefile index df3948987da6..e119354d1297 100644 --- a/lib/libpam/modules/pam_xdg/Makefile +++ b/lib/libpam/modules/pam_xdg/Makefile @@ -1,5 +1,5 @@ -LIB= pam_xdg -SRCS= pam_xdg.c -MAN= pam_xdg.8 +LIB= pam_xdg +SRCS= pam_xdg.c +MANNODEV= pam_xdg.8 .include From nobody Sat Nov 15 15:02: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 4d7y171TPqz6GRXc; Sat, 15 Nov 2025 15:02: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 4d7y170mvtz3G9q; Sat, 15 Nov 2025 15:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763218971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oq2R5D8njH1fkBey7DW/DjHho5uMLxxj0hlG2XJRXIk=; b=GF3mhTPkKzxX+Nwy5NFCPl6RlMr6rQmGKT3qAGs9r7Shdeh0ikuhfdzuPUlhYA9NsX+c/i U42lcD1Pnc3wtDoRpzH7Wcjv7V4AJaCVqrfMeMbug/UiZ9Eeruk5u7QDk63okMDJq9xgW+ WVCjTvPmumWAkvN9VdSoNhrcjEl5CZrZagtHs6gIxpc0Fecb2NIey89il95WG3CFWTZKMU mWyDVRAuO4BLZK0jUVnlUVAQzxAuPtAHkd8nRwTO440oBBlMWz7G/jADtoAGr7w53UpaCt bFBneCb60ONTUskVF6YtaRGwwzOc2uRMAbyUu+byJw+Y2s9cMw1Cs0XLw9W4Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763218971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oq2R5D8njH1fkBey7DW/DjHho5uMLxxj0hlG2XJRXIk=; b=CSYPcFLbcyNz63MCgYnk8CP5JWxBxc4C4iA27NBwIKfImfuB79ckf5HKgpiqIq3diPNa14 A0Dugy523AGYUiUvfebnjXJnYpElmc4cZsyCcRyz+oXcI504w39AXS3gbBQg+OMDaljNkY Qiowzj87ixG+jp5x488ZWWB/8CsiAKHlUIi+nQnUiIR4BEqZMhUbRalCTGoMA/W99F9O1k SKpjzHSov6ViO5UrCPsqqpCDdZH661FPozAva4aekY6+a3RyXjMY0NXzpy9mgrcF0jNvgf 6A0+bIRsBrtVXCfLHoPMoBe46iESbDc+JkgNL77Q6uxR2pyYJFUj7CtXti/iDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763218971; a=rsa-sha256; cv=none; b=sgDCKuljpmYvOPF9jEIRk2WhYzbKkhBA0NL9q78fo1czqvci09kZNI53NzqA5rrQt0tQ+q 06/N9fBX6tPW+aWzJfV+bqBaiYu/k7ow6fpq3dkGlx1vCfswQYz9e34UbwBJU0daOK9g9p u/MDmDtJBMzhmOrGczMdG9W76E/kVW78kbf7QHrQxB7PSZIGC0ORGkxgpueu/EYl4TkK8K wG9La5Wcz9PGFgFzLoyIQYlsq6+YyQA8Nh6y+gqFe9zIj2FRzimQfNEdNKRz8jm6AE0nTR W6dvGfAfcwWpT8CCGLkTwe59rCZSiM/kIIbf0bZaO4JkFGBrtoiaZZciM0eXSA== 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 4d7y170FW9zxrD; Sat, 15 Nov 2025 15:02: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 5AFF2ocO020681; Sat, 15 Nov 2025 15:02:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFF2ofL020678; Sat, 15 Nov 2025 15:02:50 GMT (envelope-from git) Date: Sat, 15 Nov 2025 15:02:50 GMT Message-Id: <202511151502.5AFF2ofL020678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 190e6d67953c - stable/15 - setcred(): Fix 32-bit compatibility copy-in 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 190e6d67953c3fb2064823d27998c54defff1925 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=190e6d67953c3fb2064823d27998c54defff1925 commit 190e6d67953c3fb2064823d27998c54defff1925 Author: Olivier Certner AuthorDate: 2025-11-14 20:20:12 +0000 Commit: Olivier Certner CommitDate: 2025-11-15 15:02:12 +0000 setcred(): Fix 32-bit compatibility copy-in For 32-bit processes on 64-bit architectures, a difference of 'int' pointers was wrongly used as a number of bytes to copy in a memcpy() used to internally construct a 64-bit 'struct setcred' from the 32-bit variant, leading to copying only part of the 32-bit structure, and thus to requesting credentials with garbage IDs except for the real and effective user IDs. This bug was spotted by jhb@, who produced a slightly more invasive fix in D53757 (a switch to using CP() on all fields). In the interest of minimizing the diff for possible inclusion in 15.0, the commit here just limits itself to fixing the number of bytes to copy. Tested successfully on a VM with 32-bit mdo(1) (and in passing also tested that the same executable on a kernel without this change exhibits the bug in practice, in the form of setcred() failing with EINVAL). Reported by: jhb Reviewed by: jhb Fixes: ddb3eb4efe55 ("New setcred() system call and associated MAC hooks") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53767 (cherry picked from commit 4872b48b175cc637ee38f645d68b8207d9335474) For the insta-MFC to stable/15: Approved by: re (cperciva) --- sys/kern/kern_prot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 3c145851b683..0b7dc2169335 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -603,8 +603,8 @@ user_setcred(struct thread *td, const u_int flags, if (error != 0) return (error); /* These fields have exactly the same sizes and positions. */ - memcpy(&wcred, &wcred32, &wcred32.setcred32_copy_end - - &wcred32.setcred32_copy_start); + memcpy(&wcred, &wcred32, __rangeof(struct setcred32, + setcred32_copy_start, setcred32_copy_end)); /* Remaining fields are pointers and need PTRIN*(). */ PTRIN_CP(wcred32, wcred, sc_supp_groups); PTRIN_CP(wcred32, wcred, sc_label); From nobody Sat Nov 15 15:05:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d7y4D3dVwz6GRT9; Sat, 15 Nov 2025 15:05: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 4d7y4D33jjz3HBw; Sat, 15 Nov 2025 15:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763219132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4jnSokCDJKk6h43BWiJ8rPXpZRj7sfE5uz+fp17U3Ts=; b=nR0rd4+hU4CBAiNm2oEwV9QBMpU7sO2h3oselcWa8RmnT2j+/sra1jPwT4dI7kucQKFRHb mUtEX/kHJSd6Oto3ZhnIllF/rn0u75owonl2fubvGdcfTRS8EsibWjZY5qrClQF7u2ubdM 09V8J+A1/S9WM4XA5XTsLWopzCZGu3j55b/krO3d3B4ADJ+/o6lgA770ZyLfSHulpLehfX 68JB3YReAvVBhqe6gChCdl+KzpPYfXgxTbTozA16P+E3UfdeqCdyX4FeYcifeLO27q4kHG ZSUvHXQn6E9HZ8KQIM0prkDEfjG0bbRmP1vSMWrY8PLXaonIzDxonhIp+7K0TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763219132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4jnSokCDJKk6h43BWiJ8rPXpZRj7sfE5uz+fp17U3Ts=; b=e++PIBdfGrbwQG9Zo7wZctcSVkOz1+696h/uy1eNNLwIpmkz4O+lbqYZG1sSW812MP2XhU 2NuwIJnxWZroM+vQb96kpY8407A1pjg1wO2Fx+AusQvfmWC246bv/YHRjPuJtU5fVNyTQV ZFKHYI1aKhXu8YoPChWGRisj+ZO+wMjq9/q8dncnYISCxNcPNoXI5syNTXK1EPgLMcWgJf U+PFCrL1XJPlCqqTv+yPHvX3sQKSPMe57HdfRMrDWYwsYsWLVSFTaZb6xG3aEa0erVt03J IDQyxx0POZgQY5HVRecHn8jQguzNCQmcIMX5Syv8Xs3ZWxGzHg+arHn0ryLjDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763219132; a=rsa-sha256; cv=none; b=ujByh1QzFsDKVaRvzX8o5CwibsuFAvhZbdVT3d6WOodNoeSFDFE1CPgxz6bNXu5R7g3JDE 9ZhRoUfelEJR/M8D6Y2inTolPeDlWevqy5/0YPPWHucAqSQFpcLd+xTpKvobstrdVzuMI+ Ewd9Q4fGudgQV3R5GfNbRNhk9rzcfFLz2zAxDk0+C0C75wTmsVLunW6XBZ7NQv3EuShDJ0 BL9GKKcWJGqeGown/UGgdsnG7lTpMXznS+cRZY2wBtxQEHO7ASw2RwlQFarY29QO45fwQX sI1aWgdReObVAzeUbHUWOI05jqHWHKSyN4Qk3QsJ2jI1cOEaZ5pML/NdNHda6Q== 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 4d7y4D2Y2NzxtF; Sat, 15 Nov 2025 15:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AFF5Wh1021718; Sat, 15 Nov 2025 15:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFF5WDX021715; Sat, 15 Nov 2025 15:05:32 GMT (envelope-from git) Date: Sat, 15 Nov 2025 15:05:32 GMT Message-Id: <202511151505.5AFF5WDX021715@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: b0447186a624 - releng/15.0 - setcred(): Fix 32-bit compatibility copy-in 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: b0447186a6240db80cba1210da049a0a0ee24508 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b0447186a6240db80cba1210da049a0a0ee24508 commit b0447186a6240db80cba1210da049a0a0ee24508 Author: Olivier Certner AuthorDate: 2025-11-14 20:20:12 +0000 Commit: Colin Percival CommitDate: 2025-11-15 15:05:11 +0000 setcred(): Fix 32-bit compatibility copy-in For 32-bit processes on 64-bit architectures, a difference of 'int' pointers was wrongly used as a number of bytes to copy in a memcpy() used to internally construct a 64-bit 'struct setcred' from the 32-bit variant, leading to copying only part of the 32-bit structure, and thus to requesting credentials with garbage IDs except for the real and effective user IDs. This bug was spotted by jhb@, who produced a slightly more invasive fix in D53757 (a switch to using CP() on all fields). In the interest of minimizing the diff for possible inclusion in 15.0, the commit here just limits itself to fixing the number of bytes to copy. Tested successfully on a VM with 32-bit mdo(1) (and in passing also tested that the same executable on a kernel without this change exhibits the bug in practice, in the form of setcred() failing with EINVAL). Reported by: jhb Reviewed by: jhb Fixes: ddb3eb4efe55 ("New setcred() system call and associated MAC hooks") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53767 (cherry picked from commit 4872b48b175cc637ee38f645d68b8207d9335474) For the insta-MFC to stable/15: Approved by: re (cperciva) (cherry picked from commit 190e6d67953c3fb2064823d27998c54defff1925) --- sys/kern/kern_prot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 3c145851b683..0b7dc2169335 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -603,8 +603,8 @@ user_setcred(struct thread *td, const u_int flags, if (error != 0) return (error); /* These fields have exactly the same sizes and positions. */ - memcpy(&wcred, &wcred32, &wcred32.setcred32_copy_end - - &wcred32.setcred32_copy_start); + memcpy(&wcred, &wcred32, __rangeof(struct setcred32, + setcred32_copy_start, setcred32_copy_end)); /* Remaining fields are pointers and need PTRIN*(). */ PTRIN_CP(wcred32, wcred, sc_supp_groups); PTRIN_CP(wcred32, wcred, sc_label); From nobody Sat Nov 15 17:42: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 4d81YM5qmQz6GgDl; Sat, 15 Nov 2025 17:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d81YM5K4Zz3WVT; Sat, 15 Nov 2025 17:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763228551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgUNZ87NJlcD1buGjKIoJqadmT9fvwUKHjA72pxDmD4=; b=iNGPjgggI17GbWfZrtHc+CyVZHnDaHvXuSujHu7/4vs7ulomZ4WXu+e/QinWSJOQ8HQ0fq 7iJxQhT8ThU6xYDzgrzwm+Elr2OXQt3EDJeq8zGerGiFqFAd/hT9mlM+ZZ4nhsBCLLvRIy UXXlTkaEwnGf8BlG5gLIWxGx18AFhBqwpuhU9SCWSlSVhg6h8/svDLY4TajuxdFIGxTF0P jIr30mQO9b7ZhwDlDwkvbqrjIoBPb+I/RuZavzZLvtzZlHDsn+9djRMt3YbidfEm2A4xCE dsugRhJuAOWjTLbAKtB6sJJpXdNpgWLeNnl6zZ+5rxdAae31KCL1IclKJv0NsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763228551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgUNZ87NJlcD1buGjKIoJqadmT9fvwUKHjA72pxDmD4=; b=XSbnx22dL1XMbnvqrnXg8YSXv+zNqJV2Rmg1jm4no6wpZorCQtI3/6KnD4Y++GaLewSztC h+OFwIdvBXFd8MNNlYEORAQNDV/2tDzkFiXUMA+jBRsboyepogZkIlQNXwl+6ozui89Ksn 28trq7/YPfeRk9GtKkXwmccWhbiWVG87AXh8xyLPjUA20PklDXSWPa1jo+cVUkclBndcyr bRKTL1SBgEV5BQhskAbvGlYSiOnO356nNKt7uFivfRxaY1zyJBLiY+7uYJN1Bcm1ieBpqT GFtB4gHNaQUtE5E/at3IPb7HMkIiFplMC4EA+5aMgKRxTvUjHpEkgXPfVvDHDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763228551; a=rsa-sha256; cv=none; b=kS4pBran0Tc2K+q1thKpI3c2qLn8z8lX9A16HCdD3zNp+1omMVKAm7Yq+2ugcFwhUKW7df 7jxvUe052lf5ZvO9sO8FqyzWvue47uoluyMWy4f70edI6JCMHN/clbEKKkcPPvdidF4+jO jU81MBYEtZOg5fD4piURODL/T14n+inAv5+YgD2cIzCuNtDEuxSGibs3CnvfVcl3eCAC+e PueCuPMho1D3NALjEvSALvO+DGUw0bxjVY05RtRMS/Ti8ol7bRL2GdO5r5tyU4KAlwatFd 634jimJFOYrJg6tQASALVYFSXP0m77apWtuTkY05I/t7Gpk6Zg3+4vzsJq8PpA== 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 4d81YM4tV9z13Cy; Sat, 15 Nov 2025 17:42: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 5AFHgVQu022444; Sat, 15 Nov 2025 17:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFHgVaF022439; Sat, 15 Nov 2025 17:42:31 GMT (envelope-from git) Date: Sat, 15 Nov 2025 17:42:31 GMT Message-Id: <202511151742.5AFHgVaF022439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 47fdacee69ec - stable/15 - arm64/vmm: Don't set MDSCR_EL1.KDE when enabling single-stepping 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 47fdacee69ec8ccb18df76b7584ffc5ce9862ec2 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=47fdacee69ec8ccb18df76b7584ffc5ce9862ec2 commit 47fdacee69ec8ccb18df76b7584ffc5ce9862ec2 Author: Mark Johnston AuthorDate: 2025-11-05 20:54:30 +0000 Commit: Mark Johnston CommitDate: 2025-11-15 17:42:08 +0000 arm64/vmm: Don't set MDSCR_EL1.KDE when enabling single-stepping When VHE mode is enabled, this results in a hang on the host. In particular, when MDSCR_EL2.KDE is set to 1 and the CPU is executing at EL_D, i.e., EL2, debug exceptions are enabled. In non-VHE mode, we call into the guest by trapping to EL2, which implicitly masks debug exceptions by setting PSTATE.D. However, in VHE mode, PSTATE.D remains clear, so when the guest's MDSCR_EL1 value is loaded, we immediately begin single-stepping. In non-VHE mode there is no need to set KDE either, so just stop setting it. Reviewed by: andrew MFC after: 3 days Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D48965 (cherry picked from commit ac0032344ca256f758a5eeb0fd6089dd647b0496) --- sys/arm64/vmm/vmm_arm64.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index e293c99a6646..5bb038dec2d3 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -1365,19 +1365,18 @@ vmmops_setcap(void *vcpui, int num, int val) if (val != 0) { hypctx->debug_spsr |= (hypctx->tf.tf_spsr & PSR_SS); - hypctx->debug_mdscr |= hypctx->mdscr_el1 & - (MDSCR_SS | MDSCR_KDE); + hypctx->debug_mdscr |= (hypctx->mdscr_el1 & MDSCR_SS); hypctx->tf.tf_spsr |= PSR_SS; - hypctx->mdscr_el1 |= MDSCR_SS | MDSCR_KDE; + hypctx->mdscr_el1 |= MDSCR_SS; hypctx->mdcr_el2 |= MDCR_EL2_TDE; } else { hypctx->tf.tf_spsr &= ~PSR_SS; hypctx->tf.tf_spsr |= hypctx->debug_spsr; hypctx->debug_spsr &= ~PSR_SS; - hypctx->mdscr_el1 &= ~(MDSCR_SS | MDSCR_KDE); + hypctx->mdscr_el1 &= ~MDSCR_SS; hypctx->mdscr_el1 |= hypctx->debug_mdscr; - hypctx->debug_mdscr &= ~(MDSCR_SS | MDSCR_KDE); + hypctx->debug_mdscr &= ~MDSCR_SS; hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; } break; From nobody Sat Nov 15 17:42:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d81YN6l4rz6GgRx; Sat, 15 Nov 2025 17:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d81YN61Y5z3WXs; Sat, 15 Nov 2025 17:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763228552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Likorg4G6KDLJA1lrioUmYAyaIgQtqlE0xmZYQAp5HY=; b=e9fuqrNAcas8RsVNkRiCRcAYgvVNojxjjxQWEXePayGw3upbxmYn/o37PsE5ghakf4UAZP RVNhnsDppdeM64yMEvXq5CfNYRKfPe3s7e9eSVLoE6W8e8WKvvy3WpbiRWhpVDzp5U+SuA 5c5l4UoPsQBOdH+ZCJ2vWtZoDqFORgw/e98anUa+WRm4lgYyFwRuPK46D+x12abBdlNemz X+lhEVK+Ul+zIsrMp0VxKNXDROn/wBkNoRFa9U708hh39o2IeQAwpeVc8iRBO8YScqeFHq 44BhxChkOcp85sUaGcMkUj1amX74aMciK3evZZoGWHPWxKMQTKYNZB+eKEWN8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763228552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Likorg4G6KDLJA1lrioUmYAyaIgQtqlE0xmZYQAp5HY=; b=p+/5w2msuuHxAZEUS/2DILEjhKSpF7dev6ucKIpp5W10AOW2tWoCDxNn74YkoQJEvh2tQA jHgP8l66bqZLPjE4e8oVPahieYSRPUEjSjeeutzJ5U0brs0fOtkQ+OpneNGJz5Dkfgdhvp 6lyNeDlMiqnfCRY3qa7YymOHs7BpoiGPXdDgNptb5EMDx6fLc4yO1nOt6aR2Fs4uCI54As HwQM6D/SwbgJ590JTaXR3I8/Mewlm4Nq7pdZ9x/1QqNhsj65rAAYRelG8U4QDQQmAQuMcg 0sKVBkTWGuFJCEJyx2lSgp37AEGc85TqfoijBAPGYJDyRJTAaEPpwkf75YLrpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763228552; a=rsa-sha256; cv=none; b=H438+9/oU5x3ZyNwnqpAUpAWIzq+zJMj8J/QMkcP5I9F+xd8l0Bkz8voJ9rYTZ/26foEHj qJ+YIzdoy9gOlakPZAkfWQj4GbnbmSiDkp13um1xLThXakdSSUyivSt4sIwtH9DrdHaO3u rY3J5oZIjbZQ2bbWcabKxex2dlnvgRq4Z74duaMlFuupLgHlwiaSEuw89KkR8t3TKHWJQ/ Wo6j7vBuS0gzWKHZziVy4CDQXwshNJsi75itueVrfLioPN6Nc7QsHywLOGPdWBblFBjuRb PwLPEXjf/pXA2mh56IRqORyl7e9yJK7lRE/bM2MeR13NQ9CVpkWLvFzwlKnpkw== 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 4d81YN5czJz12S3; Sat, 15 Nov 2025 17:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AFHgWp5022480; Sat, 15 Nov 2025 17:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFHgWkq022477; Sat, 15 Nov 2025 17:42:32 GMT (envelope-from git) Date: Sat, 15 Nov 2025 17:42:32 GMT Message-Id: <202511151742.5AFHgWkq022477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 295f7255a391 - stable/15 - arm64/vmm: Fix handling of MDCR_EL2.TDE 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 295f7255a3917dd7e176c2fcb1034d629df0ac08 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=295f7255a3917dd7e176c2fcb1034d629df0ac08 commit 295f7255a3917dd7e176c2fcb1034d629df0ac08 Author: Mark Johnston AuthorDate: 2025-11-12 15:19:07 +0000 Commit: Mark Johnston CommitDate: 2025-11-15 17:42:16 +0000 arm64/vmm: Fix handling of MDCR_EL2.TDE TDE (make EL2 the target EL for debug exceptions) is set both when setting guest breakpoints and when single-stepping the guest. In some cases we may configure both capabilities, and when subsequently disabling one of them we need to take care to avoid clearing TDE if the other is still configured. MFC after: 3 days Fixes: 75cb949228bb ("arm64/vmm: Add breakpoint and single-stepping support") Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) (cherry picked from commit b6f25aca11c98acc49f111f2899ecd4e96c7debd) --- sys/arm64/vmm/vmm_arm64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 5bb038dec2d3..e4deb052d396 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -1356,7 +1356,7 @@ vmmops_setcap(void *vcpui, int num, int val) break; if (val != 0) hypctx->mdcr_el2 |= MDCR_EL2_TDE; - else + else if ((hypctx->setcaps & (1ul << VM_CAP_SS_EXIT)) == 0) hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; break; case VM_CAP_SS_EXIT: @@ -1377,7 +1377,8 @@ vmmops_setcap(void *vcpui, int num, int val) hypctx->mdscr_el1 &= ~MDSCR_SS; hypctx->mdscr_el1 |= hypctx->debug_mdscr; hypctx->debug_mdscr &= ~MDSCR_SS; - hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; + if ((hypctx->setcaps & (1ul << VM_CAP_BRK_EXIT)) == 0) + hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; } break; case VM_CAP_MASK_HWINTR: From nobody Sun Nov 16 02:00: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 4d8DcF1cFPz6Gj1n; Sun, 16 Nov 2025 02:00: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 4d8DcF18M4z3bHN; Sun, 16 Nov 2025 02:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvcY9IovmotSxOW8kyFy7VXT5Q/tBXmelXlEHfya5Xs=; b=uAFGfY7JIZMjOfOsu8eOuISXBP8dllc7OWl0PYIOxnuoI5lpfvQdkdwsq0UdiW+kfC+wWr LdI5TiOU7zrrpa7pgY9RfV/gsUsR997Pc5y6bHh8LqP5UbMyK4IcWTCbsLbG09vDVe1U9z Q47mHhETFXsHPqZQX0fh9K+22roMmoZRTGOlwqlgPfcWp5EFa8OZfMKLDHdV3lkXzgryXl YDy7FqRSjGjaj6Svv+xgXosSLsFS+b44rpzj7h94WiR1jFlHf+Jsnq7cbO6AG3yIEfqFrv 0Gd1c2eKKeoXYY9SuDf4VQ8iZ0eIT5dSLXGOozGcLnwKJ9kKaCMarH9OMaw4fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvcY9IovmotSxOW8kyFy7VXT5Q/tBXmelXlEHfya5Xs=; b=qPiTSJ7DXNoqYhnFFZQMl+uAijPFliVNBK7ce7Z17+3E1cocAvA3p2U+9hQ+HtfBtgJgoh trz95erMVdCNOGqe2MGFuGGCXhhKbUeA7AN9tB3uMIr8juHhZPuY4lxrLjEz702SIy3eO7 fI6To+O5rWDCtOizNfgrX2S6sKSg9i0iTGqpdEcrVXB+oA0vAO2Obdgrp5WS8I0MejRlw9 2IpapmNZ7rZ/BGjdPAk4s/n3DST9/FZaLqxRwt81yjXHeqE6pTVvkSlfX10VOtUxJXkn/Q zF6ix+whKTckatkdukKYMfPcfg/bNExjymAzsq+z2DqIkia31ltcxYklLRMnrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258445; a=rsa-sha256; cv=none; b=kehxtyFb1+BGpvnTQ1pDmdKDQIicBgPL1rh/wirnQV1KHid4KZDzhLMrZWJsNwS6HQw+xQ z6KiVM71Riv56izFnq/JKjO96dLIauCmnEzZPFgkVqXMNq73hGfnAL8gSzS0DF2Qpu/OX7 OFBrxxdyZmMGm92R9Lqw8UHEgdNvRkTvPKB1zMN8p7toTkb+4eU0wtXZdyQHjt9ciY2Ggd TuEqQV12jUw/D3Gwj/eIQjYrZ8ODiRPEx9Wn2AHq8U8S5D/rBkVlBQIgDPefGj1vJU7FYa 6zftN46ewszOBXVgdbLmMBwxGDUfe3IeGUvVUlPwfYPjbI+1Aj/pLUNdkdvSnQ== 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 4d8DcF0jqXz2jr; Sun, 16 Nov 2025 02:00: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 5AG20jjC052997; Sun, 16 Nov 2025 02:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG20iwO052994; Sun, 16 Nov 2025 02:00:44 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:00:44 GMT Message-Id: <202511160200.5AG20iwO052994@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: a44a95b00199 - releng/15.0 - arm64/vmm: Don't set MDSCR_EL1.KDE when enabling single-stepping 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a44a95b00199dbf97c2b22cfb59a610c07f0af58 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a44a95b00199dbf97c2b22cfb59a610c07f0af58 commit a44a95b00199dbf97c2b22cfb59a610c07f0af58 Author: Mark Johnston AuthorDate: 2025-11-05 20:54:30 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:00:30 +0000 arm64/vmm: Don't set MDSCR_EL1.KDE when enabling single-stepping When VHE mode is enabled, this results in a hang on the host. In particular, when MDSCR_EL2.KDE is set to 1 and the CPU is executing at EL_D, i.e., EL2, debug exceptions are enabled. In non-VHE mode, we call into the guest by trapping to EL2, which implicitly masks debug exceptions by setting PSTATE.D. However, in VHE mode, PSTATE.D remains clear, so when the guest's MDSCR_EL1 value is loaded, we immediately begin single-stepping. In non-VHE mode there is no need to set KDE either, so just stop setting it. Approved by: re (cperciva) Reviewed by: andrew MFC after: 3 days Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D48965 (cherry picked from commit ac0032344ca256f758a5eeb0fd6089dd647b0496) (cherry picked from commit 47fdacee69ec8ccb18df76b7584ffc5ce9862ec2) --- sys/arm64/vmm/vmm_arm64.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index e293c99a6646..5bb038dec2d3 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -1365,19 +1365,18 @@ vmmops_setcap(void *vcpui, int num, int val) if (val != 0) { hypctx->debug_spsr |= (hypctx->tf.tf_spsr & PSR_SS); - hypctx->debug_mdscr |= hypctx->mdscr_el1 & - (MDSCR_SS | MDSCR_KDE); + hypctx->debug_mdscr |= (hypctx->mdscr_el1 & MDSCR_SS); hypctx->tf.tf_spsr |= PSR_SS; - hypctx->mdscr_el1 |= MDSCR_SS | MDSCR_KDE; + hypctx->mdscr_el1 |= MDSCR_SS; hypctx->mdcr_el2 |= MDCR_EL2_TDE; } else { hypctx->tf.tf_spsr &= ~PSR_SS; hypctx->tf.tf_spsr |= hypctx->debug_spsr; hypctx->debug_spsr &= ~PSR_SS; - hypctx->mdscr_el1 &= ~(MDSCR_SS | MDSCR_KDE); + hypctx->mdscr_el1 &= ~MDSCR_SS; hypctx->mdscr_el1 |= hypctx->debug_mdscr; - hypctx->debug_mdscr &= ~(MDSCR_SS | MDSCR_KDE); + hypctx->debug_mdscr &= ~MDSCR_SS; hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; } break; From nobody Sun Nov 16 02:00: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 4d8DcG4NFnz6Ghtc; Sun, 16 Nov 2025 02:00: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 4d8DcG2B47z3bSc; Sun, 16 Nov 2025 02:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HkHCczC/6tunxflFN+ZXUAuIS5H5991P5+Fq1Ad3+M=; b=ZDk+nGWv4Fky6HPj6rg1qBokniHvgcfTNQOEUe9gzpBGdLNWMM+yHoWGAYx6jxGzTfSD+z eUkKG/uk/pMght5nuDOLymnzgxeZ0fxkAUbIGs596Epjrhs39Hk8dQksg3rOR+kt19HJTp i+ccRFIBz+pZMcMeoPNqa5wXfGGtW4HeAV8aFz1GxvsgjtUmIpsR3QdorB5HKvLBVM1Hc0 l1R6ldHpheZD4bZz5yq2hHZ4YlO1zJM68ZEkz1+321pdzdhZigLJCPIpHy6Ok8CxtOShc3 hwMhgBPJE/5Fw3fhiMC8xJB+5OzwHqLsDe/QlZ9tBvpz5heIt1/5AZ/hIT+iYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HkHCczC/6tunxflFN+ZXUAuIS5H5991P5+Fq1Ad3+M=; b=HQuR/0dEz9dM0bIcZKlvsX+sLGU383sEkVGK75sS02PpVNGByrjiTp1FSXQBnF9oMlvciH oC7QGj4kbGBJfxye0bJPEx2Nr9Geb4KV+FjS0rzLFl506PCbwsgfwA3Eg3cI2OJfMvJYYp fGB1wz4qWeoqyfvSB0PA6kBRc0d+cjwvZo9tnAfQ9ZDkwS0cfoe/BQIP6jfoDhZWIUWjEv qzXNDUSo66jVhsA/aXn+YCkeg9Q5i7rMMoG+9X/cHc3kVdTb50jkEWntVpur1R6awIWcRI jZ0yKbzxTbVZ08Rb9Immzr+SAyPYcJ9TSuKuQq3X+XquwvpG0cNS7tADzCGSew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258446; a=rsa-sha256; cv=none; b=IShlTMaxnY2Mv/EsdPUZP27dTy6DWSx8VD32Ah6mk90xIIlimcy9/43Wes7TAc1AkTKCkC swXdUVHWllOIJM41sHlCvLvKSWELo7FimgQAgn4QjS18Y2ipJzwholzNtA57y32NjBWPSK dbv7QKgayQiyPn/yFyOWuvSWl+lFF6+hh7BPgXbvrYSERPY3ZRKXODPjebSEUEa+t5jVKi KNP5C/aI9GYK8p5+Mb9ZBLE21TvW/dwZLlzalPSr/jRFX7Emk6HStD90Y6V0hCFkOaLQ9h 4xfk+LRvKtskRFPJw8xrfSmF9ZSFa2RDKXp7zc7uYaROiHBy494FRt6idYZG+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8DcG1Vbmz3XT; Sun, 16 Nov 2025 02:00: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 5AG20kgs053036; Sun, 16 Nov 2025 02:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG20k3L053033; Sun, 16 Nov 2025 02:00:46 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:00:46 GMT Message-Id: <202511160200.5AG20k3L053033@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: 4f0b47708003 - releng/15.0 - arm64/vmm: Fix handling of MDCR_EL2.TDE 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4f0b47708003201f01dbe98da022970441716257 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4f0b47708003201f01dbe98da022970441716257 commit 4f0b47708003201f01dbe98da022970441716257 Author: Mark Johnston AuthorDate: 2025-11-12 15:19:07 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:00:36 +0000 arm64/vmm: Fix handling of MDCR_EL2.TDE TDE (make EL2 the target EL for debug exceptions) is set both when setting guest breakpoints and when single-stepping the guest. In some cases we may configure both capabilities, and when subsequently disabling one of them we need to take care to avoid clearing TDE if the other is still configured. Approved by: re (cperciva) MFC after: 3 days Fixes: 75cb949228bb ("arm64/vmm: Add breakpoint and single-stepping support") Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) (cherry picked from commit b6f25aca11c98acc49f111f2899ecd4e96c7debd) (cherry picked from commit 295f7255a3917dd7e176c2fcb1034d629df0ac08) --- sys/arm64/vmm/vmm_arm64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 5bb038dec2d3..e4deb052d396 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -1356,7 +1356,7 @@ vmmops_setcap(void *vcpui, int num, int val) break; if (val != 0) hypctx->mdcr_el2 |= MDCR_EL2_TDE; - else + else if ((hypctx->setcaps & (1ul << VM_CAP_SS_EXIT)) == 0) hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; break; case VM_CAP_SS_EXIT: @@ -1377,7 +1377,8 @@ vmmops_setcap(void *vcpui, int num, int val) hypctx->mdscr_el1 &= ~MDSCR_SS; hypctx->mdscr_el1 |= hypctx->debug_mdscr; hypctx->debug_mdscr &= ~MDSCR_SS; - hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; + if ((hypctx->setcaps & (1ul << VM_CAP_BRK_EXIT)) == 0) + hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; } break; case VM_CAP_MASK_HWINTR: From nobody Sun Nov 16 02:04: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 4d8DhV0jv9z6GjYL; Sun, 16 Nov 2025 02:04: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 4d8DhV004bz3cGy; Sun, 16 Nov 2025 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIE39neAcyflqp6RfvPe/Jh6QeeW9unJX7NZjvDobMo=; b=mndEQGAH+vp4sFcAc0jzf2E+FebZ/+s5Lsoz9uVRCBSgw6Z0tM0ITa8KlI3P9Gy+eatgVj X+WJ+HTLMnqMReTtLncyFFipEmvNhZkDqtEiCMd2a0MwuwIcX6WlKlcYe2mApE7hoaRmte exTuuSjguzn74rJkhQQEeSaEZl0a8GYSqPBHYj+/LIUewCAa5IB6UY0h6eyrJ4H9k7YiyN KpeuD/RsjtWA1i0niPImLpx9dc4r1QfBileYkm9KmPnprXlvJz7/N4NbMhkPRLpVUXLX6G jdGwlADNSG/jAWi5QWDBb4WA7J9y9GgWEdizf2IcA7V/Kp0bnCzMbEW1vbIIrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIE39neAcyflqp6RfvPe/Jh6QeeW9unJX7NZjvDobMo=; b=NkQgl305Gkhpa8qLVavXbsMLi2L6EijBu510Bg3+Otq2IWRNN9PHVh8xqEPyDmZxDSuzzO rNI0ypl5ZEf+JTkheHcP2HPgyFzD8s8bxJn0X8fwyzWwvMSkIKfIVYxVGjqPqHP3d8VRUv 0ZG45sEgHgx8T5fbmH3PHyj0b03bNBCKyadsH1dQ0F+LT+iu+5k0GnJ4V9AT5dq/DURo+1 GWyTG/7mtUoe4iE8hv0M57kbFLOAV06yqZKce2qW+XcY1a+/rGnHnMwIT1zlXYf4/5KIov eoNIKcemUsbEr1bMw6tbA2HGqgeORXyphEQxdQ6idZp6FD5Cv5kbZiKxqG/YAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258666; a=rsa-sha256; cv=none; b=G2cTmRSTVAQqAtAbT2kDEghJi41Yv7RG7Z9iCzK0NoRow8g2MvO+O8honFqYW/KVGcVcv1 5/y0IYnHtcif99/uJ2jBF+HEF93WH6zttaXiyoJ39fhroaeNvX8q/D8ZwIhc0NKW3lDI2z TZSLrXLMa1/Hr/qDaornVOgesLxEA3Wb69Nim5m/Rxo//0/dqke4unvGqJsOMK+9SlkH3e GeEvEja3R7vX0xe3gMB5bBDi2xLpI5Q0WCN/zJc6Nlo6oML1FwQdcqoLzMzGKhSu9rVR43 iJcTNOX4hTZT9yLppEVpbgINN5HLVFhyje4NeG2WGTwHwGjLE2gvTGU9/YI+WQ== 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 4d8DhT6jKGz3MV; Sun, 16 Nov 2025 02:04: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 5AG24P1S060738; Sun, 16 Nov 2025 02:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24PSd060735; Sun, 16 Nov 2025 02:04:25 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:25 GMT Message-Id: <202511160204.5AG24PSd060735@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: 7c98b725a785 - stable/15 - bsdinstall: Copy in all keys 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: 7c98b725a785efd50e195b298ed279d55ca69860 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7c98b725a785efd50e195b298ed279d55ca69860 commit 7c98b725a785efd50e195b298ed279d55ca69860 Author: Colin Percival AuthorDate: 2025-11-14 05:28:23 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +0000 bsdinstall: Copy in all keys The keys used for pkgbase signing are going to be placed in /usr/share/keys/pkgbase-N where N is the FreeBSD major version number; as such it's not sufficient to copy /usr/share/keys/pkg into the install chroot, but instead we need /usr/share/keys/*. With hat: re MFC after: 8 hours (needed in 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53753 (cherry picked from commit 6b0909f94099f92992fbd58eee7ce0f9289cb05e) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 5299d34fcb71..744e0daac6f8 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -337,7 +337,7 @@ local function pkgbase() -- Since pkg always interprets fingerprints paths as relative to -- the --rootdir we must copy the key from the host. assert(os.execute("mkdir -p " .. chroot .. "/usr/share/keys")) - assert(os.execute("cp -R /usr/share/keys/pkg " .. chroot .. "/usr/share/keys/")) + assert(os.execute("cp -R /usr/share/keys/* " .. chroot .. "/usr/share/keys/")) end -- We must use --repo-conf-dir rather than -o REPOS_DIR here as the latter From nobody Sun Nov 16 02:04: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 4d8DhW2pNpz6GjHf; Sun, 16 Nov 2025 02:04: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 4d8DhW0xfMz3cMS; Sun, 16 Nov 2025 02:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EGeVpCwGy/rH298W7/T/+JzvV8i1EyvH1dCuEi5sm4=; b=mJ6cnfsrdpaiQyA8g2tZCaRTqL+zM5YVTGx6I+SneqeGKHaaeQMdrmoHIBE1hkK1SPHMYn YXesjjlAO4OI5ES07O+9EINwgA+3VimGOUc5t43Pc6/79oIO/jwuAIRwasf2WjzdLcWMvf phoj5KTexYKTrgsFp/xOlo7fbRow/7nk4AJSUyxW4n1/JuJCWLemUAOtuolCkAJPhTiG7R Lg+yzLI85+0z78bs3bqUb+/C5xDqTi9WQjRcgkAz8hjYWMuRlMDaZIFSWYqS96EyOq406u G5n+cTz8xMDbT0VQGC2DJhjd54SEIFevxVoA2yGt8QIkfDA4phvFYc+IGNYgcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EGeVpCwGy/rH298W7/T/+JzvV8i1EyvH1dCuEi5sm4=; b=taCyqzPCAb4tv1tHVd0MbvxER4sIELNkDJJZhc7HCQ73BsCALhzMQOjlcEi6yvKODuE7fV anSMXmRq/hm09btplO9u9gwLnIONZ6M1VckYbEZKDVlVGQAaRMhiojvFlc3Ov1dH2QbIX3 7WbShNHg/Lyg7PtXGOI3+S5AHbkYgfBEyXK196drJeF9xiaFvbzDjB9Lf3bN8DyGQWOZBV HMIama5a02M9b/5q5TcwgB0Ts4Yx/uEF27wKCayg4xcVlTJMwRCvmnpxer9lxzOefQX0MB Cd7gyILtlavjfbiV5XeaOQlA2VCja/JtaBabJ9T5CV90uhmgkfg8YPhzT7TVCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258667; a=rsa-sha256; cv=none; b=ZSj8WAeBbJ0VI1jx0iaCD4z4DPwdWEf7S6Zzz1w7M5fT6OV4atmf7pQgJsWqQ5wUb8KZSG hBy7H8CDfxY6gnOc8GTmEDa7UxQnnYvKuA/H3+R771isBiU+mNsVoUewHrhuGqbl888N+R 0ZpkF9AL/DN8aI42sR59sVAF2T54BHbxT+J26IbojIGWfmw0Mj0BovHg5PeRnkVPpknQX5 PyyKYNU39WLquqnAQ8MtBCzd9Riy9MyJWLmwdQLqRyCJdExidYwY20/e60zBGrv7oTgQQ9 y/W8rrRQduQBI00B5PiGYTr1SKecC6mFJl2XSlU7JjaFixc6NQF2XZvjOx0l5w== 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 4d8DhW0Xddz3Y7; Sun, 16 Nov 2025 02:04: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 5AG24QN3060771; Sun, 16 Nov 2025 02:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24QI9060768; Sun, 16 Nov 2025 02:04:26 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:26 GMT Message-Id: <202511160204.5AG24QI9060768@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: 01ba48e11347 - stable/15 - Add pkgbase signing keys for FreeBSD 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: 01ba48e11347a69ee63636ed534a73f39a145da5 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=01ba48e11347a69ee63636ed534a73f39a145da5 commit 01ba48e11347a69ee63636ed534a73f39a145da5 Author: Colin Percival AuthorDate: 2025-11-15 00:54:17 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +0000 Add pkgbase signing keys for FreeBSD 15 These keys were generated by cperciva@ using the AWS Key Management Service. They will not be used for signing anything other than FreeBSD 15.x pkgbase repositories. Keys will be generated for FreeBSD 16 at a later date, and likely in a different way. With hat: re MFC after: 8 hours (needed in 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53768 (cherry picked from commit b05f38262b58c1e82ad5f076f2b0b9fe08ddc98b) --- etc/mtree/BSD.usr.dist | 6 ++++++ share/keys/Makefile | 2 +- share/keys/pkgbase-15/Makefile | 3 +++ share/keys/pkgbase-15/trusted/Makefile | 8 ++++++++ share/keys/pkgbase-15/trusted/awskms-15 | 2 ++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 54d408865fa5..d6f451825928 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -478,6 +478,12 @@ trusted tags=package=runtime .. .. + pkgbase-15 + revoked tags=package=runtime + .. + trusted tags=package=runtime + .. + .. .. kyua tags=package=tests misc tags=package=tests diff --git a/share/keys/Makefile b/share/keys/Makefile index f4bab152d8cb..98e17356e75a 100644 --- a/share/keys/Makefile +++ b/share/keys/Makefile @@ -1,3 +1,3 @@ -SUBDIR= pkg +SUBDIR= pkg pkgbase-15 .include diff --git a/share/keys/pkgbase-15/Makefile b/share/keys/pkgbase-15/Makefile new file mode 100644 index 000000000000..665bcf389da1 --- /dev/null +++ b/share/keys/pkgbase-15/Makefile @@ -0,0 +1,3 @@ +SUBDIR= trusted + +.include diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile new file mode 100644 index 000000000000..e6205999b12f --- /dev/null +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -0,0 +1,8 @@ +PACKAGE= pkg-bootstrap + +FILES= awskms-15 + +FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted +FILESMODE= 644 + +.include diff --git a/share/keys/pkgbase-15/trusted/awskms-15 b/share/keys/pkgbase-15/trusted/awskms-15 new file mode 100644 index 000000000000..e951b6f9e2d5 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/awskms-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "1d7b45d20fa8d6ed26f9b4a13ac81a6b5df860b9fe644d07b87e92298ba72595" From nobody Sun Nov 16 02:04: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 4d8DhX3yV9z6GjHj; Sun, 16 Nov 2025 02:04: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 4d8DhX22FKz3cMg; Sun, 16 Nov 2025 02:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQFvAAXHc66snMdEvkqql8I65jZln5ImNE0ghed8ELk=; b=R2MKDOvIE8OrLxnH9XW0OQ3tVSPrnnitFU2O2qdy15jWAaxTNbIVgJkLzZniNN3qNQ12zj 2OXwzlyAC+5d1J/7DBRpw/oolxOwQe69sWk2CkI/BAn02se4vSCbwh0wyqeodJOqXnLjWH kWPbrNSgiDnBNP8usYBDS3V36BG1H5PR6/upqQUjmLqxjrrq3yueH2d/LwX7KM+Lci9wyy 4p7pXtpC9vaqwtMenvr86RWo8fCWATaoIE78tNDG5lKjtYYk5aoxYxfNgG/u+4pmDhZ54j +f+242Kzyv9bshWhD6rMs81U9UMnhhQzS60xbD+cb6ePMBKc717a7u7cv/w4cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQFvAAXHc66snMdEvkqql8I65jZln5ImNE0ghed8ELk=; b=nr9KtCzjvdrY0+zt39nKgJdcuMB04FqL5pv6tkIYQ6vfuaCZaKw2Hcd/HpBifOgYeln+q2 GmyThWLSgOMqrV1pJLMD8FcMGbbDpl3QuTc5Fcn+70orFbXzplyiNSIzy2iSwHICYuEVez zcUKYB/2Qh0+v0doqYJLXFcNbRms4DPdTHqmM2FD7kA8IyGDNkeBSgsfjegEFXeyQVDNaq eVJDX6Z23Ry7UtUsMvpUjT2nniKjxt9kmZU0SvonHlU0b3ZA0O6Wz99oMLWJjhejVasCen kv8Bm+6a9kbmig743bpRKeCLTfx2dZhypMnxTChbufKc49CMqRXF9ded8EsglQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258668; a=rsa-sha256; cv=none; b=p+D08bsmvzCQ8obp6DfWWGJpgTe+REsV4YaoHPQNQtulkPeLQrX6de49pn/CYCCBS0gxHs MmNmtywm5ouj6Md2srySlTu7DPzBJPrjW3iD49BqmqPtVIn/cWIcgr+josoO2GycCQ9XGu A4wzibRC2B9lfQgC2Oy9esQgwcYH6RxFp6MXnvl55SK/t/EcxSMJiQByUoOUJkBExeVdG0 bSMKCmoLYjVlqMTvBR5LbGJLLUQVbuvCzJ9GyoaBo91uVC0XB3s78u715ZMYe/76f0ab5v vlsaZlcXoETod7KOR3652GqbqTqJnLGwx9tdWFnbn5eRtgyCtnPgVu2Z+1jp3A== 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 4d8DhX1Mbdz3Y8; Sun, 16 Nov 2025 02:04: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 5AG24SNU060804; Sun, 16 Nov 2025 02:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24SwW060801; Sun, 16 Nov 2025 02:04:28 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:28 GMT Message-Id: <202511160204.5AG24SwW060801@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: 2ce97e800393 - stable/15 - bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE 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: 2ce97e800393057e3b8f041993678cb8af2c7607 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce97e800393057e3b8f041993678cb8af2c7607 commit 2ce97e800393057e3b8f041993678cb8af2c7607 Author: Colin Percival AuthorDate: 2025-11-15 03:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +0000 bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE For BETA/RC/RELEASE builds, fetch files from the appropriate repository on pkgbase.freebsd.org, using the appropriate signing keys. Note that there is a separate repository for each BETA and RC; this ensures that someone installing from e.g. a 15.0-RC1 ISO will get 15.0-RC1 bits and not whatever happens to be the most recent build from releng/15.0. With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit 51184e38c932b7acedfc26fef3a0aad4c04f8959) --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 4 ++-- usr.sbin/bsdinstall/Makefile | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 792c290facdf..86ec8fabe253 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,7 +1,7 @@ FreeBSD-base: { - url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", + fingerprints: "/usr/share/keys/%%KEYSDIR%%", enabled: yes } diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index 5d7be97ed7cf..9a6b25fc5c7a 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,16 +21,26 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE +PKGHOST= pkg +KEYSDIR= pkg SUBURL= base_latest -.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ - ${BRANCH:C/[0-9]+$//} == RC +.elif ${BRANCH} == RELEASE +PKGHOST= pkgbase +KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} +.elif ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC +PKGHOST= pkgbase +KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} +SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" +PKGHOST= pkg +KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%SUBURL%%|${SUBURL}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include From nobody Sun Nov 16 02:04: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 4d8DhY4h0sz6Gj2y; Sun, 16 Nov 2025 02:04: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 4d8DhY2R0zz3cSs; Sun, 16 Nov 2025 02:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DX84nIR8v8OJTuyCLOT4dE24em0tyKWc1x7NtnJrs2U=; b=To9SP5jdl9/7mHJLaF8THW3MQaR7LdgOLNbusC3YzgdvKc1MUtDq3DQ0IUUsDesqZ2kq7u uJokDTRX6cwcdxkdeZwiMD865ZuzJpTrVtsJmiIwokARpBtANcVzKPuLC3iyfUyUKg2k8A k1AGKgYqI217+OJU2vcNnn403QPaL0WwxU8qz1TBniqYsR+AkRKJK1+iy/o9MJ4KgNchQN t7XPvNv8b9YC5aqJzqF1fyWATtcqPIHbp1Z5d79SEXo+Wu+XQVFiYI2qfgs0Bzwk7pQwo/ iZjrZYWky0BvinTcMde3moJRjIdZ3tGPy2bx2ZZtIuHN4LA7ZQLgviUaRM9NPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DX84nIR8v8OJTuyCLOT4dE24em0tyKWc1x7NtnJrs2U=; b=kFPVM2prEL5xW7IdXPLahUfZjRCEX4QXQPGWDSbDwtzUxoOnoRHxt+/uC3LY7HQU8T6Khv abWIZlz/FuCQSghE21WY5NzlrM397Fg4wOop9jcLvhKMYCZLLrbJWV5GQcQZaw8O2jeRzw dphTKNhIZfSYLSj55iIQ7yWtJpfjajZALL8hdI5A7Vx0cJoe7aQ7H04yc8JbMVbzUPlGI2 kYT84EqB4jp+hctTyoddutEn5eWp9UeRIasRMBNvmhPReYZsb1pXZkvOmxTLWbFd8FiBM9 18nJto8vrZ3WvTwVOpyKM2y7kYt0zfL9GEjlA1M0Ojkn43I54TPS/XJ0OFpb3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258669; a=rsa-sha256; cv=none; b=YjMJAu/2sPZY7SCG2rGqfMHgOhwW31+V1ro962+k/sqNgpxDkAe1C0rlv8e8aoVLYDN2do iVWSPaDI7ZkJzvQRUwALv0F/kCcIY1dCzdBpJuLTIZg1BDpGOn8KaqzGZM2XijS4NaKkH5 UKH+psO9DbodHeAUCtDEAQf+mjSk7EV+CiOCDYjTZbXl0wrOjR4B4cnGRwSWupAC/XWMMR Ccj943L8XiHRSBLQIAPrVQFyqlSPXnjTXPSy0Q7Z07oqW7Fv1PwfMRL49fuLlA/duYRoss aYXGqth5uAC5vlA6e6qJD0A3Y2G1FAB8wioubsgVOU35JeXdm2X8xJJ7DZf/EQ== 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 4d8DhY1ydVz3MW; Sun, 16 Nov 2025 02:04: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 5AG24TeS060837; Sun, 16 Nov 2025 02:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24T9o060834; Sun, 16 Nov 2025 02:04:29 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:29 GMT Message-Id: <202511160204.5AG24T9o060834@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: e4bc038ef806 - stable/15 - bsdinstall: Don't install FreeBSD-base.conf 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: e4bc038ef80607ad9ceedb52e059ebc061a2a8be Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e4bc038ef80607ad9ceedb52e059ebc061a2a8be commit e4bc038ef80607ad9ceedb52e059ebc061a2a8be Author: Colin Percival AuthorDate: 2025-11-15 03:18:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +0000 bsdinstall: Don't install FreeBSD-base.conf When installing e.g. 15.0-RC1, we want to get files from the 15.0-RC1 pkgbase repository; but running 'pkg upgrade' after installation should get the latest bits build from releng/15.0. With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit bdfc223c7a64369ed133a179c40067435a9f2cb3) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 744e0daac6f8..ddbf8eaf4f86 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -309,7 +309,7 @@ local function parse_options() end -- Fetch and install pkgbase packages to BSDINSTALL_CHROOT. --- Respect BSDINSTALL_PKG_REPOS_DIR if set, otherwise use pkg.freebsd.org. +-- Respect BSDINSTALL_PKG_REPOS_DIR if set, otherwise use pkgbase.freebsd.org. local function pkgbase() local options = parse_options() @@ -323,17 +323,9 @@ local function pkgbase() local chroot = assert(os.getenv("BSDINSTALL_CHROOT")) assert(os.execute("mkdir -p " .. chroot)) - -- Always install the default FreeBSD-base.conf file to the chroot, even - -- if we don't actually fetch the packages from the repository specified - -- there (e.g. because we are performing an offline installation). - local chroot_repos_dir = chroot .. "/usr/local/etc/pkg/repos/" - assert(os.execute("mkdir -p " .. chroot_repos_dir)) - assert(os.execute("cp /usr/share/bsdinstall/FreeBSD-base.conf " .. - chroot_repos_dir)) - local repos_dir = os.getenv("BSDINSTALL_PKG_REPOS_DIR") if not repos_dir then - repos_dir = chroot_repos_dir + repos_dir = "/usr/share/bsdinstall/" -- Since pkg always interprets fingerprints paths as relative to -- the --rootdir we must copy the key from the host. assert(os.execute("mkdir -p " .. chroot .. "/usr/share/keys")) From nobody Sun Nov 16 02:04:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8DhZ612Lz6GjYh; Sun, 16 Nov 2025 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8DhZ3MYXz3cQW; Sun, 16 Nov 2025 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Cbgv4PvDV2puBDAun0QE3mBF0Xc0fnjualhY/zO91I=; b=EK9APgtVqOmuyAt5Ux28kywXCsg0PfK8DVd9ROAczyYdXNag7AHS3CK0j4Pg8b86gqBJWN GzsXTxnBqrSWwWM9GI/KHyEqxrIZSTu30XeWO82CpV+RnTSf9Y/69TCCbRiW5fB6brwvUu N4LinSeHT9w0y2OYMEim/ZTE6hQxd2klVwuiaGY9PlvF0QFpBuh1Ylf8CbWDa+hg6EmkBq v17QttR6dvjUsEjCvsC+2b7NrkdmIVo4mSwte/7PBx3lVbVEV4VR61Tq+xkyN40NUm1i0V TV5o7006hgtXywlLQobwr0hzUDmYwe4aECS+lMPIjHnKSaggva31MuaHNwqeAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Cbgv4PvDV2puBDAun0QE3mBF0Xc0fnjualhY/zO91I=; b=Oskw6b8bhhrJFM58I66gIR8Y89VxkRvgK1fzvsiNUnh8ldqpm1rXqFQfkOn8icgLgPtZOn CbnYZvkTq0zVKKRdzG8IWtF8bEI8QFB5LAa2YVWic2gDYnQtNyqUnBLv2UvfiINGgoNaA1 PLphY8xCJoNAOoZP7ETTWy9XLCwPGX4XME5qY9PtIvLC0qL6kWOEsjP5XetJX9/wR/fCIs 1Gqoa1dSJmvxA3wFyPQ+aTkTHruxTTDUGZbgJ0yhsrYtv4iNFcAh5LsxpgIaB6XODk+2A+ MUhZYBC8zH5RyeXiXuOR3nLs/bbP161OjRSAx5LJTTvB+aKLWFgIlJt7fFyDfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258670; a=rsa-sha256; cv=none; b=Zxh4LTIkC6SGUOcuuIaSQQqs/rVbYS9e4UNHJnoM0+eJEjqrhqqBp8qrxqEmpoFQKeuAef 6fRwVVfIIBTCgaI2Cds16yRlqJgZk/SGpg27Q/SqLhdyzZ0+poa1ifs8PvKVgM7n+59s/p 5vfDssmfcqvFj5sWlnApqv/dyxM6Y+PHEmWqQMFwNcnoeOto4//HVNQLYsbrKIBumRroj/ outYOBm4EWD/7TiAYxhSOWJc46fd0eV18y6rOGxiaLymNNK/wexoXDrSO0KBzQRvCg2mGL mTFSk2Ftk15fU03WOKefxi86pnC0mEamn0NHsm2LLqYKx+wjnvOmfxsHZZ4L6g== 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 4d8DhZ2wb7z2kC; Sun, 16 Nov 2025 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG24UaI060870; Sun, 16 Nov 2025 02:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24ULb060867; Sun, 16 Nov 2025 02:04:30 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:30 GMT Message-Id: <202511160204.5AG24ULb060867@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: 91e1c18012dc - stable/15 - pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf 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: 91e1c18012dc839f400f971f02bc08798c6b9ce9 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=91e1c18012dc839f400f971f02bc08798c6b9ce9 commit 91e1c18012dc839f400f971f02bc08798c6b9ce9 Author: Colin Percival AuthorDate: 2025-11-15 03:26:07 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +0000 pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf On -CURRENT and -STABLE this gets bits from pkg.freebsd.org; but we get base system bits from pkgbase.freebsd.org for BETA/RC/RELEASE. Note that this repository is disabled by default, but can still be used by explicitly specifying it, e.g. "pkg upgrade -r FreeBSD-base". With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit 8e0b1a1c03a35a5db13e370cb3e62585d3db68e3) --- usr.sbin/pkg/FreeBSD.conf.latest | 9 +++++++++ usr.sbin/pkg/FreeBSD.conf.quarterly | 9 +++++++++ usr.sbin/pkg/FreeBSD.conf.quarterly-release | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index ac1636386942..f4b80c02cffa 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: no +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 4e26582c6981..117bbd49aeae 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: no +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release b/usr.sbin/pkg/FreeBSD.conf.quarterly-release index b4a78009f7d2..035d0ae976b9 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly-release +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkgbase.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}", + enabled: no +} From nobody Sun Nov 16 02:04: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 4d8Dhb6TPtz6Gj31; Sun, 16 Nov 2025 02:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8Dhb4YMtz3cL5; Sun, 16 Nov 2025 02:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q9YsssRzDu6V1nUuw9Z9ybLtZ4aIaxgWoYz22i3Mpi0=; b=kIp3SwDvZgOSNchlML3eidQl0xNIO0+HQ/7pOM9yTYrzXRqRB6MrRyg+KRrLsyfJa51KEM UhR2SsxcJUSB1W4xoup4ymkQ9DZGWsBbVAlqqLQ1d2he/Vi87alqDyRrESDy72d/HU/p9z gocahMflGtA4rOM71gasx5u5neNbgU4OiVbsKduF+kNX79w6sKVKzG9b0nW+NLpcajECfm QSDNEADQjlEHs8u4wdmoxEEo4ysrd/rXDiKc2lKD70X1zm0bTCfrATnzULIBiZoB5shcKp CGbyXCVTcT0IlzAswvlmcTtuRdl27ZLivr0oHeg1tf9FotOgBbEWPMSbESsGfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q9YsssRzDu6V1nUuw9Z9ybLtZ4aIaxgWoYz22i3Mpi0=; b=pycDF3SqRS0zFlc0YhowVLrdrngpOW16Q687TG2wRpxgaF2ngKqHsdg83OFOwfi7Kk+42N 7AyJG6AwXKu0VtgjMAraySiMLFuoWtivx8AdREQqSFLCwa8RpC2mwbAZxfPcGbEChsuZFJ ewUkpWnY36t9az+yK/id98FREcQ8Gg9YBkpCzK1qBlMbURK8Ws7iZS9F+xL+MsjAHpz/nb dfajdMjGw5aJlkyNsITXnRluRDAG1NE34ZAy/STTHeseeC71gE9wyXmMNCtDr+LxA6Eh1m WHQoBMq0wpLWApmwtDtY6EQOVNIecU53DqYCefqR6Dz/0iwlPp5jT1CsF/HLVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258671; a=rsa-sha256; cv=none; b=CvhZPIcs59ab+DIc3aEJKSe/zV8NewHx4zhfNch1ccWn6lnoCj3Ef97y3FlGz3NRwVJn99 EbBAQ9TKX0uWOLPwR2Kx4tdWqiSNNMqP68C58FOPUFL5phhArHKTAciu4hPKbr1ofjnXXb 7/V7fjAUm000s+MucxUP/pjL8EVI6UY9gKZbZDSMyTLA1R3KBn5S2RMbwrbvUOyGvJEk0l KyIK7B35TEVH/gliJueNQOWZf9qbDozHt0rdyiWDSXw97hAUORQH91qfsxBP3VT7MFb2fz QU2MAd2h9JVjOXZWtEACYaPjFO7RMNpj3CBdfiXlUPvs4Arv0hZy+18JJs3zZw== 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 4d8Dhb3x25z3mZ; Sun, 16 Nov 2025 02:04: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 5AG24VYE060908; Sun, 16 Nov 2025 02:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24Vdl060905; Sun, 16 Nov 2025 02:04:31 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:31 GMT Message-Id: <202511160204.5AG24Vdl060905@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: 0005bb76e2e7 - stable/15 - GCE: Add TARGET and FS to image family 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: 0005bb76e2e707f5ed39ca67beddb8a5d629c72e Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0005bb76e2e707f5ed39ca67beddb8a5d629c72e commit 0005bb76e2e707f5ed39ca67beddb8a5d629c72e Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 GCE: Add TARGET and FS to image family GCE image family is meant to be unique per set of image characteristics so that a user can create instances using the image family instead of the image name to reliably get a similar image with updated software, but no other changes. Without this change, the instances create API would select the most recent non-deprecated image matching the name, regardless of architecture or filesystem. (cherry picked from commit fc83e6c5e1f20087314dc52b63e485db87a98b86) --- release/Makefile.gce | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 06b76857ae88..a6d09de468c0 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -16,7 +16,7 @@ GCE_BUCKET?= GCE_LICENSE?= .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) -GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,} +GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" @@ -74,7 +74,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ - --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ + --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET} From nobody Sun Nov 16 02:04:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8Dhc6ksfz6GjPZ; Sun, 16 Nov 2025 02:04: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 4d8Dhc5Dlmz3cTN; Sun, 16 Nov 2025 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wErPGRDaWpZqh1pgxq45bP1ysmtjBQ2blcv5hWykT8w=; b=lSLrBm56bjajVgeuqpt2BKcWf1G1XiKVZnhuugJ9H6fQpjllz1ZOPaBva5+3YLQL4Z0nXs b934xlYqiU0on8hVX1mME2Psy+8XtJiHT5f3cZmMl2wzHGg8fJYR2wkVdK8JpFsaQwcDE5 08/q4hswqMZKMzIWUu17tO6SWP18jTR8m5zLfaUEUbA+jAOA+7r0xt2Q3OUMzjLesBiyO5 guoqgTtyjbYksnZVMCAGw6fpXMWjyvvMQkJUXLF8GDz5eo7QMb0/iwCKAOWTf4fiVFbkfM V/OqFbZiUOQX1XaSWUFavpAr44EQyYDrsnHnXwZTza5sTmrt/GYpih+rZcp53g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wErPGRDaWpZqh1pgxq45bP1ysmtjBQ2blcv5hWykT8w=; b=oTl/0bb0jxiVHYx95CUK/GQSGVNE9WnaUmILFHnUTyzrfLwysRoJNw1l6bJDti4GfwBxQq Z3O4S4JJ+WsPtsrj0vl0v1RCUtiEIr0efD0m3AWfv67/TGNmruZY4TXiX3QFNP4CCxr9a2 VHjZDPSRM2+4R9USMAyYXPjZy4L+0gdKonPbYwaHronunY0H7WwdnQ8fLKw+PIsJlTMgu+ TObIbrcuG0AOXJ3t9IDhgYfXMd5YkLN/8RQmlrWh446yS0jwoHUKMG0nUiPyQH7u4v3Yy3 OJGFQXBos27C20SMz3EwmO3TiW4h7/qTrp04dyftbyHG5zfD74TYX1+/+CFr4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258672; a=rsa-sha256; cv=none; b=HGUYACtjgMLxarIJ1d2o2t/y5vbgAQEAJ10OKxxTHYwzF0/R1NYxza6lSvrHSWLdH+tH/U YrXmb+aVc8WBzbh7p16+sQcMRmGPsxVbOczn0R0pmT/IV5XdWGMFBA6M6c1SZSZWrK47gx ldAI3vNHGPrY2gP1F3c2/o08e2mdQInfy7h6NDK+Ou1DoZvuSrgmtIBSboScGfUzfCQy/5 jz5+yEYLMzseAuMjHsqaj0tdzdHryvO0IJBxFZlW5KmArwwSeQj8SkkFFUjLUe5dn8nQLK pTv1otqAwvwMcahrihHAQC83gPS7imKryl5NatuM1im+Vl9G7NJQ4xiCMJfyhw== 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 4d8Dhc4bXcz3mb; Sun, 16 Nov 2025 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG24Wd5060946; Sun, 16 Nov 2025 02:04:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24WlI060942; Sun, 16 Nov 2025 02:04:32 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:32 GMT Message-Id: <202511160204.5AG24WlI060942@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: 93769d225fdd - stable/15 - GCE: Specify the architecture of images 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: 93769d225fddad4bc56f4edf543de45d8b666734 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=93769d225fddad4bc56f4edf543de45d8b666734 commit 93769d225fddad4bc56f4edf543de45d8b666734 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 GCE: Specify the architecture of images Without a specified architecture, a user can attempt to create an arm64 instance with an amd64 image or vice versa. With the change the API will prevent that mismatch. (cherry picked from commit 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434) --- release/Makefile.gce | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/Makefile.gce b/release/Makefile.gce index a6d09de468c0..21df4ddbc3f5 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -15,6 +15,14 @@ CLEANFILES+= ${GCE_UPLOAD_TGTS} GCE_BUCKET?= GCE_LICENSE?= +.if ${TARGET_ARCH} == "amd64" +GCE_ARCH= X86_64 +.elif ${TARGET_ARCH} == "aarch64" +GCE_ARCH= ARM64 +.else +.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +.endif + .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif @@ -74,6 +82,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ + --architecture=${GCE_ARCH} \ --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz From nobody Sun Nov 16 02:04: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 4d8Dhf4ShMz6GjTP; Sun, 16 Nov 2025 02:04: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 4d8Dhd6Rsrz3cLX; Sun, 16 Nov 2025 02:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI7aHICn1morpLbQES+U+mstoR8oqzvKx6H2SMqtess=; b=VY2MnsH10d5f82wWbiq3WNSAWZ/T5YCLar4Ko6W8orwvhQw5tSF3pSEBOU4Ff8xDBgFya7 JaUnZ4/mROPoprBYYFb7+N+N9svHqSTYvpsOGoXkowpEgMXeUBNOgfE+bF5Ny5iM4aA7OT +DdLBPXtQrqMP/KGSMLdQ6gsvZ1AhBR/kMHIxu3jBfK1qYuRIMJ+9J+HjxadzXkwBvX6sw FgWXLKhLaHts4W2v7PTIfnkRxZpKG3yvzVKSi5c0O2BiFk0WT4+UgDv+brw6ZvFGta6kqm QgAGooWmeNXP/wPsagIz4lNyz2rQ1vPmj+dxeDjGlBi2rJRSJnQkhlLM8tXheA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI7aHICn1morpLbQES+U+mstoR8oqzvKx6H2SMqtess=; b=DeQb3ZCTlkKnnywOdIzeJ0nA0bgn4unxU1U7tN0aRVGi4e2VjOpHUl6GeRX6OyxZMWZw9y wHMC3NMxCt5Yp+isVXo+Qf5KzKuGyOrWHBmi2A4yUg6C9v/1EO/wgPdVXVRKY6c3C6rEOs QKIYoU5dNI+hEAxDtd4IqZMk359gOwIV8p85dnQsXfIQuRX2fyKaRQF750nYWnX/LZFK4S 4p3cCId2mnUJLPguAJnnVSwytquD2jTFlQTTDpEPt2U10Vo/kAyrbu8hPQIV+KZdwVYn3S YvX4jDp7PQ/HOBQjJca4ESYM8u1z0GxiIry9C0s4VnynaQX29Xp9tcvbb9jxsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258673; a=rsa-sha256; cv=none; b=F8iTOCMTSUXaYkxX+AYQf6+obeaOktCp2YH2w9HdSP6Q8DLCRi0w89ncfrlPhjAigNSLOJ yI4L2IIXt1XqC1zthNLhLcQytOEVnGB7yR993WhKYGKTLVofow3vfTRIV87Vlm0O2XkuqU KBxe7xl9AadkxnqLbARs2JIC8k8cQJOXQ6LzV/CTvo8vezSzxqjRu3c1kADhulGIlnO08Y +++4vGuyHCppl+girMSDXlDMyUB1q3iwaqYV3nd+S465knlhe4aJY4lOSwhTW2eW0tj6gm xvYuDrAXgIJEiWZbhJ799CjpP8hBKcxjeANyPWiBrYGDJyLI6b3V6ANwwDOxNg== 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 4d8Dhd5mqWz3Zx; Sun, 16 Nov 2025 02:04: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 5AG24X4J060983; Sun, 16 Nov 2025 02:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24XGE060980; Sun, 16 Nov 2025 02:04:33 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:33 GMT Message-Id: <202511160204.5AG24XGE060980@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: 375f8df26be1 - stable/15 - GCE: Don't .error on unsupported targets 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: 375f8df26be16b58ff9185823e5d90761d2144e3 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=375f8df26be16b58ff9185823e5d90761d2144e3 commit 375f8df26be16b58ff9185823e5d90761d2144e3 Author: Colin Percival AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 GCE: Don't .error on unsupported targets We ingest Makefile.gce even when we're not trying to create GCE images so we don't want to .error here. Instead, set GCE_ARCH to a dummy value which should make the problem clear to anyone who attempts to create GCE images on an unsupported architecture. Reported by: Jenkins Fixes: 0a8ecca4e315 ("GCE: Specify the architecture of images") (cherry picked from commit 787d09753f70bb382a7cbfba742a612fa54069e6) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 21df4ddbc3f5..31770bfd5098 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -20,7 +20,7 @@ GCE_ARCH= X86_64 .elif ${TARGET_ARCH} == "aarch64" GCE_ARCH= ARM64 .else -.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +GCE_ARCH= UNSUPPORTED_IN_GCE .endif .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) From nobody Sun Nov 16 02:04:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8Dhh1QWWz6Gj39; Sun, 16 Nov 2025 02:04: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 4d8Dhh0SCDz3cNv; Sun, 16 Nov 2025 02:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/l8x7PBsfoCOclCHrq6G6hZARQt3YbYE+5wsAmAUh/c=; b=wL++OdWK7D/koM/c848dihEE/sdGWL6P30OwV8BaYkjI3ljwz4+bKlpx2b+hKIJ2ehAkWa ENv4ZoRFF3DoxOJsIu5z/lp+FN8f/ThGO+fipdylcVbeNcLZsEMnBrbEVzoeaoDSha9/Zs SmjWWl5vq4ZAEloPj/OKpFoaEodtQrFe/eg67GkMXLwnb4zyFTDiPtS9OC81CokQc5m9xw mtGQJ4uW7T5jTDON54PNcJC1BWMeg/ADwQa+eRUAiiDmV961Y62jTdgaYI6dgTOxrw/7HC pcewzTyvKD5PHJFJwWzyN3DU3aVtM42hIuwWAI5kJ21VwM4g+QdSM1d8sZlW6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/l8x7PBsfoCOclCHrq6G6hZARQt3YbYE+5wsAmAUh/c=; b=xfAJddBYpaaA4P31zJxhApXDPRhFy2OQbcKBZ/aGdvNRZrKZoB8WprLUwt7yQA2tbxce/b aup63IAKuEr0eBegOXLohX0+ckT0MZIZ0jgTc+AbpMCApJe53HbwlUmbTsxV359shrIZWJ x7wztVOl3miviC4f0ZDsx9guydrgiBskTwhcwrKsCSvoEKU95yl+8ohsEt5hJwryRTUKam P69krExgb7+YbZl73jcg7220ZYo1vdu2CuNnvnyIp7NIjEIjWSLm+rCCyTFKEJTStoYaYX UXQoLAPIdiOiaReAbumq6dZ1UUIACrrvLCSVF6hk7dRqWv8/SWT9mHIczs686A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258676; a=rsa-sha256; cv=none; b=BVsEYqS146PDjcJmLcC27ViWW146F9AKchVxZAHqJGDRNikl416GKVxgJljZrBvr+r2q0Y m7uqCkdX45oW66ut+3oE4jr5tXtZZc7YuhhK2O6eyENgpAR0H+2pVLFNcTn5mWcc7zuMfd dc6P9JirqRHID11rc9hSo+nD+wkuoSqcKuWy2jceGGDutJs1t2DdO4v6l7LtwRQUyogbEM F8f4qFF859KWjSndg3B2kFeF3NZURntYTnV3y15v8BF+XQeToyFAqlr2dDrxwI7d0ij//I NW2m3OPsXM8vtggT6ckhElxkiRI+VfmNgD/CQsCDrQ5IcTmRlhILM/gTwIPRlA== 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 4d8Dhh03fCz2kD; Sun, 16 Nov 2025 02:04: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 5AG24ZTg061054; Sun, 16 Nov 2025 02:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24ZZ9061051; Sun, 16 Nov 2025 02:04:35 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:35 GMT Message-Id: <202511160204.5AG24ZZ9061051@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: 5d9062f2581e - stable/15 - bsdinstall: Enable FreeBSD-base repo when pkgbase 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: 5d9062f2581ed280c49699a5d7c808015997ed24 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5d9062f2581ed280c49699a5d7c808015997ed24 commit 5d9062f2581ed280c49699a5d7c808015997ed24 Author: Colin Percival AuthorDate: 2025-11-15 21:56:35 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 bsdinstall: Enable FreeBSD-base repo when pkgbase When performing a pkgbase install, create a configuration file in /usr/local/etc/pkg/repos/FreeBSD.conf which enables the FreeBSD-base repository. (This repository is defined in /etc/pkg/FreeBSD.conf as being disabled by default.) Reported by: Mark Millard Reviewed by: markj MFC after: immediately (needed for 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53777 (cherry picked from commit a96230e0329b32cbee0999813787a86eab521da4) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index ddbf8eaf4f86..89ddc244171e 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -355,6 +355,10 @@ local function pkgbase() if not os.execute(pkg .. "install -U -y -r FreeBSD-base " .. packages) then os.exit(1) end + + -- Enable the FreeBSD-base repository for this system. + assert(os.execute("mkdir -p " .. chroot .. "/usr/local/etc/pkg/repos")) + assert(os.execute("echo 'FreeBSD-base: { enabled: yes }' > " .. chroot .. "/usr/local/etc/pkg/repos/FreeBSD.conf")) end pkgbase() From nobody Sun Nov 16 02:04: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 4d8Dhg1YDBz6GjLT; Sun, 16 Nov 2025 02:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8Dhg0BDwz3ccC; Sun, 16 Nov 2025 02:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmbwbpGiDAmZMmmg/wbwG6zeR4Q/P3oKjYTAz0VXayE=; b=IAghgKWPfzb2Hi87lXgKh/Fuw5k6Yv7hVmV4gjIqvOSN5kpmP/Jxe/AE/Z34pQcqx8IAOE cH/dGkWE0zpOKUCoIlcCMgUhI2VIvAungvBZ3+7K7JQwjoLgZ9hyPw5Q2SZxIc11E219UD JCn5xwNbNDPDA+1XT35SpTRpoFulAWgXQMzC5DB2uhcx7yVvQK/dsEnSdiXl4Qb9a0ouTq AsOU6Ymy3pinDhreALjS7uZcTIupFyDcGGLW/Pd6fTkdvK8L1aVJLyG7MfE80ZXTt+gwne FkjkF/trkEdP1m5kcHkPeVGc9in3nWFU/qkSSkBB0GSheXFbSi+zxWLXZh/7DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmbwbpGiDAmZMmmg/wbwG6zeR4Q/P3oKjYTAz0VXayE=; b=bTTPXioYnE/9F5fzAtXUetsquYlx5CJHs/zFGUpCIzyNjU3cdllbQzaWu3wEbwNNUIU82P 0pfllnra0FYYBwDRIJRnF3zqUUtGqZrqlbMYfgwcG/hxSxAC8HnYucmEGaP50cNPKDpTaT yCLYdL8MYQy/5TqAC1S0tZDjaQsNrVW2XccD14EgW8DPavcoPjkJVtM7db56CtU8MIUW6x zucigO4ypN1ASMk3vCeTV01B5cdqVGpQ1AwQRxBOjxLXQFiMU8IApLo7Rww6Ipn9pnLd3l ilvmnt8Q6iXHlEV/Zhlvl35/QLvhq+ebLANz2dsW5JSeQ+zo243luvU+xi9Q5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258675; a=rsa-sha256; cv=none; b=pjmRsCGJCxLrDvQBU1kqLtt7kOKS0XX1CuwCTX/pXqPSTTuvTrk6FzRpeNG6WZZD1DaUvZ I7wD/Ttu5Y4YX+bm63FjIgvBGE6wj6TFao4/Pk/+OQhRBtunk8VpDB2Apgw5WMTpn9XU2e 0QtbK4dbM+DligSAetHtTABdbp7WHP7rBYmSVmJnTuyRsX3NKJA+KdbGG43H9h+nqZsPXI JvV8oDWCEJn+TBN/dyOzRiRalw8fDagaZAZjpi6XDTuo1y/wJHExeqJQtAXoWyM/Elktjp tysyYYUANM4QHRw4GgkZlW0l5Er/E+VMd40UDSBulPTnSP/CN3aobHJQOkmtzA== 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 4d8Dhf6cwqz3mc; Sun, 16 Nov 2025 02:04: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 5AG24Ypv061017; Sun, 16 Nov 2025 02:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24YCP061014; Sun, 16 Nov 2025 02:04:34 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:34 GMT Message-Id: <202511160204.5AG24YCP061014@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: 6b15dc234dc5 - stable/15 - vmimage.subr: Log pkg/local.sqlite if pkgbase 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: 6b15dc234dc56cd65f07063c1f933c214c477120 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b15dc234dc56cd65f07063c1f933c214c477120 commit 6b15dc234dc56cd65f07063c1f933c214c477120 Author: Colin Percival AuthorDate: 2025-11-15 21:29:25 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 vmimage.subr: Log pkg/local.sqlite if pkgbase We were doing this in vm_extra_install_packages but VM images without any extra packages installed would not get this installed. This results in a pkgbase system which thinks it doesn't have any packages installed (even though all the files are right there). Add a "metalog_add_data ./var/db/pkg/local.sqlite" call to the pkgbase install code path, and make the call from vm_extra_install_packages conditional on !PKGBASE. Reported by: Michael Dexter MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 10a4f2d016dccb5cfa03800bebc09a9b421c4df7) --- release/tools/vmimage.subr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 92f00f9cf7c3..482d279e5987 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -106,6 +106,7 @@ vm_install_base() { $pkg_cmd update selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected + metalog_add_data ./var/db/pkg/local.sqlite else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ @@ -219,7 +220,9 @@ vm_extra_install_packages() { -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ -r ${DESTDIR} \ autoremove - metalog_add_data ./var/db/pkg/local.sqlite + if [ -n "${NOPKGBASE}" ]; then + metalog_add_data ./var/db/pkg/local.sqlite + fi else if [ -n "${WITHOUT_QEMU}" ]; then return 0 From nobody Sun Nov 16 02:04: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 4d8Dhj4WMfz6GjTV; Sun, 16 Nov 2025 02:04: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 4d8Dhj1SbQz3cM9; Sun, 16 Nov 2025 02:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i7giULDhcxpPD9+KMGV2n3MIKlh2y786cmYZZaS2e1I=; b=JSJ8JGHjI8XON+Qz7Nsrlb65WXknQw2wpzRGD4fLOpC0Q2X3WtLmsROXIYuNwkj63ZXsHt q2aSmWXg3I97yezpnYBAldmkmPIgHxhyK/HglyRVrejqeuI70DAFMs2q+cky+9vF3ylx76 NDPjkjdpsuPTGqykp6nSjj4nvPSAtlD+ySe24UEOfJz16FOBvtYHwZwHuCc0z0g2vVSRc6 mOqbKv7rCuGdFKKOZDBizc72X6tWbMGM2kuub9NVFKjafXGfUoMexaIzAZVYlVIzZcPnmB FvCHp9Q56dC1jvdZIdh4uPncnj0Ghl+zMk3GBmCauq+qLLQ8X5Aw51/OWSEfqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i7giULDhcxpPD9+KMGV2n3MIKlh2y786cmYZZaS2e1I=; b=GTZZ5VoahZYePPkX752ZzMugjeYWtiVJt7/o0i+ENedcewPMpoW0XGuO2TKVUXy1Qz4ArZ RAsDtQs3x+t9B/dhJNWC3JUpJ3YL1AgtJ5eBqh2/wcGjx/nxWHBiaonj1D7htmr7qSC11A 1Eb7RXgFiBoPIAUkgJ41RNxYdlMXsT9Zy2KcTZ2QjcWTb35DhffkF7673SuYG16FOYjK0k g8RT7oOyPfC7M2Zl3A0XOo1bYylKavFx0hDpNY/EbN9cNaDXNk+ZJNbdAOzW+jNGnkvQ4Q Ep0hZJ5ORmm75MqyVPxnB1p1Z/eucHXCAqwZ4hJwRfXwJPra425Bow8cqj/aNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258677; a=rsa-sha256; cv=none; b=M1c/DBMNuIWKphW1rfybHE4LK/w2BGm3swCnnhiYnU4jgRLIM9LQSsHwfeZySMXwEATOZC MqBerGyO8V7uWvqm8PNvlOpp2F7YVqGPT0yavK2k1+BCl0zKBLt73uPYn65jFGOAmQg26O GUI360sMd8Y8rdjmHNlpVLUXK0zirBAbIN/LtWs2wubqfEN1RXVyU0xj1z3seOBsl49qvg xOOVfprOUZBPAE6q/f2CgxoHaRxa3ZDfF/rh9rq8cY9YSws8dTmxWaYGtFtnVLDfUHRT4V eg/Wf16ld8G8QPl+ZRi1qNPGnPsxx+RT1G/c2oSbdRd/VkVIKAvSp2liPzdPkA== 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 4d8Dhj0y17z34D; Sun, 16 Nov 2025 02:04: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 5AG24bub061089; Sun, 16 Nov 2025 02:04:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24bYA061086; Sun, 16 Nov 2025 02:04:37 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:37 GMT Message-Id: <202511160204.5AG24bYA061086@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: aade34058733 - stable/15 - vmimage.subr: Enable FreeBSD-base repo if pkgbase 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: aade340587336218b32285d50b0e86c463f273e1 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=aade340587336218b32285d50b0e86c463f273e1 commit aade340587336218b32285d50b0e86c463f273e1 Author: Colin Percival AuthorDate: 2025-11-15 22:00:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 vmimage.subr: Enable FreeBSD-base repo if pkgbase When creating a VM image using pkgbase, create a configuration file in /usr/local/etc/pkg/repos/FreeBSD.conf which enables the FreeBSD-base repository. (This repository is defined in /etc/pkg/FreeBSD.conf as being disabled by default.) Reported by: Mark Millard MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit e0c41af9256b5c5a6c97c85d468ff734e29f1bd5) --- release/tools/vmimage.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 482d279e5987..3455f11d9794 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -107,6 +107,10 @@ vm_install_base() { selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected metalog_add_data ./var/db/pkg/local.sqlite + mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos + echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf + metalog_add_data /usr/local/etc/pkg/repos + metalog_add_data /usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ From nobody Sun Nov 16 02:04: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 4d8Dhk6j4Gz6GjWN; Sun, 16 Nov 2025 02:04: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 4d8Dhk2LpNz3cXR; Sun, 16 Nov 2025 02:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=88xaUj+qulwnYgZktUosWffLJiQmDtdBDRYHlpQs0PM=; b=Zmu28vOH3NYMoP0gxFtbbcDDNzM+OB3aZCN4BGd2uMbtgf/T1JNP5RQPoZekNs/QIw0ZPb dToSw/Swg3UlAvteKscb081T6fKcosMvdb7ZkNuriz29eK6tpfLOkU0Hl9V0oDuUIsuhW7 1SnonmIJwmCtW6/qVXjdj+FzRB8IY1WFPAh54vOfhCbW1Jl0JNrBXIAa1Y9UJBBe8qLd+n 6TXpfHUXj3DLnxmJiMhbtn4PHmf0BCWH5xEBlMQKa3biocvmfDjT9UMXrErpX8Dxnox8As 56P1PtKZF28pYbrLHKKpV7Bdyg9ioFCLGcOo4l7q83FHeOCcBVsi6j6ex/qHzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=88xaUj+qulwnYgZktUosWffLJiQmDtdBDRYHlpQs0PM=; b=KzaF6KD1DBOvZSuJBk9DMB8bG3p2eqkUm446FsctDO4plyrQGgarH2mDz8gepo1sKw7vru 08fH0T86JOFaowjQR8iuy1oEbLbfzsy1SLSVEEG7Btv94GhjyZ+WvT1V0oRPnEqw3ciDDb HjwL/KpBg4ks2pSNxJFx1wgHlS2hNDdBsqaZRJr+kQ95/uQXGoSbjFa/1zHivn8cP4txeW FcWpDkX+RS9PuNyu9ccMTFlBI98DITfI8LlW24+Hc9U0rCvXURFf+0uxc/cumq9eHJqYtw pgrTlSIWiSLDWBCZB9ZRkkkiTL1XdCfLMm/F53CZ1Y4Mq++rL3TZyHqAcwGTOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258678; a=rsa-sha256; cv=none; b=T5Avsb8/MDNSlPpGfWAXijoUO2M42E/Ky3OFbmTUIzAuDJQnKhBCPOIg7c1wiDDAvUK+NH 2WZz7liCvuDLrtdrnu7Zn8a014S22NeYpS+aCSl+c4NXIgaG/HtHCYz4kmoh6kbnpo60ZT Np3iYtmVwlRsQAYMGXU4Yk68cGk8SaqnVq5UxfD9VOdIY+wnrPJU6KWsjd4IGccs0tk3SW E19SHCDx1ZLK5IPKcIea0RI5r1HZ0cP7MRoEzfFEtXZU8jjkn2ONN9uVq899qZr8K36ULl XzmBQ22v5LM+oBFy4sRMX7SOwOEyG3jqhigTN15a6gxCR7Sx2d+Ve+hF6kZPEA== 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 4d8Dhk1s8mz3MX; Sun, 16 Nov 2025 02:04: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 5AG24cpY061134; Sun, 16 Nov 2025 02:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24cHA061131; Sun, 16 Nov 2025 02:04:38 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:38 GMT Message-Id: <202511160204.5AG24cHA061131@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: 9600598a5c01 - stable/15 - vmimage.subr: autoremove -y 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: 9600598a5c011c161813f929be53c3748a6a0f01 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9600598a5c011c161813f929be53c3748a6a0f01 commit 9600598a5c011c161813f929be53c3748a6a0f01 Author: Colin Percival AuthorDate: 2025-11-16 00:39:58 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 vmimage.subr: autoremove -y Running 'pkg autoremove' without -y results in VM image builds failing when (bogusly installed) packages are removed. Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install") MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 509dfd369046ee45b724d119c9eed43228fbb894) --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3455f11d9794..7035b107ae22 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -223,7 +223,7 @@ vm_extra_install_packages() { -o REPOS_DIR=${PKG_REPOS_DIR} \ -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ -r ${DESTDIR} \ - autoremove + autoremove -y if [ -n "${NOPKGBASE}" ]; then metalog_add_data ./var/db/pkg/local.sqlite fi @@ -239,7 +239,7 @@ vm_extra_install_packages() { /usr/sbin/pkg install -y ${p} done chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg autoremove + /usr/sbin/pkg autoremove -y fi return 0 From nobody Sun Nov 16 02:04:39 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 4d8Dhm43rFz6Gj3N; Sun, 16 Nov 2025 02:04: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 4d8Dhl5m0Xz3cfq; Sun, 16 Nov 2025 02:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jxwktt0s/QAl89PRb8dFN547XV4u0441SWf7pF3eCDM=; b=IwP0inPCZP9dt6KLHtDt2A8LHrjcksSKGeIWi8iWEzDVyVdP8iJkDrOPi3VK6oHFFyVBu3 gHQQkQ6WdwFTuCzGAMM2XH8diRIBtdvjuO5fkNdqrNyNK1SVE+QfP/3isNxT2ZtR/8XTdn suynkNJZK+NhKyqLENO4/5NxGz8Z00PzBt7Ohz7gHPyH2yBgGIoSqYWSqD4vLH/evd/FMr dkssQmA6JpcOzQBc9ap7t4DeiWraipz+8VB1XhnNgA/r67g26je2sjLzWYw+5QX5nW5Soo NzW8iFdODnqCkwooR98bt+aGPYLRqEN+S/+T6u3lwCrGb2JH+af/7piVw8XNpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jxwktt0s/QAl89PRb8dFN547XV4u0441SWf7pF3eCDM=; b=iSZwB0rPUw9xW2mMEJ7TjZAsKKfUgPnp006HoiD4SouuxdPUlbMIudU1WTo7+CTlsDuuTk fW5T0V9SAPNHPRsaIU4gkrlBRvTaQa5ES/SiG+Lh3MFX1z0E+B4Raax5WTzKRwd/qvjvt0 tMffFX4VtksAinPClG1GeAebTlcq4opQBCOpgWGeay8Gil5uSmxtfHMennizqQbwYd4xwE o5MFgiP9OUN1ZIJ/e7CaEAqJsdubpuwgy6SpBgYGnXEn3YE9JyrhvFNYTR7Fnykodmcqz7 oPheNcKjL/kON8Pgcrk6TzKuQWu9y6Ef742fMCRfZxKTQi+HcO7aSCPHwjsbAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258679; a=rsa-sha256; cv=none; b=BJvVY0eRW+FzBmZcwOphVMDYr5yJ2UXg0omzwfXRYm8ChweLTigWKPhiNdX2T+EhZZ+PEk KBuJLrAj41U+9ytXQM3s4qNQYq81VfTe7XzoffKRV0xI3FBIaf+EdOyQKGE0dGwNkasuDq l2B/awrDrvFt6GIv16cJ4FDy/PvhFsIZ9UQoeEaZApaIT+OKzZTgWPLmubLfaMQeyh3npT iRqbyr2YxBCXG9N2911KoIgm3NYL0Xm0CtRtqk5EgcifMACluu8UfFkZrBsJIhwPjD+0L/ cA/GD7/GkMZQm2imZDUGDZ8tKcQIlnRQZBbHruZI+eG4G+G6OUb5cDZc3CcDRQ== 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 4d8Dhl2nFZz3md; Sun, 16 Nov 2025 02:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG24d0o061168; Sun, 16 Nov 2025 02:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24dHL061165; Sun, 16 Nov 2025 02:04:39 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:39 GMT Message-Id: <202511160204.5AG24dHL061165@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: 0ff7c9251790 - stable/15 - vmimage.subr: Don't log missing files from pkgs 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: 0ff7c9251790117429d1d04d75ec75585878325d Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ff7c9251790117429d1d04d75ec75585878325d commit 0ff7c9251790117429d1d04d75ec75585878325d Author: Colin Percival AuthorDate: 2025-11-16 01:19:50 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:16 +0000 vmimage.subr: Don't log missing files from pkgs When installing "extra" packages (aka those built from the ports tree), we record everything being installed in METALOG.pkg; the contents of that file is appended to METALOG before we generate the filesystem. There are two cases when files recorded in METALOG.pkg will no longer exist by the time we create the final disk image: 1. If a pkg bug results in false dependencies being installed which are later removed by "pkg autoremove", and 2. If the pkg we build and install from /usr/ports is older than the pkg on pkg.freebsd.org, and pkg gets upgraded automatically as part of installing extra packages. The ultimate issue in both cases is that there's no mechanism for removing entries from METALOG when we run 'pkg delete'. Address this build breakage by checking, line by line, if filesystem objects mentioned in METALOG.pkg exist before appending them to METALOG. Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install") MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 78fa6965e91ec52c24f602250a9d7ec465b9a6ba) --- release/tools/vmimage.subr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 7035b107ae22..03d92850f2a3 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -292,8 +292,15 @@ vm_extra_pkg_rmcache() { buildfs() { local md tmppool + # Copy entries from METALOG.pkg into METALOG, but first check to + # make sure that filesystem objects still exist; some things may + # have been logged which no longer exist if a package was removed. if [ -f ${DESTDIR}/METALOG.pkg ]; then - cat ${DESTDIR}/METALOG.pkg >> ${DESTDIR}/METALOG + while read F REST; do + if [ -e ${DESTDIR}/${F} ]; then + echo "${F} ${REST}" >> ${DESTDIR}/METALOG + fi + done < ${DESTDIR}/METALOG.pkg fi if [ -n "${NO_ROOT}" ]; then From nobody Sun Nov 16 03:11: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 4d8GBN4w17z6GqGV; Sun, 16 Nov 2025 03:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8GBN2xZzz3mxv; Sun, 16 Nov 2025 03:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUJLOnIYFTd/kXw/Oy0vNGBP5U3D64EPovRmRO+0OYI=; b=h112mAv6J8J1vumwy3nSQwqYGlhY+MSqv0jlZcBe6/k5Rl2MEEeBj04tCINj7fSpFvztRo 0YgtF5TlrtDFjmr+OhwgI9mBJLd0u9so/pPYS5zerjH4G1P44n9XPS6w7+c2imDb0UHwiy b6ydDlRnx/EmUeNQENaEHNX9ZL99ewGvIvb+3CPiKS6uFyccaT3jLQr5DtUugU43zLZxLk OS1U0o1CDEYoqJkSqUWXm9tWnYNaMJXU3lNxBegMF7NHOv6JVjyuds2UFssJsn8PYgy67g Frebu6ico5hoWSMxLDn3PkaE0hw3eg8Auv/0Et84DlbpVJUk6RJhRNQX6t5SYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUJLOnIYFTd/kXw/Oy0vNGBP5U3D64EPovRmRO+0OYI=; b=VsnXPy8t817CadxjhhGjXacOQOQuj23jKtuqHXmICPXYauJV7Vj1o+uKJIMwquDuBRs8O9 JpIE0m+FIJAvo0fnZQm6QFsEgpxRN14JyTFDCXnUwHcsrhxbe0vJHcxUJuOHxyoRcDmei2 3pbB+IPvrojag7IcR+lts2RS5gdf2Tmc+X/QIW1TAd0PlcYDjHxV1SrhlQcF37LulxWg9Z XRZx71LzL0YctE8KnYNB6dhu7lLggCuhbxpWWDTI+THlAXJfaFHpA40dz4b2NlHzyNGRNz GLRhp5pmenP4+WUvb6cC+Ghp7tUbyHljA1QDfCJlPZtpkq0krIybu4zDZlYrDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262716; a=rsa-sha256; cv=none; b=UxpBZwrFedp+uFZoQYEotYL1i6drKc7EQUtJIQcsR9ljN5Vi3uxDUYW9BVEhiLzfJyK2MK Es9yfH9fWeTb5b4hPEmbLW9Wv824mR0e0YDOi+EzzCSeUKB3wAUOmjFA1Og6d8AyXBWBLd Z/1wFN50o5w/8E2qLIjEv7eH0r5zprjPa22FP1XCHbZG4XJZ7fxOA3tJpE0N2tAfhyhqrb QOmIv0yDub+vygbAZpMThHY/1+xnEq1UzWG6NMPT8tQc9kKgsnphByYmP1US0bAkBG3U9b NbvFpyZQ4xsgazogNAIxef5nTNWeQXHx68RrA1tUJ+k84UZkgNg3Y3i2N2ODTw== 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 4d8GBN2Gm3z4yv; Sun, 16 Nov 2025 03:11: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 5AG3BukS091452; Sun, 16 Nov 2025 03:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BurN091449; Sun, 16 Nov 2025 03:11:56 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:56 GMT Message-Id: <202511160311.5AG3BurN091449@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: d347f4a2eea6 - releng/15.0 - bsdinstall: Copy in all keys 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d347f4a2eea6ed1964bf3837c7938f6c95e3f06b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d347f4a2eea6ed1964bf3837c7938f6c95e3f06b commit d347f4a2eea6ed1964bf3837c7938f6c95e3f06b Author: Colin Percival AuthorDate: 2025-11-14 05:28:23 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:46 +0000 bsdinstall: Copy in all keys The keys used for pkgbase signing are going to be placed in /usr/share/keys/pkgbase-N where N is the FreeBSD major version number; as such it's not sufficient to copy /usr/share/keys/pkg into the install chroot, but instead we need /usr/share/keys/*. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53753 (cherry picked from commit 6b0909f94099f92992fbd58eee7ce0f9289cb05e) (cherry picked from commit 7c98b725a785efd50e195b298ed279d55ca69860) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 5299d34fcb71..744e0daac6f8 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -337,7 +337,7 @@ local function pkgbase() -- Since pkg always interprets fingerprints paths as relative to -- the --rootdir we must copy the key from the host. assert(os.execute("mkdir -p " .. chroot .. "/usr/share/keys")) - assert(os.execute("cp -R /usr/share/keys/pkg " .. chroot .. "/usr/share/keys/")) + assert(os.execute("cp -R /usr/share/keys/* " .. chroot .. "/usr/share/keys/")) end -- We must use --repo-conf-dir rather than -o REPOS_DIR here as the latter From nobody Sun Nov 16 03:11: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 4d8GBP5QTSz6Gpnh; Sun, 16 Nov 2025 03:11: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 4d8GBP3cLLz3nCH; Sun, 16 Nov 2025 03:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WP5Su0AZOzLbJenXKbUfpXhkvNuzf51yJDycHeaL8R0=; b=NbIDxkNLF273sy7cbQh0zAY3ESwajTemousLdHZZnNaH8EP/dNmBwk5MqWOi28HT36kd0f l2Y7rjYDjht5kYmbIVMMH6dYMDBYnL+7ox3Zmky0QWQ+T28bKeEa+WDDwazpZocjRxpEkD OInJ46MinL85Soju7dTfcEDybQZDibwY/I4DQB937LUJSx6AOsezA+x2KrLrVzDXwLL3q0 IqYNXX0gIGUDL2SfIwJt/4w5WnO+CmhISyj2HgvemIqTcrn1O732yxwvPYI1NPPO8GJydE ttGIwmXO8hAbizc3mnfTuV3LLacZciyN+GbGh8CLGbmOoO0+ATWKc1vEnMeJTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WP5Su0AZOzLbJenXKbUfpXhkvNuzf51yJDycHeaL8R0=; b=S9w3AFNw1W0qvINyHB5l98FpiVJT+1yZv/p8L9Lk53s2vKqCSC2AH8RrmHN0b9suBtoAQh 53EydXTNL29Fy2ab1zY7bbktzR6ipCQZGWP16CwnLFrC1iWziboGFmdxEA85qwyq9Bj0qV Yt5W9XKEmUuZilYDEKrxcpT+JKuv1botemnsTZ37rgX9R1mdMhU8PpCMIZBV0e9nyxcr3O Qp8rrLYXwv7O5Ypy1IcSlTtSBqtz2T4f1NFThiSyhB+gbL8IX9NEpWn0YFm8c+Qjs1rzCj k3SV/Mpk2P5pHgVMDpshjrKjqZEIiZFfIJqIO4qrjR69MYGXdmilbthDj0KOvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262717; a=rsa-sha256; cv=none; b=B/K8WZg04WCuxY4vDHvTqeuOhol+EgROQGTQr73poxs4U+4yFT96C7bq2eOW4kEDJPt48h peyN30zNdCXLl1f9AX9oLlRynjpvyhiOwME1z8Siy1m6WL4sCQ/Cv7nUy5ZequS24/1aMf ADfuHee+S++jdoRB4uXR+wK8Buacoq3NMtxIgTA438l9Dq0WsZrJdIzeEBvTW7VMFDvX7B kov2iIHIXmSdwxKVt7Gz/jn54zBjDYsfYmWQb7bre9Jrkpvf9z4s7EwsHNnQMiTWzh/PKA hG81g6Jw2mFe3pP0zsk1A2Hzs8/Tc2AztEybM4W3Azg1+hg9sqPqJUNfWtecTA== 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 4d8GBP3BRXz52H; Sun, 16 Nov 2025 03:11: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 5AG3Bvph091486; Sun, 16 Nov 2025 03:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BvHV091483; Sun, 16 Nov 2025 03:11:57 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:57 GMT Message-Id: <202511160311.5AG3BvHV091483@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: a13564a16fad - releng/15.0 - Add pkgbase signing keys for FreeBSD 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a13564a16fada30137d62ad0d3c71ef651387ce8 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a13564a16fada30137d62ad0d3c71ef651387ce8 commit a13564a16fada30137d62ad0d3c71ef651387ce8 Author: Colin Percival AuthorDate: 2025-11-15 00:54:17 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:51 +0000 Add pkgbase signing keys for FreeBSD 15 These keys were generated by cperciva@ using the AWS Key Management Service. They will not be used for signing anything other than FreeBSD 15.x pkgbase repositories. Keys will be generated for FreeBSD 16 at a later date, and likely in a different way. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53768 (cherry picked from commit b05f38262b58c1e82ad5f076f2b0b9fe08ddc98b) (cherry picked from commit 01ba48e11347a69ee63636ed534a73f39a145da5) --- etc/mtree/BSD.usr.dist | 6 ++++++ share/keys/Makefile | 2 +- share/keys/pkgbase-15/Makefile | 3 +++ share/keys/pkgbase-15/trusted/Makefile | 8 ++++++++ share/keys/pkgbase-15/trusted/awskms-15 | 2 ++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 1422a96c76ac..2d84ad7b3c5e 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -480,6 +480,12 @@ trusted tags=package=runtime .. .. + pkgbase-15 + revoked tags=package=runtime + .. + trusted tags=package=runtime + .. + .. .. kyua tags=package=tests misc tags=package=tests diff --git a/share/keys/Makefile b/share/keys/Makefile index f4bab152d8cb..98e17356e75a 100644 --- a/share/keys/Makefile +++ b/share/keys/Makefile @@ -1,3 +1,3 @@ -SUBDIR= pkg +SUBDIR= pkg pkgbase-15 .include diff --git a/share/keys/pkgbase-15/Makefile b/share/keys/pkgbase-15/Makefile new file mode 100644 index 000000000000..665bcf389da1 --- /dev/null +++ b/share/keys/pkgbase-15/Makefile @@ -0,0 +1,3 @@ +SUBDIR= trusted + +.include diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile new file mode 100644 index 000000000000..e6205999b12f --- /dev/null +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -0,0 +1,8 @@ +PACKAGE= pkg-bootstrap + +FILES= awskms-15 + +FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted +FILESMODE= 644 + +.include diff --git a/share/keys/pkgbase-15/trusted/awskms-15 b/share/keys/pkgbase-15/trusted/awskms-15 new file mode 100644 index 000000000000..e951b6f9e2d5 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/awskms-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "1d7b45d20fa8d6ed26f9b4a13ac81a6b5df860b9fe644d07b87e92298ba72595" From nobody Sun Nov 16 03:11: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 4d8GBR0JBrz6GqGC; Sun, 16 Nov 2025 03:11: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 4d8GBQ59Hsz3n6C; Sun, 16 Nov 2025 03:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pp4WTz8bGSgTmvPgs4DxNkMfuSVQTTIKtLYnoIhwtdU=; b=Mqv9cO5x857XWru2Y+jVqyFj0XnIhpDlUkwvOYwSuWub+gRiLgrnGo5fXI1f1MkcmsHNEl +510rjeCtBYg3csgU6v7nwkzZd8uEOFEDxlQNQMPquVtLpDM1ifncKiNZvvaZ86/GD4Dip vKEdlMOKgsRAXqso/o/v0p2joGRYEPfs6O4YBrPv8ERCteTJiIqpL56b13+4Ibj3w/7sMZ iV60D7X3dRBI6hrqxOveXJAjd47pV6/fAprk8/guG2P25qogC9CuOJa4I/1L1swauSyPr7 2OLugFiflXz7tyqKTovb/perYXdDez1678PqixG/KZYSTn0ptVqstPCzQu8ZJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pp4WTz8bGSgTmvPgs4DxNkMfuSVQTTIKtLYnoIhwtdU=; b=QKP2eKJP7btRqxRv5SmSVIuU36ZQJF1oLRlm/OtaYkJIMRXygbh6nRold5EIPIhtRIS0gB Wv5kNgs0IlkFtol3hC9iDlrrsCYpcg4UImhQLJuM3LqPuxi6V2HbLWwQtFO9ReZEdTkITb PXJBCHGLDahlaG3mewCLsA/nqHlgJac1wmS9TlEqkrLTthA0IWjAd2aZUQ5RGnpc3FxHzJ H21YKMytvWyKKfh+MUXv9UBMu82EXZbFhbnup8eghneCIu31zdTHf4mJM6mLFjN9Z/crhV pTqDVd8ehT39ofaAFN1vKdkBWmF8ZT8WqODRe6U2M1I86X4bmGFDZu1kzGgT9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262718; a=rsa-sha256; cv=none; b=Br29V9cxeQUvZYZNyxvPbMUliXs5TKQ14F5hSHUmPEUwWi6C9pEMytMNxrBVmoD0TtEtez X4r8YI/g6v8+Fj6xuRw3xnl7fTZVkbT8UyHvyv05wbWZ0m055xWXxkRQ+/lViZ6NLW6OZA /c58rumbGUzVTZZ92Z0reHRTAtFT/ovZ6JsYMxfSyL621aGfu91iU6oD0AJ6gOw+NvJDLZ Feg1KdLBWtnDr/H+b+CEv1GYFtSlquHFeqXTeKR/R9Av2tMs4qc/JHgMvQQFcjH+IJgsCT HK3hLl4SP3g2earRcsfLRSPAFnJ24pjVuJv+lGirNrM1MJ4GO7etjd+PpBYvrQ== 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 4d8GBQ481dz5bP; Sun, 16 Nov 2025 03:11: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 5AG3BwmW091520; Sun, 16 Nov 2025 03:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BwFo091517; Sun, 16 Nov 2025 03:11:58 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:58 GMT Message-Id: <202511160311.5AG3BwFo091517@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: f8526558890c - releng/15.0 - bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f8526558890c201f5a2c3959112db3f0036de385 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f8526558890c201f5a2c3959112db3f0036de385 commit f8526558890c201f5a2c3959112db3f0036de385 Author: Colin Percival AuthorDate: 2025-11-15 03:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:54 +0000 bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE For BETA/RC/RELEASE builds, fetch files from the appropriate repository on pkgbase.freebsd.org, using the appropriate signing keys. Note that there is a separate repository for each BETA and RC; this ensures that someone installing from e.g. a 15.0-RC1 ISO will get 15.0-RC1 bits and not whatever happens to be the most recent build from releng/15.0. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit 51184e38c932b7acedfc26fef3a0aad4c04f8959) (cherry picked from commit 2ce97e800393057e3b8f041993678cb8af2c7607) --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 4 ++-- usr.sbin/bsdinstall/Makefile | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 792c290facdf..86ec8fabe253 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,7 +1,7 @@ FreeBSD-base: { - url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", + fingerprints: "/usr/share/keys/%%KEYSDIR%%", enabled: yes } diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index 5d7be97ed7cf..9a6b25fc5c7a 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,16 +21,26 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE +PKGHOST= pkg +KEYSDIR= pkg SUBURL= base_latest -.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ - ${BRANCH:C/[0-9]+$//} == RC +.elif ${BRANCH} == RELEASE +PKGHOST= pkgbase +KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} +.elif ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC +PKGHOST= pkgbase +KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} +SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" +PKGHOST= pkg +KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%SUBURL%%|${SUBURL}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include From nobody Sun Nov 16 03:11: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 4d8GBS2505z6Gpnn; Sun, 16 Nov 2025 03:12: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 4d8GBR6TZGz3my9; Sun, 16 Nov 2025 03:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJbeXE9TlmjFL/bI3ddGi9AZVcmSGz/VZtvSReYC0s4=; b=iF2Uw5uaKX7Ye2d/HmTya5yytmRrui5OpqfvlOSzuG1W9GxZpgaP0pA34hA3+ZXmmpIokj 9L1ApL7RFJtHE2qI9QQduIXi0AICLBoHvtwNvjpTseyacWhO0cOKuhdFve0SU1e6H+Gay5 KpB8gLyXdy7TSjE64mBXszOCu7HSL73763ID97TYaGwS00BINAQDjZ3oS6UAh/PJ5HBqEJ HEeYG+VBlNZ1QkdNpfSWr8J4dTkyVEvepTtSr4DT6qVjELBShbIJzvDTWgbrectkZVvPS+ YtbIKAL+rNqg0pAgSsXQccDbo3wRmQOGi43LOcWLsvhA0HBqd7hbGoGnfKa4/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJbeXE9TlmjFL/bI3ddGi9AZVcmSGz/VZtvSReYC0s4=; b=ucrpC9BPem4Vt+tWAo8coq1XatBTQ23Ugp1zERukSet1UTSB3JE/JIFYlgKGOUabV7wjEl p7IRTmY9keiLY80RZ7gCNeAJ68mZzMcbjUMJdjYWjCOs4JvlldGK2FHCMx24xB+OmDPVyv prbGBDzsq7uZdYetw6ISykYZ43deNEx6OZKOW4oor3nM2c2goZ8WYEvIataOA7bqDq6dmN 0LlXy1G+bIdjMge17P36Ci4Zt8RawJa10FdrC6kd6Ve7HzMnBtpmVD+E+/gE7FAwiMmsXB eyDRwIdEkXfhktLjWaN2chZoxyWBknbEzLWySh/LG/TXsnDVJHXgUWUJRa5xlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262719; a=rsa-sha256; cv=none; b=TbN7EFNTAXlwrloD9UBI7Ct4I/2fxhXOieTNuBmgOHO5XVC8kJgrt0ZOi8ubDOmnZDmd0h acN4i9BZgvBW+L+yue9K3q0EYVZ/Ucf6QC52zu1yvpEYkhg/OE39PpeoyytDXMFn4UZgjW Imk0Tyr5XTj99KPSszbDRDIO6h/ooTAAYiEZV2RvChTnLeJ+Fhu5KiKR+TAKgDTIuU6gXT 23hHwfZEZry2K+iG5NyDa1JNv+RjUUwKCjK955Z0d/9uyHbLvi+xxxoU9Y/zJnyAIGv0Sr QGqEFW3ud9QRjRMr7MmM0Q33io4I8+DLNSXNH6BTTIND+eApNC7+ZxtGIDQ2YQ== 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 4d8GBR5Q2dz5Zb; Sun, 16 Nov 2025 03:11: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 5AG3Bx9V091555; Sun, 16 Nov 2025 03:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BxvN091552; Sun, 16 Nov 2025 03:11:59 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:59 GMT Message-Id: <202511160311.5AG3BxvN091552@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: 1b859fdfc7f1 - releng/15.0 - bsdinstall: Don't install FreeBSD-base.conf 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 commit 1b859fdfc7f1209bc96a87dcbe134d422c2d6c62 Author: Colin Percival AuthorDate: 2025-11-15 03:18:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:57 +0000 bsdinstall: Don't install FreeBSD-base.conf When installing e.g. 15.0-RC1, we want to get files from the 15.0-RC1 pkgbase repository; but running 'pkg upgrade' after installation should get the latest bits build from releng/15.0. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit bdfc223c7a64369ed133a179c40067435a9f2cb3) (cherry picked from commit e4bc038ef80607ad9ceedb52e059ebc061a2a8be) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 744e0daac6f8..ddbf8eaf4f86 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -309,7 +309,7 @@ local function parse_options() end -- Fetch and install pkgbase packages to BSDINSTALL_CHROOT. --- Respect BSDINSTALL_PKG_REPOS_DIR if set, otherwise use pkg.freebsd.org. +-- Respect BSDINSTALL_PKG_REPOS_DIR if set, otherwise use pkgbase.freebsd.org. local function pkgbase() local options = parse_options() @@ -323,17 +323,9 @@ local function pkgbase() local chroot = assert(os.getenv("BSDINSTALL_CHROOT")) assert(os.execute("mkdir -p " .. chroot)) - -- Always install the default FreeBSD-base.conf file to the chroot, even - -- if we don't actually fetch the packages from the repository specified - -- there (e.g. because we are performing an offline installation). - local chroot_repos_dir = chroot .. "/usr/local/etc/pkg/repos/" - assert(os.execute("mkdir -p " .. chroot_repos_dir)) - assert(os.execute("cp /usr/share/bsdinstall/FreeBSD-base.conf " .. - chroot_repos_dir)) - local repos_dir = os.getenv("BSDINSTALL_PKG_REPOS_DIR") if not repos_dir then - repos_dir = chroot_repos_dir + repos_dir = "/usr/share/bsdinstall/" -- Since pkg always interprets fingerprints paths as relative to -- the --rootdir we must copy the key from the host. assert(os.execute("mkdir -p " .. chroot .. "/usr/share/keys")) From nobody Sun Nov 16 03:12: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 4d8GBV00j5z6GpvH; Sun, 16 Nov 2025 03:12: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 4d8GBS6kHHz3nCk; Sun, 16 Nov 2025 03:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooyZwZ1NGSe0FXGn1MkJOV1a25Rh2pOqrva+Ewv7CC4=; b=V7/Wqm3oSL2ihVWQpRJSFL/HPuK7EvBFHqALuautaeu35oqu8NzThWnJpYtbGIPrhSpU01 VEmD9IbUQICVCU63Yn+QLGbOPJ8U4o1L6l+HTzelPu46mblRw5OCZ1NLNDko7E5kZS+nJ7 OiUuEQJQj+ItWm1vW/T9NVsYWJxw89ingTTg6s+bxcISeLoXXcPQGrpVwyOyvYTVaVxJvd YCocs0eSh9H5Deyhxhhn/sXNqqNRpO/cNc/4BWyf1d68IoXSNzp0KsqjBMZ/iedjfZDlOX UNkIOPNTdvOH7hpxKfhneVBLUv03w4WdItHDOFF5aYA80qDK1i41/i5A/Sz8Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooyZwZ1NGSe0FXGn1MkJOV1a25Rh2pOqrva+Ewv7CC4=; b=Znphf3TCp4zbPL4zvv+DJ029eMAxZe6Lj3E8i5gJuKu0x6ZcNdyuMzAGWcPNZDh07N66d2 BNsJwuLDM0v/QyaO72bXZEPLgPlFBLJxJ+7DQjcNrLpdlUel2zRyAfk+K4+M6hqkyAiine OvhEMS+fMXLgb0ZlSkUUe1z+jC88xuREWP/VXuh48fbwW9giHlk21Nldj9Fjx2GW9gBVh/ JJIY3WedkWnRHhDqZvgSjF6+Su7nDs1nOtsnbcY/huG2DjFbxSa1lALI+0Gp2EpwDrutdU gjcbFpLnN/SiaZirqDmjkw25/gWlQ3d8B0YxoItzQRQyEHAvEamnvug+dse/eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262720; a=rsa-sha256; cv=none; b=oftRuOVUNJ/LtbP1Jap2vFc4j12fP+8sWGhPD52ihmtbMZ3FwsvcbAW75/1IPbRY37FkRm dUy6cCsYmoVTEqepjEp2kdMWyvuwB/f6YXyvVuAZXf7RL2tFmEsxI0cgJtBtQPTNWFDTe/ VUYVLtEUIdKUq2Dy2oQNjIkPfle3HL8gRb6s6ZJ+KQnSsMzrNGABbnw1K3U26DU5APfTZ3 QxfKjNoBx4k8LYr/4TrvUUIkwmm3vvV9jiNVGezmzYasaGvt9v20McK6qzZkNfsaJtjWwx stkkVQ16zrB7wyQ92uo4yTcIJq0rqyrUK+Tutwtmhy0sQLjuS8/+piUEKgjxbA== 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 4d8GBS66Mhz5R4; Sun, 16 Nov 2025 03:12: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 5AG3C016091595; Sun, 16 Nov 2025 03:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C0vG091592; Sun, 16 Nov 2025 03:12:00 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:00 GMT Message-Id: <202511160312.5AG3C0vG091592@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: 5d832135a971 - releng/15.0 - pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 5d832135a971e3976cd54c0a87c896a1eb017f03 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5d832135a971e3976cd54c0a87c896a1eb017f03 commit 5d832135a971e3976cd54c0a87c896a1eb017f03 Author: Colin Percival AuthorDate: 2025-11-15 03:26:07 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:00 +0000 pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf On -CURRENT and -STABLE this gets bits from pkg.freebsd.org; but we get base system bits from pkgbase.freebsd.org for BETA/RC/RELEASE. Note that this repository is disabled by default, but can still be used by explicitly specifying it, e.g. "pkg upgrade -r FreeBSD-base". Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit 8e0b1a1c03a35a5db13e370cb3e62585d3db68e3) (cherry picked from commit 91e1c18012dc839f400f971f02bc08798c6b9ce9) --- usr.sbin/pkg/FreeBSD.conf.latest | 9 +++++++++ usr.sbin/pkg/FreeBSD.conf.quarterly | 9 +++++++++ usr.sbin/pkg/FreeBSD.conf.quarterly-release | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index ac1636386942..f4b80c02cffa 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: no +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 4e26582c6981..117bbd49aeae 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: no +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release b/usr.sbin/pkg/FreeBSD.conf.quarterly-release index b4a78009f7d2..035d0ae976b9 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly-release +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkgbase.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}", + enabled: no +} From nobody Sun Nov 16 03:12: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 4d8GBV6RXSz6GpvK; Sun, 16 Nov 2025 03:12: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 4d8GBV11Z7z3nCx; Sun, 16 Nov 2025 03:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=766DZx/GJYUVND1Uz5txWohhNKec3EaJ8aj/9nC83rw=; b=ix2kG5oCi9PHA3hz8rJA8JTs9xz9BflJRH/ioovf+JDmkomeb9sZOm7H3kK+9RwUw4G8sD ZD8sWJQo7Y6oKyBikw0zklxCf332q1CA7bOBoVReyjpCtCja1e0rMKhKtBhI5JMeBsYEid pp5jxt0vcU4cZ1phNb0rDp03nbNfSUOT+0Vm2Ypdh/VciGdnd5nIU6XfNoqn0tyRcRblWo 56GoDL2qMBoT5BXmI1Y2B3xE8PCILvtvG5YqX3ZjWkIdtnj3cO+Gzkwt62YLgOaDTETUEf Bs/UqR02FWAdZaxLutfUZOjEWvhZRulrbteraKnb0VJY5v9oywqKQiUsTydSug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=766DZx/GJYUVND1Uz5txWohhNKec3EaJ8aj/9nC83rw=; b=fsK944qoh7W4bgZpyoTEN+GrR62K3x5JjNSiDzde/ujp7rdc5Cuksb4xu1wl1j0U+wC0hZ 8K6V6bWY1ZyYEa2dhsRetcS+JTjwqWuGbem8VUv7vShSVCY/tnGjsY136tytisAaWPlDPn ptqNyaIUgSL5sIfwZ2qEEF3xsxOao1vu2lsoTP7q8pWg40ev4sAL+dw1aGps8Z4SZQ4b2s jtZ0+W8fdcU4n5P5S0d1jjt4gnNExz+autHldoxlF6wLDSQ7dqHmT434RiAimMyXWTo0i6 pQT9U96SsPPuHKMB4AFVBHev+ULSfkFwY/EWU3yedXupR5n0RO2CiTvyvT5B1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262722; a=rsa-sha256; cv=none; b=bPf3D/x4YbsEr9/ayC9erm6QA6PGNolPGXh40EDfWQDw7EAiw6QBYhhXaOXvtF78jR1Lr2 kLkGWmAtYHA4kcGoKNFs67q7rLVJfeubFdZZlFKs6wnc1JECa+MGyW/VoZcz0YDa7Eqpbo Wof2SXZzARDtCcMS23NaWHARO8h3Ojzkjhyn4HBmlvEHw5G/uYaY3aNnkxA81c68mFabZ5 z7ADQ1KzUo6qPC3W2JByV+75jcd3+rcDt2PMV9C3GntOYhoM4chJPtYiiNqd1X8iEnOMD9 6WcenZ8OGx/DdNOM8FVFsZbr98ycrz3877Cuf+WmOtNfwXPUw/iipnOnpA1uTA== 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 4d8GBV01Fmz4yy; Sun, 16 Nov 2025 03:12: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 5AG3C1Er091635; Sun, 16 Nov 2025 03:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C1ZV091632; Sun, 16 Nov 2025 03:12:01 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:01 GMT Message-Id: <202511160312.5AG3C1ZV091632@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: 75ee49d2ed5f - releng/15.0 - GCE: Add TARGET and FS to image family 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 75ee49d2ed5fd904710071ebd4549a4eb506c547 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=75ee49d2ed5fd904710071ebd4549a4eb506c547 commit 75ee49d2ed5fd904710071ebd4549a4eb506c547 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:03 +0000 GCE: Add TARGET and FS to image family GCE image family is meant to be unique per set of image characteristics so that a user can create instances using the image family instead of the image name to reliably get a similar image with updated software, but no other changes. Without this change, the instances create API would select the most recent non-deprecated image matching the name, regardless of architecture or filesystem. Approved by: re (cperciva) (cherry picked from commit fc83e6c5e1f20087314dc52b63e485db87a98b86) (cherry picked from commit 0005bb76e2e707f5ed39ca67beddb8a5d629c72e) --- release/Makefile.gce | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 06b76857ae88..a6d09de468c0 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -16,7 +16,7 @@ GCE_BUCKET?= GCE_LICENSE?= .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) -GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,} +GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" @@ -74,7 +74,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ - --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ + --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET} From nobody Sun Nov 16 03:12: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 4d8GBX0d4kz6GqJv; Sun, 16 Nov 2025 03:12: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 4d8GBW1CLKz3n6s; Sun, 16 Nov 2025 03:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5aoSwJMQveq8frv9vR7Oa016G/LeNYZ9lEPJ/e/PjV8=; b=trj++B7wOCxqNDtcyJbWlGHK5cPdNpuiIXTWtvHEUnZ+t//wemwZeHHe2gJNzTxJaf6aSL AokRwjSupoh3RAHlN+DnBpKmQPiQ68qo5hwEaob/xBuKUDtFth445ZpQIaBpwCY57gj6cP uweePlTcM1+BGhHhqselOU1ZKvaWRbidnjZzZJuWGeyFrBccd+L4oEjvbXhDpVHVFWgA3u eNJ+iVID35vIC15SGlK3BlY+9ZKyVELFzZg4GHU+SWIDuwDh2WLi0vLxfras/rKpZ72DAt zQ3fTAbK2XY2ina4Wn4N8BnFYeYg8rj3cjPH2Qcs9d4zX8DIr0wgACjZp3lxCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5aoSwJMQveq8frv9vR7Oa016G/LeNYZ9lEPJ/e/PjV8=; b=drSiKUpkxluj6HSwnAHxqBwykx+ZYmt/dRoMivl2iDSFA64MF1TlQ91HtfqLzTaMznoTdk WRGdxDe61Q/14CAFrJzuL7d3TczZ5xwAsjX9uj451/LGW+HtER0dPy5TlprcN9qgn6SBCH EpRZ1TzeM0VNm3hdKxEp4S8Rra1b+gu7fYdxZ4UtPhgFcaDEK3GygayPK9kFYm8DAE6KRI 0Ug+Ik1kRqTtAWYBre15Vxi7kbUm0Ub/x6bKXT/u0WxxFhO3BM63WArJNgyRXf9IDnyhco KF1ny5L9KmjFv/Hu2Hk/kWDrmc+etsVi8dZbSN/3O5ujwjKoXUkXLqfoOm+M/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262723; a=rsa-sha256; cv=none; b=FezvoIDuwosvU9PBk1nkn1VWiAGAO5qxLpZzsLGlDX+EnYRsEuiesGr7Ei+x5ivu+Oz5aO y/skm14aKHiynGmhLMy5P1gpR3uHiz3BAGBHPLTDq0CCueQvlNYE+iS4fvqEP6VdoedyTE l47wZO06eBo8dtXZwbEp03xRZO5lc07Vko3ZfRYAQLqELG57Zo/K4ZewYqMX9vzLMNXfVG 0cqS11jLHHIgI7HG3GFi8OkgaJZTPQbYLXJJOfOgmZIIkKO6pb7N4QMWF9M7pUzks2VenH l6eGioX75a45knq6KIesQt7HoYY4G8OJHM/nC0jGkP+j7PADA8twIZEzq0GzKg== 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 4d8GBW0X3vz5SV; Sun, 16 Nov 2025 03:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG3C2jo092461; Sun, 16 Nov 2025 03:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C2We092447; Sun, 16 Nov 2025 03:12:02 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:02 GMT Message-Id: <202511160312.5AG3C2We092447@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: c0a98d7f9daf - releng/15.0 - GCE: Specify the architecture of images 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c0a98d7f9dafbb52a533ba7ef3df51895141b2b5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a98d7f9dafbb52a533ba7ef3df51895141b2b5 commit c0a98d7f9dafbb52a533ba7ef3df51895141b2b5 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:07 +0000 GCE: Specify the architecture of images Without a specified architecture, a user can attempt to create an arm64 instance with an amd64 image or vice versa. With the change the API will prevent that mismatch. Approved by: re (cperciva) (cherry picked from commit 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434) (cherry picked from commit 93769d225fddad4bc56f4edf543de45d8b666734) --- release/Makefile.gce | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/Makefile.gce b/release/Makefile.gce index a6d09de468c0..21df4ddbc3f5 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -15,6 +15,14 @@ CLEANFILES+= ${GCE_UPLOAD_TGTS} GCE_BUCKET?= GCE_LICENSE?= +.if ${TARGET_ARCH} == "amd64" +GCE_ARCH= X86_64 +.elif ${TARGET_ARCH} == "aarch64" +GCE_ARCH= ARM64 +.else +.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +.endif + .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif @@ -74,6 +82,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ + --architecture=${GCE_ARCH} \ --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz From nobody Sun Nov 16 03:12: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 4d8GBY0Xthz6Gpww; Sun, 16 Nov 2025 03:12: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 4d8GBX1gWDz3n96; Sun, 16 Nov 2025 03:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ouhudHsua8QPqsUp5X8Ki1C0WxztE23KUfdlBR7pQZ4=; b=PuVFwlD50M1/iG1Si9n4c3lB1xkXu4wOFKi4P2FSTrIeT+D55SGdFjZNF8YNYrU/rj7U/M FHLvuFJv9u0InvUScd/nRRCOu/G5r1NinzWSHUALbhnyBSJ6Vqhoqo8Jps82QYstgALKks mwYswlQ/xa2I10jeiW2O9sj7PSf0iQx1UPRUW/zewF4uMEn5vt9LN20rkYm64gHwBBzCDV x8gJBGDn4WexcB94TetHH0bdFNtX6OEPFvq1CZ5y7pcqyEovNfbjEeanurnVoZR183yRaa RPL1NyhgjKYBVAGzUiNkGzGEhdD8XfRZlc7yqwhZmVXzBgzWIFnuEZ4HPgVC0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ouhudHsua8QPqsUp5X8Ki1C0WxztE23KUfdlBR7pQZ4=; b=IGWjLXtr+Uc+jifNTZJJgGbvmY6AghEZVpFY2FiyGknnsilAR/KHCBQhNSds8yVUbd39Ws GUoqIc62T00tTdrZHyd35UkFc9k2CtYfZAkams+g4A1Ws3PBAfoq3ooDiRanJO2dGlMXnk baV0iigIt9p443s+BgB3gAVCi9I3NRaH8/TdR5mKuRSnKGRX6bEnjP6qjYLA3DH3TkwK0z 4jtJz/1IKKDXTrIT6MOnZCnFu//xbXz2pYQa+VGVZK5ilOCjmP6KFZlLMJqy1s/0+hv7+L PSsdAw1MyRQYAXX8+KsWPiRx5z26yHDknX5ZGbVy0oV2dGgt6ffo/0jg4AmvkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262724; a=rsa-sha256; cv=none; b=nsWGqKr/o5MY+U7uyNfhuF0b9PVOLvpc8Q4nNLcEubxZtxyEa2h9Rza86cl8byNvJF+rsT ZdxAATHXNcdhcvWidwOykibO2NSXHBQkPlkC9gbfK9LB0JgGhkdvyCRk9WyZOJ2bFQeBJx bTEfIctrd9vimU2VnZT+5R8WmoB4H+5HndDWuLhLyZ2Z1MXv7WaIZyFkTaXdiiBYcyDnjW CtwW8M09gSj+RXU/Kv6Vt+WjyBatY+X9dSqSva/0PSOXyz7UgaQnZ+YGXE693DwRZOEaBo id+9F2wleE7JTdvjVysXxliQxXNkQZjrTgGMyDhuXH8lu+OPE1wjjJcW3uHWOg== 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 4d8GBX0xS2z5bR; Sun, 16 Nov 2025 03:12: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 5AG3C4ZK094011; Sun, 16 Nov 2025 03:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C4SC093996; Sun, 16 Nov 2025 03:12:04 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:04 GMT Message-Id: <202511160312.5AG3C4SC093996@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: 567ba10572cf - releng/15.0 - GCE: Don't .error on unsupported targets 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 567ba10572cf6c75dec6175c4deae3df68470921 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=567ba10572cf6c75dec6175c4deae3df68470921 commit 567ba10572cf6c75dec6175c4deae3df68470921 Author: Colin Percival AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:10 +0000 GCE: Don't .error on unsupported targets We ingest Makefile.gce even when we're not trying to create GCE images so we don't want to .error here. Instead, set GCE_ARCH to a dummy value which should make the problem clear to anyone who attempts to create GCE images on an unsupported architecture. Approved by: re (cperciva) Reported by: Jenkins Fixes: 0a8ecca4e315 ("GCE: Specify the architecture of images") (cherry picked from commit 787d09753f70bb382a7cbfba742a612fa54069e6) (cherry picked from commit 375f8df26be16b58ff9185823e5d90761d2144e3) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 21df4ddbc3f5..31770bfd5098 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -20,7 +20,7 @@ GCE_ARCH= X86_64 .elif ${TARGET_ARCH} == "aarch64" GCE_ARCH= ARM64 .else -.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +GCE_ARCH= UNSUPPORTED_IN_GCE .endif .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) From nobody Sun Nov 16 03:12:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8GBb2wlVz6Gq0F; Sun, 16 Nov 2025 03:12: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 4d8GBZ2hdxz3n9f; Sun, 16 Nov 2025 03:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fnLPh9C3g9gHBldKtDy7BIkukOiGOTKcUzy8Bg3z2I=; b=hSdvWdrOyqWVCTTmKvah84476ifgm6R93RSC5wekZY8QVr6N2o0QFiOsEiEm7ybG5iDgC8 wAwnnY+MMNaaicNxw7zo7gaF/BVDb9vON8TXTRCYJeasosSgmzqliIAP8r4b5BysmRzypu CO1HGn9eeKgr9Ww1a17E9BUZM49jRYVBKyTO6PZYIwwlihSQlvfMfwkbYN/p7Tbp+/PCUt WIwTuToYqzert6zBbe/vkrqsimb9qxlgj/cML9AOtLeVgeOMJ3X5xIp9t6oKcAWGZsmCIs hSiennDbiuyV45Gq+Uiz5gLEMws3h12fTqECMRrwf1KtuqOQJbU0PD2j/McuvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fnLPh9C3g9gHBldKtDy7BIkukOiGOTKcUzy8Bg3z2I=; b=cULr6mZboqRr/tsvwLHSDSNrp2WyVD1CjgNrceww8c+U4Z3sCCOcRDTBotLmStIxL8MQfD 2kb9RYeiT53GlOb5hv6RCZREC2CemqV/g9O6oG/Xf1nzP1tAM8hHeQYf+BKz7G00eGOcZq XzzsvqFKr69davY/r9nVol0E1kvlcSZN5aM0y9wG8pcPzNUi8mnXykpgkfuPmUtbq9ZZ+w 0xENwwtPkwS0jTUqfEohoLsO7wkgNAZE/d2+Z5jLt58YGk4jlf230W+SLFDfoHCcW7H9Xs dM7866Jm4+L4IkKtbYbR8Mk+MzuzqbuSBM9ryAkCNB82qpGzhccMrFGrJEndtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262726; a=rsa-sha256; cv=none; b=bCtgB8LsDZG+R8q9BeKymLW91HLrrpRcvj5UQVS3m4gor+9ZGe52VdoCzfupNMgSgE5iIt J5Di7WGlY7qh/YsMeYnMWmMeFSVGcvA90TcNiqe1L3CCTGx9hIYpchXXFr2mKsEZapqrzp EBr9/r6yBEKmY+BGioBpUOAtyj2/rhq06NTd1h0zERMUF0lLDLua45qzHedaCP7lkdczbb N11O1tc4KMdc7To1D3UYF0nHFW89ne4qd1GCAX2y4YjbpXAFeWbfcDaNwJzO+KcBqHyTiU 84qYA3ml29ytAt2Q7HzsRDlMTSqBixf4M7ay/kEHU+rtgwaE5ERYSlfqQxBi8w== 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 4d8GBZ2615z5Zg; Sun, 16 Nov 2025 03:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG3C6D9094403; Sun, 16 Nov 2025 03:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C6RS094400; Sun, 16 Nov 2025 03:12:06 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:06 GMT Message-Id: <202511160312.5AG3C6RS094400@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: 9835413fb078 - releng/15.0 - bsdinstall: Enable FreeBSD-base repo when pkgbase 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 9835413fb0788f65002a40f47e02c08e23047525 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9835413fb0788f65002a40f47e02c08e23047525 commit 9835413fb0788f65002a40f47e02c08e23047525 Author: Colin Percival AuthorDate: 2025-11-15 21:56:35 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:17 +0000 bsdinstall: Enable FreeBSD-base repo when pkgbase When performing a pkgbase install, create a configuration file in /usr/local/etc/pkg/repos/FreeBSD.conf which enables the FreeBSD-base repository. (This repository is defined in /etc/pkg/FreeBSD.conf as being disabled by default.) Approved by: re (cperciva) Reported by: Mark Millard Reviewed by: markj MFC after: immediately (needed for 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53777 (cherry picked from commit a96230e0329b32cbee0999813787a86eab521da4) (cherry picked from commit 5d9062f2581ed280c49699a5d7c808015997ed24) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index ddbf8eaf4f86..89ddc244171e 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -355,6 +355,10 @@ local function pkgbase() if not os.execute(pkg .. "install -U -y -r FreeBSD-base " .. packages) then os.exit(1) end + + -- Enable the FreeBSD-base repository for this system. + assert(os.execute("mkdir -p " .. chroot .. "/usr/local/etc/pkg/repos")) + assert(os.execute("echo 'FreeBSD-base: { enabled: yes }' > " .. chroot .. "/usr/local/etc/pkg/repos/FreeBSD.conf")) end pkgbase() From nobody Sun Nov 16 03:12: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 4d8GBc2mqxz6GpvX; Sun, 16 Nov 2025 03:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8GBb5Bbwz3nM3; Sun, 16 Nov 2025 03:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7l+lIJLdttoIF1y1QRFnw4Fg9HdkvpNfqG2zZMsIjY=; b=YhQ3psgwvakCCXkDJvC1vDjXUiKsfU+Pu3n46Lr0krcNnuKcbFdMzCwa4fPuFLd7xFXWwK RmdgWmWxA6zgFyzfcPof6DC40eg6SpzbDVEfzhPcmU+tVapZWTpMCsMCpu52meq5TynEpN CwNID6Le5mpCU71xfybQO3mGFy57ytT/whxHrLtODmvK/mb5bwuuSo98JEaJuASKLRrn7+ 3M3g2SEBqkcGgymXqkerChkxIfWIs9kzzmIRUCCqbsMDK4QTlWPzMwN3sG47mwPLY4ZAQe fqRwoRySnjgPFHdlvhDtzPFwQ+I2pVdPePPkMYolHE6PJIy4Az1V/QwUuKcL7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7l+lIJLdttoIF1y1QRFnw4Fg9HdkvpNfqG2zZMsIjY=; b=c+MNaazM1hDsNz16H5SDxFePjIrJrhTLud1xFGynlC05TL0czRGvyxH5YrccL8yAJeYQZS yO4aNJUQpDUMZlZ7oBXxZTZHnalQYqgtsnjcokyE4W1Cxj9mON6nhZ+5JfoGqynwho8H6H fxAvgpUn9ml6D6deeKHungubbbmT6i6UgHMWxd24wVDb3B+i6OEv50nw9SGFoCg93ROtzg BRnRRZWsD570VVcVY47LN4/REfrG6zD9PngWOBbJ0HIGN1wfxbthNfLvg0qEshJa4rNRHh pLkbe47LfihTZE+0buM7B3iDZf6ORkeROym9JmlkF/fwppILnZ/51ANiKgAHag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262727; a=rsa-sha256; cv=none; b=oJiA2zRFGF72iHhEj9mX0nevJABi2XXnditA7KayQrUgerTbX0dP+KgEKtkF+oI1XE8jVz Tm7fjLySSPQQf9pu01PtEuIROCTUNwTuMo8Dvf5sMBSiguS7HgYAx5usjtnUFm/SnYuL9o 80FsixpfzBbdOxaAIV1qCsDzro3VtjTX/ol7Fob2jejTIt8ykxL+6J4w4VK6b72OqLeA4t BIN8KEtg83ABn5Lf9yrrnZZIpjNOoVU/prXUEWlP2lLSnIonzJTreT7OoGnpUYh3vl5clk RarDtqJdxzUW+hkNyR6aYxINKY06s+uKdP04eXGn6LODRPmHjxDAUXQyC8Zwyw== 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 4d8GBb4G9Cz5qR; Sun, 16 Nov 2025 03:12: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 5AG3C79W094436; Sun, 16 Nov 2025 03:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C7tp094433; Sun, 16 Nov 2025 03:12:07 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:07 GMT Message-Id: <202511160312.5AG3C7tp094433@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: 93c5db9e9cd5 - releng/15.0 - vmimage.subr: Enable FreeBSD-base repo if pkgbase 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 93c5db9e9cd59d6f158812b07cb64a93d9685164 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=93c5db9e9cd59d6f158812b07cb64a93d9685164 commit 93c5db9e9cd59d6f158812b07cb64a93d9685164 Author: Colin Percival AuthorDate: 2025-11-15 22:00:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:20 +0000 vmimage.subr: Enable FreeBSD-base repo if pkgbase When creating a VM image using pkgbase, create a configuration file in /usr/local/etc/pkg/repos/FreeBSD.conf which enables the FreeBSD-base repository. (This repository is defined in /etc/pkg/FreeBSD.conf as being disabled by default.) Approved by: re (cperciva) Reported by: Mark Millard MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit e0c41af9256b5c5a6c97c85d468ff734e29f1bd5) (cherry picked from commit aade340587336218b32285d50b0e86c463f273e1) --- release/tools/vmimage.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 482d279e5987..3455f11d9794 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -107,6 +107,10 @@ vm_install_base() { selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected metalog_add_data ./var/db/pkg/local.sqlite + mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos + echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf + metalog_add_data /usr/local/etc/pkg/repos + metalog_add_data /usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ From nobody Sun Nov 16 03:12: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 4d8GBZ2t1Tz6GpdK; Sun, 16 Nov 2025 03:12:06 +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 4d8GBY2ShGz3n9N; Sun, 16 Nov 2025 03:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBSuEkomslDX8jgl6WAhJBTSNjAxozUzyt9/R2q1Z80=; b=SuafWesOQo8DSHzI2DeXLmajW8miRp3A0Yr9YdxVCHKOSNlY3rKE0uxqBKD6fIowxPNNyG Co+2yr2SklP5gfKkurYpBwpwWA68DmONVb9y7dLDeThys9SMJIcRpDHdRT/qXJL6WC4Zc0 HWRIlIh/5agcyVFS5c/oZ8JFU2NNLmg+3zzn4mI9Ok4KY3OMpjJeowDcI88weQLJoisxLu zhfD423KKRgxZTfjLXtosNoAC5jb7iR3yBcKCrS9n9cyEKMZ/+524sfmpPPSDsdMFbliQp EPb7yDTKuIq4dGl7+vCi8uK7CMqNTXKaRoIezooAg9skqk3C0ReXp9SzEAX36w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBSuEkomslDX8jgl6WAhJBTSNjAxozUzyt9/R2q1Z80=; b=a6N8RQF0mPszIDYxK9ro+wN+Q7iXZ5Rd6/P0Dmh6V/1jmjfg5NwwtJUFzhsOg2vuR06qGL TTYO7OE/V/t7Ryr2LZ10LTNqqSENs9gs5GN07t5igUZ9uRgBpt7qy6XoILOEKBKrl1vthK Kcxk+kx91+rM9ee2Ys3ynHElgm9bjFs0nboaYBiOvBM1DLWHBBvJQHj8RgpMAGxibCmPy8 DGhTxXf8yEazW54L1dfD7BTl7jo+b7BxQQeH7fGkhv/5kSe410xA6IzdNGRMouj3Dj34Ej Kesu1MW9gT9RzZILQt/ez/GkZu/s5QxDCVYpdmC3YOdUjGwtT7Y5EuFSQHTCYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262725; a=rsa-sha256; cv=none; b=S8fKQPzcmT7T0thozR+9tsU0CYBZh7DBW97tqZaMCzDOrltuVmdRJ7ZGCRqUvi9j6gl3nr fyrwYpT4inZFLcRdzBI8u9kOrzi8szXeu8fGIIZWZsaTxkFiuiole1MSU4FkBbmrzEONeb vc+M+cOdlMM3mySZR/wUh3FBl6o2Re/fpT/ohdIO5lq+5vAdzKbz4na9bPfZy1cl+B4IBz pFk1n4lLIWzMe/G7mSKAlOhqAvSMmEphBe8e6tSq7p3MS1qyQmzuPvUoOgsHoc3z5+roPA Q6z+Vb7tbix4bSDUea1po1dd1ad+E3kNxVWI5jmufIz+6sfGDNl8L99HXpKxxQ== 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 4d8GBY1TpKz5XF; Sun, 16 Nov 2025 03:12: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 5AG3C5o9094370; Sun, 16 Nov 2025 03:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C5Cx094367; Sun, 16 Nov 2025 03:12:05 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:05 GMT Message-Id: <202511160312.5AG3C5Cx094367@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: dbe26fafc618 - releng/15.0 - vmimage.subr: Log pkg/local.sqlite if pkgbase 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: dbe26fafc6185ef3de2f2cb7034c129e6554f6de Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe26fafc6185ef3de2f2cb7034c129e6554f6de commit dbe26fafc6185ef3de2f2cb7034c129e6554f6de Author: Colin Percival AuthorDate: 2025-11-15 21:29:25 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:14 +0000 vmimage.subr: Log pkg/local.sqlite if pkgbase We were doing this in vm_extra_install_packages but VM images without any extra packages installed would not get this installed. This results in a pkgbase system which thinks it doesn't have any packages installed (even though all the files are right there). Add a "metalog_add_data ./var/db/pkg/local.sqlite" call to the pkgbase install code path, and make the call from vm_extra_install_packages conditional on !PKGBASE. Approved by: re (cperciva) Reported by: Michael Dexter MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 10a4f2d016dccb5cfa03800bebc09a9b421c4df7) (cherry picked from commit 6b15dc234dc56cd65f07063c1f933c214c477120) --- release/tools/vmimage.subr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 92f00f9cf7c3..482d279e5987 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -106,6 +106,7 @@ vm_install_base() { $pkg_cmd update selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected + metalog_add_data ./var/db/pkg/local.sqlite else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ @@ -219,7 +220,9 @@ vm_extra_install_packages() { -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ -r ${DESTDIR} \ autoremove - metalog_add_data ./var/db/pkg/local.sqlite + if [ -n "${NOPKGBASE}" ]; then + metalog_add_data ./var/db/pkg/local.sqlite + fi else if [ -n "${WITHOUT_QEMU}" ]; then return 0 From nobody Sun Nov 16 03:12: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 4d8GBd29J0z6Gpvg; Sun, 16 Nov 2025 03:12: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 4d8GBc5Hg9z3nM9; Sun, 16 Nov 2025 03:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQrYREIeA7IiI3k2oQvti5SsrGXfxUpospyHGIkYGls=; b=HB2TRtBhlZ2/UuTSPeoyiz3ZOZXPFCTLRK4R2QxRauqn5td3VQFbru6kIdpc3Ge2Xvrbl9 JJQCA+7HmCCw0fQqRWhje+AfFXhOqzpL0Asyx2P3xauUM4FDWQo//fPbyYuBd7QqoaAp04 A89vOouBcymh7MW6jExuOwq+0IoXLoE7GlGuZPcgCEVNZVoNonegwpy0v556sTqjkLzsuf 1UQHUsNrzfJzrJaYTYnRDxaXcxi0woBXIM8Q1dxEmb9xr5S1+RBU0sftRgtzN2pS73EFtj VZEXAlESwpiK76URV/jHZLi2Q7TrwDdS5950YK6jITvvRaP4ea33L+UoateTwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQrYREIeA7IiI3k2oQvti5SsrGXfxUpospyHGIkYGls=; b=nNvW6qpmgmjCzSgErZyl2yQmhV1fMayQf5X+p/LkyTdtmAO618uxCy/rijIBjzyy/ylZsX P/UjXGLHV7NoPJEaEji9jNCdOH04mdg9zcpGKvp+M5esuxBWh7vWVEqAYay6Wbbp1CBynN SIrWhet6Oqo67gNHE84JU7GAbXVYT8C8ND6MYTYj8FbcvKF2NLC14y/dNivsVTwFYFgUU3 /vSlBXgFvlHw/qY8YOLU8j6BTHrg+eAa0wchOj0BdNd4wJd72NrwMo8RT4WnBawGKrLFyO j3m4iCHv5Gv9QC2476VHiD/KKdZLoFd76j+7mh2kgpg9gTl8TNGoS1I7Kj5ZkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262728; a=rsa-sha256; cv=none; b=UJOOukCFxV62BPnKR23fTD1KaFoWZQmZScsbSOrTOjUUj8bUio28dBbhcmmbS9zDjTtE75 zKP1OW5hRHG4N/wFCYMhKTt5UwOihr8v4kdpthRjnZzhixiOxZUUButCVqaj5pjihrYD1h Q36pS2aWQwbFUGWz0nH/4DWNC+RMYYHs9uohKBIvuVYnJ4WAViqgZEUC9VKoRhEnBl/fTl /gaLeBLbeWKeAW4eNeROJrVP4lR7QntBHiRmeV4Cgf0tXiBEJl1NhxKn0q+b1CmT7RwJuQ baQMoCVAE5G6J83ourCTWU/JCaAATURQ2NuK6wzUcFqYR99SwGwZCVoBfF6oAg== 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 4d8GBc4D9Pz52L; Sun, 16 Nov 2025 03:12: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 5AG3C8Wc094475; Sun, 16 Nov 2025 03:12:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C8w8094472; Sun, 16 Nov 2025 03:12:08 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:08 GMT Message-Id: <202511160312.5AG3C8w8094472@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: 6ac6550a91f1 - releng/15.0 - vmimage.subr: autoremove -y 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6ac6550a91f1df265a36c368052d908c3294e348 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac6550a91f1df265a36c368052d908c3294e348 commit 6ac6550a91f1df265a36c368052d908c3294e348 Author: Colin Percival AuthorDate: 2025-11-16 00:39:58 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:23 +0000 vmimage.subr: autoremove -y Running 'pkg autoremove' without -y results in VM image builds failing when (bogusly installed) packages are removed. Approved by: re (cperciva) Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install") MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 509dfd369046ee45b724d119c9eed43228fbb894) (cherry picked from commit 9600598a5c011c161813f929be53c3748a6a0f01) --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3455f11d9794..7035b107ae22 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -223,7 +223,7 @@ vm_extra_install_packages() { -o REPOS_DIR=${PKG_REPOS_DIR} \ -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ -r ${DESTDIR} \ - autoremove + autoremove -y if [ -n "${NOPKGBASE}" ]; then metalog_add_data ./var/db/pkg/local.sqlite fi @@ -239,7 +239,7 @@ vm_extra_install_packages() { /usr/sbin/pkg install -y ${p} done chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg autoremove + /usr/sbin/pkg autoremove -y fi return 0 From nobody Sun Nov 16 03:12:09 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 4d8GBg3Pdxz6Gpvl; Sun, 16 Nov 2025 03:12: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 4d8GBf1Tygz3njc; Sun, 16 Nov 2025 03:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h7y6SxUb3cFnb0lDOZZrxD9W4tE+406r40SUOPJJCao=; b=fVEDLv1yJ7RAm523PhJDIC9jRP8coWhssJKLncHJuoIp+GxaccI7vLCIzPnrqHpcuyZkIX KqQNrVfHNoGhjdFZ8bDn5c+LpvuL1DtHR+a2vBCWYHFEqSq6JIMJWTItw/jDzAYFm0FTjK 2mUJ5MZ8GZ6x3Xpvtn5VKN7hXTuykz5a2BN2vuh3BKmXbdmFuyM+r34pXDJS8oVB6BrXKV FaxY78FnobG6eC7AiC/iKg8lOdlxhZJY47yxA7kAJ0HaPqX77BEXZVq0jlcJ/dgWLef2s2 Cf/qgxhtBEud6xBeT9+CU+s/MfQpRC8oDYvS/9VYxctPfbRGwytaPrHBZ9jv/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h7y6SxUb3cFnb0lDOZZrxD9W4tE+406r40SUOPJJCao=; b=DXIC0r48iVw7skzJQ9UojjNQRRS+Y/Z0J1O/T6liEFqoSYahchBvcCuoywBy+yfPYCCJkz Pi1hCy7yVqUH5IGgKHN5oX+32DVODei++MXgwy2sa3e3G8+pW/3kjBpd2MUXBy/CJ9wp2e rbRtx2Y1o6PcKA66j6jezEN9ocedOP7+LkfQtzWnPleDxvegurDwPlDpf7RlKm2ZUJaLOE Ap+G3JFXWDoBK3WffLxnS5G8FnteZRbEC7rMwqW6l7uVjD5Ctk8aO1t4EOqtvj+CIXegTN 9TjEvTxLXEeDtifcWAzFo9jgGWsp7/Hpe2nIqQXpxhA9Lw8+cEKbK89kKSNgCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262730; a=rsa-sha256; cv=none; b=xkUiSLoR3ctR7VpymAjMk6IHI7S4Roy8yX1Yauhlfxw46j9KOHgCqi0if85AFWWZX1aZFi 9p3qd9HMj/A0dR/I9pahKtnQjt1KfD/E0PzaZc6M4gZ+yv/vPIpB2O6xllvUvUPTiwfZVs YOqzC9Bx/aQYC7cteLcvc6zkk/k3G9e2SgjugnP8DfAXl+5Sffeau8CsiKEROI1QiC/HZI VbruAI2NdxqwNNHJSYBIDaN12cnpypJ6gTp3zTgRFBSB2u/c6BmQNrvDtmuzI1xGqY2IXR zM5lPbGPGuc6n+bawfKd2q9LFQihb8mOuoDrP8+kZLnNhmjeip3F12SRJkdHaQ== 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 4d8GBd4ljVz5R7; Sun, 16 Nov 2025 03:12: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 5AG3C9oZ094509; Sun, 16 Nov 2025 03:12:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C9M7094506; Sun, 16 Nov 2025 03:12:09 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:09 GMT Message-Id: <202511160312.5AG3C9M7094506@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: 1ef6b8e0683a - releng/15.0 - vmimage.subr: Don't log missing files from pkgs 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 1ef6b8e0683a63c805b33816e4ad460b4e5e158e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1ef6b8e0683a63c805b33816e4ad460b4e5e158e commit 1ef6b8e0683a63c805b33816e4ad460b4e5e158e Author: Colin Percival AuthorDate: 2025-11-16 01:19:50 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:26 +0000 vmimage.subr: Don't log missing files from pkgs When installing "extra" packages (aka those built from the ports tree), we record everything being installed in METALOG.pkg; the contents of that file is appended to METALOG before we generate the filesystem. There are two cases when files recorded in METALOG.pkg will no longer exist by the time we create the final disk image: 1. If a pkg bug results in false dependencies being installed which are later removed by "pkg autoremove", and 2. If the pkg we build and install from /usr/ports is older than the pkg on pkg.freebsd.org, and pkg gets upgraded automatically as part of installing extra packages. The ultimate issue in both cases is that there's no mechanism for removing entries from METALOG when we run 'pkg delete'. Address this build breakage by checking, line by line, if filesystem objects mentioned in METALOG.pkg exist before appending them to METALOG. Approved by: re (cperciva) Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install") MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 78fa6965e91ec52c24f602250a9d7ec465b9a6ba) (cherry picked from commit 0ff7c9251790117429d1d04d75ec75585878325d) --- release/tools/vmimage.subr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 7035b107ae22..03d92850f2a3 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -292,8 +292,15 @@ vm_extra_pkg_rmcache() { buildfs() { local md tmppool + # Copy entries from METALOG.pkg into METALOG, but first check to + # make sure that filesystem objects still exist; some things may + # have been logged which no longer exist if a package was removed. if [ -f ${DESTDIR}/METALOG.pkg ]; then - cat ${DESTDIR}/METALOG.pkg >> ${DESTDIR}/METALOG + while read F REST; do + if [ -e ${DESTDIR}/${F} ]; then + echo "${F} ${REST}" >> ${DESTDIR}/METALOG + fi + done < ${DESTDIR}/METALOG.pkg fi if [ -n "${NO_ROOT}" ]; then From nobody Sun Nov 16 03:37: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 4d8Glr028Pz6Grf6; Sun, 16 Nov 2025 03:37: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 4d8Glq6KCxz3tfS; Sun, 16 Nov 2025 03:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763264247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Trs1zi4qnZ5WSv4ao75A0o2FuITuiO+IJW5sY+1aL8=; b=EqJ+42WeCNzSzYc8nt9TJ5YIg3RZ3aIpNsZWrlzS7XGL4eWGaqkQwtEgCqn4FfTYeeEJk1 0bgsK0Cl6DVHpqkxAzeyuLByIqGUltX9VEeroO0WdfEbyYA8biru9DYhNrba4QyCL7bCLJ QQzDQMpk+qG1lyio8JM7Rl7FnDnynHKJv9yJDE1PU+ijxZJLr2bKd7opZ4O1Q6tB1LTeEb KiMeHXqhBBoBSp+5mbW3ww02di6kkFNvtVjf/xnGlZKTFNvDnaAPhVCXL2mSM0emMM0Ssn bb6OLO3xgTaPLB3X3oRx710r0rwRj1QlgLZaSQCSzkwtjXOIwlGnPqukvFEX+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763264247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Trs1zi4qnZ5WSv4ao75A0o2FuITuiO+IJW5sY+1aL8=; b=bdaNgw/8TDwoQxGdywo14RbZfs/SoR7BLYnQxKNVlR0kDuTvF3Uk8e+AxqnjyIGLJeKXwW 8BAYY2oiuy9GkiWvJ7Pxi/ZR/YKrfj/XpA6rwCn/zGPQrGiyTvOlnVQkX2MrN+oIqJUwp2 gSyyjH/JxjZJ5vN2DNlryRM1p6ejsWdCae344f2KSfiLaxpQ2eNCdZQHX9xarONa8dxarC dC5Qgqn9D8qcOJ5/Da0Orw6FJmGGTn/VHLQeuk2rhLIioCoOIbU/+5VEMuBDGFP+Pb/Lx6 /gEWZkDl6iAvmV3XMCIM3CTsmV7KOwoUzubxkgvgK8UslxjoZ4JkInGMI3P2Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763264247; a=rsa-sha256; cv=none; b=k7dhpX2ckZ50ZR+U4b3qnRHTGye3MeqLtatJZiTuGZ1f3axw0RHeHKYb+wvVh9A7kL6QYC 2RIlSdLo5n++MolyGdMmPNcj59VDv+MYkGEC7p698ad2uPRfxP8Ses2rOtBTTmTcffEF0D DawHvPbrU5kpNX7XyNHnMUUaXFGWZYUFQFZC/xAWRDoefnEV1vxynqWGjSaC7j66pvyNDY Tjx9J8n7JoDJ6SiMj4jgZPqsoPNSf4ekqT35QczL8OTZzr5GUP2J9kMuHXO7Nr+Z5jBnDQ hCSm3zOVHL56BNElgQe0Md9jgOWzKnT9WHPLGqxGF0B1pde1zqUDVXD/z371Ng== 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 4d8Glq5dLSz5Tf; Sun, 16 Nov 2025 03:37: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 5AG3bRsX034152; Sun, 16 Nov 2025 03:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3bRsq034149; Sun, 16 Nov 2025 03:37:27 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:37:27 GMT Message-Id: <202511160337.5AG3bRsq034149@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: acf90099fe13 - releng/15.0 - 15.0: Switch from "quarterly" to "release" pkgs 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: acf90099fe13bd8b59407e247340ae9e9efe2e3c Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=acf90099fe13bd8b59407e247340ae9e9efe2e3c commit acf90099fe13bd8b59407e247340ae9e9efe2e3c Author: Colin Percival AuthorDate: 2025-11-16 03:36:43 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:36:43 +0000 15.0: Switch from "quarterly" to "release" pkgs Approved by: re (implicit) --- release/pkg_repos/release-dvd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index 600c309d5979..5682e6559ad8 100644 --- a/release/pkg_repos/release-dvd.conf +++ b/release/pkg_repos/release-dvd.conf @@ -1,5 +1,5 @@ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_0", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From nobody Sun Nov 16 03:37: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 4d8Gls294xz6GryY; Sun, 16 Nov 2025 03:37: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 4d8Glr6RSjz3tfT; Sun, 16 Nov 2025 03:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763264248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58p4m1NINpedNiiSRe3G0sRY0ze7zU6+nz5BH10CTaI=; b=ho2QYE54hflMtoqVaIzp1iqiDQPYZW7f8RtOv/wHdLkVw70buqmI3Gy2NEtm5gNXnednDl dAc8GnjbWrp8Wa1ecjTnKpbRJRrLB4oMWyXF7QjjnBZ7s/g7uKTVnLUz7MmQIX0R2g9r/C One+ge7EEcKazPzZONfky4hAbiHgooGWhznQazceGW56Dp6mH3l8vJAvcMjqiW9lN9bnMP o6tARDWi5oFAMCK2R1vRCYzu00AmNhQzAZPMOaou+O0yjysuDcTPENjdD7PIfl6s0t6sB/ 2R12GQe2l8qS6eLKlVIOXBwnvrFcRc3NoNL2Nn5CCErncPVthvdv4lBDIB2ioA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763264248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58p4m1NINpedNiiSRe3G0sRY0ze7zU6+nz5BH10CTaI=; b=ZRkEYdNuRjxqdgr04pIi+hEt81B3is3qbqGkvKjetlxbU4YHw8OhqvGId4q2wodlMADwXK cXwpBDQD9wh/N3QvwKtdCOSn9H6Z9PHq0pzjcYhOqMfunnWO1P9FpxWwIgyfFVXWIlM/+Z CUj8DF5wye7sL7NSbxXOggTo42fRnAbyoY1+BhNQczHs1Z++Xv2KJTmM8GrokZq+hvrOil SBRjeX1L3/dL8GZbHZ/45/4suV9GRF+5dXeKuFw7u6aw15WDW5lOukJEcfUuKp348Wsuro 9A0jSeyyhxs7Kts6ZLL0TTKEbcsARyvMHoBDFMuj5Nee/Xn7qVscxqQy1j5lyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763264248; a=rsa-sha256; cv=none; b=dZjl38B9R9gMA2pV/CXszMD47kRNHkhs2MXgNIbApaWf/Jzz8tP6I1LWD/djO9sNo8CmkL CgPsfxFE7TDZAqs+vzX/qUwH0wcVWC3sBPy+qw/YIqT++JN8DijczktGnQhEmsuf9af51R 7DATlQPONtYe844i+09XJR1l3lVR3NPNVoAplLlyFdMuBXUGfPH5Z8v2ZY9JhvvbKezUXH WDOw4P1uiAG+JLuM9K0Qhfeu9gzGoNJTmBmAAvHCis5+vlEsKcjMODyALHcLjRl8TRhKVz v5Ez60xfcXchBWxZ8aGM1No2j9tEi6EL1lQgxggh2fH+wf2xOgoGwL2XsQMt9w== 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 4d8Glr62Qgz6DM; Sun, 16 Nov 2025 03:37: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 5AG3bSuR034185; Sun, 16 Nov 2025 03:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3bSDp034182; Sun, 16 Nov 2025 03:37:28 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:37:28 GMT Message-Id: <202511160337.5AG3bSDp034182@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: da0c91363858 - releng/15.0 - 15.0: Update to RC1 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: da0c913638584d47db40c938fc7feff2af7501c7 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=da0c913638584d47db40c938fc7feff2af7501c7 commit da0c913638584d47db40c938fc7feff2af7501c7 Author: Colin Percival AuthorDate: 2025-11-16 03:37:00 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:37:00 +0000 15.0: Update to RC1 Approved by: re (implicit) --- 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 15a571f63454..5f5224975735 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="BETA5" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Sun Nov 16 03:52: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 4d8H4l6RVdz6Gswq; Sun, 16 Nov 2025 03:52: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 4d8H4l5ckhz3w16; Sun, 16 Nov 2025 03:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763265127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KVrwV4fQHLaYyQi6ep+p2B/a0x7lwMJi+AIou++/6uM=; b=FqsfHyDcpybnKdYNFCDY8Ze9wpCd9qN8N/O9LC5jZi8V5tZK36PbtAgThO8XZbqLwxbhkl xldcDJx1vsFXKICe1/HBbBrppzmFOwl8QycgIAZxZZE5k9JxW5egCMjEk3YMDJUriE4vvm z5XSMqmDH8/2TmGydt5EPGLOImdPpgTN/cSv4RoHzrwsQYJUUjHlPkhovKRBLeiC99FNvc BD3mTi5U+qWcIIuzEAZKhgeR0mRdeFLcKBUPeYKT7jAW3sKknXCri7dNBtc7Kgbvvcp3kD T6SyvBsfS2flx83dpjButukCZmnlDJFXBkcvcetySzY9Y31beOh/ZeyPjYdhyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763265127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KVrwV4fQHLaYyQi6ep+p2B/a0x7lwMJi+AIou++/6uM=; b=F2GGz6PcsjT2dHAZymTywX626v5MuwZyPV9MLCPcXHGEaVoiooAG3g0TIGCppM2yROBQSD +EHNcgKYk2HvTMOFgntpXUslnhreVv7JwvlBQ0yc3MUrJ6CyfuDSB7L1EawfxKuUMAc+P2 85qmtFJPpuGlHtB+VxtxQjg4/xJC4e83acb3fFzboO+SU3uv3j9eb72DdIM0Xm+KQiW3IU vNZPcP5yUlfOtDpjcf+2iwPp7BrL1Y91AMWrvDH13R1g6my4Wt4zMBozGqIx6lEWWsKlFB /5P7aBGOUxC4dBKdZeqet2Rh/ow1CkTb2N2rsW/6x3epwkPc7vPcaGmMuV0p/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763265127; a=rsa-sha256; cv=none; b=UsIHA9j9Ymxj6dQYCiU+p+gheRVHz7YkbTbaUmTJMq0nq1XayhNwT8BbmzWygpU6aN0WV5 bSxfypFHamiTIh1zpY97/1Pvlbq0cxy1x0SwsAj2W1fdFPGvgXr+rtbEQt+8aTbl92KQpA jIPBCpvbUcWCV/ZK885q4xGvtwu+jbze0SQY4criHb35vzhNCifC2YchvvBFf9MHqQslRa 7fmv52/H7eOHyJlrwxSsaUo/fhnvy+EsyIRBvtIhOWOkIgFD5WKqunvcMt+xfWKcErX5qI 1xPsfVdAI9ZHC/lTcRSqZy6ZohcoVtKxJFm9ARTe1+5yl7A/S4V24gHeTgKioQ== 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 4d8H4l5Bfzz69y; Sun, 16 Nov 2025 03:52: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 5AG3q7tq068165; Sun, 16 Nov 2025 03:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3q7oi068162; Sun, 16 Nov 2025 03:52:07 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:52:07 GMT Message-Id: <202511160352.5AG3q7oi068162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: ac4b39441773 - stable/15 - rm(1): remove whiteouts when forcibly removing directories 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ac4b39441773bc0d43f9d1aff9b0f82d83a9a97e Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4b39441773bc0d43f9d1aff9b0f82d83a9a97e commit ac4b39441773bc0d43f9d1aff9b0f82d83a9a97e Author: Jason A. Harmening AuthorDate: 2025-11-08 04:23:02 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-16 03:51:26 +0000 rm(1): remove whiteouts when forcibly removing directories Commit 2ed053cde5 changed UFS' VOP_RMDIR() behavior to no longer ignore whiteouts when determining whether a directory is empty, unless explicitly requested by the caller. However, this also necessitates a change to rm(1) to avoid breaking the expected behavior when forcibly removing directory hierarchies via `rm -fr`. I neglected to make this follow-on change despite discussing it in the review for the breaking commit (D45987). Finally address the breakage by making `rm -fr` imply FTS_WHITEOUT when rm(1) reads directory contents via fts_read(3). While here, also fix a logic error which produces a spurious 'No error' warning message on stdout for each deleted whiteout. Reported by: csjp Reviewed by: csjp, kib, olce Differential Revision: https://reviews.freebsd.org/D53640 (cherry picked from commit 8b92a6ad597e224b616a8b1d6983f3b55c85308e) --- bin/rm/rm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 16bbf7403fd4..2c41d7380cea 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -184,7 +184,7 @@ rm_tree(char **argv) flags = FTS_PHYSICAL; if (!needstat) flags |= FTS_NOSTAT; - if (Wflag) + if (Wflag || fflag) flags |= FTS_WHITEOUT; if (xflag) flags |= FTS_XDEV; @@ -273,7 +273,7 @@ rm_tree(char **argv) case FTS_W: rval = undelete(p->fts_accpath); - if (rval == 0 && (fflag && errno == ENOENT)) { + if (rval == 0 || (fflag && errno == ENOENT)) { if (vflag) (void)printf("%s\n", p->fts_path); From nobody Sun Nov 16 04:31:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8J1x2N9Kz6GxTx; Sun, 16 Nov 2025 04:34:45 +0000 (UTC) (envelope-from yasu@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.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 4d8J1x1npqz445t; Sun, 16 Nov 2025 04:34:45 +0000 (UTC) (envelope-from yasu@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763267685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1jTziNrw6XwzVP7+VF1PGI/g+zO+mk+XnYZnMiPnlRk=; b=Nmrb3HHWUn+zZAo5Q5YApDhhyRXWNQj9/9o6T9d3smmbYYAFCNXt9ZFk+wVXla63Mh7LI1 HaO4OPwVbIh37zAxKveAbe2/FMn4vxgqkGuoy6INGl47NvfS5TnvsIKVELZOQtS+4iVmQ2 W6pHCXNCKvfnG/aUCCg2oMePNka0xcey/4FELokevW6UYomsoQT6nBG48cq30YZCME12cP 92iSkcq/WD4q3qV/0p+cK8i4MXZUKpkrF5jN2H7JdK06f+idqrsDjy2Rh26gge1/skGZMA 3OzRoi96whjAe6ojORS8UKLIBBRc+dV7YyWZM+tp4gBlnM/EIS/pcvIlPw7G3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763267685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1jTziNrw6XwzVP7+VF1PGI/g+zO+mk+XnYZnMiPnlRk=; b=kGSEqP/0TWrCgNvDzPlkL0xNEEa3OZP7IU/lJc19nAyQoyioUj7zRUGA9psdykFaXWofBn wfHMTfmOcG5IAnrxl6e/D+Bzx7ZEeh3dp4PXwvTfVC6/q/fPbGEJSaTE+K1MhvfLq8HDWx Y0V1mUe/qaagHh6QKiR1kC1aZFle8+D443P8wyMuKdEHLSJyFzFsp7GbBgAXlU7HwWyyvZ deiXqnNJ6olqp+wkrHIQUwN8NLUnVk19EgtX3thTPNlyJc93jkyV+PnISrXCHkuU6lMBZ1 iIQ3TcW/jLx97ojzt0SJ3awrAqDEeeIOGiaJOLlT7P4fp/X8jVIiVkmcAQfoCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763267685; a=rsa-sha256; cv=none; b=YHIjRA4GG1mxDCWO5UpOCz8fKCD4jUvhm2ae9ra2r/vev8KjqksW7sBSLk2BoO+aq0CjoD C0Wlt5J25F9p/mBi9kHK9stnkQYVZSS/XworBwcpHcJrDnxnlHttYsKT48Vcnsi/CFp/4g H8YWAH7bK1cqfqtBBSorUv3qbZTsudxlkmXLaB3PBev8fAMn108JxmmwGlBhAy/FoI9VcK MD1aKBWyNtTglXyFtU7diUymsgXXMMQVXJO2Tbyn01m5WCbMTOBvoosZOPk8rzCbaUx6gq 0HwBqvBO4xm1cTa3peKiL3fnUYAUuRn/GkEUGQO31nx4pVlP22X0yXiMonF7oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from localhost (unknown [IPv6:240b:11:220:fe00::174:11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: yasu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4d8J1w26YVzLX3; Sun, 16 Nov 2025 04:34:44 +0000 (UTC) (envelope-from yasu@FreeBSD.org) Date: Sun, 16 Nov 2025 13:31:54 +0900 (JST) Message-Id: <20251116.133154.1583876536335720886.yasu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 9835413fb078 - releng/15.0 - bsdinstall: Enable FreeBSD-base repo when pkgbase From: Yasuhiro Kimura In-Reply-To: <202511160312.5AG3C6RS094400@gitrepo.freebsd.org> References: <202511160312.5AG3C6RS094400@gitrepo.freebsd.org> X-Mailer: Mew version 6.10 on Emacs 31.0.50 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 From: Colin Percival Subject: git: 9835413fb078 - releng/15.0 - bsdinstall: Enable FreeBSD-base repo when pkgbase Date: Sun, 16 Nov 2025 03:12:06 GMT > The branch releng/15.0 has been updated by cperciva: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9835413fb0788f65002a40f47e02c08e23047525 > > commit 9835413fb0788f65002a40f47e02c08e23047525 > Author: Colin Percival > AuthorDate: 2025-11-15 21:56:35 +0000 > Commit: Colin Percival > CommitDate: 2025-11-16 03:11:17 +0000 > > bsdinstall: Enable FreeBSD-base repo when pkgbase > > When performing a pkgbase install, create a configuration file in > /usr/local/etc/pkg/repos/FreeBSD.conf which enables the FreeBSD-base > repository. (This repository is defined in /etc/pkg/FreeBSD.conf as > being disabled by default.) When it is fresh install of 15.0-RC1 pkgbase system, information of FreeBSD-base repository is put as below [/etc/pkg/FreeBSD.conf] ---------------------------------------------------------------------- FreeBSD-base: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", enabled: no } ---------------------------------------------------------------------- [/usr/local/etc/pkg/repos/FreeBSD-base.conf] ---------------------------------------------------------------------- FreeBSD-base: { enabled: yes } ---------------------------------------------------------------------- And it works as is expected. When it is upgrade from 15.0-BETA5 or before, on the other hand, the information is put as below after `pkg upgrade` has finished. [/etc/pkg/FreeBSD.conf] ---------------------------------------------------------------------- FreeBSD-base: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", enabled: no } ---------------------------------------------------------------------- [/usr/local/etc/pkg/repos/FreeBSD-base.conf] ---------------------------------------------------------------------- FreeBSD-base: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_0", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", enabled: yes } ---------------------------------------------------------------------- Since settings in /usr/local/etc/pkg/repos/FreeBSD-base.conf overwrite ones in /etc/pkg/FreeBSD.conf, "pkg.FreeBSD.org" is still used as url of FreeBSD-base repository. --- Yasuhiro Kimura From nobody Sun Nov 16 05:41: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 4d8KWR4LKyz6H3bZ for ; Sun, 16 Nov 2025 05:41:55 +0000 (UTC) (envelope-from 0100019a8b2f254b-994b96d1-7ae4-4d9f-9bb1-d795d4ba6ced-000000@amazonses.com) Received: from a8-60.smtp-out.amazonses.com (a8-60.smtp-out.amazonses.com [54.240.8.60]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8KWQ6SPFz47gH for ; Sun, 16 Nov 2025 05:41:54 +0000 (UTC) (envelope-from 0100019a8b2f254b-994b96d1-7ae4-4d9f-9bb1-d795d4ba6ced-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1763271714; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=jd3Fd0VqT5NO8W3MkLc8V0sExqtNlEX8dG2OpQ2ACdE=; b=w9Jdhes1yzDWKN+7dXNGBlHgckWIzTWWBMYWY3d4PAWMUIHLuiOQtfjQqWSPRp9R CZ5WrO4darJ37zZl62l8t2zvUwlunLf+3ZK27qJoEJ1vdaL118vrmF8l+M7n08VsV1X rpx8u/2khdgL9oXR9J4akDDHnoRVM2bQStqj2N/g= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1763271714; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=jd3Fd0VqT5NO8W3MkLc8V0sExqtNlEX8dG2OpQ2ACdE=; b=Ge+WKpAwPAT/ktuO3SVM99+zURoAzCh75IS/2tHPTt5h1xKcGxt662gBZLEUsaRT ZqALz4dyFkcVAq6NPQngI2Cg2MC3mwmhsghZ2NICIkn04H9Ww/b7e6u7jPc+iCFneRF PeGdQOx2TIi9CgukLvaGWX9dlbRDeUn87/Vr4yJk= Message-ID: <0100019a8b2f254b-994b96d1-7ae4-4d9f-9bb1-d795d4ba6ced-000000@email.amazonses.com> Date: Sun, 16 Nov 2025 05:41:54 +0000 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 9835413fb078 - releng/15.0 - bsdinstall: Enable FreeBSD-base repo when pkgbase To: Yasuhiro Kimura , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202511160312.5AG3C6RS094400@gitrepo.freebsd.org> <20251116.133154.1583876536335720886.yasu@FreeBSD.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <20251116.133154.1583876536335720886.yasu@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2025.11.16-54.240.8.60 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d8KWQ6SPFz47gH On 11/15/25 20:31, Yasuhiro Kimura wrote: > When it is fresh install of 15.0-RC1 pkgbase system, information of > FreeBSD-base repository is put as below > [...] > And it works as is expected. > > When it is upgrade from 15.0-BETA5 or before, on the other hand, the > information is put as below after `pkg upgrade` has finished. > [...] > [/usr/local/etc/pkg/repos/FreeBSD-base.conf] > ---------------------------------------------------------------------- > FreeBSD-base: { > url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_0", > mirror_type: "srv", > signature_type: "fingerprints", > fingerprints: "/usr/share/keys/pkg", > enabled: yes > } > ---------------------------------------------------------------------- > > Since settings in /usr/local/etc/pkg/repos/FreeBSD-base.conf overwrite > ones in /etc/pkg/FreeBSD.conf, "pkg.FreeBSD.org" is still used as url > of FreeBSD-base repository. Yes, we'll have to document this clearly. The problem here is that since /usr/local/etc/pkg/repos/FreeBSD-base.conf is created by the installer, pkgbase doesn't know anything about it. I'm thinking something along these lines: > If you are upgrading a system which was installed using pkgbase prior to > FreeBSD 15.0-RC1, after upgrading you should remove all of the fields in > the "FreeBSD-base" definition in /usr/local/etc/pkg/repos/FreeBSD-base.conf > except for the line "enabled: yes". -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Sun Nov 16 11:58: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 4d8Tt33mvYz6HXCX; Sun, 16 Nov 2025 11:58:35 +0000 (UTC) (envelope-from yasu@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.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 4d8Tt338Hjz3MLn; Sun, 16 Nov 2025 11:58:35 +0000 (UTC) (envelope-from yasu@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763294315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rrMtyE736H89madVK34ub+cV5fMn/lfmm56Bqm/NypA=; b=r3jcD+ZTJEP6RwgsfF4VWEgLBNByIjJNO29iOncRFjHRDme9US52rBxHCLv2WYHd8gEN+D tpLEejLRpvSESRhaAZ0AW/H1SeCyr8Pgrj73sFVGG73DybUqdi4hUx4O2T8086dqGhcIMO x/iAfdPcDiyyptll9XfBLmjyY0Jnl8T5qHFBs7RbZSYS4Fld3DKF4vbaRBm7nu8+n2GLhs DL2zXaLBvwpD3WtKy+/N0uOJ+AfuzjNvxfITTWwimdmXJ1eh9JYoXBXXXCNLxRzJt8lsWO DPR4kPxqEFciDuLh8WppNVSm/zUbetx6/tEA+NSiQwAVNbWTzuj6c7u4wVJYtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763294315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rrMtyE736H89madVK34ub+cV5fMn/lfmm56Bqm/NypA=; b=BvpoGIy2UUZHb0Osc+3q8mZgUtIneFPRpBE6F7MW+zxb1mwJxi30EqnjBrr8xTFYgkkZtj 7HVCpQSurIJYyB5hSm7sJ1U2p2HX1euImmWe/WuN0JRIv05JKax3AL/SOvIvTSHfN5BI74 1fZmm3kAixGin1QvzYQK9sO1AI0Ic7s7WadqH02ahU0MidMSuyuYp2VFf8fG10vqeAuEjZ atw5eemV0ORSbBDDnXIIhwqt6h0n/ReiE5tTBAAMr6/0MIbRVPhqIwzayCxi2AuXxkWHAx XpGGUwcqyvqkyNJ7kpwZqHONRq0nLu5NyXVpM7YnV8SyvZHRr3n7nySOY5o5rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763294315; a=rsa-sha256; cv=none; b=YrpTfhKKlSqnm72fCOriGXnWK5r3gpkyN/pMpRkpnuu/o2tSFPolQLzYrpSb5PQyie0XEE 2cd/w+BWAqkturmku1JxaMGTRcIDM5gz2mSyj15TDINcTf8aSi+FJSoFXP/R2Q21//h23e pehRJjMhze7kkgVM3QX2cQl+qUL3XBYlBn7tz/MbPEyWA/9/b+LZeMluyIDwzDPqKMJqe4 kydJTHxL+WQmcauNfTpWokXsMw/ID90bjL/7uvIAFBpnFQVjV5O+ZWPjFvd3ZDSBPB8o/f DuvssuiQfv0D0wsN71hor/bbxGxKQS96BU+naA+LVoRxXFJ8KJH1XTUgoCtjRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from localhost (unknown [IPv6:240b:11:220:fe00::174:11]) (using TLSv1.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) (Authenticated sender: yasu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4d8Tt23KlcznRp; Sun, 16 Nov 2025 11:58:34 +0000 (UTC) (envelope-from yasu@FreeBSD.org) Date: Sun, 16 Nov 2025 20:58:14 +0900 (JST) Message-Id: <20251116.205814.461396427836122335.yasu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 9835413fb078 - releng/15.0 - bsdinstall: Enable FreeBSD-base repo when pkgbase From: Yasuhiro Kimura In-Reply-To: <0100019a8b2f2541-6147d1a4-d5a5-4175-b4c7-eb94a568809d-000000@email.amazonses.com> References: <202511160312.5AG3C6RS094400@gitrepo.freebsd.org> <20251116.133154.1583876536335720886.yasu@FreeBSD.org> <0100019a8b2f2541-6147d1a4-d5a5-4175-b4c7-eb94a568809d-000000@email.amazonses.com> X-Mailer: Mew version 6.10 on Emacs 31.0.50 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 From: Colin Percival Subject: Re: git: 9835413fb078 - releng/15.0 - bsdinstall: Enable FreeBSD-base repo when pkgbase Date: Sun, 16 Nov 2025 05:41:54 +0000 > Yes, we'll have to document this clearly. The problem here is that > since > /usr/local/etc/pkg/repos/FreeBSD-base.conf is created by the > installer, > pkgbase doesn't know anything about it. > > I'm thinking something along these lines: >> If you are upgrading a system which was installed using pkgbase prior >> to >> FreeBSD 15.0-RC1, after upgrading you should remove all of the fields >> in >> the "FreeBSD-base" definition in >> /usr/local/etc/pkg/repos/FreeBSD-base.conf >> except for the line "enabled: yes". Though it doesn't cause problem with pkgbase systems of 15-STABLE and 16-CURRENT, it should also be notfied to users of them. --- Yasuhiro Kimura From nobody Sun Nov 16 17:14:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8ctY5F41z6Gln5; Sun, 16 Nov 2025 17:14: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 4d8ctY4ct3z3qt2; Sun, 16 Nov 2025 17:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y19f1+vj9a41jl8dFzOHNcnNdn4Tf/t2UMCEyhvIsg4=; b=TK7p+DyeTe+yf8JORGASsDV8XDl4AqhFXsl9V0/cz89bJdt39jYn1zjgR7tEmuKkcd4a5l okvkjRnSOH43sDN6FFju/pMr+Vxf6FKZKeezZ1vBjU6SLYsNHIMGNCAZqDY6oa4t6ZI5yx UWYs+ejU+qCPH5SqQR+tQs+HuXOzweH3t9i0z4ECASFqZBT1vo7CIK9hfFbeIQ+poEnPuB oFogySDd7Y3xivMQrXV9ZrK6+bHEi9WbHH6gKJD/vtWaexSPgZktIx/9cpaBv/tA9FYJ3k pB1kDQPcQ8wxl9//Q0GgZwBIJ5QLYRaQEuYK3yIT7sE65rqDqkWn5yQJPn4bRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y19f1+vj9a41jl8dFzOHNcnNdn4Tf/t2UMCEyhvIsg4=; b=w5ddspA3YrKSAkaEE97GQ+s50d8f/hvau3EmkTRBn6SVP/FdRf3yq0f0oHyYLm1QGlCxu9 goCqGsH3uodFPQ7yI6gcCCApNnfJyyNv0WUbJKjqbFfilH/uKGQTVsk4K5YlvDsYsQnx/f pxjge3TpXu4khTrOOUiSqdqjhzw8WcaIYtvHY4tRXrzneiaCkw7fnPUQKo+tfs1FTH4qT+ a5y4DmmpCn2S8VPyeb3GT+gMAi2txGQe1436fOJcJMK4x/cCnFfv0wYP8/mbc2oZ4k1G5L K/VLPgnzIBXiLiCZm99EkGgG9fLj4/loDIiu25d6Bt4K+/ZV3PajdW3IYAHprw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763313269; a=rsa-sha256; cv=none; b=mGWk4AFSAJwYZvCbNyCGctlRc03gZanniH+EhXdZEmwF4wGO1UCQtb1VV0J2Qd6EQ+d1GM bBL2aahuT3URLAMIqGctKllvt5kbILjCO+roGFdfcJasNoWS0ohqRkge9QOZwicM5yZ7xx wgUb5SvEvKlQEFy81dpn9HfTRqeITHCw+XccjrZPjkF/O62UBT6egukpDYsXwvG7v7Vl4f LPvjmbXnQPuBNw7vPat8nDZZi9gZiIJCuIygPg8bIYC62FKWexIbNx47th3170pcI2N983 lDO0FOA5l72zmhN0xZAaSuThRs4nlZA4gPNi+Vk61DEkQma5DUeMSLBgGZAKwg== 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 4d8ctY4CctznZs; Sun, 16 Nov 2025 17:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AGHETu7074184; Sun, 16 Nov 2025 17:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AGHETHX074181; Sun, 16 Nov 2025 17:14:29 GMT (envelope-from git) Date: Sun, 16 Nov 2025 17:14:29 GMT Message-Id: <202511161714.5AGHETHX074181@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: e1560c8ba6a3 - stable/15 - vmimage.subr: Log correct paths into METALOG 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: e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f commit e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f Author: Colin Percival AuthorDate: 2025-11-16 17:12:00 +0000 Commit: Colin Percival CommitDate: 2025-11-16 17:14:20 +0000 vmimage.subr: Log correct paths into METALOG Paths all need to start with "./" because that's what newfs wants. Fixes: e0c41af9256b ("vmimage.subr: Enable FreeBSD-base repo if pkgbase") MFC after: immediately (cherry picked from commit aa33b6b820e6889a9eb11aa8aec498cb890c589a) --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 03d92850f2a3..d718150d8767 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -109,8 +109,8 @@ vm_install_base() { metalog_add_data ./var/db/pkg/local.sqlite mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf - metalog_add_data /usr/local/etc/pkg/repos - metalog_add_data /usr/local/etc/pkg/repos/FreeBSD.conf + metalog_add_data ./usr/local/etc/pkg/repos + metalog_add_data ./usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ From nobody Sun Nov 16 17:15: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 4d8cvB23fQz6Gm8p; Sun, 16 Nov 2025 17:15: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 4d8cvB1J0Mz3r8v; Sun, 16 Nov 2025 17:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iceJeUfmcUlreWP7WByqnhDBTjZQxi62CYifBn20UPE=; b=tjB++MF6KS/yEXiK9sFF+Od+qdTsjTEv4+uq5sV0k1l2LBDeQN4XogckLF+IoyWqpUbGKi BdTtrrEpNpnCLzHzQAZVUWbcG3VQ/9R7HrgXiFP6NcIQSeHvEuPbGXwNyAmBazBrGwefN/ 0Ktn3OfaRrthslWF4MekTh0a1+XNvinkp7pNdGcHq5iMwXcbUB46BK41i2wxEMEelxZQg1 todtgeuSwsFXrlpieBrj+qNp7JzMY2KgIp8dVk10rJAeDHpXNjOM3yXy/3J0mN0F7FqWcd s1OlQ4B2RSqpXWUIY2igZIqj/DrssJPlLBoB9gM9/Dw6worc9SRafGCNlyOfFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iceJeUfmcUlreWP7WByqnhDBTjZQxi62CYifBn20UPE=; b=r32rbmibaDe59x4P6sxRSMZmjz1cxU3Kl69LCQc8nZnCEDGDtUaxYw1OsGQDEmsMPG+8x2 uG1P2F8W9zf4KrnKHnfBsumK1bqVzae+fW9XvK6lwPrZr2NRjGoonx5ntWjBk7O6zMhaLz h9Pr5Om1Agqlpmkfz8BWUbSHyzKUPJP4YKvQhDD2OAXQvaq3WaxlrAmAHy/MpG3pKVh9qu blW3xsf/bF99xQE5yUk7SMCFStsRJMZ3A1iqbuZR+jjnAe4RTZIbIBhoyfiPZgvwEuIDhk DWUcsswCUcEAkTehC8np/4/3v/iYjMRxG2hbrXR5bymYVez73geQCzgcHNOAQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763313302; a=rsa-sha256; cv=none; b=YKW9gjAxpJBPL5SRh9qekB63u1WvB3+T92FqbFX4uk45rMgMjJrrVyvq8W6ub98HaEw+Ct yjejpMiVsYjGr3u3urdZpQajWgdrYiQFvS25ajkXT8RaFcK0FU/Z9ZuX9DPDRXmtXkkE1l OhzQQgfWBWp3EZrI7OMMobMe2sV3ALWNR9/UBgbFetGaPzRgkP/moOBIBTDJsUP8I4IIXV 6/CfIYXNNRhJ9fj1Dlh1EmnDWMEsK/SQGT8aDdK9u2c/Igy6hAMatHhPdvt2Jq7ilsblx/ f2Bu8G03Jrzwajff2+bB2HD/IjSKf906X5VOHY6g6DPa+Z/XvPF0KrrjcV3yIA== 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 4d8cvB0n2qznm8; Sun, 16 Nov 2025 17:15: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 5AGHF2lq074489; Sun, 16 Nov 2025 17:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AGHF2IC074486; Sun, 16 Nov 2025 17:15:02 GMT (envelope-from git) Date: Sun, 16 Nov 2025 17:15:02 GMT Message-Id: <202511161715.5AGHF2IC074486@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: c87b89d05340 - releng/15.0 - vmimage.subr: Log correct paths into METALOG 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c87b89d0534073324bdeb5857428b6299cd86074 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c87b89d0534073324bdeb5857428b6299cd86074 commit c87b89d0534073324bdeb5857428b6299cd86074 Author: Colin Percival AuthorDate: 2025-11-16 17:12:00 +0000 Commit: Colin Percival CommitDate: 2025-11-16 17:14:46 +0000 vmimage.subr: Log correct paths into METALOG Paths all need to start with "./" because that's what newfs wants. Approved by: re (cperciva) Fixes: e0c41af9256b ("vmimage.subr: Enable FreeBSD-base repo if pkgbase") MFC after: immediately (cherry picked from commit aa33b6b820e6889a9eb11aa8aec498cb890c589a) (cherry picked from commit e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f) --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 03d92850f2a3..d718150d8767 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -109,8 +109,8 @@ vm_install_base() { metalog_add_data ./var/db/pkg/local.sqlite mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf - metalog_add_data /usr/local/etc/pkg/repos - metalog_add_data /usr/local/etc/pkg/repos/FreeBSD.conf + metalog_add_data ./usr/local/etc/pkg/repos + metalog_add_data ./usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \